From 571fa00292cf246945662c64c4bc1966ec8f4c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Mon, 12 Feb 2024 18:34:28 +0100 Subject: [PATCH] Resolve #12248: Remove redundant and non-functional selection checkbox preference (#12263) Remove the selection checkbox preference from Display->UI. The same preference exists under General->Selection. When changing the preference and then applying the settings, it reverts back to the value under General->Selection and thus is not usable. --- src/Gui/PreferencePages/DlgSettingsUI.cpp | 29 +++++++---------------- src/Gui/PreferencePages/DlgSettingsUI.h | 1 - src/Gui/PreferencePages/DlgSettingsUI.py | 1 - 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/Gui/PreferencePages/DlgSettingsUI.cpp b/src/Gui/PreferencePages/DlgSettingsUI.cpp index d4bead92fd..beed6daf0f 100644 --- a/src/Gui/PreferencePages/DlgSettingsUI.cpp +++ b/src/Gui/PreferencePages/DlgSettingsUI.cpp @@ -92,57 +92,50 @@ DlgSettingsUI::DlgSettingsUI(QWidget* parent) ResizableColumn->setEntryName("ResizableColumn"); ResizableColumn->setParamGrpPath("TreeView"); - // Auto generated code (Tools/params_utils.py:433) - CheckBoxesSelection = new Gui::PrefCheckBox(this); - layoutTreeview->addWidget(CheckBoxesSelection, 3, 0); - CheckBoxesSelection->setChecked(Gui::TreeParams::defaultCheckBoxesSelection()); - CheckBoxesSelection->setEntryName("CheckBoxesSelection"); - CheckBoxesSelection->setParamGrpPath("TreeView"); - // Auto generated code (Tools/params_utils.py:433) HideColumn = new Gui::PrefCheckBox(this); - layoutTreeview->addWidget(HideColumn, 4, 0); + layoutTreeview->addWidget(HideColumn, 3, 0); HideColumn->setChecked(Gui::TreeParams::defaultHideColumn()); HideColumn->setEntryName("HideColumn"); HideColumn->setParamGrpPath("TreeView"); // Auto generated code (Tools/params_utils.py:433) HideScrollBar = new Gui::PrefCheckBox(this); - layoutTreeview->addWidget(HideScrollBar, 5, 0); + layoutTreeview->addWidget(HideScrollBar, 4, 0); HideScrollBar->setChecked(Gui::TreeParams::defaultHideScrollBar()); HideScrollBar->setEntryName("HideScrollBar"); HideScrollBar->setParamGrpPath("TreeView"); // Auto generated code (Tools/params_utils.py:433) HideHeaderView = new Gui::PrefCheckBox(this); - layoutTreeview->addWidget(HideHeaderView, 6, 0); + layoutTreeview->addWidget(HideHeaderView, 5, 0); HideHeaderView->setChecked(Gui::TreeParams::defaultHideHeaderView()); HideHeaderView->setEntryName("HideHeaderView"); HideHeaderView->setParamGrpPath("TreeView"); // Auto generated code (Tools/params_utils.py:433) labelIconSize = new QLabel(this); - layoutTreeview->addWidget(labelIconSize, 7, 0); + layoutTreeview->addWidget(labelIconSize, 6, 0); IconSize = new Gui::PrefSpinBox(this); - layoutTreeview->addWidget(IconSize, 7, 1); + layoutTreeview->addWidget(IconSize, 6, 1); IconSize->setValue(Gui::TreeParams::defaultIconSize()); IconSize->setEntryName("IconSize"); IconSize->setParamGrpPath("TreeView"); // Auto generated code (Tools/params_utils.py:433) labelFontSize = new QLabel(this); - layoutTreeview->addWidget(labelFontSize, 8, 0); + layoutTreeview->addWidget(labelFontSize, 7, 0); FontSize = new Gui::PrefSpinBox(this); - layoutTreeview->addWidget(FontSize, 8, 1); + layoutTreeview->addWidget(FontSize, 7, 1); FontSize->setValue(Gui::TreeParams::defaultFontSize()); FontSize->setEntryName("FontSize"); FontSize->setParamGrpPath("TreeView"); // Auto generated code (Tools/params_utils.py:433) labelItemSpacing = new QLabel(this); - layoutTreeview->addWidget(labelItemSpacing, 9, 0); + layoutTreeview->addWidget(labelItemSpacing, 8, 0); ItemSpacing = new Gui::PrefSpinBox(this); - layoutTreeview->addWidget(ItemSpacing, 9, 1); + layoutTreeview->addWidget(ItemSpacing, 8, 1); ItemSpacing->setValue(Gui::TreeParams::defaultItemSpacing()); ItemSpacing->setEntryName("ItemSpacing"); ItemSpacing->setParamGrpPath("TreeView"); @@ -449,7 +442,6 @@ void DlgSettingsUI::saveSettings() ItemBackground->onSave(); ItemBackgroundPadding->onSave(); ResizableColumn->onSave(); - CheckBoxesSelection->onSave(); HideColumn->onSave(); HideScrollBar->onSave(); HideHeaderView->onSave(); @@ -490,7 +482,6 @@ void DlgSettingsUI::loadSettings() ItemBackground->onRestore(); ItemBackgroundPadding->onRestore(); ResizableColumn->onRestore(); - CheckBoxesSelection->onRestore(); HideColumn->onRestore(); HideScrollBar->onRestore(); HideHeaderView->onRestore(); @@ -537,8 +528,6 @@ void DlgSettingsUI::retranslateUi() labelItemBackgroundPadding->setToolTip(ItemBackgroundPadding->toolTip()); ResizableColumn->setToolTip(QApplication::translate("TreeParams", Gui::TreeParams::docResizableColumn())); ResizableColumn->setText(QObject::tr("Resizable columns")); - CheckBoxesSelection->setToolTip(QApplication::translate("TreeParams", Gui::TreeParams::docCheckBoxesSelection())); - CheckBoxesSelection->setText(QObject::tr("Show item checkbox")); HideColumn->setToolTip(QApplication::translate("TreeParams", Gui::TreeParams::docHideColumn())); HideColumn->setText(QObject::tr("Hide extra column")); HideScrollBar->setToolTip(QApplication::translate("TreeParams", Gui::TreeParams::docHideScrollBar())); diff --git a/src/Gui/PreferencePages/DlgSettingsUI.h b/src/Gui/PreferencePages/DlgSettingsUI.h index d479ae73d3..362809cc5d 100644 --- a/src/Gui/PreferencePages/DlgSettingsUI.h +++ b/src/Gui/PreferencePages/DlgSettingsUI.h @@ -78,7 +78,6 @@ private: QLabel *labelItemBackgroundPadding = nullptr; Gui::PrefSpinBox *ItemBackgroundPadding = nullptr; Gui::PrefCheckBox *ResizableColumn = nullptr; - Gui::PrefCheckBox *CheckBoxesSelection = nullptr; Gui::PrefCheckBox *HideColumn = nullptr; Gui::PrefCheckBox *HideScrollBar = nullptr; Gui::PrefCheckBox *HideHeaderView = nullptr; diff --git a/src/Gui/PreferencePages/DlgSettingsUI.py b/src/Gui/PreferencePages/DlgSettingsUI.py index e2a7522dbc..8345645157 100644 --- a/src/Gui/PreferencePages/DlgSettingsUI.py +++ b/src/Gui/PreferencePages/DlgSettingsUI.py @@ -48,7 +48,6 @@ ParamGroup = ( 'ItemBackground', 'ItemBackgroundPadding', 'ResizableColumn', - 'CheckBoxesSelection', 'HideColumn', 'HideScrollBar', 'HideHeaderView',