len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-14 23:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add BrowseDirtree::setDir(const QString&) to simplify the code.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14694 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Antoine Cellerier 2007-09-14 20:10:54 +00:00
parent bedfd7c8b5
commit 4c881e2c91
5 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rbutil/rbutilqt/browsedirtree.cpp
View file

@ -39,7 +39,7 @@ BrowseDirtree::BrowseDirtree(QWidget *parent) : QDialog(parent)
} }
void BrowseDirtree::setDir(QDir &dir) void BrowseDirtree::setDir(const QDir &dir)
{ {
qDebug() << "BrowseDirtree::setDir()" << model.index(dir.absolutePath()); qDebug() << "BrowseDirtree::setDir()" << model.index(dir.absolutePath());
@ -49,17 +49,24 @@ void BrowseDirtree::setDir(QDir &dir)
if(model.index(dir.absolutePath()).isValid()) { if(model.index(dir.absolutePath()).isValid()) {
QModelIndex p = model.index(dir.absolutePath()); QModelIndex p = model.index(dir.absolutePath());
ui.tree->setCurrentIndex(p); ui.tree->setCurrentIndex(p);
ui.tree->expand(p);
ui.tree->scrollTo(p); ui.tree->scrollTo(p);
ui.tree->resizeColumnToContents(0); ui.tree->resizeColumnToContents(0);
} }
} }
void BrowseDirtree::setRoot(QString dir) void BrowseDirtree::setDir(const QString &dir)
{
QDir d(dir);
setDir(d);
}
void BrowseDirtree::setRoot(const QString &dir)
{ {
ui.tree->setRootIndex(model.index(dir)); ui.tree->setRootIndex(model.index(dir));
} }
void BrowseDirtree::setFilter(QDir::Filters filters) void BrowseDirtree::setFilter(const QDir::Filters &filters)
{ {
model.setFilter(filters); model.setFilter(filters);
} }

7
rbutil/rbutilqt/browsedirtree.h
View file

@ -29,10 +29,11 @@ class BrowseDirtree : public QDialog
public: public:
BrowseDirtree(QWidget *parent = 0); BrowseDirtree(QWidget *parent = 0);
void setFilter(QDir::Filters); void setFilter(const QDir::Filters&);
void setDir(QDir&); void setDir(const QDir&);
void setDir(const QString&);
QString getSelected(); QString getSelected();
void setRoot(QString dir); void setRoot(const QString&);
signals: signals:
void itemChanged(QString); void itemChanged(QString);

3
rbutil/rbutilqt/browseof.cpp
View file

@ -43,8 +43,7 @@ void BrowseOF::onBrowse()
if(QFileInfo(ui.OFlineEdit->text()).exists()) if(QFileInfo(ui.OFlineEdit->text()).exists())
{ {
QDir d(ui.OFlineEdit->text()); browser.setDir(ui.OFlineEdit->text());
browser.setDir(d);
} }
if(browser.exec() == QDialog::Accepted) if(browser.exec() == QDialog::Accepted)

15
rbutil/rbutilqt/configure.cpp
View file

@ -495,13 +495,11 @@ void Config::browseFolder()
#if defined(Q_OS_MACX) #if defined(Q_OS_MACX)
browser->setRoot("/Volumes"); browser->setRoot("/Volumes");
#elif defined(Q_OS_LINUX) #elif defined(Q_OS_LINUX)
QDir a("/media"); browser->setDir("/media");
browser->setDir(a);
#endif #endif
if( ui.mountPoint->text() != "" ) if( ui.mountPoint->text() != "" )
{ {
QDir d(ui.mountPoint->text()); browser->setDir(ui.mountPoint->text());
browser->setDir(d);
} }
browser->show(); browser->show();
connect(browser, SIGNAL(itemChanged(QString)), this, SLOT(setMountpoint(QString))); connect(browser, SIGNAL(itemChanged(QString)), this, SLOT(setMountpoint(QString)));
@ -516,8 +514,7 @@ void Config::browseCache()
#elif defined(Q_OS_WIN32) #elif defined(Q_OS_WIN32)
cbrowser->setFilter(QDir::Drives); cbrowser->setFilter(QDir::Drives);
#endif #endif
QDir d(ui.cachePath->text()); cbrowser->setDir(ui.cachePath->text());
cbrowser->setDir(d);
cbrowser->show(); cbrowser->show();
connect(cbrowser, SIGNAL(itemChanged(QString)), this, SLOT(setCache(QString))); connect(cbrowser, SIGNAL(itemChanged(QString)), this, SLOT(setCache(QString)));
} }
@ -625,8 +622,7 @@ void Config::browseTts()
if(QFileInfo(ui.ttsExecutable->text()).isDir()) if(QFileInfo(ui.ttsExecutable->text()).isDir())
{ {
QDir d(ui.ttsExecutable->text()); browser.setDir(ui.ttsExecutable->text());
browser.setDir(d);
} }
if(browser.exec() == QDialog::Accepted) if(browser.exec() == QDialog::Accepted)
{ {
@ -647,8 +643,7 @@ void Config::browseEnc()
if(QFileInfo(ui.encoderExecutable->text()).isDir()) if(QFileInfo(ui.encoderExecutable->text()).isDir())
{ {
QDir d(ui.encoderExecutable->text()); browser.setDir(ui.encoderExecutable->text());
browser.setDir(d);
} }
if(browser.exec() == QDialog::Accepted) if(browser.exec() == QDialog::Accepted)
{ {

6
rbutil/rbutilqt/installtalkwindow.cpp
View file

@ -43,13 +43,11 @@ void InstallTalkWindow::browseFolder()
if(QFileInfo(ui.lineTalkFolder->text()).isDir()) if(QFileInfo(ui.lineTalkFolder->text()).isDir())
{ {
QDir d(ui.lineTalkFolder->text()); browser.setDir(ui.lineTalkFolder->text());
browser.setDir(d);
} }
else else
{ {
QDir d("/media"); browser.setDir("/media"); // FIXME: This looks Linux specific
browser.setDir(d);
} }
if(browser.exec() == QDialog::Accepted) if(browser.exec() == QDialog::Accepted)
{ {