From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Sat, 29 Nov 2008 15:32:11 +0000 (+0100)
Subject: cleaning up the general settings page
X-Git-Tag: 0.4.0~396
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=b8553ef5376b181ddcc105a47d27f09c40cea9cc

cleaning up the general settings page
---

diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp
index 1c91d016..4b5aba73 100644
--- a/src/qtui/settingspages/generalsettingspage.cpp
+++ b/src/qtui/settingspages/generalsettingspage.cpp
@@ -22,7 +22,6 @@
 
 #include "qtui.h"
 #include "qtuisettings.h"
-#include "backlogsettings.h"
 #include "buffersettings.h"
 
 GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
@@ -59,8 +58,6 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
   connect(ui.displayTopicInTooltip, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.mouseWheelChangesBuffers, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.completionSuffix, SIGNAL(textEdited(const QString&)), this, SLOT(widgetHasChanged()));
-  connect(ui.fixedBacklogAmount, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged()));
-  connect(ui.dynamicBacklogAmount, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged()));
 }
 
 bool GeneralSettingsPage::hasDefaults() const {
@@ -132,14 +129,6 @@ void GeneralSettingsPage::load() {
   settings["CompletionSuffix"] = uiSettings.value("CompletionSuffix", QString(": "));
   ui.completionSuffix->setText(settings["CompletionSuffix"].toString());
 
-  // backlogSettings:
-  BacklogSettings backlogSettings;
-  settings["FixedBacklogAmount"] = backlogSettings.fixedBacklogAmount();
-  ui.fixedBacklogAmount->setValue(backlogSettings.fixedBacklogAmount());
-
-  settings["DynamicBacklogAmount"] = backlogSettings.dynamicBacklogAmount();
-  ui.dynamicBacklogAmount->setValue(backlogSettings.dynamicBacklogAmount());
-
   setChangedState(false);
 }
 
@@ -170,10 +159,6 @@ void GeneralSettingsPage::save() {
   uiSettings.setValue("CompletionSuffix", ui.completionSuffix->text());
 
 
-  BacklogSettings backlogSettings;
-  backlogSettings.setFixedBacklogAmount(ui.fixedBacklogAmount->value());
-  backlogSettings.setDynamicBacklogAmount(ui.dynamicBacklogAmount->value());
-
   load();
   setChangedState(false);
 }
@@ -205,8 +190,5 @@ bool GeneralSettingsPage::testHasChanged() {
 
   if(settings["CompletionSuffix"].toString() != ui.completionSuffix->text()) return true;
 
-  if(settings["FixedBacklogAmount"].toInt() != ui.fixedBacklogAmount->value()) return true;
-  if(settings["DynamicBacklogAmount"].toInt() != ui.dynamicBacklogAmount->value()) return true;
-
   return false;
 }
diff --git a/src/qtui/settingspages/generalsettingspage.ui b/src/qtui/settingspages/generalsettingspage.ui
index b8be73a6..c4e32f2e 100644
--- a/src/qtui/settingspages/generalsettingspage.ui
+++ b/src/qtui/settingspages/generalsettingspage.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>549</width>
-    <height>621</height>
+    <width>434</width>
+    <height>495</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -269,72 +269,17 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_3" >
-     <property name="title" >
-      <string>Backlog</string>
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout" >
-      <item row="0" column="0" >
-       <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>
-        </property>
-        <property name="text" >
-         <string>Initial backlog amount:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QSpinBox" name="fixedBacklogAmount" >
-        <property name="maximum" >
-         <number>1000</number>
-        </property>
-        <property name="singleStep" >
-         <number>10</number>
-        </property>
-        <property name="value" >
-         <number>500</number>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <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 row="1" column="2" >
-       <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 row="0" column="3" >
-       <spacer name="horizontalSpacer_2" >
-        <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>
-    </widget>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
    </item>
   </layout>
  </widget>