From fe1cfca339f1e5f694404d62061efbf9e853ce20 Mon Sep 17 00:00:00 2001 From: hasecilu Date: Wed, 4 Sep 2024 19:05:56 -0600 Subject: [PATCH] Gui: Add suffix to programatically generated preference page's spinboxes Units contain a leading space. Command to generate the C++ code on `src` dir: $ python3 -m cogapp -r Gui/PreferencePages/DlgSettingsAdvanced.{h,cpp} --- src/Gui/OverlayParams.py | 32 ++--- .../PreferencePages/DlgSettingsAdvanced.cpp | 119 +++++++++++------- src/Gui/PreferencePages/DlgSettingsAdvanced.h | 1 - src/Gui/TreeParams.py | 4 +- src/Tools/params_utils.py | 15 ++- 5 files changed, 103 insertions(+), 68 deletions(-) diff --git a/src/Gui/OverlayParams.py b/src/Gui/OverlayParams.py index effa6816c1..fde13a371b 100644 --- a/src/Gui/OverlayParams.py +++ b/src/Gui/OverlayParams.py @@ -99,9 +99,9 @@ class ParamAnimationCurve(ParamProxy): Params = [ ParamBool('DockOverlayAutoView', True, on_change=True, title="Auto hide in non 3D view"), - ParamInt('DockOverlayDelay', 200, "Overlay dock (re),layout delay.", title="Layout delay (ms)", proxy=ParamSpinBox(0, 5000, 100)), + ParamInt('DockOverlayDelay', 200, "Overlay dock (re),layout delay.", title="Layout delay", proxy=ParamSpinBox(0, 5000, 100, suffix=" ms")), ParamInt('DockOverlayRevealDelay', 2000), - ParamInt('DockOverlaySplitterHandleTimeout', 0, title="Splitter auto hide delay (ms)", proxy=ParamSpinBox(0, 99999, 100), + ParamInt('DockOverlaySplitterHandleTimeout', 0, title="Splitter auto hide delay", proxy=ParamSpinBox(0, 99999, 100, suffix=" ms"), doc="Overlay splitter handle auto hide delay. Set zero to disable auto hiding."), ParamBool('DockOverlayActivateOnHover', True, title="Activate on hover", doc="Show auto hidden dock overlay on mouse over.\n" @@ -110,41 +110,41 @@ Params = [ "Auto mouse click through transparent part of dock overlay.", title="Auto mouse pass through"), ParamBool('DockOverlayWheelPassThrough', True, "Auto pass through mouse wheel event on transparent dock overlay.", title="Auto mouse wheel pass through"), - ParamInt('DockOverlayWheelDelay', 1000, title="Delay mouse wheel pass through (ms)", proxy=ParamSpinBox(0, 99999, 1), + ParamInt('DockOverlayWheelDelay', 1000, title="Delay mouse wheel pass through", proxy=ParamSpinBox(0, 99999, 1, suffix=" ms"), doc="Delay capturing mouse wheel event for passing through if it is\n" "previously handled by other widget."), - ParamInt('DockOverlayAlphaRadius', 2, title="Alpha test radius", proxy=ParamSpinBox(1, 100, 1), doc=\ + ParamInt('DockOverlayAlphaRadius', 2, title="Alpha test radius", proxy=ParamSpinBox(1, 100, 1, suffix=" px"), doc=\ "If auto mouse click through is enabled, then this radius\n" "defines a region of alpha test under the mouse cursor.\n" "Auto click through is only activated if all pixels within\n" "the region are non-opaque."), ParamBool('DockOverlayCheckNaviCube', True, on_change=True, title="Check Navigation Cube", doc="Leave space for Navigation Cube in dock overlay"), - ParamInt('DockOverlayHintTriggerSize', 16, title="Hint trigger size", proxy=ParamSpinBox(1, 100, 1), + ParamInt('DockOverlayHintTriggerSize', 16, title="Hint trigger size", proxy=ParamSpinBox(1, 100, 1, suffix=" px"), doc="Auto hide hint visual display triggering width"), - ParamInt('DockOverlayHintSize', 8, title="Hint width", proxy=ParamSpinBox(1, 100, 1), + ParamInt('DockOverlayHintSize', 8, title="Hint width", proxy=ParamSpinBox(1, 100, 1, suffix=" px"), doc="Auto hide hint visual display width"), - ParamInt('DockOverlayHintLeftLength', 100, title='Left panel hint length', proxy=ParamSpinBox(0, 10000, 10), + ParamInt('DockOverlayHintLeftLength', 100, title='Left panel hint length', proxy=ParamSpinBox(0, 10000, 10, suffix=" px"), doc="Auto hide hint visual display length for left panel. Set to zero to fill the space."), - ParamInt('DockOverlayHintRightLength', 100, title='Right panel hint length', proxy=ParamSpinBox(0, 10000, 10), + ParamInt('DockOverlayHintRightLength', 100, title='Right panel hint length', proxy=ParamSpinBox(0, 10000, 10, suffix=" px"), doc="Auto hide hint visual display length for right panel. Set to zero to fill the space."), - ParamInt('DockOverlayHintTopLength', 100, title='Top panel hint length', proxy=ParamSpinBox(0, 10000, 10), + ParamInt('DockOverlayHintTopLength', 100, title='Top panel hint length', proxy=ParamSpinBox(0, 10000, 10, suffix=" px"), doc="Auto hide hint visual display length for top panel. Set to zero to fill the space."), - ParamInt('DockOverlayHintBottomLength', 100, title='Bottom panel hint length', proxy=ParamSpinBox(0, 10000, 10), + ParamInt('DockOverlayHintBottomLength', 100, title='Bottom panel hint length', proxy=ParamSpinBox(0, 10000, 10, suffix=" px"), doc="Auto hide hint visual display length for bottom panel. Set to zero to fill the space."), - ParamInt('DockOverlayHintLeftOffset', 0, title='Left panel hint offset', proxy=ParamSpinBox(0, 10000, 10), + ParamInt('DockOverlayHintLeftOffset', 0, title='Left panel hint offset', proxy=ParamSpinBox(0, 10000, 10, suffix=" px"), doc="Auto hide hint visual display offset for left panel"), - ParamInt('DockOverlayHintRightOffset', 0, title='Right panel hint offset', proxy=ParamSpinBox(0, 10000, 10), + ParamInt('DockOverlayHintRightOffset', 0, title='Right panel hint offset', proxy=ParamSpinBox(0, 10000, 10, suffix=" px"), doc="Auto hide hint visual display offset for right panel"), - ParamInt('DockOverlayHintTopOffset', 0, title='Top panel hint offset', proxy=ParamSpinBox(0, 10000, 10), + ParamInt('DockOverlayHintTopOffset', 0, title='Top panel hint offset', proxy=ParamSpinBox(0, 10000, 10, suffix=" px"), doc="Auto hide hint visual display offset for top panel"), - ParamInt('DockOverlayHintBottomOffset', 0, title='Bottom panel hint offset', proxy=ParamSpinBox(0, 10000, 10), + ParamInt('DockOverlayHintBottomOffset', 0, title='Bottom panel hint offset', proxy=ParamSpinBox(0, 10000, 10, suffix=" px"), doc="Auto hide hint visual display offset for bottom panel"), ParamBool('DockOverlayHintTabBar', False, "Show tab bar on mouse over when auto hide", title="Hint show tab bar"), ParamBool('DockOverlayHideTabBar', True, on_change=True, doc="Hide tab bar in dock overlay", title='Hide tab bar'), - ParamInt('DockOverlayHintDelay', 200, "Delay before show hint visual", title="Hint delay (ms)", proxy=ParamSpinBox(0, 1000, 100)), + ParamInt('DockOverlayHintDelay', 200, "Delay before show hint visual", title="Hint delay", proxy=ParamSpinBox(0, 1000, 100, suffix=" ms")), ParamInt('DockOverlayAnimationDuration', 200, "Auto hide animation duration, 0 to disable", - title="Animation duration (ms)", proxy=ParamSpinBox(0, 5000, 100)), + title="Animation duration", proxy=ParamSpinBox(0, 5000, 100, suffix=" ms")), ParamInt('DockOverlayAnimationCurve', 7, "Auto hide animation curve type", title="Animation curve type", proxy=ParamAnimationCurve()), ParamBool('DockOverlayHidePropertyViewScrollBar', False, "Hide property view scroll bar in dock overlay", title="Hide property view scroll bar"), ParamInt('DockOverlayMinimumSize', 30, on_change=True, diff --git a/src/Gui/PreferencePages/DlgSettingsAdvanced.cpp b/src/Gui/PreferencePages/DlgSettingsAdvanced.cpp index ca70006b74..8000159f39 100644 --- a/src/Gui/PreferencePages/DlgSettingsAdvanced.cpp +++ b/src/Gui/PreferencePages/DlgSettingsAdvanced.cpp @@ -70,10 +70,12 @@ DlgSettingsAdvanced::DlgSettingsAdvanced(QWidget* parent) ItemBackgroundPadding->setValue(Gui::TreeParams::defaultItemBackgroundPadding()); ItemBackgroundPadding->setEntryName("ItemBackgroundPadding"); ItemBackgroundPadding->setParamGrpPath("TreeView"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) ItemBackgroundPadding->setMinimum(0); ItemBackgroundPadding->setMaximum(100); ItemBackgroundPadding->setSingleStep(1); + ItemBackgroundPadding->setAlignment(Qt::AlignRight); + ItemBackgroundPadding->setSuffix(QLatin1String(" px")); // Auto generated code (Tools/params_utils.py:433) labelFontSize = new QLabel(this); @@ -83,6 +85,12 @@ DlgSettingsAdvanced::DlgSettingsAdvanced(QWidget* parent) FontSize->setValue(Gui::TreeParams::defaultFontSize()); FontSize->setEntryName("FontSize"); FontSize->setParamGrpPath("TreeView"); + // Auto generated code (Tools/params_utils.py:1135) + FontSize->setMinimum(0); + FontSize->setMaximum(100); + FontSize->setSingleStep(1); + FontSize->setAlignment(Qt::AlignRight); + FontSize->setSuffix(QLatin1String(" pt")); // Auto generated code (Tools/params_utils.py:420) @@ -101,10 +109,12 @@ DlgSettingsAdvanced::DlgSettingsAdvanced(QWidget* parent) DockOverlayWheelDelay->setValue(Gui::OverlayParams::defaultDockOverlayWheelDelay()); DockOverlayWheelDelay->setEntryName("DockOverlayWheelDelay"); DockOverlayWheelDelay->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlayWheelDelay->setMinimum(0); DockOverlayWheelDelay->setMaximum(99999); DockOverlayWheelDelay->setSingleStep(1); + DockOverlayWheelDelay->setAlignment(Qt::AlignRight); + DockOverlayWheelDelay->setSuffix(QLatin1String(" ms")); // Auto generated code (Tools/params_utils.py:433) labelDockOverlayAlphaRadius = new QLabel(this); @@ -114,10 +124,12 @@ DlgSettingsAdvanced::DlgSettingsAdvanced(QWidget* parent) DockOverlayAlphaRadius->setValue(Gui::OverlayParams::defaultDockOverlayAlphaRadius()); DockOverlayAlphaRadius->setEntryName("DockOverlayAlphaRadius"); DockOverlayAlphaRadius->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlayAlphaRadius->setMinimum(1); DockOverlayAlphaRadius->setMaximum(100); DockOverlayAlphaRadius->setSingleStep(1); + DockOverlayAlphaRadius->setAlignment(Qt::AlignRight); + DockOverlayAlphaRadius->setSuffix(QLatin1String(" px")); // Auto generated code (Tools/params_utils.py:433) DockOverlayCheckNaviCube = new Gui::PrefCheckBox(this); @@ -134,10 +146,12 @@ DlgSettingsAdvanced::DlgSettingsAdvanced(QWidget* parent) DockOverlayHintTriggerSize->setValue(Gui::OverlayParams::defaultDockOverlayHintTriggerSize()); DockOverlayHintTriggerSize->setEntryName("DockOverlayHintTriggerSize"); DockOverlayHintTriggerSize->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlayHintTriggerSize->setMinimum(1); DockOverlayHintTriggerSize->setMaximum(100); DockOverlayHintTriggerSize->setSingleStep(1); + DockOverlayHintTriggerSize->setAlignment(Qt::AlignRight); + DockOverlayHintTriggerSize->setSuffix(QLatin1String(" px")); // Auto generated code (Tools/params_utils.py:433) labelDockOverlayHintSize = new QLabel(this); @@ -147,10 +161,12 @@ DlgSettingsAdvanced::DlgSettingsAdvanced(QWidget* parent) DockOverlayHintSize->setValue(Gui::OverlayParams::defaultDockOverlayHintSize()); DockOverlayHintSize->setEntryName("DockOverlayHintSize"); DockOverlayHintSize->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlayHintSize->setMinimum(1); DockOverlayHintSize->setMaximum(100); DockOverlayHintSize->setSingleStep(1); + DockOverlayHintSize->setAlignment(Qt::AlignRight); + DockOverlayHintSize->setSuffix(QLatin1String(" px")); // Auto generated code (Tools/params_utils.py:433) labelDockOverlayHintLeftOffset = new QLabel(this); @@ -160,10 +176,12 @@ DlgSettingsAdvanced::DlgSettingsAdvanced(QWidget* parent) DockOverlayHintLeftOffset->setValue(Gui::OverlayParams::defaultDockOverlayHintLeftOffset()); DockOverlayHintLeftOffset->setEntryName("DockOverlayHintLeftOffset"); DockOverlayHintLeftOffset->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlayHintLeftOffset->setMinimum(0); DockOverlayHintLeftOffset->setMaximum(10000); DockOverlayHintLeftOffset->setSingleStep(10); + DockOverlayHintLeftOffset->setAlignment(Qt::AlignRight); + DockOverlayHintLeftOffset->setSuffix(QLatin1String(" px")); // Auto generated code (Tools/params_utils.py:433) labelDockOverlayHintLeftLength = new QLabel(this); @@ -173,10 +191,12 @@ DlgSettingsAdvanced::DlgSettingsAdvanced(QWidget* parent) DockOverlayHintLeftLength->setValue(Gui::OverlayParams::defaultDockOverlayHintLeftLength()); DockOverlayHintLeftLength->setEntryName("DockOverlayHintLeftLength"); DockOverlayHintLeftLength->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlayHintLeftLength->setMinimum(0); DockOverlayHintLeftLength->setMaximum(10000); DockOverlayHintLeftLength->setSingleStep(10); + DockOverlayHintLeftLength->setAlignment(Qt::AlignRight); + DockOverlayHintLeftLength->setSuffix(QLatin1String(" px")); // Auto generated code (Tools/params_utils.py:433) labelDockOverlayHintRightOffset = new QLabel(this); @@ -186,10 +206,12 @@ DlgSettingsAdvanced::DlgSettingsAdvanced(QWidget* parent) DockOverlayHintRightOffset->setValue(Gui::OverlayParams::defaultDockOverlayHintRightOffset()); DockOverlayHintRightOffset->setEntryName("DockOverlayHintRightOffset"); DockOverlayHintRightOffset->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlayHintRightOffset->setMinimum(0); DockOverlayHintRightOffset->setMaximum(10000); DockOverlayHintRightOffset->setSingleStep(10); + DockOverlayHintRightOffset->setAlignment(Qt::AlignRight); + DockOverlayHintRightOffset->setSuffix(QLatin1String(" px")); // Auto generated code (Tools/params_utils.py:433) labelDockOverlayHintRightLength = new QLabel(this); @@ -199,10 +221,12 @@ DlgSettingsAdvanced::DlgSettingsAdvanced(QWidget* parent) DockOverlayHintRightLength->setValue(Gui::OverlayParams::defaultDockOverlayHintRightLength()); DockOverlayHintRightLength->setEntryName("DockOverlayHintRightLength"); DockOverlayHintRightLength->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlayHintRightLength->setMinimum(0); DockOverlayHintRightLength->setMaximum(10000); DockOverlayHintRightLength->setSingleStep(10); + DockOverlayHintRightLength->setAlignment(Qt::AlignRight); + DockOverlayHintRightLength->setSuffix(QLatin1String(" px")); // Auto generated code (Tools/params_utils.py:433) labelDockOverlayHintTopOffset = new QLabel(this); @@ -212,10 +236,12 @@ DlgSettingsAdvanced::DlgSettingsAdvanced(QWidget* parent) DockOverlayHintTopOffset->setValue(Gui::OverlayParams::defaultDockOverlayHintTopOffset()); DockOverlayHintTopOffset->setEntryName("DockOverlayHintTopOffset"); DockOverlayHintTopOffset->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlayHintTopOffset->setMinimum(0); DockOverlayHintTopOffset->setMaximum(10000); DockOverlayHintTopOffset->setSingleStep(10); + DockOverlayHintTopOffset->setAlignment(Qt::AlignRight); + DockOverlayHintTopOffset->setSuffix(QLatin1String(" px")); // Auto generated code (Tools/params_utils.py:433) labelDockOverlayHintTopLength = new QLabel(this); @@ -225,10 +251,12 @@ DlgSettingsAdvanced::DlgSettingsAdvanced(QWidget* parent) DockOverlayHintTopLength->setValue(Gui::OverlayParams::defaultDockOverlayHintTopLength()); DockOverlayHintTopLength->setEntryName("DockOverlayHintTopLength"); DockOverlayHintTopLength->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlayHintTopLength->setMinimum(0); DockOverlayHintTopLength->setMaximum(10000); DockOverlayHintTopLength->setSingleStep(10); + DockOverlayHintTopLength->setAlignment(Qt::AlignRight); + DockOverlayHintTopLength->setSuffix(QLatin1String(" px")); // Auto generated code (Tools/params_utils.py:433) labelDockOverlayHintBottomOffset = new QLabel(this); @@ -238,10 +266,12 @@ DlgSettingsAdvanced::DlgSettingsAdvanced(QWidget* parent) DockOverlayHintBottomOffset->setValue(Gui::OverlayParams::defaultDockOverlayHintBottomOffset()); DockOverlayHintBottomOffset->setEntryName("DockOverlayHintBottomOffset"); DockOverlayHintBottomOffset->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlayHintBottomOffset->setMinimum(0); DockOverlayHintBottomOffset->setMaximum(10000); DockOverlayHintBottomOffset->setSingleStep(10); + DockOverlayHintBottomOffset->setAlignment(Qt::AlignRight); + DockOverlayHintBottomOffset->setSuffix(QLatin1String(" px")); // Auto generated code (Tools/params_utils.py:433) labelDockOverlayHintBottomLength = new QLabel(this); @@ -251,82 +281,85 @@ DlgSettingsAdvanced::DlgSettingsAdvanced(QWidget* parent) DockOverlayHintBottomLength->setValue(Gui::OverlayParams::defaultDockOverlayHintBottomLength()); DockOverlayHintBottomLength->setEntryName("DockOverlayHintBottomLength"); DockOverlayHintBottomLength->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlayHintBottomLength->setMinimum(0); DockOverlayHintBottomLength->setMaximum(10000); DockOverlayHintBottomLength->setSingleStep(10); - - // Auto generated code (Tools/params_utils.py:433) - DockOverlayHintTabBar = new Gui::PrefCheckBox(this); - layoutOverlay->addWidget(DockOverlayHintTabBar, 13, 0); - DockOverlayHintTabBar->setChecked(Gui::OverlayParams::defaultDockOverlayHintTabBar()); - DockOverlayHintTabBar->setEntryName("DockOverlayHintTabBar"); - DockOverlayHintTabBar->setParamGrpPath("View"); + DockOverlayHintBottomLength->setAlignment(Qt::AlignRight); + DockOverlayHintBottomLength->setSuffix(QLatin1String(" px")); // Auto generated code (Tools/params_utils.py:433) labelDockOverlayHintDelay = new QLabel(this); - layoutOverlay->addWidget(labelDockOverlayHintDelay, 14, 0); + layoutOverlay->addWidget(labelDockOverlayHintDelay, 13, 0); DockOverlayHintDelay = new Gui::PrefSpinBox(this); - layoutOverlay->addWidget(DockOverlayHintDelay, 14, 1); + layoutOverlay->addWidget(DockOverlayHintDelay, 13, 1); DockOverlayHintDelay->setValue(Gui::OverlayParams::defaultDockOverlayHintDelay()); DockOverlayHintDelay->setEntryName("DockOverlayHintDelay"); DockOverlayHintDelay->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlayHintDelay->setMinimum(0); DockOverlayHintDelay->setMaximum(1000); DockOverlayHintDelay->setSingleStep(100); + DockOverlayHintDelay->setAlignment(Qt::AlignRight); + DockOverlayHintDelay->setSuffix(QLatin1String(" ms")); // Auto generated code (Tools/params_utils.py:433) labelDockOverlaySplitterHandleTimeout = new QLabel(this); - layoutOverlay->addWidget(labelDockOverlaySplitterHandleTimeout, 15, 0); + layoutOverlay->addWidget(labelDockOverlaySplitterHandleTimeout, 14, 0); DockOverlaySplitterHandleTimeout = new Gui::PrefSpinBox(this); - layoutOverlay->addWidget(DockOverlaySplitterHandleTimeout, 15, 1); + layoutOverlay->addWidget(DockOverlaySplitterHandleTimeout, 14, 1); DockOverlaySplitterHandleTimeout->setValue(Gui::OverlayParams::defaultDockOverlaySplitterHandleTimeout()); DockOverlaySplitterHandleTimeout->setEntryName("DockOverlaySplitterHandleTimeout"); DockOverlaySplitterHandleTimeout->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlaySplitterHandleTimeout->setMinimum(0); DockOverlaySplitterHandleTimeout->setMaximum(99999); DockOverlaySplitterHandleTimeout->setSingleStep(100); + DockOverlaySplitterHandleTimeout->setAlignment(Qt::AlignRight); + DockOverlaySplitterHandleTimeout->setSuffix(QLatin1String(" ms")); // Auto generated code (Tools/params_utils.py:433) DockOverlayActivateOnHover = new Gui::PrefCheckBox(this); - layoutOverlay->addWidget(DockOverlayActivateOnHover, 16, 0); + layoutOverlay->addWidget(DockOverlayActivateOnHover, 15, 0); DockOverlayActivateOnHover->setChecked(Gui::OverlayParams::defaultDockOverlayActivateOnHover()); DockOverlayActivateOnHover->setEntryName("DockOverlayActivateOnHover"); DockOverlayActivateOnHover->setParamGrpPath("View"); // Auto generated code (Tools/params_utils.py:433) labelDockOverlayDelay = new QLabel(this); - layoutOverlay->addWidget(labelDockOverlayDelay, 17, 0); + layoutOverlay->addWidget(labelDockOverlayDelay, 16, 0); DockOverlayDelay = new Gui::PrefSpinBox(this); - layoutOverlay->addWidget(DockOverlayDelay, 17, 1); + layoutOverlay->addWidget(DockOverlayDelay, 16, 1); DockOverlayDelay->setValue(Gui::OverlayParams::defaultDockOverlayDelay()); DockOverlayDelay->setEntryName("DockOverlayDelay"); DockOverlayDelay->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlayDelay->setMinimum(0); DockOverlayDelay->setMaximum(5000); DockOverlayDelay->setSingleStep(100); + DockOverlayDelay->setAlignment(Qt::AlignRight); + DockOverlayDelay->setSuffix(QLatin1String(" ms")); // Auto generated code (Tools/params_utils.py:433) labelDockOverlayAnimationDuration = new QLabel(this); - layoutOverlay->addWidget(labelDockOverlayAnimationDuration, 18, 0); + layoutOverlay->addWidget(labelDockOverlayAnimationDuration, 17, 0); DockOverlayAnimationDuration = new Gui::PrefSpinBox(this); - layoutOverlay->addWidget(DockOverlayAnimationDuration, 18, 1); + layoutOverlay->addWidget(DockOverlayAnimationDuration, 17, 1); DockOverlayAnimationDuration->setValue(Gui::OverlayParams::defaultDockOverlayAnimationDuration()); DockOverlayAnimationDuration->setEntryName("DockOverlayAnimationDuration"); DockOverlayAnimationDuration->setParamGrpPath("View"); - // Auto generated code (Tools/params_utils.py:1134) + // Auto generated code (Tools/params_utils.py:1135) DockOverlayAnimationDuration->setMinimum(0); DockOverlayAnimationDuration->setMaximum(5000); DockOverlayAnimationDuration->setSingleStep(100); + DockOverlayAnimationDuration->setAlignment(Qt::AlignRight); + DockOverlayAnimationDuration->setSuffix(QLatin1String(" ms")); // Auto generated code (Tools/params_utils.py:433) labelDockOverlayAnimationCurve = new QLabel(this); - layoutOverlay->addWidget(labelDockOverlayAnimationCurve, 19, 0); + layoutOverlay->addWidget(labelDockOverlayAnimationCurve, 18, 0); DockOverlayAnimationCurve = new Gui::PrefComboBox(this); - layoutOverlay->addWidget(DockOverlayAnimationCurve, 19, 1); + layoutOverlay->addWidget(DockOverlayAnimationCurve, 18, 1); DockOverlayAnimationCurve->setEntryName("DockOverlayAnimationCurve"); DockOverlayAnimationCurve->setParamGrpPath("View"); // Auto generated code (Gui/OverlayParams.py:94) @@ -363,7 +396,6 @@ void DlgSettingsAdvanced::saveSettings() DockOverlayHintTopLength->onSave(); DockOverlayHintBottomOffset->onSave(); DockOverlayHintBottomLength->onSave(); - DockOverlayHintTabBar->onSave(); DockOverlayHintDelay->onSave(); DockOverlaySplitterHandleTimeout->onSave(); DockOverlayActivateOnHover->onSave(); @@ -391,7 +423,6 @@ void DlgSettingsAdvanced::loadSettings() DockOverlayHintTopLength->onRestore(); DockOverlayHintBottomOffset->onRestore(); DockOverlayHintBottomLength->onRestore(); - DockOverlayHintTabBar->onRestore(); DockOverlayHintDelay->onRestore(); DockOverlaySplitterHandleTimeout->onRestore(); DockOverlayActivateOnHover->onRestore(); @@ -409,11 +440,11 @@ void DlgSettingsAdvanced::retranslateUi() labelItemBackgroundPadding->setText(QObject::tr("Item background padding")); labelItemBackgroundPadding->setToolTip(ItemBackgroundPadding->toolTip()); FontSize->setToolTip(QApplication::translate("TreeParams", Gui::TreeParams::docFontSize())); - labelFontSize->setText(QObject::tr("FontSize")); + labelFontSize->setText(QObject::tr("Font size")); labelFontSize->setToolTip(FontSize->toolTip()); groupOverlay->setTitle(QObject::tr("Overlay")); DockOverlayWheelDelay->setToolTip(QApplication::translate("OverlayParams", Gui::OverlayParams::docDockOverlayWheelDelay())); - labelDockOverlayWheelDelay->setText(QObject::tr("Delay mouse wheel pass through (ms)")); + labelDockOverlayWheelDelay->setText(QObject::tr("Delay mouse wheel pass through")); labelDockOverlayWheelDelay->setToolTip(DockOverlayWheelDelay->toolTip()); DockOverlayAlphaRadius->setToolTip(QApplication::translate("OverlayParams", Gui::OverlayParams::docDockOverlayAlphaRadius())); labelDockOverlayAlphaRadius->setText(QObject::tr("Alpha test radius")); @@ -450,21 +481,19 @@ void DlgSettingsAdvanced::retranslateUi() DockOverlayHintBottomLength->setToolTip(QApplication::translate("OverlayParams", Gui::OverlayParams::docDockOverlayHintBottomLength())); labelDockOverlayHintBottomLength->setText(QObject::tr("Bottom panel hint length")); labelDockOverlayHintBottomLength->setToolTip(DockOverlayHintBottomLength->toolTip()); - DockOverlayHintTabBar->setToolTip(QApplication::translate("OverlayParams", Gui::OverlayParams::docDockOverlayHintTabBar())); - DockOverlayHintTabBar->setText(QObject::tr("Hint show tab bar")); DockOverlayHintDelay->setToolTip(QApplication::translate("OverlayParams", Gui::OverlayParams::docDockOverlayHintDelay())); - labelDockOverlayHintDelay->setText(QObject::tr("Hint delay (ms)")); + labelDockOverlayHintDelay->setText(QObject::tr("Hint delay")); labelDockOverlayHintDelay->setToolTip(DockOverlayHintDelay->toolTip()); DockOverlaySplitterHandleTimeout->setToolTip(QApplication::translate("OverlayParams", Gui::OverlayParams::docDockOverlaySplitterHandleTimeout())); - labelDockOverlaySplitterHandleTimeout->setText(QObject::tr("Splitter auto hide delay (ms)")); + labelDockOverlaySplitterHandleTimeout->setText(QObject::tr("Splitter auto hide delay")); labelDockOverlaySplitterHandleTimeout->setToolTip(DockOverlaySplitterHandleTimeout->toolTip()); DockOverlayActivateOnHover->setToolTip(QApplication::translate("OverlayParams", Gui::OverlayParams::docDockOverlayActivateOnHover())); DockOverlayActivateOnHover->setText(QObject::tr("Activate on hover")); DockOverlayDelay->setToolTip(QApplication::translate("OverlayParams", Gui::OverlayParams::docDockOverlayDelay())); - labelDockOverlayDelay->setText(QObject::tr("Layout delay (ms)")); + labelDockOverlayDelay->setText(QObject::tr("Layout delay")); labelDockOverlayDelay->setToolTip(DockOverlayDelay->toolTip()); DockOverlayAnimationDuration->setToolTip(QApplication::translate("OverlayParams", Gui::OverlayParams::docDockOverlayAnimationDuration())); - labelDockOverlayAnimationDuration->setText(QObject::tr("Animation duration (ms)")); + labelDockOverlayAnimationDuration->setText(QObject::tr("Animation duration")); labelDockOverlayAnimationDuration->setToolTip(DockOverlayAnimationDuration->toolTip()); DockOverlayAnimationCurve->setToolTip(QApplication::translate("OverlayParams", Gui::OverlayParams::docDockOverlayAnimationCurve())); labelDockOverlayAnimationCurve->setText(QObject::tr("Animation curve type")); diff --git a/src/Gui/PreferencePages/DlgSettingsAdvanced.h b/src/Gui/PreferencePages/DlgSettingsAdvanced.h index ac54174c49..01ae6411c7 100644 --- a/src/Gui/PreferencePages/DlgSettingsAdvanced.h +++ b/src/Gui/PreferencePages/DlgSettingsAdvanced.h @@ -105,7 +105,6 @@ private: Gui::PrefSpinBox *DockOverlayHintBottomOffset = nullptr; QLabel *labelDockOverlayHintBottomLength = nullptr; Gui::PrefSpinBox *DockOverlayHintBottomLength = nullptr; - Gui::PrefCheckBox *DockOverlayHintTabBar = nullptr; QLabel *labelDockOverlayHintDelay = nullptr; Gui::PrefSpinBox *DockOverlayHintDelay = nullptr; QLabel *labelDockOverlaySplitterHandleTimeout = nullptr; diff --git a/src/Gui/TreeParams.py b/src/Gui/TreeParams.py index ff1e59858e..abc2b592fa 100644 --- a/src/Gui/TreeParams.py +++ b/src/Gui/TreeParams.py @@ -63,11 +63,11 @@ Params = [ ParamInt('Indentation', 0, on_change=True), ParamBool('LabelExpression', False), ParamInt('IconSize', 0, on_change=True), - ParamInt('FontSize', 0, on_change=True, title='Font size'), + ParamInt('FontSize', 0, on_change=True, title='Font size', proxy=ParamSpinBox(0, 100, 1, suffix=" pt")), ParamInt('ItemSpacing', 0, on_change=True), ParamHex('ItemBackground', 0, on_change=True, title='Item background color', proxy=ParamColor(), doc = "Tree view item background. Only effective in overlay."), - ParamInt('ItemBackgroundPadding', 0, on_change=True, title="Item background padding", proxy=ParamSpinBox(0, 100, 1), + ParamInt('ItemBackgroundPadding', 0, on_change=True, title="Item background padding", proxy=ParamSpinBox(0, 100, 1, suffix=" px"), doc = "Tree view item background padding."), ParamBool('HideColumn', True, on_change=True, title="Hide Description", doc = "Hide extra tree view column for item description."), diff --git a/src/Tools/params_utils.py b/src/Tools/params_utils.py index 74ee71bea5..8c9537463b 100644 --- a/src/Tools/params_utils.py +++ b/src/Tools/params_utils.py @@ -19,8 +19,8 @@ # * USA * # * * # *************************************************************************** -"""Utilities for generating C++ code for parameter management using Python Cog -""" +"""Utilities for generating C++ code for parameter management using Python Cog""" + import cog import inspect import re @@ -1120,12 +1120,13 @@ class ParamFile(ParamProxy): class ParamSpinBox(ParamProxy): - def __init__(self, value_min, value_max, value_step, decimals=0, param_bool=None): + def __init__(self, value_min, value_max, value_step, decimals=0, param_bool=None, suffix=""): super().__init__(param_bool) self.value_min = value_min self.value_max = value_max self.value_step = value_step self.decimals = decimals + self.suffix = suffix def init_widget(self, param, row, group_name): super().init_widget(param, row, group_name) @@ -1134,13 +1135,19 @@ class ParamSpinBox(ParamProxy): {trace_comment()} {param.widget_name}->setMinimum({self.value_min}); {param.widget_name}->setMaximum({self.value_max}); - {param.widget_name}->setSingleStep({self.value_step});""" + {param.widget_name}->setSingleStep({self.value_step}); + {param.widget_name}->setAlignment(Qt::AlignRight);""" ) if self.decimals: cog.out( f""" {param.widget_name}->setDecimals({self.decimals});""" ) + if self.suffix: + cog.out( + f""" + {param.widget_name}->setSuffix(QLatin1String("{self.suffix}"));""" + ) class ParamShortcutEdit(ParamProxy):