X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fchatviewsettingspage.ui;h=349d335c2e240d5bb5e35659046b8a69b692d6af;hp=f37821a86ddfd0750cb0842f7a905335a8dad213;hb=310218c3d7be363ceeba646d11d007abae2d478b;hpb=6b2bda5908bc1ddcc242d13adc3390eb1510f4e0

diff --git a/src/qtui/settingspages/chatviewsettingspage.ui b/src/qtui/settingspages/chatviewsettingspage.ui
index f37821a8..349d335c 100644
--- a/src/qtui/settingspages/chatviewsettingspage.ui
+++ b/src/qtui/settingspages/chatviewsettingspage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>486</width>
-    <height>610</height>
+    <width>514</width>
+    <height>294</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,14 +17,26 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QLabel" name="label_13">
+      <widget class="QCheckBox" name="customTimestampFormat">
+       <property name="toolTip">
+        <string>Use a custom format for the timestamp</string>
+       </property>
        <property name="text">
-        <string>Timestamp format:</string>
+        <string>Custom timestamp format:</string>
+       </property>
+       <property name="defaultValue" stdset="0">
+        <bool>false</bool>
+       </property>
+       <property name="settingsKey" stdset="0">
+        <string notr="true">UseCustomTimestampFormat</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLineEdit" name="timestampFormat">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
        <property name="toolTip">
         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Usage examples:&lt;/p&gt;
 &lt;table cellpadding=&quot;2&quot;&gt;
@@ -80,6 +92,25 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="showSenderPrefixes">
+     <property name="toolTip">
+      <string>Shows the modes of senders before their name (e.g. @, +)</string>
+     </property>
+     <property name="text">
+      <string>Show sendermodes in front of nicknames</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+     <property name="defaultValue" stdset="0">
+      <bool>true</bool>
+     </property>
+     <property name="settingsKey" stdset="0">
+      <string notr="true">ShowSenderPrefixes</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
@@ -115,25 +146,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="QCheckBox" name="allowMircColors">
-     <property name="toolTip">
-      <string>Show colored text in the chat window</string>
-     </property>
-     <property name="text">
-      <string>Allow colored text (mIRC color codes)</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-     <property name="defaultValue" stdset="0">
-      <bool>true</bool>
-     </property>
-     <property name="settingsKey" stdset="0">
-      <string notr="true">/UiStyle/AllowMircColors</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QCheckBox" name="showWebPreview">
      <property name="toolTip">
