History

almost finished plugin architecture, general plugin improvements. menu actions don't work all the time, joint controllers need to be handled better, and activate/deactive aren't always called correctly

Anthony J. Thibault committed 11 years ago

Commit 060f6c11 parent 108353420 files · +367 −204Browse files

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

Unified · Split

interface/src/Menu.cpp+4−0
@@ -226,6 +226,10 @@ Menu::Menu() { · 225 unmodified lines
226 MenuWrapper* avatarMenu = addMenu("Avatar");226 MenuWrapper* avatarMenu = addMenu("Avatar");
227 QObject* avatar = DependencyManager::get<AvatarManager>()->getMyAvatar();227 QObject* avatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
228 228
229 MenuWrapper* inputModeMenu = addMenu(MenuOption::InputMenu);
230 QActionGroup* inputModeGroup = new QActionGroup(inputModeMenu);
231 inputModeGroup->setExclusive(false);
232
229 MenuWrapper* avatarSizeMenu = avatarMenu->addMenu("Size");233 MenuWrapper* avatarSizeMenu = avatarMenu->addMenu("Size");
230 addActionToQMenuAndActionHash(avatarSizeMenu,234 addActionToQMenuAndActionHash(avatarSizeMenu,
231 MenuOption::IncreaseAvatarSize,235 MenuOption::IncreaseAvatarSize,