History

Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels

ZappoMan committed 13 years ago

Commit 1b302f62 parents b8dfc38 b0bfba338 files · +1171 −1506Browse files

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

Unified · Split

interface/src/Menu.cpp+19−16
@@ -60,11 +60,11 @@ Menu::Menu() : · 59 unmodified lines
60 QMenu* fileMenu = addMenu("File");60 QMenu* fileMenu = addMenu("File");
61 61
62#ifdef Q_OS_MAC62#ifdef Q_OS_MAC
63 (addActionToQMenuAndActionHash(fileMenu,63 addActionToQMenuAndActionHash(fileMenu,
64 MenuOption::AboutApp,64 MenuOption::AboutApp,
65 0,65 0,
66 this,66 this,
67 SLOT(aboutApp())))->setMenuRole(QAction::AboutRole);67 SLOT(aboutApp()));
68#endif68#endif
69 69
70 (addActionToQMenuAndActionHash(fileMenu,70 (addActionToQMenuAndActionHash(fileMenu,
@@ -72,12 +72,6 @@ Menu::Menu() : · 1 unmodified line
72 0,72 0,
73 this,73 this,
74 SLOT(login())));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 addDisabledActionAndSeparator(fileMenu, "Voxels");76 addDisabledActionAndSeparator(fileMenu, "Voxels");
83 addActionToQMenuAndActionHash(fileMenu, MenuOption::ExportVoxels, Qt::CTRL | Qt::Key_E, appInstance, SLOT(exportVoxels()));77 addActionToQMenuAndActionHash(fileMenu, MenuOption::ExportVoxels, Qt::CTRL | Qt::Key_E, appInstance, SLOT(exportVoxels()));
@@ -114,13 +108,22 @@ Menu::Menu() : · 30 unmodified lines
114 addActionToQMenuAndActionHash(fileMenu, MenuOption::Pair, 0, PairingHandler::getInstance(), SLOT(sendPairRequest()));108 addActionToQMenuAndActionHash(fileMenu, MenuOption::Pair, 0, PairingHandler::getInstance(), SLOT(sendPairRequest()));
115 addCheckableActionToQMenuAndActionHash(fileMenu, MenuOption::TransmitterDrive, 0, true);109 addCheckableActionToQMenuAndActionHash(fileMenu, MenuOption::TransmitterDrive, 0, true);
116 110
117 (addActionToQMenuAndActionHash(fileMenu,111 addActionToQMenuAndActionHash(fileMenu,
118 MenuOption::Quit,112 MenuOption::Quit,
119 Qt::CTRL | Qt::Key_Q,113 Qt::CTRL | Qt::Key_Q,
120 appInstance,114 appInstance,
121 SLOT(quit())))->setMenuRole(QAction::QuitRole); 115 SLOT(quit()));
122 116
123 QMenu* editMenu = addMenu("Edit");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 addActionToQMenuAndActionHash(editMenu, MenuOption::CutVoxels, Qt::CTRL | Qt::Key_X, appInstance, SLOT(cutVoxels()));127 addActionToQMenuAndActionHash(editMenu, MenuOption::CutVoxels, Qt::CTRL | Qt::Key_X, appInstance, SLOT(cutVoxels()));
125 addActionToQMenuAndActionHash(editMenu, MenuOption::CopyVoxels, Qt::CTRL | Qt::Key_C, appInstance, SLOT(copyVoxels()));128 addActionToQMenuAndActionHash(editMenu, MenuOption::CopyVoxels, Qt::CTRL | Qt::Key_C, appInstance, SLOT(copyVoxels()));
126 addActionToQMenuAndActionHash(editMenu, MenuOption::PasteVoxels, Qt::CTRL | Qt::Key_V, appInstance, SLOT(pasteVoxels()));129 addActionToQMenuAndActionHash(editMenu, MenuOption::PasteVoxels, Qt::CTRL | Qt::Key_V, appInstance, SLOT(pasteVoxels()));