X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fchatviewcolorsettingspage.ui;h=5b8788504ae6d0137a727a51ac3d59a82f3b8eaa;hb=0182f0e3977026de65be1edb6ca1e8d7ea0184fd;hp=3070a3a6f5f82189ffb50b8143c03e5b8d0ef0a0;hpb=4b3d1dfbdc5a541dbbdd6574e603f4351d8b3274;p=quassel.git

diff --git a/src/qtui/settingspages/chatviewcolorsettingspage.ui b/src/qtui/settingspages/chatviewcolorsettingspage.ui
index 3070a3a6..5b878850 100644
--- a/src/qtui/settingspages/chatviewcolorsettingspage.ui
+++ b/src/qtui/settingspages/chatviewcolorsettingspage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>486</width>
-    <height>398</height>
+    <height>456</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -51,6 +51,9 @@
       <bool>false</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout">
+      <property name="spacing">
+       <number>12</number>
+      </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label_10">
         <property name="text">
@@ -116,9 +119,9 @@
         </property>
         <property name="defaultValue" stdset="0">
          <color>
-          <red>0</red>
-          <green>0</green>
-          <blue>0</blue>
+          <red>60</red>
+          <green>60</green>
+          <blue>60</blue>
          </color>
         </property>
        </widget>
@@ -128,9 +131,12 @@
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Preferred</enum>
+        </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>134</width>
+          <width>124</width>
           <height>20</height>
          </size>
         </property>
@@ -177,9 +183,9 @@
         </property>
         <property name="defaultValue" stdset="0">
          <color>
-          <red>150</red>
-          <green>0</green>
-          <blue>150</blue>
+          <red>112</red>
+          <green>112</green>
+          <blue>112</blue>
          </color>
         </property>
        </widget>
@@ -256,9 +262,9 @@
         </property>
         <property name="defaultValue" stdset="0">
          <color>
-          <red>145</red>
-          <green>100</green>
-          <blue>9</blue>
+          <red>179</red>
+          <green>14</green>
+          <blue>14</blue>
          </color>
         </property>
        </widget>
@@ -304,6 +310,19 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="5">
+       <spacer name="horizontalSpacer_4">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>1</width>
+          <height>1</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
@@ -330,6 +349,12 @@
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <layout class="QGridLayout" name="gridLayout_3">
+        <property name="horizontalSpacing">
+         <number>30</number>
+        </property>
+        <property name="verticalSpacing">
+         <number>12</number>
+        </property>
         <item row="0" column="0">
          <widget class="ColorButton" name="senderColor00">
           <property name="text">
@@ -340,9 +365,26 @@
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>233</red>
-            <green>13</green>
-            <blue>127</blue>
+            <red>204</red>
+            <green>0</green>
+            <blue>0</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="ColorButton" name="senderColor01">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender01</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>0</red>
+            <green>108</green>
+            <blue>173</blue>
            </color>
           </property>
          </widget>
@@ -357,9 +399,26 @@
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>179</red>
-            <green>14</green>
-            <blue>14</blue>
+            <red>77</red>
+            <green>153</green>
+            <blue>0</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="3">
+         <widget class="ColorButton" name="senderColor03">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender03</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>102</red>
+            <green>0</green>
+            <blue>204</blue>
            </color>
           </property>
          </widget>
@@ -374,9 +433,9 @@
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>88</red>
-            <green>175</green>
-            <blue>179</blue>
+            <red>166</red>
+            <green>125</green>
+            <blue>0</blue>
            </color>
           </property>
          </widget>
@@ -391,9 +450,9 @@
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>157</red>
-            <green>84</green>
-            <blue>179</blue>
+            <red>0</red>
+            <green>153</green>
+            <blue>39</blue>
            </color>
           </property>
          </widget>
@@ -408,9 +467,9 @@
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>179</red>
-            <green>151</green>
-            <blue>117</blue>
+            <red>0</red>
+            <green>48</green>
+            <blue>192</blue>
            </color>
           </property>
          </widget>
@@ -425,9 +484,9 @@
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>49</red>
-            <green>118</green>
-            <blue>179</blue>
+            <red>204</red>
+            <green>0</green>
+            <blue>154</blue>
            </color>
           </property>
          </widget>
@@ -442,9 +501,9 @@
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>233</red>
-            <green>13</green>
-            <blue>127</blue>
+            <red>185</red>
+            <green>70</green>
+            <blue>0</blue>
            </color>
           </property>
          </widget>
@@ -459,9 +518,9 @@
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>142</red>
-            <green>85</green>
-            <blue>233</blue>
+            <red>134</red>
+            <green>153</green>
+            <blue>0</blue>
            </color>
           </property>
          </widget>
@@ -476,9 +535,9 @@
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>179</red>
-            <green>14</green>
-            <blue>14</blue>
+            <red>20</red>
+            <green>153</green>
+            <blue>0</blue>
            </color>
           </property>
          </widget>
@@ -493,9 +552,9 @@
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>23</red>
-            <green>179</green>
-            <blue>57</blue>
+            <red>0</red>
+            <green>153</green>
+            <blue>96</blue>
            </color>
           </property>
          </widget>
@@ -510,9 +569,9 @@
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>88</red>
-            <green>175</green>
-            <blue>179</blue>
+            <red>0</red>
+            <green>108</green>
+            <blue>173</blue>
            </color>
           </property>
          </widget>
@@ -527,9 +586,9 @@
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>157</red>
-            <green>84</green>
-            <blue>179</blue>
+            <red>0</red>
+            <green>153</green>
+            <blue>204</blue>
            </color>
           </property>
          </widget>
@@ -545,8 +604,8 @@
           <property name="defaultValue" stdset="0">
            <color>
             <red>179</red>
-            <green>151</green>
-            <blue>117</blue>
+            <green>0</green>
+            <blue>204</blue>
            </color>
           </property>
          </widget>
@@ -561,46 +620,25 @@
           </property>
           <property name="defaultValue" stdset="0">
            <color>
-            <red>49</red>
-            <green>118</green>
-            <blue>179</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="ColorButton" name="senderColor01">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender01</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>142</red>
-            <green>85</green>
-            <blue>233</blue>
+            <red>204</red>
+            <green>0</green>
+            <blue>77</blue>
            </color>
           </property>
          </widget>
         </item>
-        <item row="0" column="3">
-         <widget class="ColorButton" name="senderColor03">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender03</string>
+        <item row="0" column="8">
+         <spacer name="horizontalSpacer_5">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
           </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>23</red>
-            <green>179</green>
-            <blue>57</blue>
-           </color>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
           </property>
-         </widget>
+         </spacer>
         </item>
        </layout>
       </item>
@@ -664,6 +702,25 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="useNicknameGeneralColors">
+        <property name="toolTip">
+         <string>Color nicknames in joins, parts, quits, and other messages, e.g.&lt;br/&gt;--&gt; &lt;span style=&quot; font-style:italic;&quot;&gt;Nick&lt;/span&gt; joined #quassel</string>
+        </property>
+        <property name="text">
+         <string>Color nicknames in other messages</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+        <property name="settingsKey" stdset="0">
+         <string notr="true">/QtUiStyle/Colors/UseNickGeneralColors</string>
+        </property>
+        <property name="defaultValue" stdset="0">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>