diff options
author | Kevin Smith <git@kismith.co.uk> | 2012-02-21 19:35:25 (GMT) |
---|---|---|
committer | Kevin Smith <git@kismith.co.uk> | 2012-02-21 19:35:25 (GMT) |
commit | 6a26cf436f81495242481ae7a27287e48ebc532a (patch) | |
tree | 15ff913ec0af224b8f334dca78511047247d85b2 | |
parent | 7d77d33bdf81a708663f1fe2ca8300214c90159e (diff) | |
download | swift-6a26cf436f81495242481ae7a27287e48ebc532a.zip swift-6a26cf436f81495242481ae7a27287e48ebc532a.tar.bz2 |
Read in the notifications toggle at launch
-rw-r--r-- | Swift/Controllers/MainController.cpp | 1 | ||||
-rw-r--r-- | Swift/QtUI/QtLoginWindow.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index 06f8c3a..4f869a7 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -126,6 +126,7 @@ MainController::MainController( uiEventStream_ = new UIEventStream(); notifier_ = new TogglableNotifier(notifier); + notifier_->setPersistentEnabled(settings_->getSetting(SettingConstants::SHOW_NOTIFICATIONS)); eventController_ = new EventController(); eventController_->onEventQueueLengthChange.connect(boost::bind(&MainController::handleEventQueueLengthChange, this, _1)); diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp index aafdef8..5b2cf5c 100644 --- a/Swift/QtUI/QtLoginWindow.cpp +++ b/Swift/QtUI/QtLoginWindow.cpp @@ -184,7 +184,7 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream, SettingsProvider* set toggleNotificationsAction_ = new QAction(tr("Display Pop-up &Notifications"), this); toggleNotificationsAction_->setCheckable(true); - toggleNotificationsAction_->setChecked(true); + toggleNotificationsAction_->setChecked(settings_->getSetting(SettingConstants::SHOW_NOTIFICATIONS)); connect(toggleNotificationsAction_, SIGNAL(toggled(bool)), SLOT(handleToggleNotifications(bool))); #ifndef SWIFTEN_PLATFORM_MACOSX |