History

Working on cleaning up diff

Brad Davis committed 11 years ago

Commit 7f6bb551 parent ae882c84 files · +3 −167Browse files

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

Unified · Split

interface/src/Menu.cpp+0−24
@@ -263,19 +263,6 @@ Menu::Menu() { · 262 unmodified lines
263 263
264 addActionToQMenuAndActionHash(viewMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));264 addActionToQMenuAndActionHash(viewMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));
265 265
266#if 0
267 addCheckableActionToQMenuAndActionHash(viewMenu,
268 MenuOption::Fullscreen,
269#ifdef Q_OS_MAC
270 Qt::CTRL | Qt::META | Qt::Key_F,
271#else
272 Qt::CTRL | Qt::Key_F,
273#endif
274 false,
275 qApp,
276 SLOT(setFullscreen(bool)));
277#endif
278
279 MenuWrapper* cameraModeMenu = viewMenu->addMenu("Camera Mode");266 MenuWrapper* cameraModeMenu = viewMenu->addMenu("Camera Mode");
280 QActionGroup* cameraModeGroup = new QActionGroup(cameraModeMenu);267 QActionGroup* cameraModeGroup = new QActionGroup(cameraModeMenu);
281 cameraModeGroup->setExclusive(true);268 cameraModeGroup->setExclusive(true);
@@ -302,17 +289,6 @@ Menu::Menu() { · 20 unmodified lines
302 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView,289 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView,
303 0, false, qApp, SLOT(rotationModeChanged()));290 0, false, qApp, SLOT(rotationModeChanged()));
304 291
305#if 0
306 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::HMDTools,
307#ifdef Q_OS_MAC
308 Qt::META | Qt::Key_H,
309#else
310 Qt::CTRL | Qt::Key_H,
311#endif
312 false,
313 dialogsManager.data(),
314 SLOT(hmdTools(bool)));
315#endif
316 292
317 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::TurnWithHead, 0, false);293 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::TurnWithHead, 0, false);
318 294