From 9b3810814e17426ca34786db09b34d43f5190581 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Fri, 10 Mar 2017 18:40:18 +0000 Subject: [PATCH 1/3] fiexed putting menu items on the hud when tablet not open when on desktop screen --- interface/src/Application.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 66d138103d..b575cb07b1 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5793,12 +5793,12 @@ void Application::toggleRunningScriptsWidget() const { auto tabletScriptingInterface = DependencyManager::get(); auto tablet = dynamic_cast(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system")); + auto hmd = DependencyManager::get(); if (tablet->getToolbarMode()) { static const QUrl url("hifi/dialogs/RunningScripts.qml"); DependencyManager::get()->show(url, "RunningScripts"); } else { - QQuickItem* tabletRoot = tablet->getTabletRoot(); - if (!tabletRoot && !isHMDMode()) { + if (!hmd->getShouldShowTablet() && !isHMDMode()) { static const QUrl url("hifi/dialogs/RunningScripts.qml"); DependencyManager::get()->show(url, "RunningScripts"); } else { @@ -5835,12 +5835,11 @@ void Application::showAssetServerWidget(QString filePath) { }; auto tabletScriptingInterface = DependencyManager::get(); auto tablet = dynamic_cast(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system")); - + auto hmd = DependencyManager::get(); if (tablet->getToolbarMode()) { DependencyManager::get()->show(url, "AssetServer", startUpload); } else { - QQuickItem* tabletRoot = tablet->getTabletRoot(); - if (!tabletRoot && !isHMDMode()) { + if (!hmd->getShouldShowTablet() && !isHMDMode()) { DependencyManager::get()->show(url, "AssetServer", startUpload); } else { static const QUrl url("../../hifi/dialogs/TabletAssetServer.qml"); @@ -5873,7 +5872,8 @@ void Application::addAssetToWorldFromURL(QString url) { void Application::showDialog(const QString& desktopURL, const QString& tabletURL, const QString& name) const { auto tabletScriptingInterface = DependencyManager::get(); auto tablet = dynamic_cast(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system")); - if (tablet->getToolbarMode() || (!tablet->getTabletRoot() && !isHMDMode())) { + auto hmd = DependencyManager::get(); + if (tablet->getToolbarMode() || (!hmd->getShouldShowTablet() && !isHMDMode())) { DependencyManager::get()->show(desktopURL, name); } else { tablet->loadQMLSource(tabletURL); From b63ab05eec6495fbb5986f6082b8c72dc8b0cfa2 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Fri, 10 Mar 2017 19:33:14 +0000 Subject: [PATCH 2/3] improved general settting coloring --- .../tabletWindows/TabletPreferencesDialog.qml | 46 ++++--------------- 1 file changed, 9 insertions(+), 37 deletions(-) diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml index 95ce7f5a1d..e3138e8979 100644 --- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml +++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml @@ -21,8 +21,8 @@ import "../../../controls-uit" as HifiControls Item { id: dialog - width: 480 - height: 720 + width: parent.width + height: parent.height HifiConstants { id: hifi } property var sections: [] @@ -31,6 +31,7 @@ Item { property bool keyboardEnabled: false property bool keyboardRaised: false property bool punctuationMode: false + property var tablet; @@ -68,22 +69,11 @@ Item { } z: 100 - gradient: Gradient { - GradientStop { - position: 0 - color: "#2b2b2b" - } - - GradientStop { - position: 1 - color: "#1e1e1e" - } - } - + color: hifi.colors.darkGray RalewayBold { text: title size: 26 - color: "#34a2c7" + color: hifi.colors.white anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: hifi.dimensions.contentMargin.x @@ -99,17 +89,8 @@ Item { right: parent.right } - gradient: Gradient { - GradientStop { - position: 0 - color: "#2b2b2b" - } - - GradientStop { - position: 1 - color: "#0f212e" - } - } + color: hifi.colors.baseGray + Flickable { id: scrollView width: parent.width @@ -203,17 +184,8 @@ Item { left: parent.left right: parent.right } - gradient: Gradient { - GradientStop { - position: 0 - color: "#2b2b2b" - } - - GradientStop { - position: 1 - color: "#0f212e" - } - } + + color: hifi.colors.baseGray Row { anchors { From 8a973dae3c077b7c5da386c0deb66a55d5ecf570 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Fri, 10 Mar 2017 23:21:29 +0000 Subject: [PATCH 3/3] fixed bring menu dialogs in tablet --- .../resources/qml/hifi/dialogs/TabletRunningScripts.qml | 1 + .../resources/qml/hifi/tablet/TabletAudioPreferences.qml | 2 +- .../resources/qml/hifi/tablet/TabletAvatarPreferences.qml | 2 +- .../resources/qml/hifi/tablet/TabletGeneralPreferences.qml | 5 +++-- interface/resources/qml/hifi/tablet/TabletMenuStack.qml | 2 +- .../qml/hifi/tablet/TabletNetworkingPreferences.qml | 2 +- interface/src/Application.cpp | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml b/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml index e217a6e38e..b4a1ab01b6 100644 --- a/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml +++ b/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml @@ -20,6 +20,7 @@ import "../../windows" Rectangle { id: root objectName: "RunningScripts" + property var title: "Running Scripts" HifiConstants { id: hifi } signal sendToScript(var message); property var eventBridge; diff --git a/interface/resources/qml/hifi/tablet/TabletAudioPreferences.qml b/interface/resources/qml/hifi/tablet/TabletAudioPreferences.qml index efb7b5d50d..1c18c44a97 100644 --- a/interface/resources/qml/hifi/tablet/TabletAudioPreferences.qml +++ b/interface/resources/qml/hifi/tablet/TabletAudioPreferences.qml @@ -19,7 +19,7 @@ StackView { id: profileRoot initialItem: root objectName: "stack" - + property var title: "Audio Preferences" property var eventBridge; signal sendToScript(var message); diff --git a/interface/resources/qml/hifi/tablet/TabletAvatarPreferences.qml b/interface/resources/qml/hifi/tablet/TabletAvatarPreferences.qml index f5c1ddf8f7..b29164a30f 100644 --- a/interface/resources/qml/hifi/tablet/TabletAvatarPreferences.qml +++ b/interface/resources/qml/hifi/tablet/TabletAvatarPreferences.qml @@ -19,7 +19,7 @@ StackView { id: profileRoot initialItem: root objectName: "stack" - + property var title: "Avatar Preferences" property var eventBridge; signal sendToScript(var message); diff --git a/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml b/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml index 4473a997e6..47e6a05f78 100644 --- a/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml +++ b/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml @@ -19,10 +19,11 @@ StackView { id: profileRoot initialItem: root objectName: "stack" - + property var title: "General Prefernces" + property var eventBridge; signal sendToScript(var message); - + function pushSource(path) { editRoot.push(Qt.reslovedUrl(path)); } diff --git a/interface/resources/qml/hifi/tablet/TabletMenuStack.qml b/interface/resources/qml/hifi/tablet/TabletMenuStack.qml index a75a9fcd86..64d42acabb 100644 --- a/interface/resources/qml/hifi/tablet/TabletMenuStack.qml +++ b/interface/resources/qml/hifi/tablet/TabletMenuStack.qml @@ -51,7 +51,7 @@ Item { d.push(Qt.resolvedUrl(path)); d.currentItem.eventBridge = tabletMenu.eventBridge d.currentItem.sendToScript.connect(tabletMenu.sendToScript); - breadcrumbText.text = d.currentItem.objectName; + breadcrumbText.text = d.currentItem.title; } function popSource() { diff --git a/interface/resources/qml/hifi/tablet/TabletNetworkingPreferences.qml b/interface/resources/qml/hifi/tablet/TabletNetworkingPreferences.qml index 9b12d3c69e..f48d270646 100644 --- a/interface/resources/qml/hifi/tablet/TabletNetworkingPreferences.qml +++ b/interface/resources/qml/hifi/tablet/TabletNetworkingPreferences.qml @@ -19,7 +19,7 @@ StackView { id: profileRoot initialItem: root objectName: "stack" - + property var title: "Network Preferences" property var eventBridge; signal sendToScript(var message); diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index b575cb07b1..6be36f18ac 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5876,7 +5876,7 @@ void Application::showDialog(const QString& desktopURL, const QString& tabletURL if (tablet->getToolbarMode() || (!hmd->getShouldShowTablet() && !isHMDMode())) { DependencyManager::get()->show(desktopURL, name); } else { - tablet->loadQMLSource(tabletURL); + tablet->pushOntoStack(tabletURL); } }