X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fignorelistsettingspage.cpp;h=90ea712e093610af7fe9f828b74a4a107ef4c711;hp=9b140c16bed37dc79edd2b86b7fad04a203583b1;hb=a4eb9eaf480ea9df5b4a070ad40171c5f2345440;hpb=1df837b65c25c2099df8e01de7e7bcc23b9da11b

diff --git a/src/qtui/settingspages/ignorelistsettingspage.cpp b/src/qtui/settingspages/ignorelistsettingspage.cpp
index 9b140c16..90ea712e 100644
--- a/src/qtui/settingspages/ignorelistsettingspage.cpp
+++ b/src/qtui/settingspages/ignorelistsettingspage.cpp
@@ -31,7 +31,7 @@
 #include "iconloader.h"
 
 IgnoreListSettingsPage::IgnoreListSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Misc"), tr("Ignore List"), parent)
+  : SettingsPage(tr("IRC"), tr("Ignore List"), parent)
 {
   ui.setupUi(this);
   _delegate = new IgnoreListDelegate(ui.ignoreListView);
@@ -207,11 +207,14 @@ IgnoreListEditDlg::IgnoreListEditDlg(const IgnoreListManager::IgnoreListItem &it
   ui.setupUi(this);
   setAttribute(Qt::WA_DeleteOnClose, false);
   setModal(true);
+  // FIXME patch out the bugger completely if it's good without it
+  ui.isActiveCheckBox->hide();
 
   // setup buttongroups
   // this could be moved to .ui file with qt4.5
   _typeButtonGroup.addButton(ui.senderTypeButton, 0);
   _typeButtonGroup.addButton(ui.messageTypeButton, 1);
+  _typeButtonGroup.addButton(ui.ctcpTypeButton, 2);
   _strictnessButtonGroup.addButton(ui.dynamicStrictnessButton, 0);
   _strictnessButtonGroup.addButton(ui.permanentStrictnessButton, 1);
   _scopeButtonGroup.addButton(ui.globalScopeButton, 0);
@@ -224,6 +227,8 @@ IgnoreListEditDlg::IgnoreListEditDlg(const IgnoreListManager::IgnoreListItem &it
 
   if(item.type == IgnoreListManager::MessageIgnore)
     ui.messageTypeButton->setChecked(true);
+  else if(item.type == IgnoreListManager::CtcpIgnore)
+    ui.ctcpTypeButton->setChecked(true);
   else
     ui.senderTypeButton->setChecked(true);
 
@@ -269,6 +274,8 @@ IgnoreListEditDlg::IgnoreListEditDlg(const IgnoreListManager::IgnoreListItem &it
 void IgnoreListEditDlg::widgetHasChanged() {
   if(ui.messageTypeButton->isChecked())
     _clonedIgnoreListItem.type = IgnoreListManager::MessageIgnore;
+  else if(ui.ctcpTypeButton->isChecked())
+    _clonedIgnoreListItem.type = IgnoreListManager::CtcpIgnore;
   else
     _clonedIgnoreListItem.type = IgnoreListManager::SenderIgnore;
 
@@ -296,8 +303,10 @@ void IgnoreListEditDlg::widgetHasChanged() {
   else {
     QStringList text = ui.scopeRuleTextEdit->toPlainText().split(";", QString::SkipEmptyParts);
     QStringList::iterator it = text.begin();
-    while(it != text.end())
-      (*it++).trimmed();
+    while(it != text.end()) {
+      *it = it->trimmed();
+      ++it;
+    }
 
     _clonedIgnoreListItem.scopeRule = text.join("; ");
   }