diff options
-rw-r--r-- | rbutil/rbutilqt/browsedirtree.cpp | 17 | ||||
-rw-r--r-- | rbutil/rbutilqt/browsedirtree.h | 11 | ||||
-rw-r--r-- | rbutil/rbutilqt/browseof.cpp | 3 | ||||
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 15 | ||||
-rw-r--r-- | rbutil/rbutilqt/installtalkwindow.cpp | 6 |
5 files changed, 26 insertions, 26 deletions
diff --git a/rbutil/rbutilqt/browsedirtree.cpp b/rbutil/rbutilqt/browsedirtree.cpp index 2eabe75564..59c4cef9f4 100644 --- a/rbutil/rbutilqt/browsedirtree.cpp +++ b/rbutil/rbutilqt/browsedirtree.cpp | |||
@@ -30,7 +30,7 @@ BrowseDirtree::BrowseDirtree(QWidget *parent) : QDialog(parent) | |||
30 | ui.tree->setModel(&model); | 30 | ui.tree->setModel(&model); |
31 | model.setReadOnly(true); | 31 | model.setReadOnly(true); |
32 | model.setSorting(QDir::Name | QDir::DirsFirst | QDir::IgnoreCase); | 32 | model.setSorting(QDir::Name | QDir::DirsFirst | QDir::IgnoreCase); |
33 | 33 | ||
34 | // disable size / date / type columns | 34 | // disable size / date / type columns |
35 | ui.tree->setColumnHidden(1, true); | 35 | ui.tree->setColumnHidden(1, true); |
36 | ui.tree->setColumnHidden(2, true); | 36 | ui.tree->setColumnHidden(2, true); |
@@ -39,7 +39,7 @@ BrowseDirtree::BrowseDirtree(QWidget *parent) : QDialog(parent) | |||
39 | } | 39 | } |
40 | 40 | ||
41 | 41 | ||
42 | void BrowseDirtree::setDir(QDir &dir) | 42 | void BrowseDirtree::setDir(const QDir &dir) |
43 | { | 43 | { |
44 | qDebug() << "BrowseDirtree::setDir()" << model.index(dir.absolutePath()); | 44 | qDebug() << "BrowseDirtree::setDir()" << model.index(dir.absolutePath()); |
45 | 45 | ||
@@ -49,17 +49,24 @@ void BrowseDirtree::setDir(QDir &dir) | |||
49 | if(model.index(dir.absolutePath()).isValid()) { | 49 | if(model.index(dir.absolutePath()).isValid()) { |
50 | QModelIndex p = model.index(dir.absolutePath()); | 50 | QModelIndex p = model.index(dir.absolutePath()); |
51 | ui.tree->setCurrentIndex(p); | 51 | ui.tree->setCurrentIndex(p); |
52 | ui.tree->expand(p); | ||
52 | ui.tree->scrollTo(p); | 53 | ui.tree->scrollTo(p); |
53 | ui.tree->resizeColumnToContents(0); | 54 | ui.tree->resizeColumnToContents(0); |
54 | } | 55 | } |
55 | } | 56 | } |
56 | 57 | ||
57 | void BrowseDirtree::setRoot(QString dir) | 58 | void BrowseDirtree::setDir(const QString &dir) |
59 | { | ||
60 | QDir d(dir); | ||
61 | setDir(d); | ||
62 | } | ||
63 | |||
64 | void BrowseDirtree::setRoot(const QString &dir) | ||
58 | { | 65 | { |
59 | ui.tree->setRootIndex(model.index(dir)); | 66 | ui.tree->setRootIndex(model.index(dir)); |
60 | } | 67 | } |
61 | 68 | ||
62 | void BrowseDirtree::setFilter(QDir::Filters filters) | 69 | void BrowseDirtree::setFilter(const QDir::Filters &filters) |
63 | { | 70 | { |
64 | model.setFilter(filters); | 71 | model.setFilter(filters); |
65 | } | 72 | } |
@@ -72,7 +79,7 @@ void BrowseDirtree::accept() | |||
72 | 79 | ||
73 | this->close(); | 80 | this->close(); |
74 | emit itemChanged(QDir::toNativeSeparators(path)); | 81 | emit itemChanged(QDir::toNativeSeparators(path)); |
75 | setResult(QDialog::Accepted); | 82 | setResult(QDialog::Accepted); |
76 | } | 83 | } |
77 | 84 | ||
78 | QString BrowseDirtree::getSelected() | 85 | QString BrowseDirtree::getSelected() |
diff --git a/rbutil/rbutilqt/browsedirtree.h b/rbutil/rbutilqt/browsedirtree.h index 4b9ae90a19..2c349398a8 100644 --- a/rbutil/rbutilqt/browsedirtree.h +++ b/rbutil/rbutilqt/browsedirtree.h | |||
@@ -29,18 +29,19 @@ class BrowseDirtree : public QDialog | |||
29 | 29 | ||
30 | public: | 30 | public: |
31 | BrowseDirtree(QWidget *parent = 0); | 31 | BrowseDirtree(QWidget *parent = 0); |
32 | void setFilter(QDir::Filters); | 32 | void setFilter(const QDir::Filters&); |
33 | void setDir(QDir&); | 33 | void setDir(const QDir&); |
34 | void setDir(const QString&); | ||
34 | QString getSelected(); | 35 | QString getSelected(); |
35 | void setRoot(QString dir); | 36 | void setRoot(const QString&); |
36 | 37 | ||
37 | signals: | 38 | signals: |
38 | void itemChanged(QString); | 39 | void itemChanged(QString); |
39 | 40 | ||
40 | private: | 41 | private: |
41 | Ui::BrowseDirtreeFrm ui; | 42 | Ui::BrowseDirtreeFrm ui; |
42 | QDirModel model; | 43 | QDirModel model; |
43 | 44 | ||
44 | private slots: | 45 | private slots: |
45 | void accept(void); | 46 | void accept(void); |
46 | }; | 47 | }; |
diff --git a/rbutil/rbutilqt/browseof.cpp b/rbutil/rbutilqt/browseof.cpp index e9fdc982f4..93b768c263 100644 --- a/rbutil/rbutilqt/browseof.cpp +++ b/rbutil/rbutilqt/browseof.cpp | |||
@@ -43,8 +43,7 @@ void BrowseOF::onBrowse() | |||
43 | 43 | ||
44 | if(QFileInfo(ui.OFlineEdit->text()).exists()) | 44 | if(QFileInfo(ui.OFlineEdit->text()).exists()) |
45 | { | 45 | { |
46 | QDir d(ui.OFlineEdit->text()); | 46 | browser.setDir(ui.OFlineEdit->text()); |
47 | browser.setDir(d); | ||
48 | } | 47 | } |
49 | 48 | ||
50 | if(browser.exec() == QDialog::Accepted) | 49 | if(browser.exec() == QDialog::Accepted) |
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 4001bc6347..c88b9857d8 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -495,13 +495,11 @@ void Config::browseFolder() | |||
495 | #if defined(Q_OS_MACX) | 495 | #if defined(Q_OS_MACX) |
496 | browser->setRoot("/Volumes"); | 496 | browser->setRoot("/Volumes"); |
497 | #elif defined(Q_OS_LINUX) | 497 | #elif defined(Q_OS_LINUX) |
498 | QDir a("/media"); | 498 | browser->setDir("/media"); |
499 | browser->setDir(a); | ||
500 | #endif | 499 | #endif |
501 | if( ui.mountPoint->text() != "" ) | 500 | if( ui.mountPoint->text() != "" ) |
502 | { | 501 | { |
503 | QDir d(ui.mountPoint->text()); | 502 | browser->setDir(ui.mountPoint->text()); |
504 | browser->setDir(d); | ||
505 | } | 503 | } |
506 | browser->show(); | 504 | browser->show(); |
507 | connect(browser, SIGNAL(itemChanged(QString)), this, SLOT(setMountpoint(QString))); | 505 | connect(browser, SIGNAL(itemChanged(QString)), this, SLOT(setMountpoint(QString))); |
@@ -516,8 +514,7 @@ void Config::browseCache() | |||
516 | #elif defined(Q_OS_WIN32) | 514 | #elif defined(Q_OS_WIN32) |
517 | cbrowser->setFilter(QDir::Drives); | 515 | cbrowser->setFilter(QDir::Drives); |
518 | #endif | 516 | #endif |
519 | QDir d(ui.cachePath->text()); | 517 | cbrowser->setDir(ui.cachePath->text()); |
520 | cbrowser->setDir(d); | ||
521 | cbrowser->show(); | 518 | cbrowser->show(); |
522 | connect(cbrowser, SIGNAL(itemChanged(QString)), this, SLOT(setCache(QString))); | 519 | connect(cbrowser, SIGNAL(itemChanged(QString)), this, SLOT(setCache(QString))); |
523 | } | 520 | } |
@@ -625,8 +622,7 @@ void Config::browseTts() | |||
625 | 622 | ||
626 | if(QFileInfo(ui.ttsExecutable->text()).isDir()) | 623 | if(QFileInfo(ui.ttsExecutable->text()).isDir()) |
627 | { | 624 | { |
628 | QDir d(ui.ttsExecutable->text()); | 625 | browser.setDir(ui.ttsExecutable->text()); |
629 | browser.setDir(d); | ||
630 | } | 626 | } |
631 | if(browser.exec() == QDialog::Accepted) | 627 | if(browser.exec() == QDialog::Accepted) |
632 | { | 628 | { |
@@ -647,8 +643,7 @@ void Config::browseEnc() | |||
647 | 643 | ||
648 | if(QFileInfo(ui.encoderExecutable->text()).isDir()) | 644 | if(QFileInfo(ui.encoderExecutable->text()).isDir()) |
649 | { | 645 | { |
650 | QDir d(ui.encoderExecutable->text()); | 646 | browser.setDir(ui.encoderExecutable->text()); |
651 | browser.setDir(d); | ||
652 | } | 647 | } |
653 | if(browser.exec() == QDialog::Accepted) | 648 | if(browser.exec() == QDialog::Accepted) |
654 | { | 649 | { |
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index 324fe442b1..f273721437 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp | |||
@@ -43,13 +43,11 @@ void InstallTalkWindow::browseFolder() | |||
43 | 43 | ||
44 | if(QFileInfo(ui.lineTalkFolder->text()).isDir()) | 44 | if(QFileInfo(ui.lineTalkFolder->text()).isDir()) |
45 | { | 45 | { |
46 | QDir d(ui.lineTalkFolder->text()); | 46 | browser.setDir(ui.lineTalkFolder->text()); |
47 | browser.setDir(d); | ||
48 | } | 47 | } |
49 | else | 48 | else |
50 | { | 49 | { |
51 | QDir d("/media"); | 50 | browser.setDir("/media"); // FIXME: This looks Linux specific |
52 | browser.setDir(d); | ||
53 | } | 51 | } |
54 | if(browser.exec() == QDialog::Accepted) | 52 | if(browser.exec() == QDialog::Accepted) |
55 | { | 53 | { |