History

Merge pull request #924 from stojce/19418

Code Review for Job #19418

ZappoMan committed 13 years ago

Commit 2d545c82 parents 420f162 316f8a08 files · +275 −1Browse files

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

Unified · Split

interface/src/Menu.cpp+21−1
@@ -24,6 +24,7 @@ · 23 unmodified lines
24#include "PairingHandler.h"24#include "PairingHandler.h"
25#include "Menu.h"25#include "Menu.h"
26#include "Util.h"26#include "Util.h"
27#include "InfoView.h"
27 28
28Menu* Menu::_instance = NULL;29Menu* Menu::_instance = NULL;
29 30
@@ -52,7 +53,15 @@ Menu::Menu() : · 22 unmodified lines
52 Application *appInstance = Application::getInstance();53 Application *appInstance = Application::getInstance();
53 54
54 QMenu* fileMenu = addMenu("File");55 QMenu* fileMenu = addMenu("File");
55 56
57#ifdef Q_OS_MAC
58 (addActionToQMenuAndActionHash(fileMenu,
59 MenuOption::AboutApp,
60 0,
61 this,
62 SLOT(aboutApp())))->setMenuRole(QAction::AboutRole);
63#endif
64
56 (addActionToQMenuAndActionHash(fileMenu,65 (addActionToQMenuAndActionHash(fileMenu,
57 MenuOption::Preferences,66 MenuOption::Preferences,
58 Qt::CTRL | Qt::Key_Comma,67 Qt::CTRL | Qt::Key_Comma,
@@ -437,6 +446,13 @@ Menu::Menu() : · 378 unmodified lines
437 446
438 addDisabledActionAndSeparator(developerMenu, "Voxels");447 addDisabledActionAndSeparator(developerMenu, "Voxels");
439 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DestructiveAddVoxel);448 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DestructiveAddVoxel);
449
450#ifndef Q_OS_MAC
451 QMenu* helpMenu = addMenu("Help");
452 QAction* helpAction = helpMenu->addAction(MenuOption::AboutApp);
453 connect(helpAction, SIGNAL(triggered()), this, SLOT(aboutApp()));
454#endif
455
440}456}
441 457
442Menu::~Menu() {458Menu::~Menu() {
@@ -666,6 +682,10 @@ bool Menu::isVoxelModeActionChecked() { · 223 unmodified lines
666 return false;682 return false;
667}683}
668 684
685void Menu::aboutApp() {
686 InfoView::forcedShow();
687}
688
669void Menu::editPreferences() {689void Menu::editPreferences() {
670 Application* applicationInstance = Application::getInstance();690 Application* applicationInstance = Application::getInstance();
671 QDialog dialog(applicationInstance->getGLWidget());691 QDialog dialog(applicationInstance->getGLWidget());