From b68bb653c85776fe8d985be4422f88474ded5f6b Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 9 Mar 2014 18:29:26 +0100 Subject: [PATCH] + fixes #0001393: Allow the user to set desired font size in pixels (used by sketcher constraints) in preferences --- src/Mod/Sketcher/Gui/SketcherSettings.cpp | 6 ++ src/Mod/Sketcher/Gui/SketcherSettings.ui | 69 +++++++++++++++++++-- src/Mod/Sketcher/Gui/ViewProviderSketch.cpp | 5 +- 3 files changed, 75 insertions(+), 5 deletions(-) diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.cpp b/src/Mod/Sketcher/Gui/SketcherSettings.cpp index 5dab75e24f9a..f9c158c22a35 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettings.cpp +++ b/src/Mod/Sketcher/Gui/SketcherSettings.cpp @@ -66,6 +66,9 @@ void SketcherSettings::saveSettings() ui->DefaultSketcherLineWidth->onSave(); ui->CursorTextColor->onSave(); + + // Sketch editing + ui->EditSketcherFontSize->onSave(); } void SketcherSettings::loadSettings() @@ -86,6 +89,9 @@ void SketcherSettings::loadSettings() ui->DefaultSketcherLineWidth->onRestore(); ui->CursorTextColor->onRestore(); + + // Sketch editing + ui->EditSketcherFontSize->onRestore(); } /** diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.ui b/src/Mod/Sketcher/Gui/SketcherSettings.ui index 1bb13076d2ba..73cc32f65c97 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettings.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettings.ui @@ -7,14 +7,14 @@ 0 0 359 - 834 + 544 Sketcher - - + + Sketcher colors @@ -439,7 +439,68 @@ - + + + + Sketch editing + + + + + + + + + 182 + 0 + + + + Font size + + + + + + + px + + + 1 + + + 100 + + + 17 + + + EditSketcherFontSize + + + View + + + + + + + + + Qt::Horizontal + + + + 71 + 20 + + + + + + + + Qt::Vertical diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index a655c2706976..aa3fda98b03d 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -2738,6 +2738,9 @@ void ViewProviderSketch::rebuildConstraintsVisual(void) edit->constrGroup->removeAllChildren(); edit->vConstrType.clear(); + ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View"); + int fontSize = hGrp->GetInt("EditSketcherFontSize", 17); + for (std::vector::const_iterator it=constrlist.begin(); it != constrlist.end(); ++it) { // root separator for one constraint SoSeparator *sep = new SoSeparator(); @@ -2772,7 +2775,7 @@ void ViewProviderSketch::rebuildConstraintsVisual(void) text->norm.setValue(norm); text->string = ""; text->textColor = ConstrDimColor; - text->size.setValue(17); + text->size.setValue(fontSize); text->useAntialiasing = false; SoAnnotation *anno = new SoAnnotation(); anno->renderCaching = SoSeparator::OFF;