From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 20 Oct 2008 11:30:15 +0000 (+0200)
Subject: Use QtUiSettings for QtUi-related stuff, rather than UiSettings.
X-Git-Tag: 0.3.1~155
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=335c0c0196da3ef371662b3c754f0516991906f4;ds=sidebyside

Use QtUiSettings for QtUi-related stuff, rather than UiSettings.

This also fixes the issue with custom Qt styles not being active at startup.
As a side effect, you'll have to redo your settings in Appearance->General at least,
also in Behaviour->General.
---

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 041a2aa3..39fd4749 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -75,9 +75,9 @@ MainWin::MainWin(QWidget *parent)
     _trayIcon(new QSystemTrayIcon(this))
 {
   QtUiSettings uiSettings;
-  QString style = uiSettings.value("Style", QString("")).toString();
-  if(style != "") {
-    QApplication::setStyle(style);
+  QString style = uiSettings.value("Style", QString()).toString();
+  if(!style.isEmpty()) {
+    QApplication::setStyle("plastique");
   }
 
   setWindowTitle("Quassel IRC");
@@ -399,7 +399,7 @@ void MainWin::setupStatusBar() {
   _viewMenu->addSeparator();
   QAction *showStatusbar = QtUi::actionCollection("General")->action("ToggleStatusBar");
 
-  UiSettings uiSettings;
+  QtUiSettings uiSettings;
 
   bool enabled = uiSettings.value("ShowStatusBar", QVariant(true)).toBool();
   showStatusbar->setChecked(enabled);
@@ -410,7 +410,7 @@ void MainWin::setupStatusBar() {
 }
 
 void MainWin::saveStatusBarStatus(bool enabled) {
-  UiSettings uiSettings;
+  QtUiSettings uiSettings;
   uiSettings.setValue("ShowStatusBar", enabled);
 }
 
@@ -429,7 +429,7 @@ void MainWin::setupSystray() {
 
   systemTrayIcon()->setContextMenu(systrayMenu);
 
-  UiSettings s;
+  QtUiSettings s;
   if(s.value("UseSystemTrayIcon", QVariant(true)).toBool()) {
     systemTrayIcon()->show();
   }
@@ -444,7 +444,7 @@ void MainWin::setupSystray() {
 void MainWin::changeEvent(QEvent *event) {
   if(event->type() == QEvent::WindowStateChange) {
     if(windowState() & Qt::WindowMinimized) {
-      UiSettings s;
+      QtUiSettings s;
       if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) {
         toggleVisibility();
         event->ignore();
@@ -578,7 +578,7 @@ void MainWin::showAboutDlg() {
 }
 
 void MainWin::closeEvent(QCloseEvent *event) {
-  UiSettings s;
+  QtUiSettings s;
   if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
     toggleVisibility();
     event->ignore();
diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index 4fcaa0d8..1104bc34 100644
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -21,7 +21,7 @@
 #include "appearancesettingspage.h"
 
 #include "qtui.h"
-#include "uisettings.h"
+#include "qtuisettings.h"
 #include "util.h"
 
 #include <QDir>
@@ -33,13 +33,13 @@ AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
   initStyleComboBox();
   initLanguageComboBox();
 
-  connect(ui.styleComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged())); 
-  connect(ui.languageComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged())); 
+  connect(ui.styleComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
+  connect(ui.languageComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
 }
 
 void AppearanceSettingsPage::initStyleComboBox() {
   QStringList styleList = QStyleFactory::keys();
-  ui.styleComboBox->addItem("<default>");
+  ui.styleComboBox->addItem(tr("<System Default>"));
   foreach(QString style, styleList) {
     ui.styleComboBox->addItem(style);
   }
@@ -65,7 +65,7 @@ void AppearanceSettingsPage::defaults() {
 }
 
 void AppearanceSettingsPage::load() {
-  UiSettings uiSettings;
+  QtUiSettings uiSettings;
 
   settings["Style"] = uiSettings.value("Style", QString(""));
   if(settings["Style"].toString() == "") {
@@ -88,7 +88,7 @@ void AppearanceSettingsPage::load() {
 }
 
 void AppearanceSettingsPage::save() {
-  UiSettings uiSettings;
+  QtUiSettings uiSettings;
 
   if(ui.styleComboBox->currentIndex() < 1) {
     uiSettings.setValue("Style", QString(""));
@@ -101,7 +101,7 @@ void AppearanceSettingsPage::save() {
   } else {
     uiSettings.setValue("Locale", selectedLocale());
   }
-  
+
   load();
   setChangedState(false);
 }
diff --git a/src/qtui/settingspages/appearancesettingspage.ui b/src/qtui/settingspages/appearancesettingspage.ui
index ba01cb15..e6abf9d3 100644
--- a/src/qtui/settingspages/appearancesettingspage.ui
+++ b/src/qtui/settingspages/appearancesettingspage.ui
@@ -35,7 +35,7 @@
        <widget class="QComboBox" name="languageComboBox" >
         <item>
          <property name="text" >
-          <string>&lt;System></string>
+          <string>&lt;System Default></string>
          </property>
         </item>
         <item>
diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp
index 2e45e510..f2ff5ad8 100644
--- a/src/qtui/settingspages/generalsettingspage.cpp
+++ b/src/qtui/settingspages/generalsettingspage.cpp
@@ -21,7 +21,7 @@
 #include "generalsettingspage.h"
 
 #include "qtui.h"
-#include "uisettings.h"
+#include "qtuisettings.h"
 #include "buffersettings.h"
 
 GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
@@ -76,7 +76,7 @@ void GeneralSettingsPage::defaults() {
 
 void GeneralSettingsPage::load() {
   // uiSettings:
-  UiSettings uiSettings;
+  QtUiSettings uiSettings;
   settings["UseSystemTrayIcon"] = uiSettings.value("UseSystemTrayIcon", QVariant(true));
   ui.useSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
   ui.showSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
@@ -112,7 +112,7 @@ void GeneralSettingsPage::load() {
 }
 
 void GeneralSettingsPage::save() {
-  UiSettings uiSettings;
+  QtUiSettings uiSettings;
   uiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked());
   uiSettings.setValue("MinimizeOnMinimize",  ui.minimizeOnMinimize->isChecked());
   uiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked());