Showing the changes to interface/src/Menu.cpp (1 of 38 files). Show all
Unified · Split
| @@ -60,11 +60,11 @@ Menu::Menu() : · 59 unmodified lines | ||
| 60 | 60 | QMenu* fileMenu = addMenu("File"); |
| 61 | 61 | |
| 62 | 62 | #ifdef Q_OS_MAC |
| 63 | − (addActionToQMenuAndActionHash(fileMenu, | |
| 64 | − MenuOption::AboutApp, | |
| 65 | − 0, | |
| 66 | − this, | |
| 67 | − SLOT(aboutApp())))->setMenuRole(QAction::AboutRole); | |
| 63 | + addActionToQMenuAndActionHash(fileMenu, | |
| 64 | + MenuOption::AboutApp, | |
| 65 | + 0, | |
| 66 | + this, | |
| 67 | + SLOT(aboutApp())); | |
| 68 | 68 | #endif |
| 69 | 69 | |
| 70 | 70 | (addActionToQMenuAndActionHash(fileMenu, |
| @@ -72,12 +72,6 @@ Menu::Menu() : · 1 unmodified line | ||
| 72 | 72 | 0, |
| 73 | 73 | this, |
| 74 | 74 | SLOT(login()))); |
| 75 | − | |
| 76 | − (addActionToQMenuAndActionHash(fileMenu, | |
| 77 | − MenuOption::Preferences, | |
| 78 | − Qt::CTRL | Qt::Key_Comma, | |
| 79 | − this, | |
| 80 | − SLOT(editPreferences())))->setMenuRole(QAction::PreferencesRole); | |
| 81 | 75 | |
| 82 | 76 | addDisabledActionAndSeparator(fileMenu, "Voxels"); |
| 83 | 77 | addActionToQMenuAndActionHash(fileMenu, MenuOption::ExportVoxels, Qt::CTRL | Qt::Key_E, appInstance, SLOT(exportVoxels())); |
| @@ -114,13 +108,22 @@ Menu::Menu() : · 30 unmodified lines | ||
| 114 | 108 | addActionToQMenuAndActionHash(fileMenu, MenuOption::Pair, 0, PairingHandler::getInstance(), SLOT(sendPairRequest())); |
| 115 | 109 | addCheckableActionToQMenuAndActionHash(fileMenu, MenuOption::TransmitterDrive, 0, true); |
| 116 | 110 | |
| 117 | − (addActionToQMenuAndActionHash(fileMenu, | |
| 118 | − MenuOption::Quit, | |
| 119 | − Qt::CTRL | Qt::Key_Q, | |
| 120 | − appInstance, | |
| 121 | − SLOT(quit())))->setMenuRole(QAction::QuitRole); | |
| 111 | + addActionToQMenuAndActionHash(fileMenu, | |
| 112 | + MenuOption::Quit, | |
| 113 | + Qt::CTRL | Qt::Key_Q, | |
| 114 | + appInstance, | |
| 115 | + SLOT(quit())); | |
| 122 | 116 | |
| 123 | 117 | QMenu* editMenu = addMenu("Edit"); |
| 118 | + | |
| 119 | + addActionToQMenuAndActionHash(editMenu, | |
| 120 | + MenuOption::Preferences, | |
| 121 | + Qt::CTRL | Qt::Key_Comma, | |
| 122 | + this, | |
| 123 | + SLOT(editPreferences())); | |
| 124 | + | |
| 125 | + addDisabledActionAndSeparator(editMenu, "Voxels"); | |
| 126 | + | |
| 124 | 127 | addActionToQMenuAndActionHash(editMenu, MenuOption::CutVoxels, Qt::CTRL | Qt::Key_X, appInstance, SLOT(cutVoxels())); |
| 125 | 128 | addActionToQMenuAndActionHash(editMenu, MenuOption::CopyVoxels, Qt::CTRL | Qt::Key_C, appInstance, SLOT(copyVoxels())); |
| 126 | 129 | addActionToQMenuAndActionHash(editMenu, MenuOption::PasteVoxels, Qt::CTRL | Qt::Key_V, appInstance, SLOT(pasteVoxels())); |