This also fixes the issue with custom Qt styles not being active at startup.
As a side effect, you'll have to redo your settings in Appearance->General at least,
also in Behaviour->General.
_trayIcon(new QSystemTrayIcon(this))
{
QtUiSettings uiSettings;
_trayIcon(new QSystemTrayIcon(this))
{
QtUiSettings uiSettings;
- QString style = uiSettings.value("Style", QString("")).toString();
- if(style != "") {
- QApplication::setStyle(style);
+ QString style = uiSettings.value("Style", QString()).toString();
+ if(!style.isEmpty()) {
+ QApplication::setStyle("plastique");
}
setWindowTitle("Quassel IRC");
}
setWindowTitle("Quassel IRC");
_viewMenu->addSeparator();
QAction *showStatusbar = QtUi::actionCollection("General")->action("ToggleStatusBar");
_viewMenu->addSeparator();
QAction *showStatusbar = QtUi::actionCollection("General")->action("ToggleStatusBar");
+ QtUiSettings uiSettings;
bool enabled = uiSettings.value("ShowStatusBar", QVariant(true)).toBool();
showStatusbar->setChecked(enabled);
bool enabled = uiSettings.value("ShowStatusBar", QVariant(true)).toBool();
showStatusbar->setChecked(enabled);
}
void MainWin::saveStatusBarStatus(bool enabled) {
}
void MainWin::saveStatusBarStatus(bool enabled) {
+ QtUiSettings uiSettings;
uiSettings.setValue("ShowStatusBar", enabled);
}
uiSettings.setValue("ShowStatusBar", enabled);
}
systemTrayIcon()->setContextMenu(systrayMenu);
systemTrayIcon()->setContextMenu(systrayMenu);
if(s.value("UseSystemTrayIcon", QVariant(true)).toBool()) {
systemTrayIcon()->show();
}
if(s.value("UseSystemTrayIcon", QVariant(true)).toBool()) {
systemTrayIcon()->show();
}
void MainWin::changeEvent(QEvent *event) {
if(event->type() == QEvent::WindowStateChange) {
if(windowState() & Qt::WindowMinimized) {
void MainWin::changeEvent(QEvent *event) {
if(event->type() == QEvent::WindowStateChange) {
if(windowState() & Qt::WindowMinimized) {
if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) {
toggleVisibility();
event->ignore();
if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) {
toggleVisibility();
event->ignore();
}
void MainWin::closeEvent(QCloseEvent *event) {
}
void MainWin::closeEvent(QCloseEvent *event) {
if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
toggleVisibility();
event->ignore();
if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
toggleVisibility();
event->ignore();
#include "appearancesettingspage.h"
#include "qtui.h"
#include "appearancesettingspage.h"
#include "qtui.h"
+#include "qtuisettings.h"
#include "util.h"
#include <QDir>
#include "util.h"
#include <QDir>
initStyleComboBox();
initLanguageComboBox();
initStyleComboBox();
initLanguageComboBox();
- connect(ui.styleComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
- connect(ui.languageComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
+ connect(ui.styleComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
+ connect(ui.languageComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
}
void AppearanceSettingsPage::initStyleComboBox() {
QStringList styleList = QStyleFactory::keys();
}
void AppearanceSettingsPage::initStyleComboBox() {
QStringList styleList = QStyleFactory::keys();
- ui.styleComboBox->addItem("<default>");
+ ui.styleComboBox->addItem(tr("<System Default>"));
foreach(QString style, styleList) {
ui.styleComboBox->addItem(style);
}
foreach(QString style, styleList) {
ui.styleComboBox->addItem(style);
}
}
void AppearanceSettingsPage::load() {
}
void AppearanceSettingsPage::load() {
+ QtUiSettings uiSettings;
settings["Style"] = uiSettings.value("Style", QString(""));
if(settings["Style"].toString() == "") {
settings["Style"] = uiSettings.value("Style", QString(""));
if(settings["Style"].toString() == "") {
}
void AppearanceSettingsPage::save() {
}
void AppearanceSettingsPage::save() {
+ QtUiSettings uiSettings;
if(ui.styleComboBox->currentIndex() < 1) {
uiSettings.setValue("Style", QString(""));
if(ui.styleComboBox->currentIndex() < 1) {
uiSettings.setValue("Style", QString(""));
} else {
uiSettings.setValue("Locale", selectedLocale());
}
} else {
uiSettings.setValue("Locale", selectedLocale());
}
load();
setChangedState(false);
}
load();
setChangedState(false);
}
<widget class="QComboBox" name="languageComboBox" >
<item>
<property name="text" >
<widget class="QComboBox" name="languageComboBox" >
<item>
<property name="text" >
- <string><System></string>
+ <string><System Default></string>
</property>
</item>
<item>
</property>
</item>
<item>
#include "generalsettingspage.h"
#include "qtui.h"
#include "generalsettingspage.h"
#include "qtui.h"
+#include "qtuisettings.h"
#include "buffersettings.h"
GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
#include "buffersettings.h"
GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
void GeneralSettingsPage::load() {
// uiSettings:
void GeneralSettingsPage::load() {
// uiSettings:
+ QtUiSettings uiSettings;
settings["UseSystemTrayIcon"] = uiSettings.value("UseSystemTrayIcon", QVariant(true));
ui.useSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
ui.showSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
settings["UseSystemTrayIcon"] = uiSettings.value("UseSystemTrayIcon", QVariant(true));
ui.useSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
ui.showSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
}
void GeneralSettingsPage::save() {
}
void GeneralSettingsPage::save() {
+ QtUiSettings uiSettings;
uiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked());
uiSettings.setValue("MinimizeOnMinimize", ui.minimizeOnMinimize->isChecked());
uiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked());
uiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked());
uiSettings.setValue("MinimizeOnMinimize", ui.minimizeOnMinimize->isChecked());
uiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked());