diff options
| author | con <qtc-committer@nokia.com> | 2010-05-17 17:40:40 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-05-17 17:40:40 +0200 |
| commit | 38f6379f3949779963b90c904e02314c8f2eaa50 (patch) | |
| tree | 146111bd5b7a5a73bef2cfde7e561e3375d6360e /src/plugins/locator | |
| parent | d8318a9502b2de2a5fc2e8984deb1383a4e216f7 (diff) | |
| parent | b52f3cb27464d20302599dec0f63e950a39dd64c (diff) | |
| download | qt-creator-38f6379f3949779963b90c904e02314c8f2eaa50.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
doc/qtcreator.qdoc
src/plugins/find/currentdocumentfind.cpp
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
Diffstat (limited to 'src/plugins/locator')
| -rw-r--r-- | src/plugins/locator/directoryfilter.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/locator/directoryfilter.ui | 2 | ||||
| -rw-r--r-- | src/plugins/locator/settingspage.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/locator/directoryfilter.cpp b/src/plugins/locator/directoryfilter.cpp index aa2dc8afc3..8f927d752b 100644 --- a/src/plugins/locator/directoryfilter.cpp +++ b/src/plugins/locator/directoryfilter.cpp @@ -145,7 +145,7 @@ bool DirectoryFilter::openConfigDialog(QWidget *parent, bool &needsRefresh) void DirectoryFilter::addDirectory() { - QString dir = QFileDialog::getExistingDirectory(m_dialog, tr("Choose a directory to add")); + QString dir = QFileDialog::getExistingDirectory(m_dialog, tr("Select Directory")); if (!dir.isEmpty()) { m_ui.directoryList->addItem(dir); } @@ -156,7 +156,7 @@ void DirectoryFilter::editDirectory() if (m_ui.directoryList->selectedItems().count() < 1) return; QListWidgetItem *currentItem = m_ui.directoryList->selectedItems().at(0); - QString dir = QFileDialog::getExistingDirectory(m_dialog, tr("Choose a directory to add"), + QString dir = QFileDialog::getExistingDirectory(m_dialog, tr("Select Directory"), currentItem->text()); if (!dir.isEmpty()) { currentItem->setText(dir); diff --git a/src/plugins/locator/directoryfilter.ui b/src/plugins/locator/directoryfilter.ui index 8b8ddfe59a..2786e0515d 100644 --- a/src/plugins/locator/directoryfilter.ui +++ b/src/plugins/locator/directoryfilter.ui @@ -26,7 +26,7 @@ <item row="2" column="0"> <widget class="QLabel" name="label_3"> <property name="text"> - <string>File Types:</string> + <string>File types:</string> </property> </widget> </item> diff --git a/src/plugins/locator/settingspage.cpp b/src/plugins/locator/settingspage.cpp index 0dcfdb5cf9..1f913c144b 100644 --- a/src/plugins/locator/settingspage.cpp +++ b/src/plugins/locator/settingspage.cpp @@ -165,7 +165,7 @@ void SettingsPage::updateFilterList() if (filter->isIncludedByDefault()) title = filter->displayName(); else - title = tr("%1 (Prefix: %2)").arg(filter->displayName()).arg(filter->shortcutString()); + title = tr("%1 (prefix: %2)").arg(filter->displayName()).arg(filter->shortcutString()); QListWidgetItem *item = new QListWidgetItem(title); item->setData(Qt::UserRole, qVariantFromValue(filter)); m_ui.filterList->addItem(item); |