feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Update the filter matches for the settings dialog.

Browse Source 
Task-number: QTCREATORBUG-2936
This commit is contained in:
con
2010-12-01 14:35:36 +01:00
parent e650076fd3
commit c598118d5b
25 changed files with 213 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cvs/settingspage.cpp
View File

@@ -76,10 +76,17 @@ void SettingsPageWidget::setSettings(const CVSSettings &s)
QString SettingsPageWidget::searchKeywords() const
{
QString rc;
QTextStream(&rc) << m_ui.promptToSubmitCheckBox->text()
<< ' ' << m_ui.describeByCommitIdCheckBox->text()
<< ' ' << m_ui.commandLabel->text()
<< ' ' << m_ui.rootLabel->text() << ' ' << m_ui.diffOptionsLabel->text();
QLatin1Char sep(' ');
QTextStream(&rc)
<< sep << m_ui.configGroupBox->title()
<< sep << m_ui.commandLabel->text()
<< sep << m_ui.rootLabel->text()
<< sep << m_ui.miscGroupBox->title()
<< sep << m_ui.timeOutLabel->text()
<< sep << m_ui.diffOptionsLabel->text()
<< sep << m_ui.promptToSubmitCheckBox->text()
<< sep << m_ui.describeByCommitIdCheckBox->text()
;
rc.remove(QLatin1Char('&'));
return rc;
}

6
src/plugins/cvs/settingspage.ui
View File

@@ -12,7 +12,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="miscGroupBox">
<widget class="QGroupBox" name="configGroupBox">
<property name="title">
<string>Configuration</string>
</property>
@@ -25,7 +25,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="Utils::PathChooser" name="commandPathChooser"/>
<widget class="Utils::PathChooser" name="commandPathChooser" native="true"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="rootLabel">
@@ -41,7 +41,7 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="miscGroupBox_2">
<widget class="QGroupBox" name="miscGroupBox">
<property name="title">
<string>Miscellaneous</string>
</property>