diff --git a/picard/profile.py b/picard/profile.py index 6d6d20e7c..360908b9a 100644 --- a/picard/profile.py +++ b/picard/profile.py @@ -228,7 +228,7 @@ class UserProfileGroups(): SettingDesc('completeness_ignore_pregap', ['completeness_ignore_pregap']), SettingDesc('completeness_ignore_data', ['completeness_ignore_data']), SettingDesc('completeness_ignore_silence', ['completeness_ignore_silence']), - SettingDesc('compare_ignore_tags', ['groupBox_2']), + SettingDesc('compare_ignore_tags', ['groupBox_ignore_tags']), # Network Options Page SettingDesc('use_proxy', []), # No highlight specified because the 'use_proxy' diff --git a/picard/ui/ui_options_advanced.py b/picard/ui/ui_options_advanced.py index 0116adfec..64a6332d8 100644 --- a/picard/ui/ui_options_advanced.py +++ b/picard/ui/ui_options_advanced.py @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'ui/options_advanced.ui' # -# Created by: PyQt6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.5.3 # # WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. @@ -15,12 +15,12 @@ class Ui_AdvancedOptionsPage(object): AdvancedOptionsPage.resize(570, 455) self.vboxlayout = QtWidgets.QVBoxLayout(AdvancedOptionsPage) self.vboxlayout.setObjectName("vboxlayout") - self.groupBox = QtWidgets.QGroupBox(AdvancedOptionsPage) + self.groupBox = QtWidgets.QGroupBox(parent=AdvancedOptionsPage) self.groupBox.setObjectName("groupBox") self.gridlayout = QtWidgets.QGridLayout(self.groupBox) self.gridlayout.setSpacing(2) self.gridlayout.setObjectName("gridlayout") - self.label_ignore_regex = QtWidgets.QLabel(self.groupBox) + self.label_ignore_regex = QtWidgets.QLabel(parent=self.groupBox) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -31,7 +31,7 @@ class Ui_AdvancedOptionsPage(object): self.gridlayout.addWidget(self.label_ignore_regex, 1, 0, 1, 1) self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") - self.label_query_limit = QtWidgets.QLabel(self.groupBox) + self.label_query_limit = QtWidgets.QLabel(parent=self.groupBox) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -39,7 +39,7 @@ class Ui_AdvancedOptionsPage(object): self.label_query_limit.setSizePolicy(sizePolicy) self.label_query_limit.setObjectName("label_query_limit") self.horizontalLayout_2.addWidget(self.label_query_limit) - self.query_limit = QtWidgets.QComboBox(self.groupBox) + self.query_limit = QtWidgets.QComboBox(parent=self.groupBox) self.query_limit.setCurrentText("50") self.query_limit.setObjectName("query_limit") self.query_limit.addItem("") @@ -52,17 +52,17 @@ class Ui_AdvancedOptionsPage(object): self.query_limit.setItemText(3, "100") self.horizontalLayout_2.addWidget(self.query_limit) self.gridlayout.addLayout(self.horizontalLayout_2, 8, 0, 1, 1) - self.regex_error = QtWidgets.QLabel(self.groupBox) + self.regex_error = QtWidgets.QLabel(parent=self.groupBox) self.regex_error.setText("") self.regex_error.setObjectName("regex_error") self.gridlayout.addWidget(self.regex_error, 3, 0, 1, 1) - self.ignore_regex = QtWidgets.QLineEdit(self.groupBox) + self.ignore_regex = QtWidgets.QLineEdit(parent=self.groupBox) self.ignore_regex.setObjectName("ignore_regex") self.gridlayout.addWidget(self.ignore_regex, 2, 0, 1, 1) self.horizontalLayout = QtWidgets.QHBoxLayout() self.horizontalLayout.setSizeConstraint(QtWidgets.QLayout.SizeConstraint.SetDefaultConstraint) self.horizontalLayout.setObjectName("horizontalLayout") - self.label_track_duration_diff = QtWidgets.QLabel(self.groupBox) + self.label_track_duration_diff = QtWidgets.QLabel(parent=self.groupBox) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -71,7 +71,7 @@ class Ui_AdvancedOptionsPage(object): self.label_track_duration_diff.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.label_track_duration_diff.setObjectName("label_track_duration_diff") self.horizontalLayout.addWidget(self.label_track_duration_diff) - self.ignore_track_duration_difference_under = QtWidgets.QSpinBox(self.groupBox) + self.ignore_track_duration_difference_under = QtWidgets.QSpinBox(parent=self.groupBox) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -86,36 +86,36 @@ class Ui_AdvancedOptionsPage(object): self.ignore_track_duration_difference_under.setObjectName("ignore_track_duration_difference_under") self.horizontalLayout.addWidget(self.ignore_track_duration_difference_under) self.gridlayout.addLayout(self.horizontalLayout, 6, 0, 2, 1) - self.recursively_add_files = QtWidgets.QCheckBox(self.groupBox) + self.recursively_add_files = QtWidgets.QCheckBox(parent=self.groupBox) self.recursively_add_files.setObjectName("recursively_add_files") self.gridlayout.addWidget(self.recursively_add_files, 5, 0, 1, 1) - self.ignore_hidden_files = QtWidgets.QCheckBox(self.groupBox) + self.ignore_hidden_files = QtWidgets.QCheckBox(parent=self.groupBox) self.ignore_hidden_files.setObjectName("ignore_hidden_files") self.gridlayout.addWidget(self.ignore_hidden_files, 4, 0, 1, 1) self.vboxlayout.addWidget(self.groupBox) - self.groupBox_completeness = QtWidgets.QGroupBox(AdvancedOptionsPage) + self.groupBox_completeness = QtWidgets.QGroupBox(parent=AdvancedOptionsPage) self.groupBox_completeness.setObjectName("groupBox_completeness") self.gridLayout = QtWidgets.QGridLayout(self.groupBox_completeness) self.gridLayout.setObjectName("gridLayout") - self.completeness_ignore_videos = QtWidgets.QCheckBox(self.groupBox_completeness) + self.completeness_ignore_videos = QtWidgets.QCheckBox(parent=self.groupBox_completeness) self.completeness_ignore_videos.setObjectName("completeness_ignore_videos") self.gridLayout.addWidget(self.completeness_ignore_videos, 0, 0, 1, 1) - self.completeness_ignore_data = QtWidgets.QCheckBox(self.groupBox_completeness) + self.completeness_ignore_data = QtWidgets.QCheckBox(parent=self.groupBox_completeness) self.completeness_ignore_data.setCheckable(True) self.completeness_ignore_data.setObjectName("completeness_ignore_data") self.gridLayout.addWidget(self.completeness_ignore_data, 3, 0, 1, 1) - self.completeness_ignore_pregap = QtWidgets.QCheckBox(self.groupBox_completeness) + self.completeness_ignore_pregap = QtWidgets.QCheckBox(parent=self.groupBox_completeness) self.completeness_ignore_pregap.setObjectName("completeness_ignore_pregap") self.gridLayout.addWidget(self.completeness_ignore_pregap, 0, 1, 1, 1) - self.completeness_ignore_silence = QtWidgets.QCheckBox(self.groupBox_completeness) + self.completeness_ignore_silence = QtWidgets.QCheckBox(parent=self.groupBox_completeness) self.completeness_ignore_silence.setObjectName("completeness_ignore_silence") self.gridLayout.addWidget(self.completeness_ignore_silence, 3, 1, 1, 1) self.vboxlayout.addWidget(self.groupBox_completeness) - self.groupBox_2 = QtWidgets.QGroupBox(AdvancedOptionsPage) - self.groupBox_2.setObjectName("groupBox_2") - self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox_2) + self.groupBox_ignore_tags = QtWidgets.QGroupBox(parent=AdvancedOptionsPage) + self.groupBox_ignore_tags.setObjectName("groupBox_ignore_tags") + self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox_ignore_tags) self.verticalLayout.setObjectName("verticalLayout") - self.compare_ignore_tags = TagListEditor(self.groupBox_2) + self.compare_ignore_tags = TagListEditor(parent=self.groupBox_ignore_tags) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -123,7 +123,7 @@ class Ui_AdvancedOptionsPage(object): self.compare_ignore_tags.setSizePolicy(sizePolicy) self.compare_ignore_tags.setObjectName("compare_ignore_tags") self.verticalLayout.addWidget(self.compare_ignore_tags) - self.vboxlayout.addWidget(self.groupBox_2) + self.vboxlayout.addWidget(self.groupBox_ignore_tags) self.retranslateUi(AdvancedOptionsPage) self.query_limit.setCurrentIndex(1) @@ -148,5 +148,5 @@ class Ui_AdvancedOptionsPage(object): self.completeness_ignore_data.setText(_("Data tracks")) self.completeness_ignore_pregap.setText(_("Pregap tracks")) self.completeness_ignore_silence.setText(_("Silent tracks")) - self.groupBox_2.setTitle(_("Tags to ignore for comparison:")) + self.groupBox_ignore_tags.setTitle(_("Tags to ignore for comparison:")) from picard.ui.widgets.taglisteditor import TagListEditor diff --git a/ui/options_advanced.ui b/ui/options_advanced.ui index f7708f0b8..d9fca7636 100644 --- a/ui/options_advanced.ui +++ b/ui/options_advanced.ui @@ -202,7 +202,7 @@ - + Tags to ignore for comparison: