X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fchatviewsettingspage.ui;h=95e009fe9416b19ff248e556ae2076b8034f5e7e;hp=512baee6f5e853521633c8c7fbb7ac17a73f96b4;hb=5d9b5391813a98a0908ef7cb2222e34d2803ceff;hpb=b23c0e0f6682433db59ce6fd6892856e952a349a

diff --git a/src/qtui/settingspages/chatviewsettingspage.ui b/src/qtui/settingspages/chatviewsettingspage.ui
index 512baee6..95e009fe 100644
--- a/src/qtui/settingspages/chatviewsettingspage.ui
+++ b/src/qtui/settingspages/chatviewsettingspage.ui
@@ -52,19 +52,39 @@
     </layout>
    </item>
    <item>
-    <widget class="FontSelector" name="chatViewFont" native="true">
-     <property name="text" stdset="0">
-      <string>Chat window font:</string>
-     </property>
-     <property name="settingsKey" stdset="0">
-      <string>/Fonts/ChatView</string>
-     </property>
-     <property name="defaultValue" stdset="0">
-      <font>
-       <family>Monospace</family>
-      </font>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QCheckBox" name="customChatViewFont">
+       <property name="text">
+        <string>Custom chat window font:</string>
+       </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
+       <property name="settingsKey" stdset="0">
+        <string>/QtUiStyle/Fonts/UseCustomChatViewFont</string>
+       </property>
+       <property name="defaultValue" stdset="0">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="FontSelector" name="chatViewFont" native="true">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="settingsKey" stdset="0">
+        <string>/QtUiStyle/Fonts/ChatView</string>
+       </property>
+       <property name="defaultValue" stdset="0">
+        <font>
+         <family>Monospace</family>
+        </font>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
     <widget class="QCheckBox" name="allowMircColors">
@@ -83,7 +103,7 @@
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="showWebPreview_2">
+    <widget class="QCheckBox" name="showWebPreview">
      <property name="toolTip">
       <string>Show a website preview window when hovering the mouse over a web address</string>
      </property>
@@ -102,7 +122,7 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_2">
+    <widget class="QGroupBox" name="useCustomColors">
      <property name="title">
       <string>Custom Colors</string>
      </property>
@@ -113,7 +133,7 @@
       <bool>false</bool>
      </property>
      <property name="settingsKey" stdset="0">
-      <string>/Colors/UseChatViewColors</string>
+      <string>/QtUiStyle/Colors/UseChatViewColors</string>
      </property>
      <property name="defaultValue" stdset="0">
       <bool>false</bool>
@@ -132,7 +152,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/Colors/ActionMsg</string>
+         <string>/QtUiStyle/Colors/ActionMsg</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -156,7 +176,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/Colors/Timestamp</string>
+         <string>/QtUiStyle/Colors/Timestamp</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -180,7 +200,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/Colors/ChannelMsg</string>
+         <string>/QtUiStyle/Colors/ChannelMsg</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -217,7 +237,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/Colors/Highlight</string>
+         <string>/QtUiStyle/Colors/Highlight</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -241,7 +261,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/Colors/CommandMsg</string>
+         <string>/QtUiStyle/Colors/CommandMsg</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -272,7 +292,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/Colors/ServerMsg</string>
+         <string>/QtUiStyle/Colors/ServerMsg</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -296,7 +316,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/Colors/MarkerLine</string>
+         <string>/QtUiStyle/Colors/MarkerLine</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -320,7 +340,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/Colors/ErrorMsg</string>
+         <string>/QtUiStyle/Colors/ErrorMsg</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -344,7 +364,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/Colors/ChatViewBackground</string>
+         <string>/QtUiStyle/Colors/ChatViewBackground</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -361,7 +381,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/Colors/HighlightBackground</string>
+         <string>/QtUiStyle/Colors/HighlightBackground</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -383,11 +403,14 @@
      <property name="checkable">
       <bool>true</bool>
      </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
      <property name="settingsKey" stdset="0">
-      <string>/Colors/UseSenderColors</string>
+      <string>/QtUiStyle/Colors/UseSenderColors</string>
      </property>
      <property name="defaultValue" stdset="0">
-      <bool>true</bool>
+      <bool>false</bool>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
@@ -398,13 +421,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender00</string>
+           <string>/QtUiStyle/Colors/Sender00</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>233</red>
+            <green>13</green>
+            <blue>127</blue>
            </color>
           </property>
          </widget>
@@ -415,13 +438,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender02</string>
+           <string>/QtUiStyle/Colors/Sender02</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>179</red>
+            <green>14</green>
+            <blue>14</blue>
            </color>
           </property>
          </widget>
@@ -432,13 +455,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender04</string>
+           <string>/QtUiStyle/Colors/Sender04</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>88</red>
+            <green>175</green>
+            <blue>179</blue>
            </color>
           </property>
          </widget>
