X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.cpp;h=91369f9c90417986b1164a78834d4408a1d19e09;hp=228fe40391888a51fe6fb7ccd75179dadef16ec9;hb=c0f725d462b8f9737cfc5ee6a9766b61cf103ab1;hpb=d7832127ff8412b09d9fa4e56570d8a890abcbbe diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp index 228fe403..91369f9c 100644 --- a/src/qtui/settingspages/appearancesettingspage.cpp +++ b/src/qtui/settingspages/appearancesettingspage.cpp @@ -20,6 +20,7 @@ #include "appearancesettingspage.h" +#include "buffersettings.h" #include "qtui.h" #include "qtuisettings.h" #include "qtuistyle.h" @@ -27,11 +28,21 @@ #include #include #include +#include +#include AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent) : 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(); @@ -44,6 +55,18 @@ AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent) } connect(ui.chooseStyleSheet, SIGNAL(clicked()), SLOT(chooseStyleSheet())); + + 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())); + + 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.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() { @@ -55,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())); } @@ -68,6 +94,7 @@ void AppearanceSettingsPage::initLanguageComboBox() { void AppearanceSettingsPage::defaults() { ui.styleComboBox->setCurrentIndex(0); + ui.languageComboBox->setCurrentIndex(1); SettingsPage::defaults(); widgetHasChanged(); @@ -82,21 +109,37 @@ 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; + 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); + + 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); } @@ -108,18 +151,49 @@ 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()); bool needsStyleReload = ui.useCustomStyleSheet->isChecked() != ui.useCustomStyleSheet->property("storedValue").toBool() || (ui.useCustomStyleSheet->isChecked() && ui.customStyleSheetPath->text() != ui.customStyleSheetPath->property("storedValue").toString()); + 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) @@ -129,9 +203,9 @@ void AppearanceSettingsPage::save() { 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]; @@ -140,7 +214,13 @@ QLocale AppearanceSettingsPage::selectedLocale() const { } 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); } @@ -151,8 +231,19 @@ void AppearanceSettingsPage::widgetHasChanged() { bool AppearanceSettingsPage::testHasChanged() { 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(SettingsPage::hasChanged(ui.serverNoticesInStatusBuffer)) return true; + if(SettingsPage::hasChanged(ui.serverNoticesInDefaultBuffer)) return true; + if(SettingsPage::hasChanged(ui.serverNoticesInCurrentBuffer)) return true; - if(selectedLocale() != QLocale()) return true; // QLocale() returns the default locale (manipulated via loadTranslation()) + if(SettingsPage::hasChanged(ui.errorMsgsInStatusBuffer)) return true; + if(SettingsPage::hasChanged(ui.errorMsgsInDefaultBuffer)) return true; + if(SettingsPage::hasChanged(ui.errorMsgsInCurrentBuffer)) return true; return false; }