diff --git a/src/Mod/Sketcher/Gui/SketcherSettingsColors.ui b/src/Mod/Sketcher/Gui/SketcherSettingsColors.ui index bc575a9157..a34ac63724 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettingsColors.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettingsColors.ui @@ -6,62 +6,28 @@ 0 0 - 375 - 627 + 689 + 893 Colors - - - + + + - Sketcher colors + Colors outside Sketcher - - - - - - - Default edge color - - - - - - - Color of edges - - - - 255 - 255 - 255 - - - - SketchEdgeColor - - - View - - - - - - - Default vertex color - - - - + + + + Color of vertices - + 255 255 @@ -76,19 +42,91 @@ - - - - Making line color + + + + Color of edges + + + + 255 + 255 + 255 + + + + SketchEdgeColor + + + View - + + + + Default vertex + + + + + + + + 240 + 0 + + + + Default edge + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Working colors + + + + + + + + + 240 + 0 + + + + Coordinate text + + + + Color used while new sketch elements are created - + 204 204 @@ -103,19 +141,220 @@ - - - - Edit edge color + + + + Color of crosshair cursor. +(The one you get when creating a new sketch element.) + + + + 255 + 255 + 255 + + + + CursorCrosshairColor + + + View - + + + + + 240 + 0 + + + + Creating line + + + + + + + Text color of the coordinates + + + + 0 + 0 + 255 + + + + CursorTextColor + + + View + + + + + + + Cursor crosshair + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Geometric element colors + + + + + + + + Invalid Sketch + + + + + + + + 240 + 0 + + + + Fully constrained Sketch + + + + + + + + 0 + 0 + + + + Color of fully constrained geometry in edit mode + + + + 0 + 255 + 0 + + + + FullyConstrainedColor + + + View + + + + + + + + 0 + 0 + + + + Color of geometry indicating an invalid sketch + + + + 255 + 109 + 0 + + + + InvalidSketchColor + + + View + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + 240 + 0 + + + + Internal alignment edge + + + + + + + + 120 + 0 + + + + Unconstrained + + + + + + + 0 + 0 + + Color of edges being edited - + 255 255 @@ -130,19 +369,25 @@ - - + + - Edit vertex color + Edit edge - + + + + 0 + 0 + + Color of vertices being edited - + 255 38 @@ -158,180 +403,24 @@ - + - Construction geometry + Edit vertex - - - - Color of construction geometry in edit mode - - - - 0 - 0 - 220 - - - - ConstructionColor - - - View - - - - - - - Internal alignment edge color - - - - - - - Color of edges of internal alignment geometry - - - - 178 - 178 - 127 - - - - InternalAlignedGeoColor - - - View - - - - - - - External geometry - - - - - - - Color of external geometry in edit mode - - - - 204 - 51 - 115 - - - - ExternalColor - - - View - - - - - - - Invalid Sketch - - - - - - - Color of geometry indicating an invalid sketch - - - - 255 - 109 - 0 - - - - InvalidSketchColor - - - View - - - - - - - Fully constrained geometry - - - - - - - Color of fully constrained geometry in edit mode - - - - 0 - 255 - 0 - - - - FullyConstrainedColor - - - View - - - - - - - Fully constrained edit edge color - - - - - - - Color of fully constrained edge color in edit mode - - - - 128 - 208 - 160 - - - - FullyConstraintElementColor - - - View - - - - - - - Fully constrained edit construction edge color - - - - + + + + 0 + 0 + + Color of fully constrained construction edge color in edit mode - + 143 169 @@ -346,19 +435,103 @@ - - + + - Fully constrained edit internal alignment edge color + Construction geometry - + + + + + 0 + 0 + + + + Color of edges of internal alignment geometry + + + + 178 + 178 + 127 + + + + InternalAlignedGeoColor + + + View + + + + + + + + 0 + 0 + + + + Color of construction geometry in edit mode + + + + 0 + 0 + 220 + + + + ConstructionColor + + + View + + + + + + + + 0 + 0 + + + + Color of fully constrained edge color in edit mode + + + + 128 + 208 + 160 + + + + FullyConstraintElementColor + + + View + + + + + + + 0 + 0 + + Color of fully constrained internal alignment edge color in edit mode - + 222 222 @@ -373,19 +546,51 @@ - - - - Fully constrained edit vertex color + + + + + 0 + 0 + + + + Color of external geometry in edit mode + + + + 204 + 51 + 115 + + + + ExternalColor + + + View - + + + + External geometry + + + + + + + 0 + 0 + + Color of fully constrained vertex color in edit mode - + 255 149 @@ -400,46 +605,51 @@ - - + + + + + 120 + 0 + + - Constraint color + Constrained - - - - Color of driving constraints in edit mode + + + + Qt::Horizontal - - - 255 - 38 - 0 - + + + 40 + 20 + - - ConstrainedIcoColor - - - View - - + - - - - Reference constraint color - - - - + + + + + + + + + Constraint colors + + + + + Color of reference constraints in edit mode - + 0 38 @@ -454,19 +664,53 @@ - - - - Expression dependent constraint color + + + + Color of driving constraints in edit mode + + + + 255 + 38 + 0 + + + + ConstrainedIcoColor + + + View - + + + + Deactivated constraint + + + + + + + Expression dependent constraint + + + + + + + Dimensional constraint + + + + Color of expression dependent constraints in edit mode - + 255 127 @@ -481,19 +725,12 @@ - - - - Deactivated constraint color - - - - + Color of deactivated constraints in edit mode - + 127 127 @@ -508,19 +745,32 @@ - - + + + + + 240 + 0 + + - Dimensional constraint color + Constraint symbols - + + + + Reference constraint + + + + Color of dimensional driving constraints - + 255 38 @@ -535,67 +785,25 @@ - - - - Coordinate text color - - - - - - - Text color of the coordinates - - - - 0 - 0 - 255 - - - - CursorTextColor - - - View - - - - - - - Cursor crosshair color - - - - - - - Color of crosshair cursor. -(The one you get when creating a new sketch element.) - - - - 255 - 255 - 255 - - - - CursorCrosshairColor - - - View - - - + + + + Qt::Horizontal + + + + 40 + 20 + + + + - + Qt::Vertical @@ -616,11 +824,6 @@ QPushButton
Gui/Widgets.h
- - Gui::PrefSpinBox - QSpinBox -
Gui/PrefWidgets.h
- Gui::PrefColorButton Gui::ColorButton