@@ -215,634 +227,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="QGroupBox" name="useCustomColors">
-     <property name="title">
-      <string>Custom Colors</string>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-     <property name="checked">
-      <bool>false</bool>
-     </property>
-     <property name="settingsKey" stdset="0">
-      <string notr="true">/QtUiStyle/Colors/UseChatViewColors</string>
-     </property>
-     <property name="defaultValue" stdset="0">
-      <bool>false</bool>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_10">
-        <property name="text">
-         <string>Action:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="ColorButton" name="actionMsgColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/ActionMsg</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>0</red>
-          <green>0</green>
-          <blue>255</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3">
-       <widget class="QLabel" name="label_5">
-        <property name="text">
-         <string>Timestamp:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="4">
-       <widget class="ColorButton" name="timestampColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/Timestamp</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>112</red>
-          <green>124</green>
-          <blue>112</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Channel message:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="ColorButton" name="channelMsgColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/ChannelMsg</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>0</red>
-          <green>0</green>
-          <blue>0</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>134</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="3">
-       <widget class="QLabel" name="label_7">
-        <property name="text">
-         <string>Highlight foreground:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="4">
-       <widget class="ColorButton" name="highlightColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/Highlight</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>0</red>
-          <green>0</green>
-          <blue>0</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="text">
-         <string>Command message:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="ColorButton" name="commandMsgColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/CommandMsg</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>150</red>
-          <green>0</green>
-          <blue>150</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="3">
-       <widget class="QLabel" name="label_12">
-        <property name="text">
-         <string>Highlight background:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Server message:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="ColorButton" name="serverMsgColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/ServerMsg</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>145</red>
-          <green>100</green>
-          <blue>9</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="3">
-       <widget class="QLabel" name="label_11">
-        <property name="text">
-         <string>Marker line:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="4">
-       <widget class="ColorButton" name="markerLineColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/MarkerLine</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>255</red>
-          <green>0</green>
-          <blue>0</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Error message:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="ColorButton" name="errorMsgColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/ErrorMsg</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>145</red>
-          <green>100</green>
-          <blue>9</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="3">
-       <widget class="QLabel" name="label_8">
-        <property name="text">
-         <string>Background:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="4">
-       <widget class="ColorButton" name="backgroundColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/ChatViewBackground</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>255</red>
-          <green>255</green>
-          <blue>255</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="4">
-       <widget class="ColorButton" name="highlightBackgroundColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/HighlightBackground</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>255</red>
-          <green>128</green>
-          <blue>0</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="useSenderColors">
-     <property name="title">
-      <string>Use Sender Coloring</string>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-     <property name="checked">
-      <bool>false</bool>
-     </property>
-     <property name="settingsKey" stdset="0">
-      <string notr="true">/QtUiStyle/Colors/UseSenderColors</string>
-     </property>
-     <property name="defaultValue" stdset="0">
-      <bool>false</bool>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <layout class="QGridLayout" name="gridLayout_3">
-        <item row="0" column="0">
-         <widget class="ColorButton" name="senderColor00">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender00</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>233</red>
-            <green>13</green>
-            <blue>127</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="2">
-         <widget class="ColorButton" name="senderColor02">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender02</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>179</red>
-            <green>14</green>
-            <blue>14</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="4">
-         <widget class="ColorButton" name="senderColor04">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender04</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>88</red>
-            <green>175</green>
-            <blue>179</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="5">
-         <widget class="ColorButton" name="senderColor05">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender05</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>157</red>
-            <green>84</green>
-            <blue>179</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="6">
-         <widget class="ColorButton" name="senderColor06">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender06</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>179</red>
-            <green>151</green>
-            <blue>117</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="7">
-         <widget class="ColorButton" name="senderColor07">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender07</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>49</red>
-            <green>118</green>
-            <blue>179</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="ColorButton" name="senderColor08">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender08</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>233</red>
-            <green>13</green>
-            <blue>127</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="ColorButton" name="senderColor09">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender09</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>142</red>
-            <green>85</green>
-            <blue>233</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="2">
-         <widget class="ColorButton" name="senderColor10">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender10</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>179</red>
-            <green>14</green>
-            <blue>14</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="3">
-         <widget class="ColorButton" name="senderColor11">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender11</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>23</red>
-            <green>179</green>
-            <blue>57</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="4">
-         <widget class="ColorButton" name="senderColor12">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender12</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>88</red>
-            <green>175</green>
-            <blue>179</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="5">
-         <widget class="ColorButton" name="senderColor13">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender13</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>157</red>
-            <green>84</green>
-            <blue>179</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="6">
-         <widget class="ColorButton" name="senderColor14">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender14</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>179</red>
-            <green>151</green>
-            <blue>117</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="7">
-         <widget class="ColorButton" name="senderColor15">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender15</string>
-          </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>
-           </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>23</red>
-            <green>179</green>
-            <blue>57</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QLabel" name="label_9">
-          <property name="text">
-           <string>Own messages:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="ColorButton" name="senderColorSelf">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/SenderSelf</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_3">
-          <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>
-      <item>
-       <widget class="QCheckBox" name="useSenderActionColors">
-        <property name="toolTip">
-         <string>Color sender nicknames in action messages, e.g.&lt;br/&gt;-*- &lt;span style=&quot; font-style:italic;&quot;&gt;Nick&lt;/span&gt; does an action</string>
-        </property>
-        <property name="text">
-         <string>Color senders in action messages</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/UseSenderActionColors</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -859,11 +243,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>ColorButton</class>
-   <extends>QToolButton</extends>
-   <header>colorbutton.h</header>
-  </customwidget>
   <customwidget>
    <class>FontSelector</class>
    <extends>QWidget</extends>
@@ -872,42 +251,14 @@
   </customwidget>
  </customwidgets>
  <tabstops>
+  <tabstop>customTimestampFormat</tabstop>
   <tabstop>timestampFormat</tabstop>
   <tabstop>showSenderBrackets</tabstop>
   <tabstop>customChatViewFont</tabstop>
-  <tabstop>allowMircColors</tabstop>
   <tabstop>showWebPreview</tabstop>
   <tabstop>autoMarkerLine</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>
-  <tabstop>useSenderActionColors</tabstop>
+  <tabstop>autoMarkerLineOnLostFocus</tabstop>
+  <tabstop>webSearchUrlFormat</tabstop>
  </tabstops>
  <resources/>
  <connections>
@@ -927,5 +278,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>customTimestampFormat</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>timestampFormat</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>116</x>
+     <y>22</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>301</x>
+     <y>23</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>