From dd01944bbf3db4a90b8c378baf59fa5f0e20de26 Mon Sep 17 00:00:00 2001 From: Armored Dragon Date: Thu, 16 May 2024 16:31:59 -0500 Subject: [PATCH 1/2] Fixed Settings UI in simplifiedUi. Keepmenus by default. Update HiFi links to Overte. Signed-off-by: Armored Dragon --- .../resources/qml/hifi/simplifiedUI/helpApp/faq/HelpFAQ.qml | 3 ++- .../qml/hifi/simplifiedUI/helpApp/support/HelpSupport.qml | 3 ++- .../resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml | 5 +++-- .../qml/hifi/simplifiedUI/settingsApp/general/General.qml | 3 ++- .../qml/hifi/simplifiedUI/simplifiedControls/Button.qml | 4 ++-- scripts/simplifiedUI/ui/simplifiedUI.js | 3 ++- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/faq/HelpFAQ.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/faq/HelpFAQ.qml index 7bfb711e29..6272598e29 100644 --- a/interface/resources/qml/hifi/simplifiedUI/helpApp/faq/HelpFAQ.qml +++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/faq/HelpFAQ.qml @@ -3,6 +3,7 @@ // // Created by Zach Fox on 2019-08-08 // Copyright 2019 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -78,7 +79,7 @@ Item { temporaryText: "Viewing!" onClicked: { - Qt.openUrlExternally("https://www.highfidelity.com/knowledge"); + Qt.openUrlExternally("https://overte.org/"); } } diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/support/HelpSupport.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/support/HelpSupport.qml index 156e5cf5fd..8d294be95d 100644 --- a/interface/resources/qml/hifi/simplifiedUI/helpApp/support/HelpSupport.qml +++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/support/HelpSupport.qml @@ -3,6 +3,7 @@ // // Created by Zach Fox on 2019-08-20 // Copyright 2019 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -76,7 +77,7 @@ Item { temporaryText: "Opening browser..." onClicked: { - Qt.openUrlExternally("https://www.highfidelity.com/knowledge/kb-tickets/new"); + Qt.openUrlExternally("https://overte.org/contact.html"); } } } diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml index 359b1bb670..68a66c11c6 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml @@ -3,6 +3,7 @@ // // Created by Zach Fox on 2019-06-11 // Copyright 2019 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -93,9 +94,9 @@ Flickable { width: parent.width height: 18 labelTextOn: "Keep Old Menus (File, Edit, etc)" - checked: Settings.getValue("simplifiedUI/keepMenus", false); + checked: Settings.getValue("simplifiedUI/keepMenus", true); onClicked: { - Settings.setValue("simplifiedUI/keepMenus", !Settings.getValue("simplifiedUI/keepMenus", false)); + Settings.setValue("simplifiedUI/keepMenus", !Settings.getValue("simplifiedUI/keepMenus", true)); } } diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml index a61fd68239..db65d8868a 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml @@ -3,6 +3,7 @@ // // Created by Zach Fox on 2019-05-06 // Copyright 2019 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -175,7 +176,7 @@ Flickable { spacing: simplifiedUI.margins.settings.spacingBetweenRadiobuttons SimplifiedControls.RadioButton { - id: performanceLow + id: performanceLowPower text: "Low Power Quality" + (PlatformInfo.getTierProfiled() === PerformanceEnums.LOW_POWER ? " (Recommended)" : "") checked: Performance.getPerformancePreset() === PerformanceEnums.LOW_POWER onClicked: { diff --git a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Button.qml b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Button.qml index e4a1c2af08..fe2a6b83eb 100644 --- a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Button.qml +++ b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Button.qml @@ -3,6 +3,7 @@ // // Created by Zach Fox on 2019-05-08 // Copyright 2019 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -96,12 +97,11 @@ Original.Button { } } - contentItem: HifiStylesUit.FiraSansMedium { + contentItem: Text { id: buttonText //topPadding: -2 // Necessary for proper alignment using Graphik Medium wrapMode: Text.Wrap color: enabled ? simplifiedUI.colors.controls.button.text.enabled : simplifiedUI.colors.controls.button.text.disabled - size: simplifiedUI.sizes.controls.button.textSize verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter text: root.text diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index 2ce6a3e073..2d0f954f24 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -7,6 +7,7 @@ // Authors: Wayne Chen & Zach Fox // Created: 2019-05-01 // Copyright 2019 High Fidelity, Inc. +// Copyright 2022 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -20,7 +21,7 @@ var DEFAULT_SCRIPTS_PATH_PREFIX = ScriptDiscoveryService.defaultScriptsPath + "/ var MENU_NAMES = ["File", "Edit", "Display", "View", "Navigate", "Settings", "Developer", "Help"]; -var keepMenusSetting = Settings.getValue("simplifiedUI/keepMenus", false); +var keepMenusSetting = Settings.getValue("simplifiedUI/keepMenus", true); function maybeRemoveDesktopMenu() { if (!keepMenusSetting) { MENU_NAMES.forEach(function(menu) { From c541b64f668c53d2dc80eafe7737a2dc564bbe57 Mon Sep 17 00:00:00 2001 From: Armored Dragon Date: Thu, 16 May 2024 16:35:55 -0500 Subject: [PATCH 2/2] I know the date... Signed-off-by: Armored Dragon --- scripts/simplifiedUI/ui/simplifiedUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index 2d0f954f24..8023ce3318 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -7,7 +7,7 @@ // Authors: Wayne Chen & Zach Fox // Created: 2019-05-01 // Copyright 2019 High Fidelity, Inc. -// Copyright 2022 Overte e.V. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html