From 1762bec1c224ee4fa0e95bd7adcb26fd3ec015b9 Mon Sep 17 00:00:00 2001 From: Emma Broman Date: Tue, 25 Apr 2023 11:29:41 +0200 Subject: [PATCH] Make the Enabled properties advanced, show in GUI, and change name Update GUI hash to show enabled property --- data/assets/util/webgui.asset | 2 +- modules/cefwebgui/cefwebguimodule.cpp | 2 +- modules/globebrowsing/src/geojson/geojsoncomponent.cpp | 4 ++-- modules/imgui/imguimodule.cpp | 2 +- modules/imgui/src/guicomponent.cpp | 2 +- modules/server/src/serverinterface.cpp | 2 +- modules/space/labelscomponent.cpp | 4 ++-- src/rendering/dashboarditem.cpp | 4 ++-- src/rendering/renderable.cpp | 4 ++-- src/rendering/screenspacerenderable.cpp | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset index 922c67841f..60c2d60920 100644 --- a/data/assets/util/webgui.asset +++ b/data/assets/util/webgui.asset @@ -3,7 +3,7 @@ asset.require("./static_server") local guiCustomization = asset.require("customization/gui") -- Select which commit hashes to use for the frontend and backend -local frontendHash = "aaca14dffeb9aed1163c01651e2a6c3c5a01d2ec" +local frontendHash = "7fc3d9550dbdf64740519c7c5d7fc8e5385b7191" local dataProvider = "data.openspaceproject.com/files/webgui" local frontend = asset.syncedResource({ diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp index d6a0c8fa73..9d10c38408 100644 --- a/modules/cefwebgui/cefwebguimodule.cpp +++ b/modules/cefwebgui/cefwebguimodule.cpp @@ -40,7 +40,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", - "Is Enabled", + "Enabled", "This setting determines whether the browser should be enabled or not", openspace::properties::Property::Visibility::AdvancedUser }; diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp index 4b8387e35c..05b6fd73bc 100644 --- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp +++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp @@ -60,9 +60,9 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", - "Is Enabled", + "Enabled", "This setting determines whether this object will be visible or not", - openspace::properties::Property::Visibility::NoviceUser + openspace::properties::Property::Visibility::AdvancedUser }; constexpr openspace::properties::Property::PropertyInfo FileInfo = { diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp index 95492d3efb..773cbe2dd7 100644 --- a/modules/imgui/imguimodule.cpp +++ b/modules/imgui/imguimodule.cpp @@ -54,7 +54,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", - "Is Enabled", + "Enabled", "This setting determines whether this object will be visible or not", openspace::properties::Property::Visibility::Developer }; diff --git a/modules/imgui/src/guicomponent.cpp b/modules/imgui/src/guicomponent.cpp index 09cad8b2ce..e4661c73d0 100644 --- a/modules/imgui/src/guicomponent.cpp +++ b/modules/imgui/src/guicomponent.cpp @@ -27,7 +27,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", - "Is Enabled", + "Enabled", "This setting determines whether this object will be visible or not", // @VISIBILITY(3.4) openspace::properties::Property::Visibility::AdvancedUser diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp index b236c0e596..5f4798e48d 100644 --- a/modules/server/src/serverinterface.cpp +++ b/modules/server/src/serverinterface.cpp @@ -39,7 +39,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", - "Is Enabled", + "Enabled", "This setting determines whether this server interface is enabled or not", openspace::properties::Property::Visibility::AdvancedUser }; diff --git a/modules/space/labelscomponent.cpp b/modules/space/labelscomponent.cpp index 9bbf8ee35e..3beb097f64 100644 --- a/modules/space/labelscomponent.cpp +++ b/modules/space/labelscomponent.cpp @@ -41,11 +41,11 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", - "Is Enabled", + "Enabled", "This setting determines whether the labels will be visible or not. They are " "disabled per default", // @VISIBILITY(?) - openspace::properties::Property::Visibility::NoviceUser + openspace::properties::Property::Visibility::AdvancedUser }; constexpr openspace::properties::Property::PropertyInfo FileInfo = { diff --git a/src/rendering/dashboarditem.cpp b/src/rendering/dashboarditem.cpp index ab2eb27ac5..a187389be7 100644 --- a/src/rendering/dashboarditem.cpp +++ b/src/rendering/dashboarditem.cpp @@ -36,10 +36,10 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", - "Is Enabled", + "Enabled", "If this value is set to 'true' this dashboard item is shown in the dashboard", // @VISIBILITY(1.75) - openspace::properties::Property::Visibility::NoviceUser + openspace::properties::Property::Visibility::AdvancedUser }; struct [[codegen::Dictionary(DashboardItem)]] Parameters { diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp index 89fa5a45f8..adb42c8d5f 100644 --- a/src/rendering/renderable.cpp +++ b/src/rendering/renderable.cpp @@ -44,10 +44,10 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", - "Is Enabled", + "Enabled", "This setting determines whether this object will be visible or not", // @VISIBILITY(0.33) - openspace::properties::Property::Visibility::NoviceUser + openspace::properties::Property::Visibility::AdvancedUser }; constexpr openspace::properties::Property::PropertyInfo RenderableTypeInfo = { diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp index b0915128d2..b615c75380 100644 --- a/src/rendering/screenspacerenderable.cpp +++ b/src/rendering/screenspacerenderable.cpp @@ -49,9 +49,9 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", - "Is Enabled", + "Enabled", "This setting determines whether this sceen space plane will be visible or not", - openspace::properties::Property::Visibility::NoviceUser + openspace::properties::Property::Visibility::AdvancedUser }; constexpr openspace::properties::Property::PropertyInfo