X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fbacklogsettingspage.ui;h=b8c70bf0ff7e4e6e5fb8d21ba2e8c6c894868dcf;hb=c01c1ad4823a3e49c9526c19560dd5ce4fe30cb8;hp=f50e6c595e2cc7c62e80da793fb8b19765c9df3b;hpb=9471509e681b184ad4090f3589766fa9c261a538;p=quassel.git

diff --git a/src/qtui/settingspages/backlogsettingspage.ui b/src/qtui/settingspages/backlogsettingspage.ui
index f50e6c59..b8c70bf0 100644
--- a/src/qtui/settingspages/backlogsettingspage.ui
+++ b/src/qtui/settingspages/backlogsettingspage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>446</width>
-    <height>325</height>
+    <height>329</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -38,7 +38,7 @@
         <number>200</number>
        </property>
        <property name="settingsKey" stdset="0">
-        <string>DynamicBacklogAmount</string>
+        <string notr="true">DynamicBacklogAmount</string>
        </property>
        <property name="defaultValue" stdset="0">
         <number>200</number>
@@ -60,6 +60,22 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QCheckBox" name="ensureBacklogOnBufferShow">
+     <property name="toolTip">
+      <string>When switching to a chat, more backlog will be fetched if no messages are shown yet or the scrollbar isn't visible.  Useful when not fetching any initial backlog.</string>
+     </property>
+     <property name="text">
+      <string>Fetch backlog if needed when switching chats</string>
+     </property>
+     <property name="settingsKey" stdset="0">
+      <string notr="true">EnsureBacklogOnBufferShow</string>
+     </property>
+     <property name="defaultValue" stdset="0">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="Line" name="line">
      <property name="orientation">
@@ -72,25 +88,33 @@
      <item>
       <widget class="QLabel" name="label_3">
        <property name="text">
-        <string>Backlog Request Method:</string>
+        <string>Backlog request method:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QComboBox" name="requesterType">
+       <property name="currentIndex">
+        <number>2</number>
+       </property>
+       <item>
+        <property name="text">
+         <string>Fixed amount per chat</string>
+        </property>
+       </item>
        <item>
         <property name="text">
-         <string>Fixed Amount per Buffer</string>
+         <string>Unread messages per chat</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Unread Messages per Buffer</string>
+         <string>Only fetch when needed</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Global Unread Messages</string>
+         <string>Globally unread messages</string>
         </property>
        </item>
       </widget>
@@ -113,14 +137,14 @@
    <item>
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="page">
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <widget class="QLabel" name="label_9">
          <property name="text">
-          <string>The simplest Requester. It fetches a fixed amount of lines for each buffer from the Backlog.</string>
+          <string>The simplest requester. It fetches a fixed amount of lines for each chat window from the backlog.</string>
          </property>
          <property name="textFormat">
           <enum>Qt::PlainText</enum>
@@ -135,7 +159,7 @@
          <item>
           <widget class="QLabel" name="label">
            <property name="toolTip">
-            <string>amount of messages per buffer that are requested after the core connection has been established.</string>
+            <string>Amount of messages per buffer that are requested after the core connection has been established.</string>
            </property>
            <property name="text">
             <string>Initial backlog amount:</string>
@@ -144,8 +168,14 @@
          </item>
          <item>
           <widget class="QSpinBox" name="fixedBacklogAmount">
+           <property name="specialValueText">
+            <string/>
+           </property>
+           <property name="minimum">
+            <number>0</number>
+           </property>
            <property name="maximum">
-            <number>1000</number>
+            <number>99999</number>
            </property>
            <property name="singleStep">
             <number>10</number>
@@ -154,7 +184,7 @@
             <number>500</number>
            </property>
            <property name="settingsKey" stdset="0">
-            <string>FixedBacklogAmount</string>
+            <string notr="true">FixedBacklogAmount</string>
            </property>
            <property name="defaultValue" stdset="0">
             <number>500</number>
@@ -196,7 +226,7 @@
        <item>
         <widget class="QLabel" name="label_10">
          <property name="text">
-          <string>This requester fetches unread messages for each buffer individually. The amount of lines can be limited per buffer.
+          <string>This requester fetches unread messages for each chat window individually. The amount of lines can be limited per chat.
 
 You can also choose to fetch additional older chatlines to provide a better context.</string>
          </property>
@@ -225,20 +255,26 @@ You can also choose to fetch additional older chatlines to provide a better cont
            <property name="toolTip">
             <string>Maximum amount of messages to be fetched per buffer.</string>
            </property>
+           <property name="specialValueText">
+            <string>Unlimited</string>
+           </property>
+           <property name="minimum">
+            <number>-1</number>
+           </property>
            <property name="maximum">
