diff --git a/src/Mod/Measure/App/Preferences.cpp b/src/Mod/Measure/App/Preferences.cpp index 46b4cb0bb6..45d7b3fa4b 100644 --- a/src/Mod/Measure/App/Preferences.cpp +++ b/src/Mod/Measure/App/Preferences.cpp @@ -64,17 +64,7 @@ App::Color Preferences::defaultTextBackgroundColor() return fcColor; } -double Preferences::defaultDistFactor() -{ - return getPreferenceGroup("Appearance")->GetFloat("DefaultDistFactor", 1.0); -} - int Preferences::defaultFontSize() { return getPreferenceGroup("Appearance")->GetInt("DefaultFontSize", 18); } - -bool Preferences::defaultMirror() -{ - return getPreferenceGroup("Appearance")->GetBool("DefaultMirror", false); -} diff --git a/src/Mod/Measure/App/Preferences.h b/src/Mod/Measure/App/Preferences.h index 44f186c485..2cd2d1584d 100644 --- a/src/Mod/Measure/App/Preferences.h +++ b/src/Mod/Measure/App/Preferences.h @@ -46,9 +46,7 @@ public: static App::Color defaultLineColor(); static App::Color defaultTextColor(); - static double defaultDistFactor(); static int defaultFontSize(); - static bool defaultMirror(); static App::Color defaultTextBackgroundColor(); }; diff --git a/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.cpp b/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.cpp index fe6aa3ede1..b134464ea3 100644 --- a/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.cpp +++ b/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.cpp @@ -40,8 +40,6 @@ DlgPrefsMeasureAppearanceImp::~DlgPrefsMeasureAppearanceImp() void DlgPrefsMeasureAppearanceImp::saveSettings() { - ui->cbMirror->onSave(); - ui->dsbDistFactor->onSave(); ui->sbFontSize->onSave(); ui->cbText->onSave(); ui->cbLine->onSave(); @@ -54,8 +52,6 @@ void DlgPrefsMeasureAppearanceImp::loadSettings() ui->cbText->onRestore(); ui->cbBackground->onRestore(); ui->cbLine->onRestore(); - ui->cbMirror->onRestore(); - ui->dsbDistFactor->onRestore(); } /** diff --git a/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.ui b/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.ui index acaf50ff97..9ff737b10a 100644 --- a/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.ui +++ b/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.ui @@ -52,35 +52,18 @@ - - - + + + - Distance Factor + Text size - - + + - Text color - - - - - - - - 0 - 0 - 0 - - - - DefaultTextColor - - - Mod/Measure/Appearance + Line color @@ -103,6 +86,30 @@ + + + + + 0 + 0 + 0 + + + + DefaultTextBackgroundColor + + + Mod/Measure/Appearance + + + + + + + Background color + + + @@ -111,7 +118,7 @@ 0 - + 255 255 @@ -126,59 +133,16 @@ - - - - Text size - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 1.000000000000000 - - - DefaultDistFactor - - - Mod/Measure/Appearance - - - - - - - Line color - - - - - - - Mirror - - - DefaultMirror - - - Mod/Measure/Appearance - - - - + - Background color + Text color - - - + + + 0 0 @@ -186,7 +150,7 @@ - DefaultTextBackgroundColor + DefaultTextColor Mod/Measure/Appearance @@ -229,16 +193,6 @@ Gui::ColorButton
Gui/PrefWidgets.h
- - Gui::PrefCheckBox - QCheckBox -
Gui/PrefWidgets.h
-
- - Gui::PrefDoubleSpinBox - QDoubleSpinBox -
Gui/PrefWidgets.h
-