diff --git a/picard/ui/options/cover.py b/picard/ui/options/cover.py index ad7d77315..a7832c9b9 100644 --- a/picard/ui/options/cover.py +++ b/picard/ui/options/cover.py @@ -112,8 +112,6 @@ class CoverOptionsPage(OptionsPage): self.ui.cb_type_as_filename.setChecked(config.setting["caa_image_type_as_filename"]) self.connect(self.ui.caprovider_caa, QtCore.SIGNAL("toggled(bool)"), self.ui.gb_caa.setEnabled) - self.connect(self.ui.caprovider_caa, QtCore.SIGNAL("toggled(bool)"), - self.ui.caprovider_caa_release_group.setEnabled) def save(self): config.setting["save_images_to_tags"] = self.ui.save_images_to_tags.isChecked() diff --git a/picard/ui/ui_options_cover.py b/picard/ui/ui_options_cover.py index e015de489..e9eedf366 100644 --- a/picard/ui/ui_options_cover.py +++ b/picard/ui/ui_options_cover.py @@ -60,10 +60,6 @@ class Ui_CoverOptionsPage(object): self.caprovider_caa = QtGui.QCheckBox(self.groupBox) self.caprovider_caa.setObjectName(_fromUtf8("caprovider_caa")) self.verticalLayout_2.addWidget(self.caprovider_caa) - self.caprovider_caa_release_group = QtGui.QCheckBox(self.groupBox) - self.caprovider_caa_release_group.setEnabled(False) - self.caprovider_caa_release_group.setObjectName(_fromUtf8("caprovider_caa_release_group")) - self.verticalLayout_2.addWidget(self.caprovider_caa_release_group) self.caprovider_whitelist = QtGui.QCheckBox(self.groupBox) self.caprovider_whitelist.setObjectName(_fromUtf8("caprovider_whitelist")) self.verticalLayout_2.addWidget(self.caprovider_whitelist) @@ -121,6 +117,9 @@ class Ui_CoverOptionsPage(object): self.cb_type_as_filename.setSizePolicy(sizePolicy) self.cb_type_as_filename.setObjectName(_fromUtf8("cb_type_as_filename")) self.verticalLayout_3.addWidget(self.cb_type_as_filename) + self.caprovider_caa_release_group = QtGui.QCheckBox(self.gb_caa) + self.caprovider_caa_release_group.setObjectName(_fromUtf8("caprovider_caa_release_group")) + self.verticalLayout_3.addWidget(self.caprovider_caa_release_group) self.verticalLayout.addWidget(self.gb_caa) spacerItem1 = QtGui.QSpacerItem(275, 91, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) self.verticalLayout.addItem(spacerItem1) @@ -134,12 +133,12 @@ class Ui_CoverOptionsPage(object): CoverOptionsPage.setTabOrder(self.cover_image_filename, self.save_images_overwrite) CoverOptionsPage.setTabOrder(self.save_images_overwrite, self.caprovider_amazon) CoverOptionsPage.setTabOrder(self.caprovider_amazon, self.caprovider_caa) - CoverOptionsPage.setTabOrder(self.caprovider_caa, self.caprovider_caa_release_group) - CoverOptionsPage.setTabOrder(self.caprovider_caa_release_group, self.caprovider_whitelist) + CoverOptionsPage.setTabOrder(self.caprovider_caa, self.caprovider_whitelist) CoverOptionsPage.setTabOrder(self.caprovider_whitelist, self.cb_image_size) CoverOptionsPage.setTabOrder(self.cb_image_size, self.caa_types_selector_1) CoverOptionsPage.setTabOrder(self.caa_types_selector_1, self.cb_approved_only) CoverOptionsPage.setTabOrder(self.cb_approved_only, self.cb_type_as_filename) + CoverOptionsPage.setTabOrder(self.cb_type_as_filename, self.caprovider_caa_release_group) def retranslateUi(self, CoverOptionsPage): self.rename_files.setTitle(_("Location")) @@ -151,7 +150,6 @@ class Ui_CoverOptionsPage(object): self.groupBox.setTitle(_("Coverart Providers")) self.caprovider_amazon.setText(_("Amazon")) self.caprovider_caa.setText(_("Cover Art Archive")) - self.caprovider_caa_release_group.setText(_("Fall back on Cover Art Archive release group image")) self.caprovider_whitelist.setText(_("Sites on the whitelist")) self.gb_caa.setTitle(_("Cover Art Archive")) self.label.setText(_("Only use images of the following size:")) @@ -161,4 +159,5 @@ class Ui_CoverOptionsPage(object): self.label_2.setText(_("Download only images of the following types:")) self.cb_approved_only.setText(_("Download only approved images")) self.cb_type_as_filename.setText(_("Use the first image type as the filename. This will not change the filename of front images.")) + self.caprovider_caa_release_group.setText(_("Fall back on Cover Art Archive release group image")) diff --git a/ui/options_cover.ui b/ui/options_cover.ui index cf741ff0c..b842f492c 100644 --- a/ui/options_cover.ui +++ b/ui/options_cover.ui @@ -84,16 +84,6 @@ - - - - false - - - Fall back on Cover Art Archive release group image - - - @@ -219,6 +209,13 @@ Use the first image type as the filename. This will not change the filename of front images. + + + + + Fall back on Cover Art Archive release group image + + @@ -246,12 +243,12 @@ save_images_overwrite caprovider_amazon caprovider_caa - caprovider_caa_release_group caprovider_whitelist cb_image_size caa_types_selector_1 cb_approved_only cb_type_as_filename + caprovider_caa_release_group