From 0b8ed2f5d198387e28612a4fe403edfd40fc8dbe Mon Sep 17 00:00:00 2001 From: Bob Swift Date: Fri, 22 Sep 2023 14:33:10 -0600 Subject: [PATCH] Hide individual update items but leave plugins update check visible --- picard/ui/options/general.py | 2 +- picard/ui/ui_options_general.py | 92 +++++++++++++++-------------- ui/options_general.ui | 101 ++++++++++++++++++++------------ 3 files changed, 112 insertions(+), 83 deletions(-) diff --git a/picard/ui/options/general.py b/picard/ui/options/general.py index aae47d495..eeb64ba42 100644 --- a/picard/ui/options/general.py +++ b/picard/ui/options/general.py @@ -106,7 +106,7 @@ class GeneralOptionsPage(OptionsPage): self.set_update_level(config.setting["update_level"]) self.ui.update_check_days.setValue(config.setting["update_check_days"]) if not self.tagger.autoupdate_enabled: - self.ui.update_check_groupbox.hide() + self.ui.program_update_check_group.hide() def set_update_level(self, value): if value not in PROGRAM_UPDATE_LEVELS: diff --git a/picard/ui/ui_options_general.py b/picard/ui/ui_options_general.py index e32ac1c69..dd309860d 100644 --- a/picard/ui/ui_options_general.py +++ b/picard/ui/ui_options_general.py @@ -115,6 +115,54 @@ class Ui_GeneralOptionsPage(object): self.check_for_plugin_updates = QtWidgets.QCheckBox(self.update_check_groupbox) self.check_for_plugin_updates.setObjectName("check_for_plugin_updates") self.verticalLayout_2.addWidget(self.check_for_plugin_updates) + self.program_update_check_group = QtWidgets.QWidget(self.update_check_groupbox) + self.program_update_check_group.setMinimumSize(QtCore.QSize(0, 0)) + self.program_update_check_group.setObjectName("program_update_check_group") + self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.program_update_check_group) + self.verticalLayout_6.setContentsMargins(0, 0, 0, 0) + self.verticalLayout_6.setObjectName("verticalLayout_6") + self.check_for_updates = QtWidgets.QCheckBox(self.program_update_check_group) + self.check_for_updates.setObjectName("check_for_updates") + self.verticalLayout_6.addWidget(self.check_for_updates) + self.gridLayout = QtWidgets.QGridLayout() + self.gridLayout.setContentsMargins(-1, -1, -1, 0) + self.gridLayout.setObjectName("gridLayout") + self.label_2 = QtWidgets.QLabel(self.program_update_check_group) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth()) + self.label_2.setSizePolicy(sizePolicy) + self.label_2.setObjectName("label_2") + self.gridLayout.addWidget(self.label_2, 0, 0, 1, 1) + self.update_check_days = QtWidgets.QSpinBox(self.program_update_check_group) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.update_check_days.sizePolicy().hasHeightForWidth()) + self.update_check_days.setSizePolicy(sizePolicy) + self.update_check_days.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.update_check_days.setMinimum(1) + self.update_check_days.setObjectName("update_check_days") + self.gridLayout.addWidget(self.update_check_days, 0, 1, 1, 1) + self.gridLayout_2 = QtWidgets.QGridLayout() + self.gridLayout_2.setContentsMargins(-1, -1, -1, 0) + self.gridLayout_2.setObjectName("gridLayout_2") + self.label_3 = QtWidgets.QLabel(self.program_update_check_group) + self.label_3.setObjectName("label_3") + self.gridLayout_2.addWidget(self.label_3, 0, 0, 1, 1) + self.update_level = QtWidgets.QComboBox(self.program_update_check_group) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.update_level.sizePolicy().hasHeightForWidth()) + self.update_level.setSizePolicy(sizePolicy) + self.update_level.setEditable(False) + self.update_level.setObjectName("update_level") + self.gridLayout_2.addWidget(self.update_level, 0, 1, 1, 1) + self.gridLayout.addLayout(self.gridLayout_2, 1, 0, 1, 1) + self.verticalLayout_6.addLayout(self.gridLayout) + self.verticalLayout_2.addWidget(self.program_update_check_group) self.program_update_check_frame = QtWidgets.QFrame(self.update_check_groupbox) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -127,47 +175,6 @@ class Ui_GeneralOptionsPage(object): self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.program_update_check_frame) self.verticalLayout_5.setContentsMargins(0, 0, 0, 0) self.verticalLayout_5.setObjectName("verticalLayout_5") - self.check_for_updates = QtWidgets.QCheckBox(self.program_update_check_frame) - self.check_for_updates.setObjectName("check_for_updates") - self.verticalLayout_5.addWidget(self.check_for_updates) - self.gridLayout = QtWidgets.QGridLayout() - self.gridLayout.setContentsMargins(-1, -1, -1, 0) - self.gridLayout.setObjectName("gridLayout") - self.label_2 = QtWidgets.QLabel(self.program_update_check_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth()) - self.label_2.setSizePolicy(sizePolicy) - self.label_2.setObjectName("label_2") - self.gridLayout.addWidget(self.label_2, 0, 0, 1, 1) - self.update_check_days = QtWidgets.QSpinBox(self.program_update_check_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.update_check_days.sizePolicy().hasHeightForWidth()) - self.update_check_days.setSizePolicy(sizePolicy) - self.update_check_days.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) - self.update_check_days.setMinimum(1) - self.update_check_days.setObjectName("update_check_days") - self.gridLayout.addWidget(self.update_check_days, 0, 1, 1, 1) - self.verticalLayout_5.addLayout(self.gridLayout) - self.gridLayout_2 = QtWidgets.QGridLayout() - self.gridLayout_2.setContentsMargins(-1, -1, -1, 0) - self.gridLayout_2.setObjectName("gridLayout_2") - self.label_3 = QtWidgets.QLabel(self.program_update_check_frame) - self.label_3.setObjectName("label_3") - self.gridLayout_2.addWidget(self.label_3, 0, 0, 1, 1) - self.update_level = QtWidgets.QComboBox(self.program_update_check_frame) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.update_level.sizePolicy().hasHeightForWidth()) - self.update_level.setSizePolicy(sizePolicy) - self.update_level.setEditable(False) - self.update_level.setObjectName("update_level") - self.gridLayout_2.addWidget(self.update_level, 0, 1, 1, 1) - self.verticalLayout_5.addLayout(self.gridLayout_2) self.verticalLayout_2.addWidget(self.program_update_check_frame) self.vboxlayout.addWidget(self.update_check_groupbox) spacerItem2 = QtWidgets.QSpacerItem(181, 21, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) @@ -183,8 +190,7 @@ class Ui_GeneralOptionsPage(object): GeneralOptionsPage.setTabOrder(self.analyze_new_files, self.cluster_new_files) GeneralOptionsPage.setTabOrder(self.cluster_new_files, self.ignore_file_mbids) GeneralOptionsPage.setTabOrder(self.ignore_file_mbids, self.check_for_plugin_updates) - GeneralOptionsPage.setTabOrder(self.check_for_plugin_updates, self.check_for_updates) - GeneralOptionsPage.setTabOrder(self.check_for_updates, self.update_check_days) + GeneralOptionsPage.setTabOrder(self.check_for_plugin_updates, self.update_check_days) GeneralOptionsPage.setTabOrder(self.update_check_days, self.update_level) def retranslateUi(self, GeneralOptionsPage): diff --git a/ui/options_general.ui b/ui/options_general.ui index b4ab4729e..0aa65fcd9 100644 --- a/ui/options_general.ui +++ b/ui/options_general.ui @@ -228,20 +228,14 @@ QCheckBox { color: black } - - - - 0 - 0 - + + + + 0 + 0 + - - QFrame::NoFrame - - - QFrame::Plain - - + 0 @@ -295,38 +289,68 @@ QCheckBox { color: black } - - - - - - 0 - - - - - Updates to check: + + + + 0 - - - - - - - 0 - 0 - - - - false - - + + + + Updates to check: + + + + + + + + 0 + 0 + + + + false + + + + + + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + + 0 + + + 0 + + + 0 + + + 0 + + + + @@ -355,7 +379,6 @@ QCheckBox { color: black } cluster_new_files ignore_file_mbids check_for_plugin_updates - check_for_updates update_check_days update_level