Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-01-21 10:57:06 (GMT) |
|---|---|---|
| committer | Richard Maudsley <richard.maudsley@isode.com> | 2014-01-21 10:57:06 (GMT) |
| commit | 0cc9e14b1dc41f7d67eff02e3b277c2ec059bb4b (patch) | |
| tree | 8857256a4cd8a6c10afcd1b0b0d694d11de2f01d | |
| parent | c4ddf2191ea33eb9a7c2890e797d45c83c993100 (diff) | |
| download | swift-0cc9e14b1dc41f7d67eff02e3b277c2ec059bb4b.zip swift-0cc9e14b1dc41f7d67eff02e3b277c2ec059bb4b.tar.bz2 | |
Improved 'all rooms' and 'all chats' option clairty.
Change-Id: Id854e0f210ecccab5c3475eca219524a56ba3975
| -rw-r--r-- | Swift/QtUI/QtHighlightEditor.cpp | 10 | ||||
| -rw-r--r-- | Swift/QtUI/QtHighlightEditor.ui | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Swift/QtUI/QtHighlightEditor.cpp b/Swift/QtUI/QtHighlightEditor.cpp index 598a52b..d4e8899 100644 --- a/Swift/QtUI/QtHighlightEditor.cpp +++ b/Swift/QtUI/QtHighlightEditor.cpp @@ -97,9 +97,9 @@ std::string formatLongDescription(const HighlightRule& rule) if (rule.getMatchChat() && rule.getMatchMUC()) { text += "either in chats or in rooms"; } else if (rule.getMatchChat()) { - text += "in chats only"; + text += "in chats"; } else if (rule.getMatchMUC()) { - text += "in rooms only"; + text += "in rooms"; } else { return "This rule has not been marked as a chat or room rule!"; } @@ -328,6 +328,12 @@ void QtHighlightEditor::setChildWidgetStates() ui_.matchWholeWords->setEnabled(false); ui_.matchCase->setEnabled(false); } + + if (ui_.chatRadio->isChecked()) { + ui_.allMsgRadio->setText(tr("Apply to all chat messages")); + } else { + ui_.allMsgRadio->setText(tr("Apply to all room messages")); + } } void QtHighlightEditor::widgetClick() diff --git a/Swift/QtUI/QtHighlightEditor.ui b/Swift/QtUI/QtHighlightEditor.ui index 5f45d4a..cded649 100644 --- a/Swift/QtUI/QtHighlightEditor.ui +++ b/Swift/QtUI/QtHighlightEditor.ui @@ -344,7 +344,7 @@ p, li { white-space: pre-wrap; } <bool>false</bool> </property> <property name="text"> - <string>&Foreground</string> + <string>&Text</string> </property> <property name="toolButtonStyle"> <enum>Qt::ToolButtonTextBesideIcon</enum> |