summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-10-08 15:11:11 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-10-08 15:11:11 (GMT)
commit14285263a840f84dd62019856bfcd53d457aedd7 (patch)
tree9e8fdbca103879d91ebb96964595efa901f1c66d /Swift/QtUI
parent958928d499ceb846b185d75ba17d48f3dd962cef (diff)
downloadswift-contrib-14285263a840f84dd62019856bfcd53d457aedd7.zip
swift-contrib-14285263a840f84dd62019856bfcd53d457aedd7.tar.bz2
Slightly re-arrange the menus.
Resolves: #602 Resolves: #603
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/QtLoginWindow.cpp8
-rw-r--r--Swift/QtUI/QtLoginWindow.h1
2 files changed, 4 insertions, 5 deletions
diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp
index 3088dd6..00176ca 100644
--- a/Swift/QtUI/QtLoginWindow.cpp
+++ b/Swift/QtUI/QtLoginWindow.cpp
@@ -138,11 +138,9 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream) : QMainWindow() {
connect(aboutAction, SIGNAL(triggered()), SLOT(handleAbout()));
swiftMenu_->addAction(aboutAction);
- toolsMenu_ = new QMenu(tr("Tools"), this);
-
QAction* xmlConsoleAction = new QAction(tr("Show Debug Console"), this);
connect(xmlConsoleAction, SIGNAL(triggered()), SLOT(handleShowXMLConsole()));
- toolsMenu_->addAction(xmlConsoleAction);
+ generalMenu_->addAction(xmlConsoleAction);
toggleSoundsAction_ = new QAction(tr("Play Sounds"), this);
toggleSoundsAction_->setCheckable(true);
@@ -158,6 +156,9 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream) : QMainWindow() {
generalMenu_->addAction(toggleNotificationsAction_);
#endif
+#ifndef SWIFTEN_PLATFORM_MACOSX
+ swiftMenu_->addSeparator();
+#endif
QAction* quitAction = new QAction("Quit", this);
connect(quitAction, SIGNAL(triggered()), SLOT(handleQuit()));
@@ -324,7 +325,6 @@ void QtLoginWindow::setInitialMenus() {
#ifdef SWIFTEN_PLATFORM_MACOSX
menuBar_->addMenu(generalMenu_);
#endif
- menuBar_->addMenu(toolsMenu_);
}
void QtLoginWindow::morphInto(MainWindow *mainWindow) {
diff --git a/Swift/QtUI/QtLoginWindow.h b/Swift/QtUI/QtLoginWindow.h
index d9484b7..1a4343e 100644
--- a/Swift/QtUI/QtLoginWindow.h
+++ b/Swift/QtUI/QtLoginWindow.h
@@ -74,7 +74,6 @@ namespace Swift {
QMenuBar* menuBar_;
QMenu* swiftMenu_;
QMenu* generalMenu_;
- QMenu* toolsMenu_;
QAction* toggleSoundsAction_;
QAction* toggleNotificationsAction_;
UIEventStream* uiEventStream_;