rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Integrate tray options with the settings menu

Browse Source
This commit is contained in:
Jani Mustonen 2017-11-02 17:18:26 +02:00
parent a2b936dcc6
commit fc8f3a80ed
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/UserSettingsPage.h
View File

@ -66,6 +66,7 @@ protected:
signals: signals:
void moveBack(); void moveBack();
void trayOptionChanged(const bool value);
private: private:
// Layouts // Layouts

8
src/MainWindow.cc
View File

@ -94,6 +94,10 @@ MainWindow::MainWindow(QWidget *parent)
pageStack_->setCurrentWidget(chat_page_); pageStack_->setCurrentWidget(chat_page_);
}); });
connect(userSettingsPage_, &UserSettingsPage::trayOptionChanged, this, [=](const bool value) {
trayIcon_->setVisible(value);
});
connect(trayIcon_, connect(trayIcon_,
SIGNAL(activated(QSystemTrayIcon::ActivationReason)), SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
this, this,
@ -113,9 +117,7 @@ MainWindow::MainWindow(QWidget *parent)
QSettings settings; QSettings settings;
if (!settings.value("user/window/tray", true).toBool()) { trayIcon_->setVisible(settings.value("user/window/tray", true).toBool());
trayIcon_->hide();
}
if (hasActiveUser()) { if (hasActiveUser()) {
QString token = settings.value("auth/access_token").toString(); QString token = settings.value("auth/access_token").toString();

3
src/TrayIcon.cc
View File

@ -123,9 +123,6 @@ TrayIcon::TrayIcon(const QString &filename, QWidget *parent)
menu->addAction(quitAction_); menu->addAction(quitAction_);
setContextMenu(menu); setContextMenu(menu);
// We wait a little for the icon to load.
QTimer::singleShot(500, this, [=]() { show(); });
} }
void void

13
src/UserSettingsPage.cc
View File

@ -32,7 +32,7 @@ void
UserSettings::load() UserSettings::load()
{ {
QSettings settings; QSettings settings;
isTrayEnabled_ = settings.value("user/tray", true).toBool(); isTrayEnabled_ = settings.value("user/window/tray", true).toBool();
theme_ = settings.value("user/theme", "default").toString(); theme_ = settings.value("user/theme", "default").toString();
} }
@ -41,7 +41,11 @@ UserSettings::save()
{ {
QSettings settings; QSettings settings;
settings.beginGroup("user"); settings.beginGroup("user");
settings.beginGroup("window");
settings.setValue("tray", isTrayEnabled_); settings.setValue("tray", isTrayEnabled_);
settings.endGroup();
settings.setValue("theme", theme()); settings.setValue("theme", theme());
settings.endGroup(); settings.endGroup();
} }
@ -122,8 +126,9 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated), static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated),
[=](const QString &text) { settings_->setTheme(text.toLower()); }); [=](const QString &text) { settings_->setTheme(text.toLower()); });
connect(trayToggle_, &Toggle::toggled, this, [=](bool isEnabled) { connect(trayToggle_, &Toggle::toggled, this, [=](bool isDisabled) {
settings_->setTray(isEnabled); settings_->setTray(!isDisabled);
emit trayOptionChanged(!isDisabled);
}); });
connect(backBtn_, &QPushButton::clicked, this, [=]() { connect(backBtn_, &QPushButton::clicked, this, [=]() {
@ -136,5 +141,5 @@ void
UserSettingsPage::showEvent(QShowEvent *) UserSettingsPage::showEvent(QShowEvent *)
{ {
themeCombo_->setCurrentIndex((settings_->theme() == "default" ? 0 : 1)); themeCombo_->setCurrentIndex((settings_->theme() == "default" ? 0 : 1));
trayToggle_->setState(settings_->isTrayEnabled()); trayToggle_->setState(!settings_->isTrayEnabled()); // Treats true as "off"
} }