History

- CR/style fixes - Moved the old Avatar Packager tool to Developer -> Avatar -> ..

Thijs Wenker committed 7 years ago

Commit 5d40e1e1 parent b10560710 files · +38 −44Browse files

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

Unified · Split

interface/src/Menu.cpp+2−4
@@ -145,10 +145,6 @@ Menu::Menu() { · 144 unmodified lines
145 assetServerAction->setEnabled(nodeList->getThisNodeCanWriteAssets());145 assetServerAction->setEnabled(nodeList->getThisNodeCanWriteAssets());
146 }146 }
147 147
148 // Edit > Package Avatar as .fst...
149 addActionToQMenuAndActionHash(editMenu, MenuOption::PackageModel, 0,
150 qApp, SLOT(packageModel()));
151
152 // Edit > Avatar Packager148 // Edit > Avatar Packager
153#ifndef Q_OS_ANDROID149#ifndef Q_OS_ANDROID
154 action = addActionToQMenuAndActionHash(editMenu, MenuOption::AvatarPackager);150 action = addActionToQMenuAndActionHash(editMenu, MenuOption::AvatarPackager);
@@ -654,6 +650,8 @@ Menu::Menu() { · 499 unmodified lines
654 650
655 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowTrackedObjects, 0, false, qApp, SLOT(setShowTrackedObjects(bool)));651 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowTrackedObjects, 0, false, qApp, SLOT(setShowTrackedObjects(bool)));
656 652
653 addActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::PackageModel, 0, qApp, SLOT(packageModel()));
654
657 // Developer > Hands >>>655 // Developer > Hands >>>
658 MenuWrapper* handOptionsMenu = developerMenu->addMenu("Hands");656 MenuWrapper* handOptionsMenu = developerMenu->addMenu("Hands");
659 addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false,657 addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false,