summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorRichard Maudsley <richard.maudsley@isode.com>2014-07-28 10:13:04 (GMT)
committerSwift Review <review@swift.im>2014-07-28 12:20:35 (GMT)
commit9403679b404852edfc0509026da7d5c131d21c38 (patch)
tree509d3427bb4fbc73de3de16e67c95df44c38c778 /Swift
parentcc379dcf8aeba3c7f259b7e40c9ea2d7a137aa7a (diff)
downloadswift-9403679b404852edfc0509026da7d5c131d21c38.zip
swift-9403679b404852edfc0509026da7d5c131d21c38.tar.bz2
Change highlight rule default to MUC for new rules.
Test-Information: View highlight editor dialog and confirm that Rooms is now the default option. Change-Id: I4881efeb26c19fc0779dc99c3a4516f54ec3e211
Diffstat (limited to 'Swift')
-rw-r--r--Swift/QtUI/QtHighlightEditor.cpp2
-rw-r--r--Swift/QtUI/QtHighlightEditor.ui11
2 files changed, 8 insertions, 5 deletions
diff --git a/Swift/QtUI/QtHighlightEditor.cpp b/Swift/QtUI/QtHighlightEditor.cpp
index 3900cf9..ce07003 100644
--- a/Swift/QtUI/QtHighlightEditor.cpp
+++ b/Swift/QtUI/QtHighlightEditor.cpp
@@ -170,7 +170,7 @@ void QtHighlightEditor::onNewButtonClicked()
int row = getSelectedRow() + 1;
populateList();
HighlightRule newRule;
- newRule.setMatchChat(true);
+ newRule.setMatchMUC(true);
highlightManager_->insertRule(row, newRule);
QListWidgetItem *item = new QListWidgetItem();
item->setText(P2QSTRING(formatShortDescription(newRule)));
diff --git a/Swift/QtUI/QtHighlightEditor.ui b/Swift/QtUI/QtHighlightEditor.ui
index a2baffd..be2e99b 100644
--- a/Swift/QtUI/QtHighlightEditor.ui
+++ b/Swift/QtUI/QtHighlightEditor.ui
@@ -144,9 +144,9 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QRadioButton" name="chatRadio">
+ <widget class="QRadioButton" name="roomRadio">
<property name="text">
- <string>Chats</string>
+ <string>Rooms</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -154,9 +154,12 @@
</widget>
</item>
<item>
- <widget class="QRadioButton" name="roomRadio">
+ <widget class="QRadioButton" name="chatRadio">
<property name="text">
- <string>Rooms</string>
+ <string>Chats</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
</property>
</widget>
</item>