From 67f5c3e9c1ac4ee1b01f642872fdba797389b140 Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 16 Nov 2008 02:56:19 +0100
Subject: [PATCH] Small settingspage fixes

---
 src/qtui/settingspages/colorsettingspage.ui   | 60 +------------------
 .../settingspages/generalsettingspage.cpp     | 10 ++--
 src/qtui/settingspages/generalsettingspage.ui |  2 +-
 .../settingspages/networkssettingspage.ui     |  2 +-
 4 files changed, 9 insertions(+), 65 deletions(-)

diff --git a/src/qtui/settingspages/colorsettingspage.ui b/src/qtui/settingspages/colorsettingspage.ui
index bbf53894..99f3ff88 100644
--- a/src/qtui/settingspages/colorsettingspage.ui
+++ b/src/qtui/settingspages/colorsettingspage.ui
@@ -22,17 +22,9 @@
    <item>
     <widget class="QTabWidget" name="tabWidget" >
      <property name="currentIndex" >
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="bufferview" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>487</width>
-        <height>485</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Bufferview</string>
       </attribute>
@@ -323,14 +315,6 @@
       </layout>
      </widget>
      <widget class="QWidget" name="chatview" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>487</width>
-        <height>485</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Chatview</string>
       </attribute>
@@ -344,17 +328,9 @@
           </sizepolicy>
          </property>
          <property name="currentIndex" >
-          <number>2</number>
+          <number>0</number>
          </property>
          <widget class="QWidget" name="tab" >
-          <property name="geometry" >
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>441</width>
-            <height>262</height>
-           </rect>
-          </property>
           <attribute name="title" >
            <string>Server Activity</string>
           </attribute>
@@ -582,14 +558,6 @@
           </layout>
          </widget>
          <widget class="QWidget" name="tab_2" >
-          <property name="geometry" >
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>441</width>
-            <height>294</height>
-           </rect>
-          </property>
           <attribute name="title" >
            <string>User Activity</string>
           </attribute>
@@ -907,14 +875,6 @@
           </layout>
          </widget>
          <widget class="QWidget" name="Seite_2" >
-          <property name="geometry" >
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>441</width>
-            <height>294</height>
-           </rect>
-          </property>
           <attribute name="title" >
            <string>Message</string>
           </attribute>
@@ -1268,14 +1228,6 @@
       </layout>
      </widget>
      <widget class="QWidget" name="Mirc" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>487</width>
-        <height>485</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Mirc Color Codes</string>
       </attribute>
@@ -1535,14 +1487,6 @@
       </layout>
      </widget>
      <widget class="QWidget" name="nickview" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>487</width>
-        <height>485</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Nickview</string>
       </attribute>
diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp
index 9b232bdd..1c91d016 100644
--- a/src/qtui/settingspages/generalsettingspage.cpp
+++ b/src/qtui/settingspages/generalsettingspage.cpp
@@ -55,7 +55,7 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
   connect(ui.errorMsgsInDefaultBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.errorMsgsInStatusBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.errorMsgsInCurrentBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
-  
+
   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()));
@@ -86,7 +86,7 @@ void GeneralSettingsPage::defaults() {
   ui.errorMsgsInCurrentBuffer->setChecked(false);
 
   ui.displayTopicInTooltip->setChecked(false);
-  ui.mouseWheelChangesBuffers->setChecked(true);
+  ui.mouseWheelChangesBuffers->setChecked(false);
 
   ui.completionSuffix->setText(": ");
 
@@ -107,7 +107,7 @@ void GeneralSettingsPage::load() {
   settings["MinimizeOnClose"] = qtuiSettings.value("MinimizeOnClose", QVariant(false));
   ui.minimizeOnClose->setChecked(settings["MinimizeOnClose"].toBool());
 
-  settings["MouseWheelChangesBuffers"] = uiSettings.value("MouseWheelChangesBuffers", QVariant(true));
+  settings["MouseWheelChangesBuffers"] = uiSettings.value("MouseWheelChangesBuffers", QVariant(false));
   ui.mouseWheelChangesBuffers->setChecked(settings["MouseWheelChangesBuffers"].toBool());
 
   // bufferSettings:
@@ -124,7 +124,7 @@ void GeneralSettingsPage::load() {
   SettingsPage::load(ui.errorMsgsInStatusBuffer, bufferSettings.value("ErrorMsgsInStatusBuffer", QVariant(false)).toBool());
   SettingsPage::load(ui.errorMsgsInCurrentBuffer, bufferSettings.value("ErrorMsgsInCurrentBuffer", QVariant(false)).toBool());
 
-  
+
   settings["DisplayTopicInTooltip"] = bufferSettings.value("DisplayTopicInTooltip", QVariant(false));
   ui.displayTopicInTooltip->setChecked(settings["DisplayTopicInTooltip"].toBool());
 
@@ -173,7 +173,7 @@ void GeneralSettingsPage::save() {
   BacklogSettings backlogSettings;
   backlogSettings.setFixedBacklogAmount(ui.fixedBacklogAmount->value());
   backlogSettings.setDynamicBacklogAmount(ui.dynamicBacklogAmount->value());
-  
+
   load();
   setChangedState(false);
 }
diff --git a/src/qtui/settingspages/generalsettingspage.ui b/src/qtui/settingspages/generalsettingspage.ui
index 9257cc17..b8be73a6 100644
--- a/src/qtui/settingspages/generalsettingspage.ui
+++ b/src/qtui/settingspages/generalsettingspage.ui
@@ -212,7 +212,7 @@
          <string>Mouse wheel changes displayed buffers</string>
         </property>
         <property name="checked" >
-         <bool>true</bool>
+         <bool>false</bool>
         </property>
        </widget>
       </item>
diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index 4c1563e2..5f578f59 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -160,7 +160,7 @@
          <string/>
         </property>
         <property name="currentIndex" >
-         <number>2</number>
+         <number>0</number>
         </property>
         <widget class="QWidget" name="serversTab" >
          <property name="enabled" >
-- 
2.20.1