X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fhighlightsettingspage.ui;h=70922c08e2dbeb7a180e3e2c1d8d38e027789aad;hp=1929460e28baf9925273eaea798d849d689304a6;hb=673ded0d543cbdc2cf6e746b6bee7c1d21af8f90;hpb=6d55e659fa87565462d7f3e92da594fdcf9708a2

diff --git a/src/qtui/settingspages/highlightsettingspage.ui b/src/qtui/settingspages/highlightsettingspage.ui
index 1929460e..70922c08 100644
--- a/src/qtui/settingspages/highlightsettingspage.ui
+++ b/src/qtui/settingspages/highlightsettingspage.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>HighlightSettingsPage</class>
- <widget class="QWidget" name="HighlightSettingsPage" >
-  <property name="geometry" >
+ <widget class="QWidget" name="HighlightSettingsPage">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,119 +10,162 @@
     <height>404</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
       <string>Custom Highlights</string>
      </property>
-     <layout class="QGridLayout" >
-      <item rowspan="3" row="0" column="0" >
-       <widget class="QTableWidget" name="highlightTable" >
-        <property name="toolTip" >
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QTableWidget" name="highlightTable">
+        <property name="toolTip">
          <string/>
         </property>
-        <property name="styleSheet" >
-         <string notr="true" />
+        <property name="styleSheet">
+         <string notr="true"/>
         </property>
         <column>
-         <property name="text" >
+         <property name="text">
+          <string>Enabled</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
           <string>Highlight</string>
          </property>
         </column>
         <column>
-         <property name="text" >
+         <property name="text">
           <string>RegEx</string>
          </property>
         </column>
         <column>
-         <property name="text" >
+         <property name="text">
           <string>CS</string>
          </property>
         </column>
         <column>
-         <property name="text" >
-          <string>Enable</string>
+         <property name="text">
+          <string>Channel</string>
          </property>
         </column>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="add" >
-        <property name="text" >
-         <string>Add</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="remove" >
-        <property name="text" >
-         <string>Remove</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Vertical</enum>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <property name="topMargin">
+         <number>0</number>
         </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
+        <property name="bottomMargin">
+         <number>0</number>
         </property>
-       </spacer>
+        <item>
+         <widget class="QPushButton" name="add">
+          <property name="text">
+           <string>Add</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="remove">
+          <property name="text">
+           <string>Remove</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_2" >
-     <property name="title" >
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
       <string>Highlight Nicks</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout">
       <item>
-       <widget class="QRadioButton" name="highlightAllNicks" >
-        <property name="text" >
+       <widget class="QRadioButton" name="highlightAllNicks">
+        <property name="text">
          <string>All nicks from identity</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="highlightCurrentNick" >
-        <property name="text" >
+       <widget class="QRadioButton" name="highlightCurrentNick">
+        <property name="text">
          <string>Current nick</string>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="highlightNoNick" >
-        <property name="text" >
+       <widget class="QRadioButton" name="highlightNoNick">
+        <property name="text">
          <string>None</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="nicksCaseSensitive" >
-        <property name="text" >
+       <widget class="QCheckBox" name="nicksCaseSensitive">
+        <property name="text">
          <string>Case sensitive</string>
         </property>
-        <property name="checked" >
-         <bool>true</bool>
-        </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
+   <item>
+    <layout class="QHBoxLayout">
+     <item>
+      <widget class="QLabel" name="localHighlightsIcon">
+       <property name="text">
+        <string notr="true">[icon]</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="localHighlightsLabel">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Local Highlights apply to this device only</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="localHighlightsDetails">
+       <property name="text">
+        <string>Details...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <resources/>
@@ -132,11 +176,11 @@
    <receiver>nicksCaseSensitive</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>64</x>
      <y>350</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>69</x>
      <y>381</y>
     </hint>