Skip to content

Commit

Permalink
Stylesheet fixes part IV - A new hope (to be done for 1.0) (FreeCAD#1…
Browse files Browse the repository at this point in the history
…5586)

* Qcolor dialog fixes

* Fix for white hoover on tabbar

* Changes active color and selected feature color

* update same colors in cfg

* fix for tab pan in material editor

* some fixes

mostly theme accent colors fixes.

* fixed text edit being cut off

FreeCAD#15603

* extend arrow fix

FreeCAD#15616

* checkboxes links qpushbuttons etc.

Fixed FreeCAD#15610 (comment)
and hopefully also
FreeCAD#15136 (comment)

* fixed selection-text color in the preference menu also White is white.

* forgot checkbox spacing for light

* colors update

fix for FreeCAD#15660 (comment)
and
FreeCAD#15620 (comment)

* Delete CMakeSettings.json

* get out of here

* title a tat higher

* change rubberband from white to blue to make it work with white background.

* setting the colors.

* tree colors
  • Loading branch information
MisterMakerNL committed Jul 29, 2024
1 parent 04acc05 commit c4bb689
Show file tree
Hide file tree
Showing 9 changed files with 121 additions and 90 deletions.
4 changes: 2 additions & 2 deletions src/Gui/GLPainter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ Rubberband::Rubberband() : viewer(nullptr)
working = false;
stipple = true;

rgb_r = 1.0f;
rgb_g = 1.0f;
rgb_r = 0.27f;
rgb_g = 0.4f;
rgb_b = 1.0f;
rgb_a = 1.0f;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Gui/PreferencePacks/FreeCAD Classic/FreeCAD Classic.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@
<FCUInt Name="DefaultShapeColor" Value="3435980543"/>
</FCParamGroup>
<FCParamGroup Name="TreeView">
<FCUInt Name="TreeEditColor" Value="4294902015"/>
<FCUInt Name="TreeActiveColor" Value="3873898495"/>
<FCUInt Name="TreeEditColor" Value="563609599"/>
<FCUInt Name="TreeActiveColor" Value="1538528255"/>
</FCParamGroup>
<FCParamGroup Name="MainWindow">
<FCBool Name="TiledBackground" Value="0"/>
Expand Down
8 changes: 7 additions & 1 deletion src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
<FCParamGroup Name="Root">
<FCParamGroup Name="BaseApp">
<FCParamGroup Name="Preferences">
<FCParamGroup Name="Themes">
<FCUInt Name="ThemeAccentColor1" Value="1252392959"/>
<FCUInt Name="ThemeAccentColor2" Value="3027763199"/>
<FCUInt Name="ThemeAccentColor3" Value="4290017279"/>
</FCParamGroup>
<FCParamGroup Name="View">
<FCUInt Name="SketchEdgeColor" Value="4059297279"/>
<FCUInt Name="SketchVertexColor" Value="4059297279"/>
Expand Down Expand Up @@ -34,6 +39,7 @@
<FCInt Name="AntiAliasing" Value="4"/>
<FCInt Name="RenderCache" Value="0"/>
<FCInt Name="SegmentsPerGeometry" Value="100"/>
<FCUInt Name="BoundingBoxColor" Value="4059297279"/>
<FCFloat Name="BoundingBoxFontSize" Value="10.000000000000"/>
<FCFloat Name="ViewScalingFactor" Value="1.000000000000"/>
<FCBool Name="EnableBacklight" Value="1"/>
Expand All @@ -44,7 +50,7 @@
<FCBool Name="UseBackgroundColorMid" Value="0"/>
<FCInt Name="BacklightIntensity" Value="70"/>
<FCInt Name="DefaultShapeTransparency" Value="0"/>
<FCBool Name="Simple" Value="1"/>
<FCBool Name="Simple" Value="1"/>
<FCUInt Name="AnnotationTextColor" Value="2914369023"/>
<FCUInt Name="BackgroundColor" Value="993737727"/>
<FCUInt Name="BackgroundColor2" Value="1482187775"/>
Expand Down
8 changes: 7 additions & 1 deletion src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
<FCParamGroup Name="Root">
<FCParamGroup Name="BaseApp">
<FCParamGroup Name="Preferences">
<FCParamGroup Name="Themes">
<FCUInt Name="ThemeAccentColor1" Value="1252392959"/>
<FCUInt Name="ThemeAccentColor2" Value="3027763199"/>
<FCUInt Name="ThemeAccentColor3" Value="4290017279"/>
</FCParamGroup>
<FCParamGroup Name="Mod">
<FCParamGroup Name="Start">
<FCBool Name="FileCardUseStyleSheet" Value="0"/>
Expand Down Expand Up @@ -44,7 +49,7 @@
<FCUInt Name="LightTextColor" Value="1230002175"/>
<FCUInt Name="TemplateUnderlineColor" Value="995875839"/>
</FCParamGroup>
<FCParamGroup Name="Dimensions">
<FCParamGroup Name="Dimensions">
<FCUInt Name="Color" Value="556083711"/>
</FCParamGroup>
<FCParamGroup Name="Markups">
Expand Down Expand Up @@ -97,6 +102,7 @@
<FCInt Name="ConstructionPattern" Value="64764"/>
<FCInt Name="InternalPattern" Value="61166"/>
<FCInt Name="ExternalPattern" Value="58596"/>
<FCUInt Name="BoundingBoxColor" Value="556083711"/>
</FCParamGroup>
<FCBool Name="AutoRemoveRedundants" Value="1"/>
</FCParamGroup>
Expand Down
14 changes: 7 additions & 7 deletions src/Gui/PreferencePages/DlgSettingsViewColor.ui
Original file line number Diff line number Diff line change
Expand Up @@ -342,9 +342,9 @@
</property>
<property name="color" stdset="0">
<color>
<red>255</red>
<green>255</green>
<blue>0</blue>
<red>94</red>
<green>170</green>
<blue>35</blue>
</color>
</property>
<property name="prefEntry" stdset="0">
Expand Down Expand Up @@ -373,11 +373,11 @@
<property name="toolTip">
<string>Background color for active containers in tree view</string>
</property>
<property name="color" stdset="0">
<property name="color" stdset="0">rgb(60, 145, 252)
<color>
<red>230</red>
<green>230</green>
<blue>255</blue>
<red>60</red>
<green>145</green>
<blue>252</blue>
</color>
</property>
<property name="prefEntry" stdset="0">
Expand Down
Loading

0 comments on commit c4bb689

Please sign in to comment.