Move fallback option to cover archive options group

sirusdas · Jul 9, 2014 · acab1dc · acab1dc
1 parent 932a326
commit acab1dc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/picard/ui/options/cover.py b/picard/ui/options/cover.py
@@ -112,8 +112,6 @@ def load(self):
         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
@@ -60,10 +60,6 @@ def setupUi(self, CoverOptionsPage):
         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 @@ def setupUi(self, CoverOptionsPage):
         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 @@ def setupUi(self, CoverOptionsPage):
         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 @@ def retranslateUi(self, CoverOptionsPage):
         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 @@ def retranslateUi(self, CoverOptionsPage):
         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
@@ -84,16 +84,6 @@
         </property>
        </widget>
       </item>
-      <item>
-	  <widget class="QCheckBox" name="caprovider_caa_release_group">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string>Fall back on Cover Art Archive release group image</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QCheckBox" name="caprovider_whitelist">
         <property name="text">
@@ -219,6 +209,13 @@
          <string>Use the first image type as the filename. This will not change the filename of front images.</string>
         </property>
        </widget>
+     </item>
+     <item>
+	  <widget class="QCheckBox" name="caprovider_caa_release_group">
+        <property name="text">
+         <string>Fall back on Cover Art Archive release group image</string>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
@@ -246,12 +243,12 @@
   <tabstop>save_images_overwrite</tabstop>
   <tabstop>caprovider_amazon</tabstop>
   <tabstop>caprovider_caa</tabstop>
-  <tabstop>caprovider_caa_release_group</tabstop>
   <tabstop>caprovider_whitelist</tabstop>
   <tabstop>cb_image_size</tabstop>
   <tabstop>caa_types_selector_1</tabstop>
   <tabstop>cb_approved_only</tabstop>
   <tabstop>cb_type_as_filename</tabstop>
+  <tabstop>caprovider_caa_release_group</tabstop>
  </tabstops>
  <resources/>
  <connections>