X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.cpp;h=29b9335e15daa7e26e3aff3ec23bf2d35afe7cea;hp=fc4674fdbc42050c80d06bb2ad7a4e3848301d64;hb=a5ea274363f8ab9fd5279084c564c9966e313955;hpb=9996d2489e5e5ca23b0750f39f64d8d4b5990029

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index fc4674fd..29b9335e 100644
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,23 +24,44 @@
 #include "chatviewsettings.h"
 #include "qtui.h"
 #include "qtuisettings.h"
+#include "qtuistyle.h"
 #include "util.h"
 
 #include <QDir>
+#include <QFontDialog>
+#include <QSignalMapper>
 #include <QStyleFactory>
 
 AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Appearance"), tr("General"), parent) {
+  : SettingsPage(tr("Appearance"), QString(), parent),
+  _fontsChanged(false)
+{
   ui.setupUi(this);
   initStyleComboBox();
   initLanguageComboBox();
 
+#ifndef HAVE_WEBKIT
+  ui.showWebPreview->hide();
+  ui.showWebPreview->setEnabled(false);
+#endif
+
   foreach(QComboBox *comboBox, findChildren<QComboBox *>()) {
     connect(comboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
   }
   foreach(QCheckBox *checkBox, findChildren<QCheckBox *>()) {
     connect(checkBox, SIGNAL(clicked()), this, SLOT(widgetHasChanged()));
   }
+
+  mapper = new QSignalMapper(this);
+  connect(mapper, SIGNAL(mapped(QWidget *)), this, SLOT(chooseFont(QWidget *)));
+
+  connect(ui.chooseChatView, SIGNAL(clicked()), mapper, SLOT(map()));
+  connect(ui.chooseBufferView, SIGNAL(clicked()), mapper, SLOT(map()));
+  connect(ui.chooseInputLine, SIGNAL(clicked()), mapper, SLOT(map()));
+
+  mapper->setMapping(ui.chooseChatView, ui.demoChatView);
+  mapper->setMapping(ui.chooseBufferView, ui.demoBufferView);
+  mapper->setMapping(ui.chooseInputLine, ui.demoInputLine);
 }
 
 void AppearanceSettingsPage::initStyleComboBox() {
@@ -52,7 +73,7 @@ void AppearanceSettingsPage::initStyleComboBox() {
 }
 
 void AppearanceSettingsPage::initLanguageComboBox() {
-  QDir i18nDir(":/i18n", "quassel_*.qm");
+  QDir i18nDir(Quassel::translationDirPath(), "quassel_*.qm");
 
   foreach(QString translationFile, i18nDir.entryList()) {
     QString localeName(translationFile.mid(8));
@@ -61,12 +82,17 @@ void AppearanceSettingsPage::initLanguageComboBox() {
     _locales << locale;
     ui.languageComboBox->addItem(QLocale::languageToString(locale.language()));
   }
-
 }
 
 void AppearanceSettingsPage::defaults() {
   ui.styleComboBox->setCurrentIndex(0);
 
+  loadFonts(Settings::Default);
+  _fontsChanged = true;
+
+  ui.showWebPreview->setChecked(true);
+  ui.showUserStateIcons->setChecked(true);
+
   widgetHasChanged();
 }
 
@@ -74,13 +100,14 @@ void AppearanceSettingsPage::load() {
   QtUiSettings uiSettings;
 
   // Gui Style
-  settings["Style"] = uiSettings.value("Style", QString(""));
-  if(settings["Style"].toString() == "") {
+  QString style = uiSettings.value("Style", QString("")).toString();
+  if(style.isEmpty()) {
     ui.styleComboBox->setCurrentIndex(0);
   } else {
-    ui.styleComboBox->setCurrentIndex(ui.styleComboBox->findText(settings["Style"].toString(), Qt::MatchExactly));
-    QApplication::setStyle(settings["Style"].toString());
+    ui.styleComboBox->setCurrentIndex(ui.styleComboBox->findText(style, Qt::MatchExactly));
+    QApplication::setStyle(style);
   }
+  ui.styleComboBox->setProperty("storedValue", ui.styleComboBox->currentIndex());
 
   // Language
   QLocale locale = uiSettings.value("Locale", QLocale::system()).value<QLocale>();
@@ -90,7 +117,8 @@ void AppearanceSettingsPage::load() {
     ui.languageComboBox->setCurrentIndex(1);
   else
     ui.languageComboBox->setCurrentIndex(ui.languageComboBox->findText(QLocale::languageToString(locale.language()), Qt::MatchExactly));
-  loadTranslation(selectedLocale());
+  ui.languageComboBox->setProperty("storedValue", ui.languageComboBox->currentIndex());
+  Quassel::loadTranslation(selectedLocale());
 
   ChatViewSettings chatViewSettings;
   SettingsPage::load(ui.showWebPreview, chatViewSettings.showWebPreview());
@@ -98,9 +126,30 @@ void AppearanceSettingsPage::load() {
   BufferSettings bufferSettings;
   SettingsPage::load(ui.showUserStateIcons, bufferSettings.showUserStateIcons());
 
+  loadFonts(Settings::Custom);
+
   setChangedState(false);
 }
 
+void AppearanceSettingsPage::loadFonts(Settings::Mode mode) {
+  QtUiStyleSettings s("Fonts");
+
+  QFont inputLineFont;
+  if(mode == Settings::Custom)
+    inputLineFont = s.value("InputLine", QFont()).value<QFont>();
+  setFont(ui.demoInputLine, inputLineFont);
+
+  QFont bufferViewFont;
+  if(mode == Settings::Custom)
+    bufferViewFont = s.value("BufferView", QFont()).value<QFont>();
+  setFont(ui.demoBufferView, bufferViewFont);
+
+  QTextCharFormat chatFormat = QtUi::style()->format(UiStyle::None, mode);
+  setFont(ui.demoChatView, chatFormat.font());
+
+  _fontsChanged = false;
+}
+
 void AppearanceSettingsPage::save() {
   QtUiSettings uiSettings;
 
@@ -122,6 +171,24 @@ void AppearanceSettingsPage::save() {
   BufferSettings bufferSettings;
   bufferSettings.enableUserStateIcons(ui.showUserStateIcons->isChecked());
 
+  // Fonts
+  QtUiStyleSettings fontSettings("Fonts");
+  if(ui.demoInputLine->font() != QApplication::font())
+    fontSettings.setValue("InputLine", ui.demoInputLine->font());
+  else
+    fontSettings.setValue("InputLine", "");
+
+  if(ui.demoBufferView->font() != QApplication::font())
+    fontSettings.setValue("BufferView", ui.demoBufferView->font());
+  else
+    fontSettings.setValue("BufferView", "");
+
+  QTextCharFormat chatFormat = QtUi::style()->format(UiStyle::None);
+  chatFormat.setFont(ui.demoChatView->font());
+  QtUi::style()->setFormat(UiStyle::None, chatFormat, Settings::Custom);
+
+  _fontsChanged = false;
+
   load();
   setChangedState(false);
 }
@@ -139,12 +206,35 @@ QLocale AppearanceSettingsPage::selectedLocale() const {
   return locale;
 }
 
+void AppearanceSettingsPage::setFont(QLabel *label, const QFont &font_) {
+  QFont font = font_;
+  if(font.family().isEmpty())
+    font = QApplication::font();
+  label->setFont(font);
+  label->setText(QString("%1 %2").arg(font.family()).arg(font.pointSize()));
+  widgetHasChanged();
+}
+
+void AppearanceSettingsPage::chooseFont(QWidget *widget) {
+  QLabel *label = qobject_cast<QLabel *>(widget);
+  Q_ASSERT(label);
+  bool ok;
+  QFont font = QFontDialog::getFont(&ok, label->font());
+  if(ok) {
+    _fontsChanged = true;
+    setFont(label, font);
+  }
+}
+
 void AppearanceSettingsPage::widgetHasChanged() {
   setChangedState(testHasChanged());
 }
 
 bool AppearanceSettingsPage::testHasChanged() {
-  if(settings["Style"].toString() != ui.styleComboBox->currentText()) return true;
+  if(_fontsChanged) return true; // comparisons are nasty for now
+
+  if(ui.styleComboBox->currentIndex() != ui.styleComboBox->property("storedValue").toInt()) return true;
+
   if(selectedLocale() != QLocale()) return true; // QLocale() returns the default locale (manipulated via loadTranslation())
 
   if(SettingsPage::hasChanged(ui.showWebPreview)) return true;
@@ -152,7 +242,3 @@ bool AppearanceSettingsPage::testHasChanged() {
 
   return false;
 }
-
-
-
-