added help + about menu for non OS X
Showing the changes to interface/src/Menu.cpp (1 of 1 file). Show all
Unified · Split
| @@ -54,12 +54,14 @@ Menu::Menu() : · 53 unmodified lines | |||
| 54 | 54 | ||
| 55 | QMenu* fileMenu = addMenu("File"); | 55 | QMenu* fileMenu = addMenu("File"); |
| 56 | 56 | ||
| 57 | #ifdef Q_OS_MAC | ||
| 57 | (addActionToQMenuAndActionHash(fileMenu, | 58 | (addActionToQMenuAndActionHash(fileMenu, |
| 58 | MenuOption::AboutApp, | 59 | MenuOption::AboutApp, |
| 59 | 0, | 60 | 0, |
| 60 | this, | 61 | this, |
| 61 | SLOT(aboutApp())))->setMenuRole(QAction::AboutRole); | 62 | SLOT(aboutApp())))->setMenuRole(QAction::AboutRole); |
| 62 | 63 | #endif | |
| 64 | |||
| 63 | (addActionToQMenuAndActionHash(fileMenu, | 65 | (addActionToQMenuAndActionHash(fileMenu, |
| 64 | MenuOption::Preferences, | 66 | MenuOption::Preferences, |
| 65 | Qt::CTRL | Qt::Key_Comma, | 67 | Qt::CTRL | Qt::Key_Comma, |
| @@ -441,6 +443,13 @@ Menu::Menu() : · 375 unmodified lines | |||
| 441 | 443 | ||
| 442 | addDisabledActionAndSeparator(developerMenu, "Voxels"); | 444 | addDisabledActionAndSeparator(developerMenu, "Voxels"); |
| 443 | addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DestructiveAddVoxel); | 445 | 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 | |||
| 444 | } | 453 | } |
| 445 | 454 | ||
| 446 | Menu::~Menu() { | 455 | Menu::~Menu() { |