X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.cpp;h=1104bc34b8cd5d754308fd832999b16be7719988;hp=14c79240033d97e469fdd4346dc40711bfcda28a;hb=335c0c0196da3ef371662b3c754f0516991906f4;hpb=109e990662d25b98e5d5a159c4cad7c93e56b2fe

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index 14c79240..1104bc34 100644
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -3,16 +3,16 @@
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Appearance Public License as published by  *
+ *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU Appearance Public License for more details.                          *
+ *   GNU General Public License for more details.                          *
  *                                                                         *
- *   You should have received a copy of the GNU Appearance Public License     *
+ *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
@@ -21,28 +21,41 @@
 #include "appearancesettingspage.h"
 
 #include "qtui.h"
-#include "uisettings.h"
+#include "qtuisettings.h"
+#include "util.h"
 
+#include <QDir>
 #include <QStyleFactory>
 
 AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
   : SettingsPage(tr("Appearance"), tr("General"), parent) {
   ui.setupUi(this);
   initStyleComboBox();
+  initLanguageComboBox();
 
-  connect(ui.styleComboBox, 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);
   }
 }
 
-bool AppearanceSettingsPage::hasDefaults() const {
-  return true;
+void AppearanceSettingsPage::initLanguageComboBox() {
+  QDir i18nDir(":/i18n", "quassel_*.qm");
+
+  foreach(QString translationFile, i18nDir.entryList()) {
+    QString localeName(translationFile.mid(8));
+    localeName.chop(3);
+    QLocale locale(localeName);
+    _locales << locale;
+    ui.languageComboBox->addItem(QLocale::languageToString(locale.language()));
+  }
+
 }
 
 void AppearanceSettingsPage::defaults() {
@@ -52,7 +65,7 @@ void AppearanceSettingsPage::defaults() {
 }
 
 void AppearanceSettingsPage::load() {
-  UiSettings uiSettings;
+  QtUiSettings uiSettings;
 
   settings["Style"] = uiSettings.value("Style", QString(""));
   if(settings["Style"].toString() == "") {
@@ -62,11 +75,20 @@ void AppearanceSettingsPage::load() {
     QApplication::setStyle(settings["Style"].toString());
   }
 
+  QLocale locale = uiSettings.value("Locale", QLocale::system()).value<QLocale>();
+  if(locale == QLocale::system())
+    ui.languageComboBox->setCurrentIndex(0);
+  else if(locale.language() == QLocale::C)
+    ui.languageComboBox->setCurrentIndex(1);
+  else
+    ui.languageComboBox->setCurrentIndex(ui.languageComboBox->findText(QLocale::languageToString(locale.language()), Qt::MatchExactly));
+  loadTranslation(selectedLocale());
+
   setChangedState(false);
 }
 
 void AppearanceSettingsPage::save() {
-  UiSettings uiSettings;
+  QtUiSettings uiSettings;
 
   if(ui.styleComboBox->currentIndex() < 1) {
     uiSettings.setValue("Style", QString(""));
@@ -74,17 +96,36 @@ void AppearanceSettingsPage::save() {
     uiSettings.setValue("Style", ui.styleComboBox->currentText());
   }
 
+  if(ui.languageComboBox->currentIndex() == 0) {
+    uiSettings.remove("Locale"); // force the default (QLocale::system())
+  } else {
+    uiSettings.setValue("Locale", selectedLocale());
+  }
+
   load();
   setChangedState(false);
 }
 
+QLocale AppearanceSettingsPage::selectedLocale() const {
+  QLocale locale;
+  int index = ui.languageComboBox->currentIndex();
+  if(index == 0)
+    locale = QLocale::system();
+  else if(index == 1)
+    locale = QLocale::c();
+  else if(index > 1)
+    locale = _locales[index - 2];
+
+  return locale;
+}
+
 void AppearanceSettingsPage::widgetHasChanged() {
-  bool changed = testHasChanged();
-  if(changed != hasChanged()) setChangedState(changed);
+  setChangedState(testHasChanged());
 }
 
 bool AppearanceSettingsPage::testHasChanged() {
   if(settings["Style"].toString() != ui.styleComboBox->currentText()) return true;
+  if(selectedLocale() != QLocale()) return true; // QLocale() returns the default locale (manipulated via loadTranslation())
 
   return false;
 }