From f8e49be141ce7469022ce2d0b56c8a504d2fc553 Mon Sep 17 00:00:00 2001 From: jriegel Date: Mon, 10 Feb 2014 21:25:41 +0100 Subject: [PATCH] Added new color types to Preferences --- src/Mod/Part/Gui/DlgSettingsObjectColor.cpp | 51 +- src/Mod/Part/Gui/DlgSettingsObjectColor.ui | 787 ++++++++++++++------ 2 files changed, 613 insertions(+), 225 deletions(-) diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp b/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp index 1ce9eb555..2bdb7b48c 100644 --- a/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp +++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp @@ -53,28 +53,59 @@ DlgSettingsObjectColor::~DlgSettingsObjectColor() void DlgSettingsObjectColor::saveSettings() { - CursorTextColor->onSave(); + // Part + DefaultShapeColor->onSave(); + DefaultShapeLineColor->onSave(); + DefaultShapeLineWidth->onSave(); + DefaultShapeVertexColor->onSave(); + DefaultShapeVertexWidth->onSave(); + BoundingBoxColor->onSave(); + + // Sketcher + SketchEdgeColor->onSave(); + SketchVertexColor->onSave(); EditedEdgeColor->onSave(); EditedVertexColor->onSave(); ConstructionColor->onSave(); FullyConstrainedColor->onSave(); - BoundingBoxColor->onSave(); - DefaultShapeColor->onSave(); - DefaultShapeLineColor->onSave(); - DefaultShapeLineWidth->onSave(); + + ConstrainedColor->onSave(); + DatumColor->onSave(); + + SketcherDatumWidth->onSave(); + DefaultSketcherVertexWidth->onSave(); + DefaultSketcherLineWidth->onSave(); + + CursorTextColor->onSave(); + } void DlgSettingsObjectColor::loadSettings() { - CursorTextColor->onRestore(); + // Part + DefaultShapeColor->onRestore(); + DefaultShapeLineColor->onRestore(); + DefaultShapeLineWidth->onRestore(); + DefaultShapeVertexColor->onRestore(); + DefaultShapeVertexWidth->onRestore(); + BoundingBoxColor->onRestore(); + + // Sketcher + SketchEdgeColor->onRestore(); + SketchVertexColor->onRestore(); EditedEdgeColor->onRestore(); EditedVertexColor->onRestore(); ConstructionColor->onRestore(); FullyConstrainedColor->onRestore(); - BoundingBoxColor->onRestore(); - DefaultShapeColor->onRestore(); - DefaultShapeLineColor->onRestore(); - DefaultShapeLineWidth->onRestore(); + + ConstrainedColor->onRestore(); + DatumColor->onRestore(); + + SketcherDatumWidth->onRestore(); + DefaultSketcherVertexWidth->onRestore(); + DefaultSketcherLineWidth->onRestore(); + + CursorTextColor->onRestore(); } /** diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui index 7913af994..26a15eaf1 100644 --- a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui +++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui @@ -6,192 +6,185 @@ 0 0 - 601 - 598 + 359 + 834 Object Colors - - - 9 - - - 6 - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + - Default colors + Default Part colors - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 0 - - - 6 - - - + + + + + - 240 + 182 0 - Edited edge color - - - - - - - Edited vertex color - - - - - - - Construction geometry - - - - - - - Fully constrained geometry - - - - - - - The color of construction geometry in edit mode - - - - 0 - 0 - 220 - - - - ConstructionColor - - - View - - - - - - - The color of fully constrained geometry in edit mode - - - - 0 - 255 - 0 - - - - FullyConstrainedColor - - - View - - - - - - - The color of vertices being edited - - - - 255 - 38 - 0 - - - - EditedVertexColor - - - View - - - - - - - The color of edges being edited - - - - 255 - 255 - 255 - - - - EditedEdgeColor - - - View - - - - - - - Cursor text color + Default shape color - - + + + The default color for new shapes + + - 0 - 0 - 255 + 204 + 204 + 204 - CursorTextColor + DefaultShapeColor + + + View + + + + + + + + 182 + 0 + + + + Default line color + + + + + + + The default line color for new shapes + + + + 25 + 25 + 25 + + + + DefaultShapeLineColor + + + View + + + + + + + + 182 + 0 + + + + Default line width + + + + + + + The default line thickness for new shapes + + + px + + + 9 + + + 2 + + + DefaultShapeLineWidth + + + View + + + + + + + + 182 + 0 + + + + Default vertex color + + + + + + + The default line color for new shapes + + + + 25 + 25 + 25 + + + + DefaultShapeVertexColor + + + View + + + + + + + + 182 + 0 + + + + Default vertex size + + + + + + + The default line thickness for new shapes + + + px + + + 9 + + + 2 + + + DefaultShapeVertexWidth View @@ -200,6 +193,12 @@ + + + 182 + 0 + + Bounding box color @@ -210,7 +209,7 @@ The color of bounding boxes in the 3D view - + 255 255 @@ -227,47 +226,32 @@ - - - - - - - 240 - 0 - - - - Default shape color - - - - - - - The default color for new shapes - - - - 204 - 204 - 204 - - - - DefaultShapeColor - - - View - - - - + + + + Qt::Horizontal + + + + 28 + 20 + + + - - + + + + + + + Sketcher colors + + + + - + 182 @@ -275,38 +259,355 @@ - Default line width and color + Default edge color - - + + - The default line color for new shapes + The color of edges being edited - + - 25 - 25 - 25 + 255 + 255 + 255 - DefaultShapeLineColor + SketchEdgeColor View - - + + + + + 182 + 0 + + + + Default vertex color + + + + + + + The color of vertices being edited + + + + 255 + 255 + 255 + + + + SketchVertexColor + + + View + + + + + + + + 182 + 0 + + + + Edit edge color + + + + + + + The color of edges being edited + + + + 255 + 255 + 255 + + + + EditedEdgeColor + + + View + + + + + + + + 182 + 0 + + + + Edit vertex color + + + + + + + The color of vertices being edited + + + + 255 + 38 + 0 + + + + EditedVertexColor + + + View + + + + + + + + 182 + 0 + + + + Construction geometry + + + + + + + The color of construction geometry in edit mode + + + + 0 + 0 + 220 + + + + ConstructionColor + + + View + + + + + + + + 182 + 0 + + + + Fully constrained geometry + + + + + + + The color of fully constrained geometry in edit mode + + + + 0 + 255 + 0 + + + + FullyConstrainedColor + + + View + + + + + + + + 182 + 0 + + + + Constrain color + + + + + + + The color of fully constrained geometry in edit mode + + + + 0 + 255 + 0 + + + + ConstrainedColor + + + View + + + + + + + + 182 + 0 + + + + Datum color + + + + + + + The color of fully constrained geometry in edit mode + + + + 0 + 255 + 0 + + + + DatumColor + + + View + + + + + + + + 182 + 0 + + + + Datum text size + + + + + The default line thickness for new shapes px + + 9 + + + 2 + + + DefaultSketcherVertexWidth + + + View + + + + + + + + 182 + 0 + + + + Default vertex size + + + + + + + The default line thickness for new shapes + + + px + + + 9 + + + 2 + + + DefaultSketcherVertexWidth + + + View + + + + + + + + 182 + 0 + + + + Default line width + + + + + + + The default line thickness for new shapes + + + px + + + 9 + 2 @@ -318,11 +619,67 @@ + + + + + 182 + 0 + + + + Cursor text color + + + + + + + + 0 + 0 + 255 + + + + CursorTextColor + + + View + + + + + + + Qt::Horizontal + + + + 74 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 217 + + + +