@@ -449,13 +472,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender05</string>
+           <string>/QtUiStyle/Colors/Sender05</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>157</red>
+            <green>84</green>
+            <blue>179</blue>
            </color>
           </property>
          </widget>
@@ -466,13 +489,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender06</string>
+           <string>/QtUiStyle/Colors/Sender06</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>179</red>
+            <green>151</green>
+            <blue>117</blue>
            </color>
           </property>
          </widget>
@@ -483,13 +506,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender07</string>
+           <string>/QtUiStyle/Colors/Sender07</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>49</red>
+            <green>118</green>
+            <blue>179</blue>
            </color>
           </property>
          </widget>
@@ -500,13 +523,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender08</string>
+           <string>/QtUiStyle/Colors/Sender08</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>233</red>
+            <green>13</green>
+            <blue>127</blue>
            </color>
           </property>
          </widget>
@@ -517,13 +540,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender09</string>
+           <string>/QtUiStyle/Colors/Sender09</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>142</red>
+            <green>85</green>
+            <blue>233</blue>
            </color>
           </property>
          </widget>
@@ -534,13 +557,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender10</string>
+           <string>/QtUiStyle/Colors/Sender10</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>179</red>
+            <green>14</green>
+            <blue>14</blue>
            </color>
           </property>
          </widget>
@@ -551,13 +574,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender11</string>
+           <string>/QtUiStyle/Colors/Sender11</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>23</red>
+            <green>179</green>
+            <blue>57</blue>
            </color>
           </property>
          </widget>
@@ -568,13 +591,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender12</string>
+           <string>/QtUiStyle/Colors/Sender12</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>88</red>
+            <green>175</green>
+            <blue>179</blue>
            </color>
           </property>
          </widget>
@@ -585,13 +608,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender13</string>
+           <string>/QtUiStyle/Colors/Sender13</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>157</red>
+            <green>84</green>
+            <blue>179</blue>
            </color>
           </property>
          </widget>
@@ -602,13 +625,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender14</string>
+           <string>/QtUiStyle/Colors/Sender14</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>179</red>
+            <green>151</green>
+            <blue>117</blue>
            </color>
           </property>
          </widget>
@@ -619,13 +642,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender15</string>
+           <string>/QtUiStyle/Colors/Sender15</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>49</red>
+            <green>118</green>
+            <blue>179</blue>
            </color>
           </property>
          </widget>
@@ -636,13 +659,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender01</string>
+           <string>/QtUiStyle/Colors/Sender01</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>142</red>
+            <green>85</green>
+            <blue>233</blue>
            </color>
           </property>
          </widget>
@@ -653,13 +676,13 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/Sender03</string>
+           <string>/QtUiStyle/Colors/Sender03</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
+            <red>23</red>
+            <green>179</green>
+            <blue>57</blue>
            </color>
           </property>
          </widget>
@@ -681,7 +704,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/Colors/SenderSelf</string>
+           <string>/QtUiStyle/Colors/SenderSelf</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -738,6 +761,57 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>timestampFormat</tabstop>
+  <tabstop>allowMircColors</tabstop>
+  <tabstop>showWebPreview</tabstop>
+  <tabstop>useCustomColors</tabstop>
+  <tabstop>actionMsgColor</tabstop>
+  <tabstop>channelMsgColor</tabstop>
+  <tabstop>commandMsgColor</tabstop>
+  <tabstop>serverMsgColor</tabstop>
+  <tabstop>errorMsgColor</tabstop>
+  <tabstop>timestampColor</tabstop>
+  <tabstop>highlightColor</tabstop>
+  <tabstop>highlightBackgroundColor</tabstop>
+  <tabstop>markerLineColor</tabstop>
+  <tabstop>backgroundColor</tabstop>
+  <tabstop>useSenderColors</tabstop>
+  <tabstop>senderColor00</tabstop>
+  <tabstop>senderColor01</tabstop>
+  <tabstop>senderColor02</tabstop>
+  <tabstop>senderColor03</tabstop>
+  <tabstop>senderColor04</tabstop>
+  <tabstop>senderColor05</tabstop>
+  <tabstop>senderColor06</tabstop>
+  <tabstop>senderColor07</tabstop>
+  <tabstop>senderColor08</tabstop>
+  <tabstop>senderColor09</tabstop>
+  <tabstop>senderColor10</tabstop>
+  <tabstop>senderColor11</tabstop>
+  <tabstop>senderColor12</tabstop>
+  <tabstop>senderColor13</tabstop>
+  <tabstop>senderColor14</tabstop>
+  <tabstop>senderColor15</tabstop>
+  <tabstop>senderColorSelf</tabstop>
+ </tabstops>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>customChatViewFont</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>chatViewFont</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>205</x>
+     <y>48</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>304</x>
+     <y>50</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>