X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fchatviewsettingspage.ui;h=d1d47bedbb6e955d3300748f49cba6c585af52ee;hb=4a5065255e652dd0c301bac0db41b7afb777ef49;hp=3b60b0a4b171e7171c1c74a108c816d3e13ff254;hpb=7f5b32c0b9d8ed0f045ae4b6e88339c8fd00023b;p=quassel.git

diff --git a/src/qtui/settingspages/chatviewsettingspage.ui b/src/qtui/settingspages/chatviewsettingspage.ui
index 3b60b0a4..d1d47bed 100644
--- a/src/qtui/settingspages/chatviewsettingspage.ui
+++ b/src/qtui/settingspages/chatviewsettingspage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>486</width>
-    <height>475</height>
+    <height>492</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -25,6 +25,16 @@
      </item>
      <item>
       <widget class="QLineEdit" name="timestampFormat">
+       <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;
+&lt;tr&gt;&lt;td&gt;dd.MM.yyyy&lt;/td&gt;&lt;td&gt;21.05.2001&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;td&gt;ddd MMMM d yy&lt;/td&gt;&lt;td&gt;Tue May 21 01&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;td&gt;hh:mm:ss.zzz&lt;/td&gt;&lt;td&gt;14:13:09.042&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;td&gt;h:m:s ap&lt;/td&gt;&lt;td&gt;2:13:9 pm&lt;/td&gt;&lt;/tr&gt;
+&lt;/table&gt;
+&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
        <property name="text">
         <string/>
        </property>
@@ -32,7 +42,7 @@
         <string>[hh:mm:ss]</string>
        </property>
        <property name="settingsKey" stdset="0">
-        <string>TimestampFormat</string>
+        <string notr="true">TimestampFormat</string>
        </property>
       </widget>
      </item>
@@ -52,22 +62,45 @@
     </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>/QtUiStyle/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 notr="true">/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 notr="true">/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">
+     <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>
@@ -78,12 +111,12 @@
       <bool>true</bool>
      </property>
      <property name="settingsKey" stdset="0">
-      <string>AllowMircColors</string>
+      <string notr="true">/UiStyle/AllowMircColors</string>
      </property>
     </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>
@@ -97,7 +130,26 @@
       <bool>true</bool>
      </property>
      <property name="settingsKey" stdset="0">
-      <string>ShowWebPreview</string>
+      <string notr="true">ShowWebPreview</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="autoMarkerLine">
+     <property name="toolTip">
+      <string>Set the marker line to the bottom of the current chat window when selecting another channel</string>
+     </property>
+     <property name="text">
+      <string>Set marker line automatically when switching chats</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+     <property name="settingsKey" stdset="0">
+      <string notr="true">AutoMarkerLine</string>
+     </property>
+     <property name="defaultValue" stdset="0">
+      <bool>true</bool>
      </property>
     </widget>
    </item>
@@ -113,7 +165,7 @@
       <bool>false</bool>
      </property>
      <property name="settingsKey" stdset="0">
-      <string>/QtUiStyle/Colors/UseChatViewColors</string>
+      <string notr="true">/QtUiStyle/Colors/UseChatViewColors</string>
      </property>
      <property name="defaultValue" stdset="0">
       <bool>false</bool>
@@ -132,7 +184,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/QtUiStyle/Colors/ActionMsg</string>
+         <string notr="true">/QtUiStyle/Colors/ActionMsg</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -156,7 +208,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/QtUiStyle/Colors/Timestamp</string>
+         <string notr="true">/QtUiStyle/Colors/Timestamp</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -180,7 +232,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/QtUiStyle/Colors/ChannelMsg</string>
+         <string notr="true">/QtUiStyle/Colors/ChannelMsg</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -217,7 +269,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/QtUiStyle/Colors/Highlight</string>
+         <string notr="true">/QtUiStyle/Colors/Highlight</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -241,7 +293,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/QtUiStyle/Colors/CommandMsg</string>
+         <string notr="true">/QtUiStyle/Colors/CommandMsg</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -272,7 +324,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/QtUiStyle/Colors/ServerMsg</string>
+         <string notr="true">/QtUiStyle/Colors/ServerMsg</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -296,7 +348,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/QtUiStyle/Colors/MarkerLine</string>
+         <string notr="true">/QtUiStyle/Colors/MarkerLine</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -320,7 +372,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/QtUiStyle/Colors/ErrorMsg</string>
+         <string notr="true">/QtUiStyle/Colors/ErrorMsg</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -344,7 +396,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/QtUiStyle/Colors/ChatViewBackground</string>
+         <string notr="true">/QtUiStyle/Colors/ChatViewBackground</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -361,7 +413,7 @@
          <string>...</string>
         </property>
         <property name="settingsKey" stdset="0">
