Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-12 18:42:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Settings UI in simplifiedUi.

Browse source 
Keepmenus by default.
Update HiFi links to Overte.

Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
This commit is contained in:
Armored Dragon 2024-05-16 16:31:59 -05:00
parent 8661e8a858
commit dd01944bbf
No known key found for this signature in database
GPG key ID: C7207ACC3382AD8B
6 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/hifi/simplifiedUI/helpApp/faq/HelpFAQ.qml
View file

@ -3,6 +3,7 @@
// //
// Created by Zach Fox on 2019-08-08 // Created by Zach Fox on 2019-08-08
// Copyright 2019 High Fidelity, Inc. // Copyright 2019 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -78,7 +79,7 @@ Item {
temporaryText: "Viewing!" temporaryText: "Viewing!"
onClicked: { onClicked: {
Qt.openUrlExternally("https://www.highfidelity.com/knowledge"); Qt.openUrlExternally("https://overte.org/");
} }
} }

3
interface/resources/qml/hifi/simplifiedUI/helpApp/support/HelpSupport.qml
View file

@ -3,6 +3,7 @@
// //
// Created by Zach Fox on 2019-08-20 // Created by Zach Fox on 2019-08-20
// Copyright 2019 High Fidelity, Inc. // Copyright 2019 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -76,7 +77,7 @@ Item {
temporaryText: "Opening browser..." temporaryText: "Opening browser..."
onClicked: { onClicked: {
Qt.openUrlExternally("https://www.highfidelity.com/knowledge/kb-tickets/new"); Qt.openUrlExternally("https://overte.org/contact.html");
} }
} }
} }

5
interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml
View file

@ -3,6 +3,7 @@
// //
// Created by Zach Fox on 2019-06-11 // Created by Zach Fox on 2019-06-11
// Copyright 2019 High Fidelity, Inc. // Copyright 2019 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -93,9 +94,9 @@ Flickable {
width: parent.width width: parent.width
height: 18 height: 18
labelTextOn: "Keep Old Menus (File, Edit, etc)" labelTextOn: "Keep Old Menus (File, Edit, etc)"
checked: Settings.getValue("simplifiedUI/keepMenus", false); checked: Settings.getValue("simplifiedUI/keepMenus", true);
onClicked: { onClicked: {
Settings.setValue("simplifiedUI/keepMenus", !Settings.getValue("simplifiedUI/keepMenus", false)); Settings.setValue("simplifiedUI/keepMenus", !Settings.getValue("simplifiedUI/keepMenus", true));
} }
} }

3
interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
View file

@ -3,6 +3,7 @@
// //
// Created by Zach Fox on 2019-05-06 // Created by Zach Fox on 2019-05-06
// Copyright 2019 High Fidelity, Inc. // Copyright 2019 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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 spacing: simplifiedUI.margins.settings.spacingBetweenRadiobuttons
SimplifiedControls.RadioButton { SimplifiedControls.RadioButton {
id: performanceLow id: performanceLowPower
text: "Low Power Quality" + (PlatformInfo.getTierProfiled() === PerformanceEnums.LOW_POWER ? " (Recommended)" : "") text: "Low Power Quality" + (PlatformInfo.getTierProfiled() === PerformanceEnums.LOW_POWER ? " (Recommended)" : "")
checked: Performance.getPerformancePreset() === PerformanceEnums.LOW_POWER checked: Performance.getPerformancePreset() === PerformanceEnums.LOW_POWER
onClicked: { onClicked: {

4
interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Button.qml
View file

@ -3,6 +3,7 @@
// //
// Created by Zach Fox on 2019-05-08 // Created by Zach Fox on 2019-05-08
// Copyright 2019 High Fidelity, Inc. // Copyright 2019 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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 id: buttonText
//topPadding: -2 // Necessary for proper alignment using Graphik Medium //topPadding: -2 // Necessary for proper alignment using Graphik Medium
wrapMode: Text.Wrap wrapMode: Text.Wrap
color: enabled ? simplifiedUI.colors.controls.button.text.enabled : simplifiedUI.colors.controls.button.text.disabled color: enabled ? simplifiedUI.colors.controls.button.text.enabled : simplifiedUI.colors.controls.button.text.disabled
size: simplifiedUI.sizes.controls.button.textSize
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: root.text text: root.text

3
scripts/simplifiedUI/ui/simplifiedUI.js
View file

@ -7,6 +7,7 @@
// Authors: Wayne Chen & Zach Fox // Authors: Wayne Chen & Zach Fox
// Created: 2019-05-01 // Created: 2019-05-01
// Copyright 2019 High Fidelity, Inc. // Copyright 2019 High Fidelity, Inc.
// Copyright 2022 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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 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() { function maybeRemoveDesktopMenu() {
if (!keepMenusSetting) { if (!keepMenusSetting) {
MENU_NAMES.forEach(function(menu) { MENU_NAMES.forEach(function(menu) {