X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.cpp;h=e33381696877bf2405b941892e71b445e7b98a6f;hp=91e32a010cc0ebc8cf1c2b30ba63dcdd2fd1a078;hb=9fb25d34cfc4dee02159b112c72e018c6e26e63f;hpb=dcac65fc4beeb1167de8ebec5cc54608fc314fd3

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index 91e32a01..e3338169 100644
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -24,15 +24,21 @@
 #include "chatviewsettings.h"
 #include "qtui.h"
 #include "qtuisettings.h"
+#include "qtuistyle.h"
 #include "util.h"
 
 #include <QDir>
+#include <QFileDialog>
+#include <QFontDialog>
+#include <QSignalMapper>
 #include <QStyleFactory>
 
 AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Appearance"), QString(), parent)
+  : SettingsPage(tr("Appearance"), QString(), parent),
+  _fontsChanged(false)
 {
   ui.setupUi(this);
+  initAutoWidgets();
   initStyleComboBox();
   initLanguageComboBox();
 
@@ -47,6 +53,17 @@ AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
   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.chooseBufferView, SIGNAL(clicked()), mapper, SLOT(map()));
+  connect(ui.chooseInputLine, SIGNAL(clicked()), mapper, SLOT(map()));
+
+  mapper->setMapping(ui.chooseBufferView, ui.demoBufferView);
+  mapper->setMapping(ui.chooseInputLine, ui.demoInputLine);
+
+  connect(ui.chooseStyleSheet, SIGNAL(clicked()), SLOT(chooseStyleSheet()));
 }
 
 void AppearanceSettingsPage::initStyleComboBox() {
@@ -67,12 +84,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.showUserStateIcons->setChecked(true);
+
+  SettingsPage::defaults();
   widgetHasChanged();
 }
 
@@ -80,13 +102,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>();
@@ -96,17 +119,37 @@ void AppearanceSettingsPage::load() {
     ui.languageComboBox->setCurrentIndex(1);
   else
     ui.languageComboBox->setCurrentIndex(ui.languageComboBox->findText(QLocale::languageToString(locale.language()), Qt::MatchExactly));
+  ui.languageComboBox->setProperty("storedValue", ui.languageComboBox->currentIndex());
   Quassel::loadTranslation(selectedLocale());
 
-  ChatViewSettings chatViewSettings;
-  SettingsPage::load(ui.showWebPreview, chatViewSettings.showWebPreview());
-
   BufferSettings bufferSettings;
   SettingsPage::load(ui.showUserStateIcons, bufferSettings.showUserStateIcons());
 
+  loadFonts(Settings::Custom);
+
+  SettingsPage::load();
   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()->cachedFormat(UiStyle::None, 0); // FIXME
+  //setFont(ui.demoChatView, chatFormat.font());
+
+  _fontsChanged = false;
+}
+
 void AppearanceSettingsPage::save() {
   QtUiSettings uiSettings;
 
@@ -122,13 +165,28 @@ void AppearanceSettingsPage::save() {
     uiSettings.setValue("Locale", selectedLocale());
   }
 
-  ChatViewSettings chatViewSettings;
-  chatViewSettings.enableWebPreview(ui.showWebPreview->isChecked());
-
   BufferSettings bufferSettings;
   bufferSettings.enableUserStateIcons(ui.showUserStateIcons->isChecked());
 
-  load();
+  // 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;
+
+  SettingsPage::save();
   setChangedState(false);
 }
 
@@ -145,20 +203,44 @@ 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::chooseStyleSheet() {
+  QString name = QFileDialog::getOpenFileName(this, tr("Please choose a stylesheet file"), QString(), "*.qss");
+  if(!name.isEmpty())
+    ui.customStyleSheetPath->setText(name);
+}
+
 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;
   if(SettingsPage::hasChanged(ui.showUserStateIcons)) return true;
 
   return false;
 }
-
-
-
-