-         <string>/QtUiStyle/Colors/HighlightBackground</string>
+         <string notr="true">/QtUiStyle/Colors/HighlightBackground</string>
         </property>
         <property name="defaultValue" stdset="0">
          <color>
@@ -383,11 +435,14 @@
      <property name="checkable">
       <bool>true</bool>
      </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
      <property name="settingsKey" stdset="0">
-      <string>/QtUiStyle/Colors/UseSenderColors</string>
+      <string notr="true">/QtUiStyle/Colors/UseSenderColors</string>
      </property>
      <property name="defaultValue" stdset="0">
-      <bool>true</bool>
+      <bool>false</bool>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
@@ -398,7 +453,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender00</string>
+           <string notr="true">/QtUiStyle/Colors/Sender00</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -415,7 +470,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender02</string>
+           <string notr="true">/QtUiStyle/Colors/Sender02</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -432,7 +487,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender04</string>
+           <string notr="true">/QtUiStyle/Colors/Sender04</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -449,7 +504,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender05</string>
+           <string notr="true">/QtUiStyle/Colors/Sender05</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -466,7 +521,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender06</string>
+           <string notr="true">/QtUiStyle/Colors/Sender06</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -483,7 +538,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender07</string>
+           <string notr="true">/QtUiStyle/Colors/Sender07</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -500,7 +555,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender08</string>
+           <string notr="true">/QtUiStyle/Colors/Sender08</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -517,7 +572,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender09</string>
+           <string notr="true">/QtUiStyle/Colors/Sender09</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -534,7 +589,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender10</string>
+           <string notr="true">/QtUiStyle/Colors/Sender10</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -551,7 +606,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender11</string>
+           <string notr="true">/QtUiStyle/Colors/Sender11</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -568,7 +623,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender12</string>
+           <string notr="true">/QtUiStyle/Colors/Sender12</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -585,7 +640,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender13</string>
+           <string notr="true">/QtUiStyle/Colors/Sender13</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -602,7 +657,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender14</string>
+           <string notr="true">/QtUiStyle/Colors/Sender14</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -619,7 +674,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender15</string>
+           <string notr="true">/QtUiStyle/Colors/Sender15</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -636,7 +691,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender01</string>
+           <string notr="true">/QtUiStyle/Colors/Sender01</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -653,7 +708,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/Sender03</string>
+           <string notr="true">/QtUiStyle/Colors/Sender03</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -681,7 +736,7 @@
            <string>...</string>
           </property>
           <property name="settingsKey" stdset="0">
-           <string>/QtUiStyle/Colors/SenderSelf</string>
+           <string notr="true">/QtUiStyle/Colors/SenderSelf</string>
           </property>
           <property name="defaultValue" stdset="0">
            <color>
@@ -740,8 +795,10 @@
  </customwidgets>
  <tabstops>
   <tabstop>timestampFormat</tabstop>
+  <tabstop>customChatViewFont</tabstop>
   <tabstop>allowMircColors</tabstop>
-  <tabstop>showWebPreview_2</tabstop>
+  <tabstop>showWebPreview</tabstop>
+  <tabstop>autoMarkerLine</tabstop>
   <tabstop>useCustomColors</tabstop>
   <tabstop>actionMsgColor</tabstop>
   <tabstop>channelMsgColor</tabstop>
@@ -773,5 +830,22 @@
   <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>