X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fbacklogsettingspage.ui;h=c5ae88e6eef1a59e9e4f993af5ce0e841be40f94;hb=7a44d67d565fe4f627e64b158a91a5978591c743;hp=fd5c2cd8691a840f3a79bd4c406dc5ce4e3c451a;hpb=22b225ba81373362e6d02a88cd3a906e8c394aac;p=quassel.git

diff --git a/src/qtui/settingspages/backlogsettingspage.ui b/src/qtui/settingspages/backlogsettingspage.ui
index fd5c2cd8..c5ae88e6 100644
--- a/src/qtui/settingspages/backlogsettingspage.ui
+++ b/src/qtui/settingspages/backlogsettingspage.ui
@@ -13,6 +13,59 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" >
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+      <widget class="QLabel" name="label_2" >
+       <property name="toolTip" >
+        <string>Number of messages to be requested from the core when using scrolling up in the buffer view.</string>
+       </property>
+       <property name="text" >
+        <string>Dynamic backlog amount:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="dynamicBacklogAmount" >
+       <property name="maximum" >
+        <number>1000</number>
+       </property>
+       <property name="singleStep" >
+        <number>10</number>
+       </property>
+       <property name="value" >
+        <number>200</number>
+       </property>
+       <property name="settingsKey" stdset="0" >
+        <string>DynamicBacklogAmount</string>
+       </property>
+       <property name="defaultValue" stdset="0" >
+        <number>200</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer" >
+       <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="Line" name="line" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_5" >
      <item>
@@ -62,14 +115,6 @@
       <number>0</number>
      </property>
      <widget class="QWidget" name="page" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>415</width>
-        <height>216</height>
-       </rect>
-      </property>
       <layout class="QVBoxLayout" name="verticalLayout_2" >
        <item>
         <widget class="QLabel" name="label_9" >
@@ -107,6 +152,12 @@
            <property name="value" >
             <number>500</number>
            </property>
+           <property name="settingsKey" stdset="0" >
+            <string>FixedBacklogAmount</string>
+           </property>
+           <property name="defaultValue" stdset="0" >
+            <number>500</number>
+           </property>
           </widget>
          </item>
          <item>
@@ -140,21 +191,13 @@
       </layout>
      </widget>
      <widget class="QWidget" name="page_2" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>415</width>
-        <height>216</height>
-       </rect>
-      </property>
       <layout class="QVBoxLayout" name="verticalLayout_3" >
        <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.
 
-You can also chose to fetch additional older chatlines to provide a better context.</string>
+You can also choose to fetch additional older chatlines to provide a better context.</string>
          </property>
          <property name="textFormat" >
           <enum>Qt::PlainText</enum>
@@ -190,6 +233,12 @@ You can also chose to fetch additional older chatlines to provide a better conte
            <property name="value" >
             <number>200</number>
            </property>
+           <property name="settingsKey" stdset="0" >
+            <string>PerBufferUnreadBacklogLimit</string>
+           </property>
+           <property name="defaultValue" stdset="0" >
+            <number>200</number>
+           </property>
           </widget>
          </item>
          <item>
@@ -216,10 +265,16 @@ You can also chose to fetch additional older chatlines to provide a better conte
            <property name="value" >
             <number>50</number>
            </property>
+           <property name="settingsKey" stdset="0" >
+            <string>PerBufferUnreadBacklogAdditional</string>
+           </property>
+           <property name="defaultValue" stdset="0" >
+            <number>50</number>
+           </property>
           </widget>
          </item>
          <item>
-          <spacer name="horizontalSpacer_3" >
+          <spacer name="horizontalSpacer_5" >
            <property name="orientation" >
             <enum>Qt::Horizontal</enum>
            </property>
@@ -249,20 +304,11 @@ You can also chose to fetch additional older chatlines to provide a better conte
       </layout>
      </widget>
      <widget class="QWidget" name="Seite" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>415</width>
-        <height>216</height>
-       </rect>
-      </property>
       <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. 
-This requester determines which is the oldest read message of all buffers and then requests one large chunk of messages across all buffers.
+          <string>This requester fetches all messages newer than the oldest unread message for all buffers.
 
 Note: this requester is not recommended if you use hidden buffer or have inactive buffers (i.e.: no stale queries or channels).
 It is useful to limit the total amount of the backlog and is probably the fastest.
@@ -295,7 +341,7 @@ You can also chose to fetch additional older chatlines to provide a better conte
             <string>Maximum amount of messages to be fetched per buffer.</string>
            </property>
            <property name="maximum" >
-            <number>1000</number>
+            <number>100000</number>
            </property>
            <property name="singleStep" >
             <number>10</number>
@@ -303,6 +349,12 @@ You can also chose to fetch additional older chatlines to provide a better conte
            <property name="value" >
             <number>200</number>
            </property>
+           <property name="settingsKey" stdset="0" >
+            <string>GlobalUnreadBacklogLimit</string>
+           </property>
+           <property name="defaultValue" stdset="0" >
+            <number>200</number>
+           </property>
           </widget>
          </item>
          <item>
@@ -329,6 +381,12 @@ You can also chose to fetch additional older chatlines to provide a better conte
            <property name="value" >
             <number>50</number>
            </property>
+           <property name="settingsKey" stdset="0" >
+            <string>GlobalUnreadBacklogAdditional</string>
+           </property>
+           <property name="defaultValue" stdset="0" >
+            <number>50</number>
+           </property>
           </widget>
          </item>
          <item>
@@ -363,46 +421,6 @@ You can also chose to fetch additional older chatlines to provide a better conte
      </widget>
     </widget>
    </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout" >
-     <item>
-      <widget class="QLabel" name="label_2" >
-       <property name="toolTip" >
-        <string>Number of messages to be requested from the core when using scrolling up in the buffer view.</string>
-       </property>
-       <property name="text" >
-        <string>Dynamic backlog amount:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="dynamicBacklogAmount" >
-       <property name="maximum" >
-        <number>1000</number>
-       </property>
-       <property name="singleStep" >
-        <number>10</number>
-       </property>
-       <property name="value" >
-        <number>200</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer" >
-       <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>
     <spacer name="verticalSpacer_2" >
      <property name="orientation" >
@@ -411,7 +429,7 @@ You can also chose to fetch additional older chatlines to provide a better conte
      <property name="sizeHint" stdset="0" >
       <size>
        <width>20</width>
-       <height>18</height>
+       <height>40</height>
       </size>
      </property>
     </spacer>
@@ -427,8 +445,8 @@ You can also chose to fetch additional older chatlines to provide a better conte
    <slot>setCurrentIndex(int)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>146</x>
-     <y>27</y>
+     <x>316</x>
+     <y>31</y>
     </hint>
     <hint type="destinationlabel" >
      <x>147</x>