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

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

View file

@ -30,7 +30,7 @@ BrowseDirtree::BrowseDirtree(QWidget *parent) : QDialog(parent)
ui.tree->setModel(&model);
model.setReadOnly(true);
model.setSorting(QDir::Name | QDir::DirsFirst | QDir::IgnoreCase);
// disable size / date / type columns
ui.tree->setColumnHidden(1, true);
ui.tree->setColumnHidden(2, true);
@ -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());
@ -49,17 +49,24 @@ void BrowseDirtree::setDir(QDir &dir)
if(model.index(dir.absolutePath()).isValid()) {
QModelIndex p = model.index(dir.absolutePath());
ui.tree->setCurrentIndex(p);
ui.tree->expand(p);
ui.tree->scrollTo(p);
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));
}
void BrowseDirtree::setFilter(QDir::Filters filters)
void BrowseDirtree::setFilter(const QDir::Filters &filters)
{
model.setFilter(filters);
}
@ -72,7 +79,7 @@ void BrowseDirtree::accept()
this->close();
emit itemChanged(QDir::toNativeSeparators(path));
setResult(QDialog::Accepted);
setResult(QDialog::Accepted);
}
QString BrowseDirtree::getSelected()

View file

@ -29,18 +29,19 @@ class BrowseDirtree : public QDialog
public:
BrowseDirtree(QWidget *parent = 0);
void setFilter(QDir::Filters);
void setDir(QDir&);
void setFilter(const QDir::Filters&);
void setDir(const QDir&);
void setDir(const QString&);
QString getSelected();
void setRoot(QString dir);
void setRoot(const QString&);
signals:
void itemChanged(QString);
private:
Ui::BrowseDirtreeFrm ui;
QDirModel model;
private slots:
void accept(void);
};

View file

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

View file

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

View file

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