From 4c006c50aa0dfd4ae419cc9a3242fc9bfd520f2f Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Fri, 16 Aug 2019 15:53:30 -0700 Subject: [PATCH] Controls almost done --- .../simplifiedUI/helpApp/about/HelpAbout.qml | 30 +- .../helpApp/controls/ControlsTable.qml | 695 ++++++++++++++++++ .../helpApp/controls/HelpControls.qml | 14 +- .../helpApp/controls/images/rightClick.svg | 15 + .../simplifiedUI/settingsApp/about/About.qml | 26 +- .../simplifiedUI/settingsApp/audio/Audio.qml | 6 +- .../hifi/simplifiedUI/settingsApp/dev/Dev.qml | 4 +- .../settingsApp/general/General.qml | 6 +- .../hifi/simplifiedUI/settingsApp/vr/VR.qml | 8 +- .../SimplifiedConstants.qml | 4 + .../simplifiedUI/topBar/SimplifiedTopBar.qml | 4 +- .../topBar/images/questionMark.svg | 11 + 12 files changed, 776 insertions(+), 47 deletions(-) create mode 100644 interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml create mode 100644 interface/resources/qml/hifi/simplifiedUI/helpApp/controls/images/rightClick.svg create mode 100644 interface/resources/qml/hifi/simplifiedUI/topBar/images/questionMark.svg diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/about/HelpAbout.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/about/HelpAbout.qml index 25f1a14a6a..78ff24a2ee 100644 --- a/interface/resources/qml/hifi/simplifiedUI/helpApp/about/HelpAbout.qml +++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/about/HelpAbout.qml @@ -74,7 +74,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { text: "About Your Configuration" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width Layout.topMargin: 16 Layout.bottomMargin: 8 height: paintedHeight @@ -85,7 +85,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "Use the button below to get a copy to share with us." - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width Layout.bottomMargin: 8 height: paintedHeight size: 18 @@ -95,7 +95,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "Version " + Window.checkVersion() - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width Layout.topMargin: 8 Layout.bottomMargin: 8 height: paintedHeight @@ -106,7 +106,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { text: "Platform Info" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width Layout.topMargin: 8 Layout.bottomMargin: 8 height: paintedHeight @@ -117,7 +117,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "Computer Vendor/Model:" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -140,7 +140,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "Profiled Platform Tier: " + PlatformInfo.getTierProfiled() - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -149,7 +149,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "OS Type: " + PlatformInfo.getOperatingSystemType() - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -158,7 +158,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "CPU:" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -177,7 +177,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "# CPUs: " + PlatformInfo.getNumCPUs() - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -186,7 +186,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "# CPU Cores: " + PlatformInfo.getNumLogicalCores() - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -195,7 +195,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "RAM: " + PlatformInfo.getTotalSystemMemoryMB() + " MB" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -204,7 +204,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "GPU: " - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -223,7 +223,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "VR Hand Controllers: " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None")) - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -255,7 +255,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "Audio Input: " + audioInputDevices.selectedInputDeviceName - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -288,7 +288,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "Audio Output: " + audioOutputDevices.selectedOutputDeviceName - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml new file mode 100644 index 0000000000..e66c61e98d --- /dev/null +++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml @@ -0,0 +1,695 @@ +// +// ControlsTable.qml +// +// Created by Zach Fox on 2019-08-16 +// Copyright 2019 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +import QtQuick 2.10 +import QtQuick.Layouts 1.3 +import stylesUit 1.0 as HifiStylesUit + +Item { + id: controlsTableRoot + property int column1Width: 80 + property int column2Width: width - column1Width + property int rowHeight: 31 + property int rowPadding: 4 + property int mainTextSize: 18 + property int subTextSize: 14 + property color separatorColor: "#CCCCCC" + height: controlsTableColumnLayout.height + + // Top separator + Rectangle { + anchors.top: controlsTableColumnLayout.top + anchors.left: controlsTableColumnLayout.left + width: parent.width + height: 1 + color: controlsTableRoot.separatorColor + } + + // Right separator + Rectangle { + anchors.top: controlsTableColumnLayout.top + anchors.right: controlsTableColumnLayout.right + width: 1 + height: controlsTableColumnLayout.height + color: controlsTableRoot.separatorColor + } + + // Bottom separator + Rectangle { + anchors.bottom: controlsTableColumnLayout.bottom + anchors.left: controlsTableColumnLayout.left + width: parent.width + height: 1 + color: controlsTableRoot.separatorColor + } + + // Left separator + Rectangle { + anchors.top: controlsTableColumnLayout.top + anchors.left: controlsTableColumnLayout.left + width: 1 + height: controlsTableColumnLayout.height + color: controlsTableRoot.separatorColor + } + + ColumnLayout { + id: controlsTableColumnLayout + anchors.left: parent.left + anchors.right: parent.right + anchors.top: parent.top + spacing: 0 + + Row { + Layout.preferredWidth: parent.width + height: controlsTableRoot.rowHeight + + Item { + width: controlsTableRoot.column1Width + height: controlsTableRoot.rowHeight + + Image { + source: "images/rightClick.svg" + anchors.centerIn: parent + width: 24 + height: 24 + mipmap: true + fillMode: Image.PreserveAspectFit + } + + Rectangle { + width: 1 + height: parent.height + color: controlsTableRoot.separatorColor + anchors.right: parent.right + anchors.top: parent.top + } + } + + Row { + width: controlsTableRoot.column2Width + height: controlsTableRoot.rowHeight + spacing: controlsTableRoot.rowPadding + + HifiStylesUit.GraphikRegular { + id: cameraText + text: "Camera" + width: paintedWidth + height: parent.height + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + + HifiStylesUit.GraphikRegular { + text: "Right-click and drag to look around" + width: parent.width - cameraText.width - parent.spacing + height: parent.height + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + size: controlsTableRoot.subTextSize + color: Qt.rgba(255, 255, 255, 0.5) + } + } + } + + + + + + Row { + Layout.preferredWidth: parent.width + height: controlsTableRoot.rowHeight + + Item { + width: controlsTableRoot.column1Width + height: controlsTableRoot.rowHeight + + HifiStylesUit.GraphikRegular { + text: "W / ↑" + anchors.fill: parent + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + + Rectangle { + width: 1 + height: parent.height + color: controlsTableRoot.separatorColor + anchors.right: parent.right + anchors.top: parent.top + } + } + + // Spacer + Item { + width: controlsTableRoot.rowPadding + height: controlsTableRoot.rowHeight + } + + HifiStylesUit.GraphikRegular { + text: "Walk Forward" + width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 + height: controlsTableRoot.rowHeight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + } + + + + + + Row { + Layout.preferredWidth: parent.width + height: controlsTableRoot.rowHeight + + Item { + width: controlsTableRoot.column1Width + height: controlsTableRoot.rowHeight + + HifiStylesUit.GraphikRegular { + text: "S / ↓" + anchors.fill: parent + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + + Rectangle { + width: 1 + height: parent.height + color: controlsTableRoot.separatorColor + anchors.right: parent.right + anchors.top: parent.top + } + } + + // Spacer + Item { + width: controlsTableRoot.rowPadding + height: controlsTableRoot.rowHeight + } + + HifiStylesUit.GraphikRegular { + text: "Walk Backward" + width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 + height: controlsTableRoot.rowHeight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + } + + + + + + Row { + Layout.preferredWidth: parent.width + height: controlsTableRoot.rowHeight + + Item { + width: controlsTableRoot.column1Width + height: controlsTableRoot.rowHeight + + HifiStylesUit.GraphikRegular { + text: "A / ←" + anchors.fill: parent + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + + Rectangle { + width: 1 + height: parent.height + color: controlsTableRoot.separatorColor + anchors.right: parent.right + anchors.top: parent.top + } + } + + // Spacer + Item { + width: controlsTableRoot.rowPadding + height: controlsTableRoot.rowHeight + } + + HifiStylesUit.GraphikRegular { + text: "Turn Left" + width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 + height: controlsTableRoot.rowHeight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + } + + + + + + Row { + Layout.preferredWidth: parent.width + height: controlsTableRoot.rowHeight + + Item { + width: controlsTableRoot.column1Width + height: controlsTableRoot.rowHeight + + HifiStylesUit.GraphikRegular { + text: "A / →" + anchors.fill: parent + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + + Rectangle { + width: 1 + height: parent.height + color: controlsTableRoot.separatorColor + anchors.right: parent.right + anchors.top: parent.top + } + } + + // Spacer + Item { + width: controlsTableRoot.rowPadding + height: controlsTableRoot.rowHeight + } + + HifiStylesUit.GraphikRegular { + text: "Turn Right" + width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 + height: controlsTableRoot.rowHeight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + } + + + + + + Row { + Layout.preferredWidth: parent.width + height: controlsTableRoot.rowHeight + + Item { + width: controlsTableRoot.column1Width + height: controlsTableRoot.rowHeight + + HifiStylesUit.GraphikRegular { + text: "Q" + anchors.fill: parent + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + + Rectangle { + width: 1 + height: parent.height + color: controlsTableRoot.separatorColor + anchors.right: parent.right + anchors.top: parent.top + } + } + + // Spacer + Item { + width: controlsTableRoot.rowPadding + height: controlsTableRoot.rowHeight + } + + HifiStylesUit.GraphikRegular { + text: "Sidestep Left" + width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 + height: controlsTableRoot.rowHeight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + } + + + + + + Row { + Layout.preferredWidth: parent.width + height: controlsTableRoot.rowHeight + + Item { + width: controlsTableRoot.column1Width + height: controlsTableRoot.rowHeight + + HifiStylesUit.GraphikRegular { + text: "E" + anchors.fill: parent + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + + Rectangle { + width: 1 + height: parent.height + color: controlsTableRoot.separatorColor + anchors.right: parent.right + anchors.top: parent.top + } + } + + // Spacer + Item { + width: controlsTableRoot.rowPadding + height: controlsTableRoot.rowHeight + } + + HifiStylesUit.GraphikRegular { + text: "Sidestep Right" + width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 + height: controlsTableRoot.rowHeight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + } + + + + + + Row { + Layout.preferredWidth: parent.width + height: controlsTableRoot.rowHeight + + Item { + width: controlsTableRoot.column1Width + height: controlsTableRoot.rowHeight + + HifiStylesUit.GraphikRegular { + text: "Shift" + anchors.fill: parent + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + + Rectangle { + width: 1 + height: parent.height + color: controlsTableRoot.separatorColor + anchors.right: parent.right + anchors.top: parent.top + } + } + + // Spacer + Item { + width: controlsTableRoot.rowPadding + height: controlsTableRoot.rowHeight + } + + Row { + width: controlsTableRoot.column2Width + height: controlsTableRoot.rowHeight + spacing: controlsTableRoot.rowPadding + + HifiStylesUit.GraphikRegular { + id: runText + text: "Hold + Direction to Run" + width: paintedWidth + height: parent.height + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + + HifiStylesUit.GraphikRegular { + text: "Example: Shift + W" + width: parent.width - runText.width - parent.spacing + height: parent.height + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + size: controlsTableRoot.subTextSize + color: Qt.rgba(255, 255, 255, 0.5) + } + } + } + + + + + + Row { + Layout.preferredWidth: parent.width + height: controlsTableRoot.rowHeight + + Item { + width: controlsTableRoot.column1Width + height: controlsTableRoot.rowHeight + + HifiStylesUit.GraphikRegular { + text: "Space" + anchors.fill: parent + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + + Rectangle { + width: 1 + height: parent.height + color: controlsTableRoot.separatorColor + anchors.right: parent.right + anchors.top: parent.top + } + } + + // Spacer + Item { + width: controlsTableRoot.rowPadding + height: controlsTableRoot.rowHeight + } + + Row { + width: controlsTableRoot.column2Width + height: controlsTableRoot.rowHeight + spacing: controlsTableRoot.rowPadding + + HifiStylesUit.GraphikRegular { + id: jumpText + text: "Jump / Stand Up" + width: paintedWidth + height: parent.height + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + + HifiStylesUit.GraphikRegular { + text: "Stand Up only while seated" + width: parent.width - jumpText.width - parent.spacing + height: parent.height + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + size: controlsTableRoot.subTextSize + color: Qt.rgba(255, 255, 255, 0.5) + } + } + } + + + + + + Row { + Layout.preferredWidth: parent.width + height: controlsTableRoot.rowHeight + + Item { + width: controlsTableRoot.column1Width + height: controlsTableRoot.rowHeight + + HifiStylesUit.GraphikRegular { + text: "1" + anchors.fill: parent + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + + Rectangle { + width: 1 + height: parent.height + color: controlsTableRoot.separatorColor + anchors.right: parent.right + anchors.top: parent.top + } + } + + // Spacer + Item { + width: controlsTableRoot.rowPadding + height: controlsTableRoot.rowHeight + } + + HifiStylesUit.GraphikRegular { + text: "1st Person View" + width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 + height: controlsTableRoot.rowHeight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + } + + + + + + Row { + Layout.preferredWidth: parent.width + height: controlsTableRoot.rowHeight + + Item { + width: controlsTableRoot.column1Width + height: controlsTableRoot.rowHeight + + HifiStylesUit.GraphikRegular { + text: "2" + anchors.fill: parent + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + + Rectangle { + width: 1 + height: parent.height + color: controlsTableRoot.separatorColor + anchors.right: parent.right + anchors.top: parent.top + } + } + + // Spacer + Item { + width: controlsTableRoot.rowPadding + height: controlsTableRoot.rowHeight + } + + Row { + width: controlsTableRoot.column2Width + height: controlsTableRoot.rowHeight + spacing: controlsTableRoot.rowPadding + + HifiStylesUit.GraphikRegular { + id: mirrorText + text: "Mirror Mode" + width: paintedWidth + height: parent.height + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + + HifiStylesUit.GraphikRegular { + text: "See your own avatar" + width: parent.width - mirrorText.width - parent.spacing + height: parent.height + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + size: controlsTableRoot.subTextSize + color: Qt.rgba(255, 255, 255, 0.5) + } + } + } + + + + + + Row { + Layout.preferredWidth: parent.width + height: controlsTableRoot.rowHeight + + Item { + width: controlsTableRoot.column1Width + height: controlsTableRoot.rowHeight + + HifiStylesUit.GraphikRegular { + text: "3" + anchors.fill: parent + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + + Rectangle { + width: 1 + height: parent.height + color: controlsTableRoot.separatorColor + anchors.right: parent.right + anchors.top: parent.top + } + } + + // Spacer + Item { + width: controlsTableRoot.rowPadding + height: controlsTableRoot.rowHeight + } + + HifiStylesUit.GraphikRegular { + text: "3rd Person View" + width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 + height: controlsTableRoot.rowHeight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + size: controlsTableRoot.mainTextSize + color: simplifiedUI.colors.text.white + } + } + } +} \ No newline at end of file diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/HelpControls.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/HelpControls.qml index b502f7524b..0ad71f4b9b 100644 --- a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/HelpControls.qml +++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/HelpControls.qml @@ -14,7 +14,6 @@ import "../../simplifiedConstants" as SimplifiedConstants import "../../simplifiedControls" as SimplifiedControls import stylesUit 1.0 as HifiStylesUit import QtQuick.Layouts 1.3 -import PerformanceEnums 1.0 Flickable { id: root @@ -60,7 +59,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { text: "HQ Controls" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width Layout.topMargin: 16 height: paintedHeight size: 22 @@ -69,22 +68,27 @@ Flickable { HifiStylesUit.GraphikRegular { text: "You can use the following controls to move your avatar around your HQ:" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width wrapMode: Text.Wrap height: paintedHeight size: 18 color: simplifiedUI.colors.text.white } + ControlsTable { + Layout.topMargin: 8 + Layout.preferredWidth: parent.width + } + SimplifiedControls.Button { Layout.topMargin: 8 - width: 200 + Layout.preferredWidth: 200 height: 32 text: "VIEW ALL CONTROLS" temporaryText: "Viewing!" onClicked: { - Qt.openUrlExternally("http://docs.highfidelity.com/en/rc83/explore/get-started/desktop.html"); + Qt.openUrlExternally("http://docs.highfidelity.com/explore/get-started/desktop.html"); } } } diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/images/rightClick.svg b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/images/rightClick.svg new file mode 100644 index 0000000000..6df8929a3d --- /dev/null +++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/images/rightClick.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml index 632f137339..89cccb8ecd 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml @@ -70,7 +70,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { text: "Version " + Window.checkVersion() Layout.alignment: Qt.AlignHCenter - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -79,7 +79,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { text: "Platform Info" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width Layout.topMargin: 8 Layout.bottomMargin: 8 height: paintedHeight @@ -90,7 +90,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "Computer Vendor/Model:" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -113,7 +113,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "Profiled Platform Tier: " + PlatformInfo.getTierProfiled() - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -122,7 +122,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "OS Type: " + PlatformInfo.getOperatingSystemType() - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -131,7 +131,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "CPU:" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -150,7 +150,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "# CPUs: " + PlatformInfo.getNumCPUs() - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -159,7 +159,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "# CPU Cores: " + PlatformInfo.getNumLogicalCores() - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -168,7 +168,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "RAM: " + PlatformInfo.getTotalSystemMemoryMB() + " MB" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -177,7 +177,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "GPU: " - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -196,7 +196,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "VR Hand Controllers: " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None")) - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -228,7 +228,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "Audio Input: " + audioInputDevices.selectedInputDeviceName - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -261,7 +261,7 @@ Flickable { HifiStylesUit.GraphikRegular { text: "Audio Output: " + audioOutputDevices.selectedOutputDeviceName - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml index bfc0bc5200..108016ef8c 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml @@ -174,7 +174,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { id: micControlsTitle text: "Default Mute Controls" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 22 color: simplifiedUI.colors.text.white @@ -244,7 +244,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { id: inputDeviceTitle text: "Which input device?" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 22 color: simplifiedUI.colors.text.white @@ -340,7 +340,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { id: outputDeviceTitle text: "Which output device?" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 22 color: simplifiedUI.colors.text.white diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml index fe623e5d78..4d0589c1e1 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml @@ -68,7 +68,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { id: uiControlsTitle text: "User Interface" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 22 color: simplifiedUI.colors.text.white @@ -77,7 +77,7 @@ Flickable { HifiStylesUit.GraphikRegular { id: uiControlsSubtitle text: "You'll have to restart Interface after changing either of these settings. If you don't get any Toolbar apps back after restarting, run defaultScripts.js manually." - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml index af7e9ba4ae..a2bf26161e 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml @@ -72,7 +72,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { id: avatarNameTagsTitle text: "Avatar Name Tags" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 22 color: simplifiedUI.colors.text.white @@ -120,7 +120,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { id: performanceTitle text: "Graphics Settings" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 22 color: simplifiedUI.colors.text.white @@ -168,7 +168,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { id: cameraTitle text: "Camera View" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 22 color: simplifiedUI.colors.text.white diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml index d7e85c7f68..5f0fbe49d5 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml @@ -77,7 +77,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { id: controlsTitle text: "VR Movement Controls" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 22 color: simplifiedUI.colors.text.white @@ -163,7 +163,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { id: micControlsTitle text: "Default Mute Controls" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 22 color: simplifiedUI.colors.text.white @@ -206,7 +206,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { id: inputDeviceTitle text: "Which input device?" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 22 color: simplifiedUI.colors.text.white @@ -302,7 +302,7 @@ Flickable { HifiStylesUit.GraphikSemiBold { id: outputDeviceTitle text: "Which output device?" - Layout.maximumWidth: parent.width + Layout.preferredWidth: parent.width height: paintedHeight size: 22 color: simplifiedUI.colors.text.white diff --git a/interface/resources/qml/hifi/simplifiedUI/simplifiedConstants/SimplifiedConstants.qml b/interface/resources/qml/hifi/simplifiedUI/simplifiedConstants/SimplifiedConstants.qml index bc27dbad5f..88a2f46de8 100644 --- a/interface/resources/qml/hifi/simplifiedUI/simplifiedConstants/SimplifiedConstants.qml +++ b/interface/resources/qml/hifi/simplifiedUI/simplifiedConstants/SimplifiedConstants.qml @@ -153,6 +153,10 @@ QtObject { readonly property color background: "#474747" readonly property color contentItem: "#0198CB" } + readonly property QtObject table: QtObject { + readonly property color cellBackground: "#000000" + readonly property color textColor: "#ffffff" + } } readonly property color darkSeparator: "#595959" diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml index 209966dee3..1e6a127f9a 100644 --- a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml +++ b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml @@ -427,9 +427,9 @@ Rectangle { Image { id: helpButtonImage - source: "./images/settings.svg" + source: "./images/questionMark.svg" anchors.centerIn: parent - width: 22 + width: 13 height: 22 visible: false } diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/images/questionMark.svg b/interface/resources/qml/hifi/simplifiedUI/topBar/images/questionMark.svg new file mode 100644 index 0000000000..eec3edb1c6 --- /dev/null +++ b/interface/resources/qml/hifi/simplifiedUI/topBar/images/questionMark.svg @@ -0,0 +1,11 @@ + + + + + + +