X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fchatviewsettingspage.ui;h=d1d47bedbb6e955d3300748f49cba6c585af52ee;hp=93d141e1842ee102008bf49833c1df6dfdb91170;hb=24acf1efa9e91c58d9e64d76e03e7683ac0ac889;hpb=34c691d6f61f3d7a5de569045814274311ebc240

diff --git a/src/qtui/settingspages/chatviewsettingspage.ui b/src/qtui/settingspages/chatviewsettingspage.ui
index 93d141e1..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>
@@ -62,7 +72,7 @@
         <bool>false</bool>
        </property>
        <property name="settingsKey" stdset="0">
-        <string>/QtUiStyle/Fonts/UseCustomChatViewFont</string>
+        <string notr="true">/QtUiStyle/Fonts/UseCustomChatViewFont</string>
        </property>
        <property name="defaultValue" stdset="0">
         <bool>false</bool>
@@ -71,8 +81,11 @@
      </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>
+        <string notr="true">/QtUiStyle/Fonts/ChatView</string>
        </property>
        <property name="defaultValue" stdset="0">
         <font>
@@ -85,6 +98,9 @@
    </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>
@@ -95,7 +111,7 @@
       <bool>true</bool>
      </property>
      <property name="settingsKey" stdset="0">
-      <string>AllowMircColors</string>
+      <string notr="true">/UiStyle/AllowMircColors</string>
      </property>
     </widget>
    </item>
@@ -114,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>
@@ -130,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>
@@ -149,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>
@@ -173,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>
@@ -197,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>
@@ -234,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>
@@ -258,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>
@@ -289,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>
@@ -313,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>
@@ -337,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>
@@ -361,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>
@@ -378,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>
@@ -404,7 +439,7 @@
       <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>false</bool>
@@ -418,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>
@@ -435,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>
@@ -452,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>
@@ -469,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>
@@ -486,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>
@@ -503,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>
@@ -520,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>
@@ -537,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>
@@ -554,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>
@@ -571,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>
@@ -588,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>
@@ -605,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>
@@ -622,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>
@@ -639,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>
@@ -656,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>
@@ -673,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>
@@ -701,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>
@@ -760,8 +795,10 @@
  </customwidgets>
  <tabstops>
   <tabstop>timestampFormat</tabstop>
+  <tabstop>customChatViewFont</tabstop>
   <tabstop>allowMircColors</tabstop>
   <tabstop>showWebPreview</tabstop>
+  <tabstop>autoMarkerLine</tabstop>
   <tabstop>useCustomColors</tabstop>
   <tabstop>actionMsgColor</tabstop>
   <tabstop>channelMsgColor</tabstop>