Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-01-23 09:31:03 (GMT) |
|---|---|---|
| committer | Richard Maudsley <richard.maudsley@isode.com> | 2014-01-23 09:31:03 (GMT) |
| commit | d773cc196eb63618fe0c426d4eafd7fe8ec69873 (patch) | |
| tree | b2ca6bbcdaf158e0ecea12ed64d07e3ebf544d72 | |
| parent | ced0c04c6424c0f1df1f4fa4f86fcdb9bc596ee3 (diff) | |
| download | swift-d773cc196eb63618fe0c426d4eafd7fe8ec69873.zip swift-d773cc196eb63618fe0c426d4eafd7fe8ec69873.tar.bz2 | |
Fixed UI label description error.
Change-Id: I02fe9eaa34bea59f97803285c989a1e106472274
| -rw-r--r-- | Swift/QtUI/QtHighlightEditor.cpp | 14 | ||||
| -rw-r--r-- | Swift/QtUI/QtHighlightEditor.ui | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Swift/QtUI/QtHighlightEditor.cpp b/Swift/QtUI/QtHighlightEditor.cpp index fcc0ef8..2221336 100644 --- a/Swift/QtUI/QtHighlightEditor.cpp +++ b/Swift/QtUI/QtHighlightEditor.cpp @@ -64,7 +64,7 @@ QtHighlightEditor::QtHighlightEditor(QtSettingsProvider* settings, QWidget* pare connect(jid_, SIGNAL(textChanged(const QString&)), SLOT(widgetClick())); connect(ui_.keywordRadio, SIGNAL(clicked()), SLOT(widgetClick())); connect(ui_.keyword, SIGNAL(textChanged(const QString&)), SLOT(widgetClick())); - connect(ui_.matchWholeWords, SIGNAL(clicked()), SLOT(widgetClick())); + connect(ui_.matchPartialWords, SIGNAL(clicked()), SLOT(widgetClick())); connect(ui_.matchCase, SIGNAL(clicked()), SLOT(widgetClick())); connect(ui_.noColorRadio, SIGNAL(clicked()), SLOT(widgetClick())); connect(ui_.defaultColorRadio, SIGNAL(clicked()), SLOT(widgetClick())); @@ -321,11 +321,11 @@ void QtHighlightEditor::setChildWidgetStates() if (ui_.keywordRadio->isChecked()) { ui_.keyword->setEnabled(true); - ui_.matchWholeWords->setEnabled(true); + ui_.matchPartialWords->setEnabled(true); ui_.matchCase->setEnabled(true); } else { ui_.keyword->setEnabled(false); - ui_.matchWholeWords->setEnabled(false); + ui_.matchPartialWords->setEnabled(false); ui_.matchCase->setEnabled(false); } @@ -358,7 +358,7 @@ void QtHighlightEditor::disableDialog() ui_.dummySenderName->setEnabled(false); ui_.keywordRadio->setEnabled(false); ui_.keyword->setEnabled(false); - ui_.matchWholeWords->setEnabled(false); + ui_.matchPartialWords->setEnabled(false); ui_.matchCase->setEnabled(false); ui_.noColorRadio->setEnabled(false); ui_.defaultColorRadio->setEnabled(false); @@ -448,7 +448,7 @@ HighlightRule QtHighlightEditor::ruleFromDialog() } rule.setNickIsKeyword(ui_.nickIsKeyword->isChecked()); - rule.setMatchWholeWords(ui_.matchWholeWords->isChecked()); + rule.setMatchWholeWords(!ui_.matchPartialWords->isChecked()); rule.setMatchCase(ui_.matchCase->isChecked()); HighlightAction& action = rule.getAction(); @@ -497,7 +497,7 @@ void QtHighlightEditor::ruleToDialog(const HighlightRule& rule) ui_.allMsgRadio->setChecked(true); /* this is the default radio button */ jid_->setText(""); ui_.keyword->setText(""); - ui_.matchWholeWords->setChecked(false); + ui_.matchPartialWords->setChecked(false); ui_.matchCase->setChecked(false); ui_.nickIsKeyword->setEnabled(true); @@ -517,7 +517,7 @@ void QtHighlightEditor::ruleToDialog(const HighlightRule& rule) if (!keywords.empty()) { ui_.keywordRadio->setChecked(true); ui_.keyword->setText(P2QSTRING(keywords[0])); - ui_.matchWholeWords->setChecked(rule.getMatchWholeWords()); + ui_.matchPartialWords->setChecked(!rule.getMatchWholeWords()); ui_.matchCase->setChecked(rule.getMatchCase()); } diff --git a/Swift/QtUI/QtHighlightEditor.ui b/Swift/QtUI/QtHighlightEditor.ui index ad93ef9..e2fed46 100644 --- a/Swift/QtUI/QtHighlightEditor.ui +++ b/Swift/QtUI/QtHighlightEditor.ui @@ -216,7 +216,7 @@ <widget class="QLineEdit" name="keyword"/> </item> <item> - <widget class="QCheckBox" name="matchWholeWords"> + <widget class="QCheckBox" name="matchPartialWords"> <property name="text"> <string>Match keyword within longer words</string> </property> |