From 02535722ba8916b0070eab46805a2484c4d6c876 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Mon, 27 Mar 2017 23:31:41 +0100 Subject: [PATCH 1/3] removed visible to others opition from general settings --- interface/src/ui/PreferencesDialog.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index c2caf91045..5c239f6e13 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -102,11 +102,12 @@ void setupPreferences() { auto setter = [](bool value) { qApp->setHmdTabletBecomesToolbarSetting(value); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "HMD Tablet Becomes Toolbar", getter, setter)); } - { + // TODO + /*{ auto getter = []()->bool { return qApp->getTabletVisibleToOthersSetting(); }; auto setter = [](bool value) { qApp->setTabletVisibleToOthersSetting(value); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Tablet Is Visible To Others", getter, setter)); - } + }*/ { auto getter = []()->bool { return qApp->getPreferAvatarFingerOverStylus(); }; auto setter = [](bool value) { qApp->setPreferAvatarFingerOverStylus(value); }; From 7434cc5644c583e5489a9f047623d1df8e168aa6 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Tue, 28 Mar 2017 00:02:02 +0100 Subject: [PATCH 2/3] force vto to false on start up --- interface/src/Application.cpp | 4 ++-- interface/src/ui/PreferencesDialog.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index a96ef7c5c6..32d2ee506b 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2000,7 +2000,7 @@ void Application::initializeUi() { rootContext->setContextProperty("ScriptDiscoveryService", DependencyManager::get().data()); rootContext->setContextProperty("AudioDevice", AudioDeviceScriptingInterface::getInstance()); - // Caches + rootContext->setContextProperty("AnimationCache", DependencyManager::get().data()); rootContext->setContextProperty("TextureCache", DependencyManager::get().data()); rootContext->setContextProperty("ModelCache", DependencyManager::get().data()); @@ -3788,7 +3788,7 @@ void Application::loadSettings() { } getMyAvatar()->loadData(); - + setTabletVisibleToOthersSetting(false); _settingsLoaded = true; } diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index 5c239f6e13..5983d7cc25 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -103,6 +103,7 @@ void setupPreferences() { preferences->addPreference(new CheckPreference(UI_CATEGORY, "HMD Tablet Becomes Toolbar", getter, setter)); } // TODO + // Note: If this code is added back, you must remove the line "setTabletVisibleToOthersSetting(false)" from Application::loadSettings() /*{ auto getter = []()->bool { return qApp->getTabletVisibleToOthersSetting(); }; auto setter = [](bool value) { qApp->setTabletVisibleToOthersSetting(value); }; From 65be71fa69486bf9196f3f12fc89d2580d661f81 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Tue, 28 Mar 2017 00:05:02 +0100 Subject: [PATCH 3/3] min diff --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 32d2ee506b..25a585ea34 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2000,7 +2000,7 @@ void Application::initializeUi() { rootContext->setContextProperty("ScriptDiscoveryService", DependencyManager::get().data()); rootContext->setContextProperty("AudioDevice", AudioDeviceScriptingInterface::getInstance()); - + // Caches rootContext->setContextProperty("AnimationCache", DependencyManager::get().data()); rootContext->setContextProperty("TextureCache", DependencyManager::get().data()); rootContext->setContextProperty("ModelCache", DependencyManager::get().data());