X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fignorelisteditdlg.ui;h=e7fb3bba97a6bec026dcd449d84512be5454b4aa;hb=8d736eb601e79e8fe1a866eb67e626b33f651d7a;hp=d6b32a2453013b7da881da0b5d7f95584c47330a;hpb=9d3446581d6f1900806b42078b7d2c16289a5fa5;p=quassel.git

diff --git a/src/qtui/settingspages/ignorelisteditdlg.ui b/src/qtui/settingspages/ignorelisteditdlg.ui
index d6b32a24..e7fb3bba 100644
--- a/src/qtui/settingspages/ignorelisteditdlg.ui
+++ b/src/qtui/settingspages/ignorelisteditdlg.ui
@@ -15,7 +15,7 @@
    <string>Configure Ignore Rule</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../icons/oxygen.qrc">
+   <iconset>
     <normaloff>:/icons/oxygen/16x16/actions/configure.png</normaloff>:/icons/oxygen/16x16/actions/configure.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -56,10 +56,10 @@ Whenever you disable/delete the ignore rule, the messages are shown again.&lt;/p
       <widget class="QGroupBox" name="typeGroupBox">
        <property name="toolTip">
         <string>&lt;p&gt;&lt;b&gt;Rule Type:&lt;/b&gt;&lt;/p&gt;
-&lt;p&gt;&lt;u&gt;By Sender:&lt;/u&gt;&lt;/p&gt;
+&lt;p&gt;&lt;u&gt;Sender:&lt;/u&gt;&lt;/p&gt;
 &lt;p&gt;The rule is matched against the sender string
 &lt;i&gt;nick!ident@host.name&lt;i&gt;&lt;/p&gt;
-&lt;p&gt;&lt;u&gt;By Message:&lt;/u&gt;&lt;/p&gt;
+&lt;p&gt;&lt;u&gt;Message:&lt;/u&gt;&lt;/p&gt;
 &lt;p&gt;The rule is matched against the actual message content&lt;/p&gt;</string>
        </property>
        <property name="title">
@@ -80,6 +80,13 @@ Whenever you disable/delete the ignore rule, the messages are shown again.&lt;/p
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QRadioButton" name="ctcpTypeButton">
+          <property name="text">
+           <string>CTCP</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -154,13 +161,13 @@ Whenever you disable/delete the ignore rule, the messages are shown again.&lt;/p
           </property>
          </widget>
         </item>
-       <item>
+        <item>
          <widget class="QRadioButton" name="networkScopeButton">
           <property name="text">
            <string>Network</string>
           </property>
          </widget>
-       </item>
+        </item>
         <item>
          <widget class="QRadioButton" name="channelScopeButton">
           <property name="text">
@@ -177,9 +184,16 @@ Whenever you disable/delete the ignore rule, the messages are shown again.&lt;/p
 &lt;p&gt;A scope rule is a semicolon separated list of either &lt;i&gt;network&lt;/i&gt; or &lt;i&gt;channel&lt;/i&gt; names.&lt;/p&gt;
 &lt;p&gt;&lt;i&gt;Example:&lt;/i&gt;
 &lt;br /&gt;
-&lt;i&gt;#quassel*; #foobar&lt;/i&gt;
+&lt;i&gt;#quassel*; #foobar; !#quasseldroid&lt;/i&gt;
+&lt;br /&gt;
+would match on &lt;i&gt;#foobar&lt;/i&gt; and any channel starting with &lt;i&gt;#quassel&lt;/i&gt; except for &lt;i&gt;#quasseldroid&lt;/i&gt;
+&lt;br /&gt;
+&lt;p&gt;If only inverted names are specified, it will match anything except for what's specified (implicit wildcard).&lt;/p&gt;
+&lt;p&gt;&lt;i&gt;Example:&lt;/i&gt;
+&lt;br /&gt;
+&lt;i&gt;!#quassel*; !#foobar&lt;/i&gt;
 &lt;br /&gt;
-would match on #foobar and on any channel starting with &lt;i&gt;#quassel&lt;/i&gt;&lt;/p&gt;</string>
+would match anything except for &lt;i&gt;#foobar&lt;/i&gt; or any channel starting with &lt;i&gt;#quassel&lt;/i&gt;&lt;/p&gt;</string>
         </property>
        </widget>
       </item>
@@ -228,8 +242,22 @@ For dynamic rules, disabling actually shows the filtered messages again.&lt;/p&g
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>dynamicStrictnessButton</tabstop>
+  <tabstop>permanentStrictnessButton</tabstop>
+  <tabstop>senderTypeButton</tabstop>
+  <tabstop>messageTypeButton</tabstop>
+  <tabstop>ignoreRuleLineEdit</tabstop>
+  <tabstop>isRegExCheckBox</tabstop>
+  <tabstop>scopeRuleTextEdit</tabstop>
+  <tabstop>globalScopeButton</tabstop>
+  <tabstop>networkScopeButton</tabstop>
+  <tabstop>channelScopeButton</tabstop>
+  <tabstop>isActiveCheckBox</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
  <resources>
-  <include location="../../../icons/oxygen.qrc"/>
+  <include location="../../../icons/oxygen_icons.qrc"/>
  </resources>
  <connections>
   <connection>