summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMateusz Piekos <mateuszpiekos@gmail.com>2012-04-24 19:59:55 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-04-25 08:40:59 (GMT)
commitc47d084c27bb92ad861a75538f9eafa8a232b88c (patch)
tree90cf9756ce0fa6f22d0a227c5958c1c831667b93
parent0119586b08ab7262b41cb27fc71e52b4bc00f5be (diff)
downloadswift-c47d084c27bb92ad861a75538f9eafa8a232b88c.zip
swift-c47d084c27bb92ad861a75538f9eafa8a232b88c.tar.bz2
Inserting elements do generalMenu_ before quitAction
Resolves: #1081 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
-rw-r--r--Swift/QtUI/QtLoginWindow.cpp3
-rw-r--r--Swift/QtUI/QtMainWindow.cpp4
2 files changed, 5 insertions, 2 deletions
diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp
index 7612720..e7cabf2 100644
--- a/Swift/QtUI/QtLoginWindow.cpp
+++ b/Swift/QtUI/QtLoginWindow.cpp
@@ -222,7 +222,8 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream, SettingsProvider* set
void QtLoginWindow::setShowNotificationToggle(bool toggle) {
if (toggle) {
- generalMenu_->addAction(toggleNotificationsAction_);
+ QList< QAction* > generalMenuActions = generalMenu_->actions();
+ generalMenu_->insertAction(generalMenuActions.at(generalMenuActions.count()-2), toggleNotificationsAction_);
}
else {
generalMenu_->removeAction(toggleNotificationsAction_);
diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp
index ea888d5..05c78b3 100644
--- a/Swift/QtUI/QtMainWindow.cpp
+++ b/Swift/QtUI/QtMainWindow.cpp
@@ -126,7 +126,9 @@ QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStr
toggleRequestDeliveryReceipts_->setCheckable(true);
toggleRequestDeliveryReceipts_->setChecked(settings_->getSetting(SettingConstants::REQUEST_DELIVERYRECEIPTS));
connect(toggleRequestDeliveryReceipts_, SIGNAL(toggled(bool)), SLOT(handleToggleRequestDeliveryReceipts(bool)));
- loginMenus_.generalMenu->addAction(toggleRequestDeliveryReceipts_);
+
+ QList< QAction* > generalMenuActions = loginMenus_.generalMenu->actions();
+ loginMenus_.generalMenu->insertAction(generalMenuActions.at(generalMenuActions.count()-2),toggleRequestDeliveryReceipts_);
treeWidget_->onSomethingSelectedChanged.connect(boost::bind(&QAction::setEnabled, editUserAction_, _1));