From eefe08e733412abafcc508efc399b36636326751 Mon Sep 17 00:00:00 2001 From: stojce Date: Thu, 12 Sep 2013 19:39:34 +0200 Subject: [PATCH] non OS X menu added help + about menu for non OS X --- interface/src/Menu.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index f6e4128dbb..744a1bff99 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -54,12 +54,14 @@ Menu::Menu() : QMenu* fileMenu = addMenu("File"); +#ifdef Q_OS_MAC (addActionToQMenuAndActionHash(fileMenu, MenuOption::AboutApp, 0, this, SLOT(aboutApp())))->setMenuRole(QAction::AboutRole); - +#endif + (addActionToQMenuAndActionHash(fileMenu, MenuOption::Preferences, Qt::CTRL | Qt::Key_Comma, @@ -441,6 +443,13 @@ Menu::Menu() : addDisabledActionAndSeparator(developerMenu, "Voxels"); addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DestructiveAddVoxel); + +#ifndef Q_OS_MAC + QMenu* helpMenu = addMenu("Help"); + QAction* helpAction = helpMenu->addAction(MenuOption::AboutApp); + connect(helpAction, SIGNAL(triggered()), this, SLOT(aboutApp())); +#endif + } Menu::~Menu() {