Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:37:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding back some menus

Browse source
This commit is contained in:
Dante Ruiz 2018-05-15 11:31:58 -07:00
parent a6ef459723
commit 71633105de
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
interface/src/Menu.cpp
View file

@ -141,9 +141,20 @@ Menu::Menu() {
// Edit > Reload All Content // Edit > Reload All Content
addActionToQMenuAndActionHash(editMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches())); addActionToQMenuAndActionHash(editMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));
MenuWrapper* avatarMenu = addMenu("Avatar");
auto avatarManager = DependencyManager::get<AvatarManager>(); auto avatarManager = DependencyManager::get<AvatarManager>();
auto avatar = avatarManager->getMyAvatar(); auto avatar = avatarManager->getMyAvatar();
// Avatar > Attachments...
action = addActionToQMenuAndActionHash(avatarMenu, MenuOption::Attachments);
connect(action, &QAction::triggered, [] {
qApp->showDialog(QString("hifi/dialogs/AttachmentsDialog.qml"),
QString("hifi/tablet/TabletAttachmentsDialog.qml"), "AttachmentsDialog");
});
auto avatarBookmarks = DependencyManager::get<AvatarBookmarks>();
avatarBookmarks->setupMenus(this, avatarMenu);
// Display menu ---------------------------------- // Display menu ----------------------------------
// FIXME - this is not yet matching Alan's spec because it doesn't have // FIXME - this is not yet matching Alan's spec because it doesn't have
// menus for "2D"/"3D" - we need to add support for detecting the appropriate // menus for "2D"/"3D" - we need to add support for detecting the appropriate
@ -772,6 +783,22 @@ Menu::Menu() {
connect(speechRecognizer.data(), SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool))); connect(speechRecognizer.data(), SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool)));
#endif #endif
// console
addActionToQMenuAndActionHash(developerMenu, MenuOption::Console, Qt::CTRL | Qt::ALT | Qt::Key_J,
DependencyManager::get<StandAloneJSConsole>().data(),
SLOT(toggleConsole()),
QAction::NoRole,
UNSPECIFIED_POSITION);
// Developer > API Debugger
action = addActionToQMenuAndActionHash(developerMenu, "API Debugger");
connect(action, &QAction::triggered, [] {
auto scriptEngines = DependencyManager::get<ScriptEngines>();
QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/tools/currentAPI.js");
scriptEngines->loadScript(defaultScriptsLoc.toString());
});
// Developer > Log... // Developer > Log...
addActionToQMenuAndActionHash(developerMenu, MenuOption::Log, Qt::CTRL | Qt::SHIFT | Qt::Key_L, addActionToQMenuAndActionHash(developerMenu, MenuOption::Log, Qt::CTRL | Qt::SHIFT | Qt::Key_L,
qApp, SLOT(toggleLogDialog())); qApp, SLOT(toggleLogDialog()));

6
interface/src/ui/PreferencesDialog.cpp
View file

@ -62,13 +62,13 @@ void setupPreferences() {
{ {
auto getterY = []()->float { return 1.0; }; auto getterY = []()->float { return 1.0; };
auto setterY = [](float value) { }; auto setterY = [](float value) { };
preferences->addPreference(new SliderPreference(MOUSE_SENSIVITY, "Y Input", getterY, setterY)); preferences->addPreference(new SliderPreference(MOUSE_SENSIVITY, "Mouse Look Y", getterY, setterY));
auto getterX = []()->float { return 1.0; }; auto getterX = []()->float { return 1.0; };
auto setterX = [](float value) { }; auto setterX = [](float value) { };
preferences->addPreference(new SliderPreference(MOUSE_SENSIVITY, "X Input", getterX, setterX)); preferences->addPreference(new SliderPreference(MOUSE_SENSIVITY, "Mouse Look X", getterX, setterX));
auto getterSW = []()->float { return 1.0; }; auto getterSW = []()->float { return 1.0; };
auto setterSW = [](float value) { }; auto setterSW = [](float value) { };
preferences->addPreference(new SliderPreference(MOUSE_SENSIVITY, "Scroll Wheel", getterSW, setterSW)); preferences->addPreference(new SliderPreference(MOUSE_SENSIVITY, "Mouse Look Zoom", getterSW, setterSW));
} }
// Graphics quality // Graphics quality
static const QString GRAPHICS_QUALITY { "Graphics Quality" }; static const QString GRAPHICS_QUALITY { "Graphics Quality" };