X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.cpp;h=91369f9c90417986b1164a78834d4408a1d19e09;hp=e33381696877bf2405b941892e71b445e7b98a6f;hb=c0f725d462b8f9737cfc5ee6a9766b61cf103ab1;hpb=9fb25d34cfc4dee02159b112c72e018c6e26e63f diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp index e3338169..91369f9c 100644 --- a/src/qtui/settingspages/appearancesettingspage.cpp +++ b/src/qtui/settingspages/appearancesettingspage.cpp @@ -21,32 +21,32 @@ #include "appearancesettingspage.h" #include "buffersettings.h" -#include "chatviewsettings.h" #include "qtui.h" #include "qtuisettings.h" #include "qtuistyle.h" -#include "util.h" -#include +#include #include -#include -#include #include +#include +#include AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent) - : SettingsPage(tr("Appearance"), QString(), parent), - _fontsChanged(false) + : SettingsPage(tr("Interface"), QString(), parent) { ui.setupUi(this); + +#ifdef Q_WS_MAC + ui.minimizeOnClose->hide(); +#endif +#ifdef QT_NO_SYSTEMTRAYICON + ui.useSystemTrayIcon->hide(); +#endif + initAutoWidgets(); initStyleComboBox(); initLanguageComboBox(); -#ifndef HAVE_WEBKIT - ui.showWebPreview->hide(); - ui.showWebPreview->setEnabled(false); -#endif - foreach(QComboBox *comboBox, findChildren()) { connect(comboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged())); } @@ -54,16 +54,19 @@ AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent) connect(checkBox, SIGNAL(clicked()), this, SLOT(widgetHasChanged())); } - mapper = new QSignalMapper(this); - connect(mapper, SIGNAL(mapped(QWidget *)), this, SLOT(chooseFont(QWidget *))); + connect(ui.chooseStyleSheet, SIGNAL(clicked()), SLOT(chooseStyleSheet())); - connect(ui.chooseBufferView, SIGNAL(clicked()), mapper, SLOT(map())); - connect(ui.chooseInputLine, SIGNAL(clicked()), mapper, SLOT(map())); + connect(ui.userNoticesInDefaultBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.userNoticesInStatusBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.userNoticesInCurrentBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); - mapper->setMapping(ui.chooseBufferView, ui.demoBufferView); - mapper->setMapping(ui.chooseInputLine, ui.demoInputLine); + connect(ui.serverNoticesInDefaultBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.serverNoticesInStatusBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.serverNoticesInCurrentBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); - connect(ui.chooseStyleSheet, SIGNAL(clicked()), SLOT(chooseStyleSheet())); + 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())); } void AppearanceSettingsPage::initStyleComboBox() { @@ -75,12 +78,15 @@ void AppearanceSettingsPage::initStyleComboBox() { } void AppearanceSettingsPage::initLanguageComboBox() { - QDir i18nDir(Quassel::translationDirPath(), "quassel_*.qm"); + QDir i18nDir(Quassel::translationDirPath(), "*.qm"); + QRegExp rx("(qt_)?([a-zA-Z_]+)\\.qm"); foreach(QString translationFile, i18nDir.entryList()) { - QString localeName(translationFile.mid(8)); - localeName.chop(3); - QLocale locale(localeName); + if(!rx.exactMatch(translationFile)) + continue; + if(!rx.cap(1).isEmpty()) + continue; + QLocale locale(rx.cap(2)); _locales << locale; ui.languageComboBox->addItem(QLocale::languageToString(locale.language())); } @@ -88,11 +94,7 @@ void AppearanceSettingsPage::initLanguageComboBox() { void AppearanceSettingsPage::defaults() { ui.styleComboBox->setCurrentIndex(0); - - loadFonts(Settings::Default); - _fontsChanged = true; - - ui.showUserStateIcons->setChecked(true); + ui.languageComboBox->setCurrentIndex(1); SettingsPage::defaults(); widgetHasChanged(); @@ -107,49 +109,41 @@ void AppearanceSettingsPage::load() { ui.styleComboBox->setCurrentIndex(0); } else { 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(); if(locale == QLocale::system()) - ui.languageComboBox->setCurrentIndex(0); - else if(locale.language() == QLocale::C) ui.languageComboBox->setCurrentIndex(1); + else if(locale.language() == QLocale::C) // we use C for "untranslated" + ui.languageComboBox->setCurrentIndex(0); else ui.languageComboBox->setCurrentIndex(ui.languageComboBox->findText(QLocale::languageToString(locale.language()), Qt::MatchExactly)); ui.languageComboBox->setProperty("storedValue", ui.languageComboBox->currentIndex()); Quassel::loadTranslation(selectedLocale()); + // bufferSettings: BufferSettings bufferSettings; - SettingsPage::load(ui.showUserStateIcons, bufferSettings.showUserStateIcons()); + int redirectTarget = bufferSettings.userNoticesTarget(); + SettingsPage::load(ui.userNoticesInDefaultBuffer, redirectTarget & BufferSettings::DefaultBuffer); + SettingsPage::load(ui.userNoticesInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer); + SettingsPage::load(ui.userNoticesInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer); + + redirectTarget = bufferSettings.serverNoticesTarget(); + SettingsPage::load(ui.serverNoticesInDefaultBuffer, redirectTarget & BufferSettings::DefaultBuffer); + SettingsPage::load(ui.serverNoticesInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer); + SettingsPage::load(ui.serverNoticesInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer); - loadFonts(Settings::Custom); + redirectTarget = bufferSettings.errorMsgsTarget(); + SettingsPage::load(ui.errorMsgsInDefaultBuffer, redirectTarget & BufferSettings::DefaultBuffer); + SettingsPage::load(ui.errorMsgsInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer); + SettingsPage::load(ui.errorMsgsInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer); 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(); - setFont(ui.demoInputLine, inputLineFont); - - QFont bufferViewFont; - if(mode == Settings::Custom) - bufferViewFont = s.value("BufferView", QFont()).value(); - 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; @@ -157,45 +151,61 @@ void AppearanceSettingsPage::save() { uiSettings.setValue("Style", QString("")); } else { uiSettings.setValue("Style", ui.styleComboBox->currentText()); + QApplication::setStyle(ui.styleComboBox->currentText()); } + ui.styleComboBox->setProperty("storedValue", ui.styleComboBox->currentIndex()); - if(ui.languageComboBox->currentIndex() == 0) { + if(ui.languageComboBox->currentIndex() == 1) { uiSettings.remove("Locale"); // force the default (QLocale::system()) } else { uiSettings.setValue("Locale", selectedLocale()); } + ui.languageComboBox->setProperty("storedValue", ui.languageComboBox->currentIndex()); - 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); + bool needsStyleReload = + ui.useCustomStyleSheet->isChecked() != ui.useCustomStyleSheet->property("storedValue").toBool() + || (ui.useCustomStyleSheet->isChecked() && ui.customStyleSheetPath->text() != ui.customStyleSheetPath->property("storedValue").toString()); - _fontsChanged = false; + BufferSettings bufferSettings; + int redirectTarget = 0; + if(ui.userNoticesInDefaultBuffer->isChecked()) + redirectTarget |= BufferSettings::DefaultBuffer; + if(ui.userNoticesInStatusBuffer->isChecked()) + redirectTarget |= BufferSettings::StatusBuffer; + if(ui.userNoticesInCurrentBuffer->isChecked()) + redirectTarget |= BufferSettings::CurrentBuffer; + bufferSettings.setUserNoticesTarget(redirectTarget); + + redirectTarget = 0; + if(ui.serverNoticesInDefaultBuffer->isChecked()) + redirectTarget |= BufferSettings::DefaultBuffer; + if(ui.serverNoticesInStatusBuffer->isChecked()) + redirectTarget |= BufferSettings::StatusBuffer; + if(ui.serverNoticesInCurrentBuffer->isChecked()) + redirectTarget |= BufferSettings::CurrentBuffer; + bufferSettings.setServerNoticesTarget(redirectTarget); + + redirectTarget = 0; + if(ui.errorMsgsInDefaultBuffer->isChecked()) + redirectTarget |= BufferSettings::DefaultBuffer; + if(ui.errorMsgsInStatusBuffer->isChecked()) + redirectTarget |= BufferSettings::StatusBuffer; + if(ui.errorMsgsInCurrentBuffer->isChecked()) + redirectTarget |= BufferSettings::CurrentBuffer; + bufferSettings.setErrorMsgsTarget(redirectTarget); SettingsPage::save(); setChangedState(false); + if(needsStyleReload) + QtUi::style()->reload(); } QLocale AppearanceSettingsPage::selectedLocale() const { QLocale locale; int index = ui.languageComboBox->currentIndex(); - if(index == 0) + if(index == 1) locale = QLocale::system(); - else if(index == 1) + else if(index == 0) locale = QLocale::c(); else if(index > 1) locale = _locales[index - 2]; @@ -203,28 +213,14 @@ 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(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"); + QString dir = ui.customStyleSheetPath->property("storedValue").toString(); + if(!dir.isEmpty() && QFile(dir).exists()) + dir = QDir(dir).absolutePath(); + else + dir = QDir(Quassel::findDataFilePath("default.qss")).absolutePath(); + + QString name = QFileDialog::getOpenFileName(this, tr("Please choose a stylesheet file"), dir, "*.qss"); if(!name.isEmpty()) ui.customStyleSheetPath->setText(name); } @@ -234,13 +230,20 @@ void AppearanceSettingsPage::widgetHasChanged() { } bool AppearanceSettingsPage::testHasChanged() { - if(_fontsChanged) return true; // comparisons are nasty for now - if(ui.styleComboBox->currentIndex() != ui.styleComboBox->property("storedValue").toInt()) return true; + if(ui.languageComboBox->currentIndex() != ui.languageComboBox->property("storedValue").toInt()) return true; + + if(SettingsPage::hasChanged(ui.userNoticesInStatusBuffer)) return true; + if(SettingsPage::hasChanged(ui.userNoticesInDefaultBuffer)) return true; + if(SettingsPage::hasChanged(ui.userNoticesInCurrentBuffer)) return true; - if(selectedLocale() != QLocale()) return true; // QLocale() returns the default locale (manipulated via loadTranslation()) + if(SettingsPage::hasChanged(ui.serverNoticesInStatusBuffer)) return true; + if(SettingsPage::hasChanged(ui.serverNoticesInDefaultBuffer)) return true; + if(SettingsPage::hasChanged(ui.serverNoticesInCurrentBuffer)) return true; - if(SettingsPage::hasChanged(ui.showUserStateIcons)) return true; + if(SettingsPage::hasChanged(ui.errorMsgsInStatusBuffer)) return true; + if(SettingsPage::hasChanged(ui.errorMsgsInDefaultBuffer)) return true; + if(SettingsPage::hasChanged(ui.errorMsgsInCurrentBuffer)) return true; return false; }