X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fchatviewsettingspage.ui;h=d1d47bedbb6e955d3300748f49cba6c585af52ee;hb=65aeb641b824b78cafbab1af7ae92a0b7069f44e;hp=378c6513cdd1a5c43bb03d19d42df4d2049026fb;hpb=79da84574c2e95ec37894b869668d6b6ffc71c59;p=quassel.git

diff --git a/src/qtui/settingspages/chatviewsettingspage.ui b/src/qtui/settingspages/chatviewsettingspage.ui
index 378c6513..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>
@@ -88,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>
@@ -121,6 +134,25 @@
      </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>
    <item>
     <widget class="QGroupBox" name="useCustomColors">
      <property name="title">
@@ -766,6 +798,7 @@
   <tabstop>customChatViewFont</tabstop>
   <tabstop>allowMircColors</tabstop>
   <tabstop>showWebPreview</tabstop>
+  <tabstop>autoMarkerLine</tabstop>
   <tabstop>useCustomColors</tabstop>
   <tabstop>actionMsgColor</tabstop>
   <tabstop>channelMsgColor</tabstop>