From 56d8d37ab422fa9e3c4cebe4616e8e2306d2d044 Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Sat, 16 Aug 2025 13:26:07 +0200 Subject: [PATCH] Gui: Move style parameters to yaml files --- .../FreeCAD Dark/FreeCAD Dark.cfg | 62 ------------------- .../FreeCAD Light/FreeCAD Light.cfg | 62 ------------------- src/Gui/Stylesheets/CMakeLists.txt | 14 ++++- .../Stylesheets/parameters/FreeCAD Dark.yaml | 59 ++++++++++++++++++ .../Stylesheets/parameters/FreeCAD Light.yaml | 59 ++++++++++++++++++ 5 files changed, 131 insertions(+), 125 deletions(-) create mode 100644 src/Gui/Stylesheets/parameters/FreeCAD Dark.yaml create mode 100644 src/Gui/Stylesheets/parameters/FreeCAD Light.yaml diff --git a/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg b/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg index 23b1f6f52e..430b53146f 100644 --- a/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg +++ b/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg @@ -104,68 +104,6 @@ - - @BackgroundColor - @ButtonTopBackgroundColor - @GeneralBorderColor - @GeneralBorderColor - @PrimaryColorLighten2 - @PrimaryColorLighten3 - @TextEditFieldBackgroundColor - @GeneralBorderColor - @PrimaryColorLighten3 - @PrimaryColorLighten2 - @PrimaryColor - @PrimaryColorLighten4 - @PrimaryColorDarken5 - @PrimaryColorLighten6 - @PrimaryColorDarken3 - @PrimaryColorLighten3 - @PrimaryColor - @PrimaryColorLighten4 - lighten(@GroupboxBackgroundColor,20) - images_classic - 3px - @PrimaryColorDarken4 - #191919 - darken(@PrimaryColor,5) - darken(@PrimaryColor,8) - darken(@PrimaryColor,15) - darken(@PrimaryColor,20) - darken(@PrimaryColor,200) - darken(@PrimaryColor,5890) - lighten(@PrimaryColor,20) - lighten(@PrimaryColor,40) - lighten(@PrimaryColor,80) - lighten(@PrimaryColor,100) - lighten(@PrimaryColor,300) - lighten(@PrimaryColor,5890) - @CheckBoxBackgroundColor - @GeneralBorderColor - @GeneralDisabledBackgroundColor - #fc6c6c - #ffffff - #8cff5b - #fc6c6c - #77cbff - #ffa256 - #ff9090 - #ffffff - white - @PrimaryColorDarken5 - @PrimaryColorDarken2 - @3DViewBackgroundRefColor - darken(@TextForegroundColor,40) - @PrimaryColor - #ffffff - darken(@AccentColor,100) - #0095ff - 2px - @ThemeAccentColor1 - blend(@GeneralBackgroundColor,@AccentColor,60) - blend(@GeneralBackgroundHoverColor,@AccentColor,30) - - diff --git a/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg b/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg index 568f808d49..7f13118993 100644 --- a/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg +++ b/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg @@ -119,68 +119,6 @@ - - @BackgroundColor - @ButtonTopBackgroundColor - @GeneralBorderColor - @GeneralBorderColor - @PrimaryColorDarken1 - @PrimaryColorLighten3 - @TextEditFieldBackgroundColor - @GeneralBorderColor - @PrimaryColorLighten4 - @PrimaryColor - @PrimaryColor - @PrimaryColorLighten5 - @PrimaryColorDarken4 - @PrimaryColorDarken5 - @PrimaryColorDarken3 - @PrimaryColorDarken4 - @PrimaryColorDarken2 - @PrimaryColorLighten2 - darken(@GroupboxBackgroundColor,20) - images_classic - 3px - @PrimaryColorLighten1 - #F0F0F0 - darken(@PrimaryColor,4) - darken(@PrimaryColor,8) - darken(@PrimaryColor,10) - darken(@PrimaryColor,20) - darken(@PrimaryColor,200) - darken(@PrimaryColor,5890) - lighten(@PrimaryColor,2) - lighten(@PrimaryColor,3) - lighten(@PrimaryColor,4) - lighten(@PrimaryColor,5) - lighten(@PrimaryColor,6) - lighten(@PrimaryColor,7) - @CheckBoxBackgroundColor - @GeneralBorderColor - @GeneralDisabledBackgroundColor - #9d0000 - #000000 - #278100 - #9d0000 - #005991 - #ab4d00 - #9d0000 - #000000 - black - @PrimaryColorDarken4 - @PrimaryColorDarken2 - @3DViewBackgroundRefColor - darken(@TabbarBackgroundColor,80) - @PrimaryColorLighten3 - #000000 - @AccentHoverColor - #0061a7 - @ThemeAccentColor1 - blend(@GeneralBackgroundColor,@AccentColor,60) - blend(@GeneralBackgroundHoverColor,@AccentColor,30) - 2px - - diff --git a/src/Gui/Stylesheets/CMakeLists.txt b/src/Gui/Stylesheets/CMakeLists.txt index ac16f446dd..11ca09cb0a 100644 --- a/src/Gui/Stylesheets/CMakeLists.txt +++ b/src/Gui/Stylesheets/CMakeLists.txt @@ -6,6 +6,11 @@ SET(Stylesheets_Files "FreeCAD Light.qss" ) +SET(Parameters_Files + "parameters/FreeCAD Dark.yaml" + "parameters/FreeCAD Light.yaml" +) + SET(Overlay_Stylesheets_Files "overlay/Freecad Overlay.qss" #remove below after testing new stylesheet system 8/6/2025 @@ -35,11 +40,12 @@ SOURCE_GROUP("overlay_icons" FILES ${Overlay_icons}) ADD_CUSTOM_TARGET(Stylesheets_data ALL - SOURCES ${Stylesheets_Files} ${Images_Files} ${Images_Files2} ${Overlay_Stylesheets_Files} ${Overlay_icons} + SOURCES ${Stylesheets_Files} ${Parameters_Files} ${Images_Files} ${Images_Files2} ${Overlay_Stylesheets_Files} ${Overlay_icons} ) fc_copy_sources(Stylesheets_data "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Gui/Stylesheets" ${Stylesheets_Files} + ${Parameters_Files} ${Images_Files} ${Images_Files2} ${Overlay_Stylesheets_Files} @@ -51,6 +57,12 @@ INSTALL( DESTINATION ${CMAKE_INSTALL_DATADIR}/Gui/Stylesheets ) +INSTALL( + FILES + ${Parameters_Files} + DESTINATION + ${CMAKE_INSTALL_DATADIR}/Gui/Stylesheets/parameters +) INSTALL( FILES ${Overlay_Stylesheets_Files} diff --git a/src/Gui/Stylesheets/parameters/FreeCAD Dark.yaml b/src/Gui/Stylesheets/parameters/FreeCAD Dark.yaml new file mode 100644 index 0000000000..82ab75dab1 --- /dev/null +++ b/src/Gui/Stylesheets/parameters/FreeCAD Dark.yaml @@ -0,0 +1,59 @@ +3DViewBackgroundRefColor: "@BackgroundColor" +ButtonBackgroundHooverColor: "@ButtonTopBackgroundColor" +ButtonBorderColor: "@GeneralBorderColor" +ButtonBorderHooverColor: "@GeneralBorderColor" +ButtonBottomBackgroundColor: "@PrimaryColorLighten2" +ButtonTopBackgroundColor: "@PrimaryColorLighten3" +CheckBoxBackgroundColor: "@TextEditFieldBackgroundColor" +CheckBoxBorderColor: "@GeneralBorderColor" +DialogBackgroundColor: "@PrimaryColorLighten3" +GeneralAlternateBackgroundColor: "@PrimaryColorLighten2" +GeneralBackgroundColor: "@PrimaryColor" +GeneralBackgroundHoverColor: "@PrimaryColorLighten4" +GeneralBorderColor: "@PrimaryColorDarken5" +GeneralBorderHoverColor: "@PrimaryColorLighten6" +GeneralDisabledBackgroundColor: "@PrimaryColorDarken3" +GeneralGridLinesColor: "@PrimaryColorLighten3" +GeneralHeaderBackgroundColor: "@PrimaryColor" +GroupboxBackgroundColor: "@PrimaryColorLighten4" +GroupboxBorderColor: "lighten(@GroupboxBackgroundColor,20)" +IconsLocationFolderName: "images_classic" +InputFieldBorderRadius: "3px" +MenuBackgroundColor: "@PrimaryColorDarken4" +PrimaryColor: "#191919" +PrimaryColorDarken1: "darken(@PrimaryColor,5)" +PrimaryColorDarken2: "darken(@PrimaryColor,8)" +PrimaryColorDarken3: "darken(@PrimaryColor,15)" +PrimaryColorDarken4: "darken(@PrimaryColor,20)" +PrimaryColorDarken5: "darken(@PrimaryColor,200)" +PrimaryColorDarken6: "darken(@PrimaryColor,5890)" +PrimaryColorLighten1: "lighten(@PrimaryColor,20)" +PrimaryColorLighten2: "lighten(@PrimaryColor,40)" +PrimaryColorLighten3: "lighten(@PrimaryColor,80)" +PrimaryColorLighten4: "lighten(@PrimaryColor,100)" +PrimaryColorLighten5: "lighten(@PrimaryColor,300)" +PrimaryColorLighten6: "lighten(@PrimaryColor,5890)" +RadioButtonBackgroundColor: "@CheckBoxBackgroundColor" +RadioButtonBorderColor: "@GeneralBorderColor" +ScrollbarBackgroundColor: "@GeneralDisabledBackgroundColor" +SketcherConflictingConstraintsColor: "#fc6c6c" +SketcherEmptySketchColor: "#ffffff" +SketcherFullyConstrainedColor: "#8cff5b" +SketcherMalformedConstraintsColor: "#fc6c6c" +SketcherPartiallyRedundantConstraintsColor: "#77cbff" +SketcherRedundantConstraintsColor: "#ffa256" +SketcherSolverFailedColor: "#ff9090" +SketcherUnderConstrainedColor: "#ffffff" +StylesheetIconsColor: "white" +TabbarBackgroundColor: "@PrimaryColorDarken5" +InActiveTabBackgroundColor: "@PrimaryColorDarken2" +ActiveTabBackgroundColor: "@3DViewBackgroundRefColor" +TextDisabledColor: "darken(@TextForegroundColor,40)" +TextEditFieldBackgroundColor: "@PrimaryColor" +TextForegroundColor: "#ffffff" +TextSelectBackgroundColor: "darken(@AccentColor,100)" +TextUrlColor: "#0095ff" +ToolbarButtonsPadding: "2px" +AccentColor: "@ThemeAccentColor1" +AccentBackgroundColor: "blend(@GeneralBackgroundColor,@AccentColor,60)" +AccentHoverColor: "blend(@GeneralBackgroundHoverColor,@AccentColor,30)" diff --git a/src/Gui/Stylesheets/parameters/FreeCAD Light.yaml b/src/Gui/Stylesheets/parameters/FreeCAD Light.yaml new file mode 100644 index 0000000000..31621e39cb --- /dev/null +++ b/src/Gui/Stylesheets/parameters/FreeCAD Light.yaml @@ -0,0 +1,59 @@ +3DViewBackgroundRefColor: "@BackgroundColor" +ButtonBackgroundHooverColor: "@ButtonTopBackgroundColor" +ButtonBorderColor: "@GeneralBorderColor" +ButtonBorderHooverColor: "@GeneralBorderColor" +ButtonBottomBackgroundColor: "@PrimaryColorDarken1" +ButtonTopBackgroundColor: "@PrimaryColorLighten3" +CheckBoxBackgroundColor: "@TextEditFieldBackgroundColor" +CheckBoxBorderColor: "@GeneralBorderColor" +DialogBackgroundColor: "@PrimaryColorLighten4" +GeneralAlternateBackgroundColor: "@PrimaryColor" +GeneralBackgroundColor: "@PrimaryColor" +GeneralBackgroundHoverColor: "@PrimaryColorLighten5" +GeneralBorderColor: "@PrimaryColorDarken4" +GeneralBorderHoverColor: "@PrimaryColorDarken5" +GeneralDisabledBackgroundColor: "@PrimaryColorDarken3" +GeneralGridLinesColor: "@PrimaryColorDarken4" +GeneralHeaderBackgroundColor: "@PrimaryColorDarken2" +GroupboxBackgroundColor: "@PrimaryColorLighten2" +GroupboxBorderColor: "darken(@GroupboxBackgroundColor,20)" +IconsLocationFolderName: "images_classic" +InputFieldBorderRadius: "3px" +MenuBackgroundColor: "@PrimaryColorLighten1" +PrimaryColor: "#F0F0F0" +PrimaryColorDarken1: "darken(@PrimaryColor,4)" +PrimaryColorDarken2: "darken(@PrimaryColor,8)" +PrimaryColorDarken3: "darken(@PrimaryColor,10)" +PrimaryColorDarken4: "darken(@PrimaryColor,20)" +PrimaryColorDarken5: "darken(@PrimaryColor,200)" +PrimaryColorDarken6: "darken(@PrimaryColor,5890)" +PrimaryColorLighten1: "lighten(@PrimaryColor,2)" +PrimaryColorLighten2: "lighten(@PrimaryColor,3)" +PrimaryColorLighten3: "lighten(@PrimaryColor,4)" +PrimaryColorLighten4: "lighten(@PrimaryColor,5)" +PrimaryColorLighten5: "lighten(@PrimaryColor,6)" +PrimaryColorLighten6: "lighten(@PrimaryColor,7)" +RadioButtonBackgroundColor: "@CheckBoxBackgroundColor" +RadioButtonBorderColor: "@GeneralBorderColor" +ScrollbarBackgroundColor: "@GeneralDisabledBackgroundColor" +SketcherConflictingConstraintsColor: "#9d0000" +SketcherEmptySketchColor: "#000000" +SketcherFullyConstrainedColor: "#278100" +SketcherMalformedConstraintsColor: "#9d0000" +SketcherPartiallyRedundantConstraintsColor: "#005991" +SketcherRedundantConstraintsColor: "#ab4d00" +SketcherSolverFailedColor: "#9d0000" +SketcherUnderConstrainedColor: "#000000" +StylesheetIconsColor: "black" +TabbarBackgroundColor: "@PrimaryColorDarken4" +InActiveTabBackgroundColor: "@PrimaryColorDarken2" +ActiveTabBackgroundColor: "@3DViewBackgroundRefColor" +TextDisabledColor: "darken(@TabbarBackgroundColor,80)" +TextEditFieldBackgroundColor: "@PrimaryColorLighten3" +TextForegroundColor: "#000000" +TextSelectBackgroundColor: "@AccentHoverColor" +TextUrlColor: "#0061a7" +AccentColor: "@ThemeAccentColor1" +AccentBackgroundColor: "blend(@GeneralBackgroundColor,@AccentColor,60)" +AccentHoverColor: "blend(@GeneralBackgroundHoverColor,@AccentColor,30)" +ToolbarButtonsPadding: "2px"