History

non OS X menu

added help + about menu for non OS X

stojce committed 13 years ago

Commit eefe08e1 parent 330b1cd1 file · +10 −1Browse files

Showing the changes to interface/src/Menu.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Menu.cpp+10−1
@@ -54,12 +54,14 @@ Menu::Menu() : · 53 unmodified lines
5454
5555 QMenu* fileMenu = addMenu("File");
5656
57+#ifdef Q_OS_MAC
5758 (addActionToQMenuAndActionHash(fileMenu,
5859 MenuOption::AboutApp,
5960 0,
6061 this,
6162 SLOT(aboutApp())))->setMenuRole(QAction::AboutRole);
62−
63+#endif
64+
6365 (addActionToQMenuAndActionHash(fileMenu,
6466 MenuOption::Preferences,
6567 Qt::CTRL | Qt::Key_Comma,
@@ -441,6 +443,13 @@ Menu::Menu() : · 375 unmodified lines
441443
442444 addDisabledActionAndSeparator(developerMenu, "Voxels");
443445 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DestructiveAddVoxel);
446+
447+#ifndef Q_OS_MAC
448+ QMenu* helpMenu = addMenu("Help");
449+ QAction* helpAction = helpMenu->addAction(MenuOption::AboutApp);
450+ connect(helpAction, SIGNAL(triggered()), this, SLOT(aboutApp()));
451+#endif
452+
444453 }
445454
446455 Menu::~Menu() {