projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a settingspage for configuring the input widget
[quassel.git]
/
src
/
qtui
/
settingspages
/
appearancesettingspage.cpp
diff --git
a/src/qtui/settingspages/appearancesettingspage.cpp
b/src/qtui/settingspages/appearancesettingspage.cpp
index
23fdb8a
..
228fe40
100644
(file)
--- a/
src/qtui/settingspages/appearancesettingspage.cpp
+++ b/
src/qtui/settingspages/appearancesettingspage.cpp
@@
-20,18
+20,19
@@
#include "appearancesettingspage.h"
#include "appearancesettingspage.h"
-#include "buffersettings.h"
-#include "chatviewsettings.h"
#include "qtui.h"
#include "qtuisettings.h"
#include "qtui.h"
#include "qtuisettings.h"
-#include "
util
.h"
+#include "
qtuistyle
.h"
-#include <QDir>
+#include <QCheckBox>
+#include <QFileDialog>
#include <QStyleFactory>
AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
#include <QStyleFactory>
AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
- : SettingsPage(tr("Appearance"), tr("General"), parent) {
+ : SettingsPage(tr("Interface"), QString(), parent)
+{
ui.setupUi(this);
ui.setupUi(this);
+ initAutoWidgets();
initStyleComboBox();
initLanguageComboBox();
initStyleComboBox();
initLanguageComboBox();
@@
-41,6
+42,8
@@
AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
foreach(QCheckBox *checkBox, findChildren<QCheckBox *>()) {
connect(checkBox, SIGNAL(clicked()), this, SLOT(widgetHasChanged()));
}
foreach(QCheckBox *checkBox, findChildren<QCheckBox *>()) {
connect(checkBox, SIGNAL(clicked()), this, SLOT(widgetHasChanged()));
}
+
+ connect(ui.chooseStyleSheet, SIGNAL(clicked()), SLOT(chooseStyleSheet()));
}
void AppearanceSettingsPage::initStyleComboBox() {
}
void AppearanceSettingsPage::initStyleComboBox() {
@@
-52,7
+55,7
@@
void AppearanceSettingsPage::initStyleComboBox() {
}
void AppearanceSettingsPage::initLanguageComboBox() {
}
void AppearanceSettingsPage::initLanguageComboBox() {
- QDir i18nDir(
":/i18n"
, "quassel_*.qm");
+ QDir i18nDir(
Quassel::translationDirPath()
, "quassel_*.qm");
foreach(QString translationFile, i18nDir.entryList()) {
QString localeName(translationFile.mid(8));
foreach(QString translationFile, i18nDir.entryList()) {
QString localeName(translationFile.mid(8));
@@
-61,12
+64,12
@@
void AppearanceSettingsPage::initLanguageComboBox() {
_locales << locale;
ui.languageComboBox->addItem(QLocale::languageToString(locale.language()));
}
_locales << locale;
ui.languageComboBox->addItem(QLocale::languageToString(locale.language()));
}
-
}
void AppearanceSettingsPage::defaults() {
ui.styleComboBox->setCurrentIndex(0);
}
void AppearanceSettingsPage::defaults() {
ui.styleComboBox->setCurrentIndex(0);
+ SettingsPage::defaults();
widgetHasChanged();
}
widgetHasChanged();
}
@@
-74,13
+77,14
@@
void AppearanceSettingsPage::load() {
QtUiSettings uiSettings;
// Gui Style
QtUiSettings uiSettings;
// Gui Style
-
settings["Style"] = uiSettings.value("Style", QString("")
);
- if(s
ettings["Style"].toString() == ""
) {
+
QString style = uiSettings.value("Style", QString("")).toString(
);
+ if(s
tyle.isEmpty()
) {
ui.styleComboBox->setCurrentIndex(0);
} else {
ui.styleComboBox->setCurrentIndex(0);
} else {
- ui.styleComboBox->setCurrentIndex(ui.styleComboBox->findText(s
ettings["Style"].toString()
, Qt::MatchExactly));
- QApplication::setStyle(s
ettings["Style"].toString()
);
+ ui.styleComboBox->setCurrentIndex(ui.styleComboBox->findText(s
tyle
, Qt::MatchExactly));
+ QApplication::setStyle(s
tyle
);
}
}
+ ui.styleComboBox->setProperty("storedValue", ui.styleComboBox->currentIndex());
// Language
QLocale locale = uiSettings.value("Locale", QLocale::system()).value<QLocale>();
// Language
QLocale locale = uiSettings.value("Locale", QLocale::system()).value<QLocale>();
@@
-90,14
+94,10
@@
void AppearanceSettingsPage::load() {
ui.languageComboBox->setCurrentIndex(1);
else
ui.languageComboBox->setCurrentIndex(ui.languageComboBox->findText(QLocale::languageToString(locale.language()), Qt::MatchExactly));
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());
Quassel::loadTranslation(selectedLocale());
- ChatViewSettings chatViewSettings;
- SettingsPage::load(ui.showWebPreview, chatViewSettings.showWebPreview());
-
- BufferSettings bufferSettings;
- SettingsPage::load(ui.showUserStateIcons, bufferSettings.showUserStateIcons());
-
+ SettingsPage::load();
setChangedState(false);
}
setChangedState(false);
}
@@
-116,14
+116,14
@@
void AppearanceSettingsPage::save() {
uiSettings.setValue("Locale", selectedLocale());
}
uiSettings.setValue("Locale", selectedLocale());
}
- ChatViewSettings chatViewSettings;
- chatViewSettings.enableWebPreview(ui.showWebPreview->isChecked());
+ bool needsStyleReload =
+ ui.useCustomStyleSheet->isChecked() != ui.useCustomStyleSheet->property("storedValue").toBool()
+ || (ui.useCustomStyleSheet->isChecked() && ui.customStyleSheetPath->text() != ui.customStyleSheetPath->property("storedValue").toString());
- BufferSettings bufferSettings;
- bufferSettings.enableUserStateIcons(ui.showUserStateIcons->isChecked());
-
- load();
+ SettingsPage::save();
setChangedState(false);
setChangedState(false);
+ if(needsStyleReload)
+ QtUi::style()->reload();
}
QLocale AppearanceSettingsPage::selectedLocale() const {
}
QLocale AppearanceSettingsPage::selectedLocale() const {
@@
-139,20
+139,20
@@
QLocale AppearanceSettingsPage::selectedLocale() const {
return locale;
}
return locale;
}
+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() {
void AppearanceSettingsPage::widgetHasChanged() {
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())
+ if(ui.styleComboBox->currentIndex() != ui.styleComboBox->property("storedValue").toInt()) return true;
- if(SettingsPage::hasChanged(ui.showWebPreview)) return true;
- if(SettingsPage::hasChanged(ui.showUserStateIcons)) return true;
+ if(selectedLocale() != QLocale()) return true; // QLocale() returns the default locale (manipulated via loadTranslation())
return false;
}
return false;
}
-
-
-
-