diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-06-08 16:48:24 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-06-12 09:49:58 +0000 |
| commit | ee488785bf2843d38092d083b509782e77a8ce22 (patch) | |
| tree | 0db23daf13f709d0ec1052c8e4a16449d32cb539 /src/plugins/help | |
| parent | 0046562391fac5c2b22b4d46beee5a9261200041 (diff) | |
| download | qt-creator-ee488785bf2843d38092d083b509782e77a8ce22.tar.gz | |
Improved locator settings
* Added columns for name, prefix and default
* Made sortable
* Added filter input field
* Added inline editing of prefix and default state
* Changed "Limit to prefix" to "Include by default"
* Added some tool tips
Change-Id: I9ddfaf1bc9ff62e3fbe84c1b66bdd795aaa274fd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
Diffstat (limited to 'src/plugins/help')
| -rw-r--r-- | src/plugins/help/remotehelpfilter.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/help/remotehelpfilter.ui | 14 |
2 files changed, 14 insertions, 9 deletions
diff --git a/src/plugins/help/remotehelpfilter.cpp b/src/plugins/help/remotehelpfilter.cpp index c6b64119a7..a9ab238c8a 100644 --- a/src/plugins/help/remotehelpfilter.cpp +++ b/src/plugins/help/remotehelpfilter.cpp @@ -41,8 +41,13 @@ RemoteFilterOptions::RemoteFilterOptions(RemoteHelpFilter *filter, QWidget *pare , m_filter(filter) { m_ui.setupUi(this); + setWindowTitle(Core::ILocatorFilter::msgConfigureDialogTitle()); + m_ui.prefixLabel->setText(Core::ILocatorFilter::msgPrefixLabel()); + m_ui.prefixLabel->setToolTip(Core::ILocatorFilter::msgPrefixToolTip()); + m_ui.includeByDefault->setText(Core::ILocatorFilter::msgIncludeByDefault()); + m_ui.includeByDefault->setToolTip(Core::ILocatorFilter::msgIncludeByDefaultToolTip()); m_ui.shortcutEdit->setText(m_filter->shortcutString()); - m_ui.limitCheck->setChecked(!m_filter->isIncludedByDefault()); + m_ui.includeByDefault->setChecked(m_filter->isIncludedByDefault()); foreach (const QString &url, m_filter->remoteUrls()) { QListWidgetItem *item = new QListWidgetItem(url); m_ui.listWidget->addItem(item); @@ -162,7 +167,7 @@ bool RemoteHelpFilter::openConfigDialog(QWidget *parent, bool &needsRefresh) if (optionsDialog.exec() == QDialog::Accepted) { QMutexLocker lock(&m_mutex); Q_UNUSED(lock) m_remoteUrls.clear(); - setIncludedByDefault(!optionsDialog.m_ui.limitCheck->isChecked()); + setIncludedByDefault(optionsDialog.m_ui.includeByDefault->isChecked()); setShortcutString(optionsDialog.m_ui.shortcutEdit->text().trimmed()); for (int i = 0; i < optionsDialog.m_ui.listWidget->count(); ++i) m_remoteUrls.append(optionsDialog.m_ui.listWidget->item(i)->text()); diff --git a/src/plugins/help/remotehelpfilter.ui b/src/plugins/help/remotehelpfilter.ui index 6d8011ff2c..55f1f4de38 100644 --- a/src/plugins/help/remotehelpfilter.ui +++ b/src/plugins/help/remotehelpfilter.ui @@ -6,18 +6,18 @@ <rect> <x>0</x> <y>0</y> - <width>340</width> - <height>179</height> + <width>342</width> + <height>182</height> </rect> </property> <property name="windowTitle"> - <string>Edit Filter Configuration</string> + <string notr="true">Filter Configuration</string> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QLabel" name="label"> + <widget class="QLabel" name="prefixLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> <horstretch>0</horstretch> @@ -25,7 +25,7 @@ </sizepolicy> </property> <property name="text"> - <string>Prefix:</string> + <string notr="true">Prefix:</string> </property> <property name="buddy"> <cstring>shortcutEdit</cstring> @@ -43,7 +43,7 @@ </widget> </item> <item> - <widget class="QCheckBox" name="limitCheck"> + <widget class="QCheckBox" name="includeByDefault"> <property name="sizePolicy"> <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> <horstretch>0</horstretch> @@ -51,7 +51,7 @@ </sizepolicy> </property> <property name="text"> - <string>Limit to prefix</string> + <string notr="true">Include by default</string> </property> </widget> </item> |