Showing the changes to interface/src/Menu.cpp (1 of 52 files). Show all
Unified · Split
| @@ -37,6 +37,7 @@ · 36 unmodified lines | ||
| 37 | 37 | #include "Menu.h" |
| 38 | 38 | #include "scripting/MenuScriptingInterface.h" |
| 39 | 39 | #include "Util.h" |
| 40 | +#include "ui/AnimationsDialog.h" | |
| 40 | 41 | #include "ui/AttachmentsDialog.h" |
| 41 | 42 | #include "ui/InfoView.h" |
| 42 | 43 | #include "ui/MetavoxelEditor.h" |
| @@ -193,6 +194,7 @@ Menu::Menu() : · 150 unmodified lines | ||
| 193 | 194 | QAction::PreferencesRole); |
| 194 | 195 | |
| 195 | 196 | addActionToQMenuAndActionHash(editMenu, MenuOption::Attachments, 0, this, SLOT(editAttachments())); |
| 197 | + addActionToQMenuAndActionHash(editMenu, MenuOption::Animations, 0, this, SLOT(editAnimations())); | |
| 196 | 198 | |
| 197 | 199 | addDisabledActionAndSeparator(editMenu, "Physics"); |
| 198 | 200 | QObject* avatar = appInstance->getAvatar(); |
| @@ -863,6 +865,15 @@ void Menu::editAttachments() { · 664 unmodified lines | ||
| 863 | 865 | } |
| 864 | 866 | } |
| 865 | 867 | |
| 868 | +void Menu::editAnimations() { | |
| 869 | + if (!_animationsDialog) { | |
| 870 | + _animationsDialog = new AnimationsDialog(); | |
| 871 | + _animationsDialog->show(); | |
| 872 | + } else { | |
| 873 | + _animationsDialog->close(); | |
| 874 | + } | |
| 875 | +} | |
| 876 | + | |
| 866 | 877 | void Menu::goToDomain(const QString newDomain) { |
| 867 | 878 | if (NodeList::getInstance()->getDomainHandler().getHostname() != newDomain) { |
| 868 | 879 | // send a node kill request, indicating to other clients that they should play the "disappeared" effect |