-            <number>1000</number>
+            <number>99999</number>
            </property>
            <property name="singleStep">
             <number>10</number>
            </property>
            <property name="value">
-            <number>200</number>
+            <number>1000</number>
            </property>
            <property name="settingsKey" stdset="0">
-            <string>PerBufferUnreadBacklogLimit</string>
+            <string notr="true">PerBufferUnreadBacklogLimit</string>
            </property>
            <property name="defaultValue" stdset="0">
-            <number>200</number>
+            <number>1000</number>
            </property>
           </widget>
          </item>
@@ -267,7 +303,7 @@ You can also choose to fetch additional older chatlines to provide a better cont
             <number>50</number>
            </property>
            <property name="settingsKey" stdset="0">
-            <string>PerBufferUnreadBacklogAdditional</string>
+            <string notr="true">PerBufferUnreadBacklogAdditional</string>
            </property>
            <property name="defaultValue" stdset="0">
             <number>50</number>
@@ -304,17 +340,102 @@ You can also choose to fetch additional older chatlines to provide a better cont
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="page_3">
+      <layout class="QVBoxLayout" name="verticalLayout_5">
+       <item>
+        <widget class="QLabel" name="label_16">
+         <property name="text">
+          <string>&lt;p&gt;On modern cores (v0.13.0 or newer), no backlog will be fetched.  The core keeps track of chat activity automatically.&lt;br/&gt;
+&lt;i&gt;Note: Chat Monitor won't show past messages.&lt;/i&gt;
+&lt;/p&gt;
+&lt;p&gt;On older cores, this requester fetches a fixed amount of lines for each chat window from the backlog.&lt;/p&gt;</string>
+         </property>
+         <property name="textFormat">
+          <enum>Qt::RichText</enum>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_6">
+         <item>
+          <widget class="QLabel" name="label_4">
+           <property name="toolTip">
+            <string>Amount of messages per buffer that are requested after the core connection has been established.</string>
+           </property>
+           <property name="text">
+            <string>For legacy cores, initial backlog amount:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="asNeededLegacyBacklogAmount">
+           <property name="specialValueText">
+            <string/>
+           </property>
+           <property name="minimum">
+            <number>0</number>
+           </property>
+           <property name="maximum">
+            <number>99999</number>
+           </property>
+           <property name="singleStep">
+            <number>10</number>
+           </property>
+           <property name="value">
+            <number>500</number>
+           </property>
+           <property name="settingsKey" stdset="0">
+            <string notr="true">AsNeededLegacyBacklogAmount</string>
+           </property>
+           <property name="defaultValue" stdset="0">
+            <number>500</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_6">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>263</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_5">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>47</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="Seite">
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
         <widget class="QLabel" name="label_15">
          <property name="text">
-          <string>This requester fetches all messages newer than the oldest unread message for all buffers.
+          <string>This requester fetches all messages newer than the oldest unread message for all chats.
 
-Note: this requester is not recommended if you use hidden buffer or have inactive buffers (i.e.: no stale queries or channels).
+Note: This requester is not recommended if you use hidden chat windows or have inactive chats (i.e.: no stale queries or channels).
 It is useful to limit the total amount of the backlog and is probably the fastest.
 
-You can also chose to fetch additional older chatlines to provide a better context similar.</string>
+You can also chose to fetch additional older chatlines to provide a better context.</string>
          </property>
          <property name="textFormat">
           <enum>Qt::PlainText</enum>
@@ -341,6 +462,12 @@ You can also chose to fetch additional older chatlines to provide a better conte
            <property name="toolTip">
             <string>Maximum amount of messages to be fetched per buffer.</string>
            </property>
+           <property name="specialValueText">
+            <string>Unlimited</string>
+           </property>
+           <property name="minimum">
+            <number>-1</number>
+           </property>
            <property name="maximum">
             <number>100000</number>
            </property>
@@ -351,7 +478,7 @@ You can also chose to fetch additional older chatlines to provide a better conte
             <number>200</number>
            </property>
            <property name="settingsKey" stdset="0">
-            <string>GlobalUnreadBacklogLimit</string>
+            <string notr="true">GlobalUnreadBacklogLimit</string>
            </property>
            <property name="defaultValue" stdset="0">
             <number>200</number>
@@ -383,7 +510,7 @@ You can also chose to fetch additional older chatlines to provide a better conte
             <number>50</number>
            </property>
            <property name="settingsKey" stdset="0">
-            <string>GlobalUnreadBacklogAdditional</string>
+            <string notr="true">GlobalUnreadBacklogAdditional</string>
            </property>
            <property name="defaultValue" stdset="0">
             <number>50</number>