History

Moving display plugins menu

Brad Davis committed 11 years ago

Commit ead9bbe1 parent 6df260b2 files · +8 −7Browse files

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

Unified · Split

interface/src/Menu.cpp+7−6
@@ -219,6 +219,13 @@ Menu::Menu() { · 218 unmodified lines
219 addActionToQMenuAndActionHash(toolsMenu, MenuOption::PackageModel, 0,219 addActionToQMenuAndActionHash(toolsMenu, MenuOption::PackageModel, 0,
220 qApp, SLOT(packageModel()));220 qApp, SLOT(packageModel()));
221 221
222 MenuWrapper* displayMenu = addMenu("Display");
223 {
224 MenuWrapper* displayModeMenu = addMenu(MenuOption::OutputMenu);
225 QActionGroup* displayModeGroup = new QActionGroup(displayModeMenu);
226 displayModeGroup->setExclusive(true);
227 }
228
222 MenuWrapper* avatarMenu = addMenu("Avatar");229 MenuWrapper* avatarMenu = addMenu("Avatar");
223 QObject* avatar = DependencyManager::get<AvatarManager>()->getMyAvatar();230 QObject* avatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
224 231
@@ -255,12 +262,6 @@ Menu::Menu() { · 30 unmodified lines
255 avatar, SLOT(updateMotionBehaviorFromMenu()));262 avatar, SLOT(updateMotionBehaviorFromMenu()));
256 263
257 MenuWrapper* viewMenu = addMenu("View");264 MenuWrapper* viewMenu = addMenu("View");
258 {
259 MenuWrapper* displayModeMenu = addMenu(MenuOption::OutputMenu);
260 QActionGroup* displayModeGroup = new QActionGroup(displayModeMenu);
261 displayModeGroup->setExclusive(true);
262 }
263
264 addActionToQMenuAndActionHash(viewMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));265 addActionToQMenuAndActionHash(viewMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));
265 266
266 MenuWrapper* cameraModeMenu = viewMenu->addMenu("Camera Mode");267 MenuWrapper* cameraModeMenu = viewMenu->addMenu("Camera Mode");