diff --git a/picard/ui/options/cover.py b/picard/ui/options/cover.py index 9bb0b9a27..5f27d9f53 100644 --- a/picard/ui/options/cover.py +++ b/picard/ui/options/cover.py @@ -17,8 +17,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -from PyQt4 import QtCore -from picard.config import BoolOption, TextOption +from PyQt4 import QtCore, QtGui +from picard.config import BoolOption, IntOption, TextOption from picard.ui.options import OptionsPage, register_options_page from picard.ui.ui_options_cover import Ui_CoverOptionsPage @@ -36,6 +36,15 @@ class CoverOptionsPage(OptionsPage): BoolOption("setting", "save_images_to_files", False), TextOption("setting", "cover_image_filename", "cover"), BoolOption("setting", "save_images_overwrite", False), + BoolOption("setting", "ca_provider_use_amazon", True), + BoolOption("setting", "ca_provider_use_cdbaby", True), + BoolOption("setting", "ca_provider_use_caa", True), + BoolOption("setting", "ca_provider_use_jamendo", True), + BoolOption("setting", "ca_provider_use_whitelist", True), + BoolOption("setting", "caa_approved_only", False), + BoolOption("setting", "caa_image_type_as_filename", False), + IntOption("setting", "caa_image_size", 2), + TextOption("setting", "caa_image_types", "front"), ] def __init__(self, parent=None): @@ -50,11 +59,42 @@ class CoverOptionsPage(OptionsPage): self.ui.cover_image_filename.setText(self.config.setting["cover_image_filename"]) self.ui.save_images_overwrite.setChecked(self.config.setting["save_images_overwrite"]) self.update_filename() + self.ui.caprovider_amazon.setChecked(self.config.setting["ca_provider_use_amazon"]) + self.ui.caprovider_cdbaby.setChecked(self.config.setting["ca_provider_use_cdbaby"]) + self.ui.caprovider_caa.setChecked(self.config.setting["ca_provider_use_caa"]) + self.ui.caprovider_jamendo.setChecked(self.config.setting["ca_provider_use_jamendo"]) + self.ui.caprovider_whitelist.setChecked(self.config.setting["ca_provider_use_whitelist"]) + self.ui.gb_caa.setEnabled(self.config.setting["ca_provider_use_caa"]) + + self.ui.cb_image_size.setCurrentIndex(self.config.setting["caa_image_size"]) + self.ui.le_image_types.setText(self.config.setting["caa_image_types"]) + self.ui.cb_approved_only.setChecked(self.config.setting["caa_approved_only"]) + self.ui.cb_type_as_filename.setChecked(self.config.setting["caa_image_type_as_filename"]) + self.connect(self.ui.caprovider_caa, QtCore.SIGNAL("toggled(bool)"), + self.ui.gb_caa.setEnabled) def save(self): self.config.setting["save_images_to_tags"] = self.ui.save_images_to_tags.isChecked() self.config.setting["save_images_to_files"] = self.ui.save_images_to_files.isChecked() self.config.setting["cover_image_filename"] = unicode(self.ui.cover_image_filename.text()) + self.config.setting["ca_provider_use_amazon"] =\ + self.ui.caprovider_amazon.isChecked() + self.config.setting["ca_provider_use_cdbaby"] =\ + self.ui.caprovider_cdbaby.isChecked() + self.config.setting["ca_provider_use_caa"] =\ + self.ui.caprovider_caa.isChecked() + self.config.setting["ca_provider_use_jamendo"] =\ + self.ui.caprovider_jamendo.isChecked() + self.config.setting["ca_provider_use_whitelist"] =\ + self.ui.caprovider_whitelist.isChecked() + self.config.setting["caa_image_size"] =\ + self.ui.cb_image_size.currentIndex() + self.config.setting["caa_image_types"] = self.ui.le_image_types.text() + self.config.setting["caa_approved_only"] =\ + self.ui.cb_approved_only.isChecked() + self.config.setting["caa_image_type_as_filename"] = \ + self.ui.cb_type_as_filename.isChecked() + self.config.setting["save_images_overwrite"] = self.ui.save_images_overwrite.isChecked() def update_filename(self): diff --git a/picard/ui/options/coverartproviders.py b/picard/ui/options/coverartproviders.py deleted file mode 100644 index 5dddfd7be..000000000 --- a/picard/ui/options/coverartproviders.py +++ /dev/null @@ -1,77 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Picard, the next-generation MusicBrainz tagger -# Copyright (C) 2012 Wieland Hoffmann -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -from picard.config import BoolOption, IntOption, TextOption -from picard.ui.options import register_options_page, OptionsPage -from picard.ui.ui_options_coverartproviders import Ui_CoverartProvidersOptionsPage - -class CoverartProvidersOptionsPage(OptionsPage): - NAME = "coverartproviders" - TITLE = "Providers" - PARENT = "cover" - - options = [ - BoolOption("setting", "ca_provider_use_amazon", True), - BoolOption("setting", "ca_provider_use_cdbaby", True), - BoolOption("setting", "ca_provider_use_caa", True), - BoolOption("setting", "ca_provider_use_jamendo", True), - BoolOption("setting", "ca_provider_use_whitelist", True), - BoolOption("setting", "caa_approved_only", False), - BoolOption("setting", "caa_image_type_as_filename", False), - IntOption("setting", "caa_image_size", 2), - TextOption("setting", "caa_image_types", "front"), - ] - - def __init__(self, parent=None): - super(CoverartProvidersOptionsPage, self).__init__(parent) - self.ui = Ui_CoverartProvidersOptionsPage() - self.ui.setupUi(self) - - def load(self): - self.ui.caprovider_amazon.setChecked(self.config.setting["ca_provider_use_amazon"]) - self.ui.caprovider_cdbaby.setChecked(self.config.setting["ca_provider_use_cdbaby"]) - self.ui.caprovider_caa.setChecked(self.config.setting["ca_provider_use_caa"]) - self.ui.caprovider_jamendo.setChecked(self.config.setting["ca_provider_use_jamendo"]) - self.ui.caprovider_whitelist.setChecked(self.config.setting["ca_provider_use_whitelist"]) - self.ui.gb_caa.setEnabled(self.config.setting["ca_provider_use_caa"]) - - self.ui.cb_image_size.setCurrentIndex(self.config.setting["caa_image_size"]) - self.ui.le_image_types.setText(self.config.setting["caa_image_types"]) - self.ui.cb_approved_only.setChecked(self.config.setting["caa_approved_only"]) - self.ui.cb_type_as_filename.setChecked(self.config.setting["caa_image_type_as_filename"]) - - def save(self): - self.config.setting["ca_provider_use_amazon"] =\ - self.ui.caprovider_amazon.isChecked() - self.config.setting["ca_provider_use_cdbaby"] =\ - self.ui.caprovider_cdbaby.isChecked() - self.config.setting["ca_provider_use_caa"] =\ - self.ui.caprovider_caa.isChecked() - self.config.setting["ca_provider_use_jamendo"] =\ - self.ui.caprovider_jamendo.isChecked() - self.config.setting["ca_provider_use_whitelist"] =\ - self.ui.caprovider_whitelist.isChecked() - self.config.setting["caa_image_size"] =\ - self.ui.cb_image_size.currentIndex() - self.config.setting["caa_image_types"] = self.ui.le_image_types.text() - self.config.setting["caa_approved_only"] =\ - self.ui.cb_approved_only.isChecked() - self.config.setting["caa_image_type_as_filename"] = \ - self.ui.cb_type_as_filename.isChecked() - -register_options_page(CoverartProvidersOptionsPage) diff --git a/picard/ui/options/dialog.py b/picard/ui/options/dialog.py index 1ae3d7158..d9ff4fe21 100644 --- a/picard/ui/options/dialog.py +++ b/picard/ui/options/dialog.py @@ -27,7 +27,6 @@ from picard.ui.options import ( advanced, cdlookup, cover, - coverartproviders, general, interface, folksonomy, diff --git a/picard/ui/ui_options_cover.py b/picard/ui/ui_options_cover.py index 2d883a93d..86ddd78bc 100644 --- a/picard/ui/ui_options_cover.py +++ b/picard/ui/ui_options_cover.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'ui/options_cover.ui' # -# Created: Tue May 29 19:44:15 2012 -# by: PyQt4 UI code generator 4.8.3 +# Created: Fri Aug 31 14:03:14 2012 +# by: PyQt4 UI code generator 4.9.4 # # WARNING! All changes made in this file will be lost! @@ -17,32 +17,92 @@ except AttributeError: class Ui_CoverOptionsPage(object): def setupUi(self, CoverOptionsPage): CoverOptionsPage.setObjectName(_fromUtf8("CoverOptionsPage")) - CoverOptionsPage.resize(293, 279) - self.vboxlayout = QtGui.QVBoxLayout(CoverOptionsPage) - self.vboxlayout.setMargin(9) - self.vboxlayout.setSpacing(6) - self.vboxlayout.setObjectName(_fromUtf8("vboxlayout")) + CoverOptionsPage.resize(524, 484) + self.verticalLayout = QtGui.QVBoxLayout(CoverOptionsPage) + self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) self.rename_files = QtGui.QGroupBox(CoverOptionsPage) self.rename_files.setObjectName(_fromUtf8("rename_files")) - self.vboxlayout1 = QtGui.QVBoxLayout(self.rename_files) - self.vboxlayout1.setMargin(9) - self.vboxlayout1.setSpacing(2) - self.vboxlayout1.setObjectName(_fromUtf8("vboxlayout1")) + self.vboxlayout = QtGui.QVBoxLayout(self.rename_files) + self.vboxlayout.setSpacing(2) + self.vboxlayout.setMargin(9) + self.vboxlayout.setObjectName(_fromUtf8("vboxlayout")) self.save_images_to_tags = QtGui.QCheckBox(self.rename_files) self.save_images_to_tags.setObjectName(_fromUtf8("save_images_to_tags")) - self.vboxlayout1.addWidget(self.save_images_to_tags) + self.vboxlayout.addWidget(self.save_images_to_tags) self.save_images_to_files = QtGui.QCheckBox(self.rename_files) self.save_images_to_files.setObjectName(_fromUtf8("save_images_to_files")) - self.vboxlayout1.addWidget(self.save_images_to_files) + self.vboxlayout.addWidget(self.save_images_to_files) self.cover_image_filename = QtGui.QLineEdit(self.rename_files) self.cover_image_filename.setObjectName(_fromUtf8("cover_image_filename")) - self.vboxlayout1.addWidget(self.cover_image_filename) + self.vboxlayout.addWidget(self.cover_image_filename) self.save_images_overwrite = QtGui.QCheckBox(self.rename_files) self.save_images_overwrite.setObjectName(_fromUtf8("save_images_overwrite")) - self.vboxlayout1.addWidget(self.save_images_overwrite) - self.vboxlayout.addWidget(self.rename_files) - spacerItem = QtGui.QSpacerItem(275, 91, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.vboxlayout.addItem(spacerItem) + self.vboxlayout.addWidget(self.save_images_overwrite) + self.verticalLayout.addWidget(self.rename_files) + self.groupBox = QtGui.QGroupBox(CoverOptionsPage) + self.groupBox.setObjectName(_fromUtf8("groupBox")) + self.verticalLayout_2 = QtGui.QVBoxLayout(self.groupBox) + self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2")) + self.caprovider_amazon = QtGui.QCheckBox(self.groupBox) + self.caprovider_amazon.setObjectName(_fromUtf8("caprovider_amazon")) + self.verticalLayout_2.addWidget(self.caprovider_amazon) + self.caprovider_cdbaby = QtGui.QCheckBox(self.groupBox) + self.caprovider_cdbaby.setObjectName(_fromUtf8("caprovider_cdbaby")) + self.verticalLayout_2.addWidget(self.caprovider_cdbaby) + self.caprovider_caa = QtGui.QCheckBox(self.groupBox) + self.caprovider_caa.setObjectName(_fromUtf8("caprovider_caa")) + self.verticalLayout_2.addWidget(self.caprovider_caa) + self.caprovider_jamendo = QtGui.QCheckBox(self.groupBox) + self.caprovider_jamendo.setObjectName(_fromUtf8("caprovider_jamendo")) + self.verticalLayout_2.addWidget(self.caprovider_jamendo) + self.caprovider_whitelist = QtGui.QCheckBox(self.groupBox) + self.caprovider_whitelist.setObjectName(_fromUtf8("caprovider_whitelist")) + self.verticalLayout_2.addWidget(self.caprovider_whitelist) + self.verticalLayout.addWidget(self.groupBox) + self.gb_caa = QtGui.QGroupBox(CoverOptionsPage) + self.gb_caa.setEnabled(False) + self.gb_caa.setObjectName(_fromUtf8("gb_caa")) + self.verticalLayout_3 = QtGui.QVBoxLayout(self.gb_caa) + self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3")) + self.horizontalLayout = QtGui.QHBoxLayout() + self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) + self.label = QtGui.QLabel(self.gb_caa) + self.label.setObjectName(_fromUtf8("label")) + self.horizontalLayout.addWidget(self.label) + spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout.addItem(spacerItem) + self.cb_image_size = QtGui.QComboBox(self.gb_caa) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cb_image_size.sizePolicy().hasHeightForWidth()) + self.cb_image_size.setSizePolicy(sizePolicy) + self.cb_image_size.setObjectName(_fromUtf8("cb_image_size")) + self.cb_image_size.addItem(_fromUtf8("")) + self.cb_image_size.addItem(_fromUtf8("")) + self.cb_image_size.addItem(_fromUtf8("")) + self.horizontalLayout.addWidget(self.cb_image_size) + self.verticalLayout_3.addLayout(self.horizontalLayout) + self.label_2 = QtGui.QLabel(self.gb_caa) + self.label_2.setObjectName(_fromUtf8("label_2")) + self.verticalLayout_3.addWidget(self.label_2) + self.le_image_types = QtGui.QLineEdit(self.gb_caa) + self.le_image_types.setObjectName(_fromUtf8("le_image_types")) + self.verticalLayout_3.addWidget(self.le_image_types) + self.cb_approved_only = QtGui.QCheckBox(self.gb_caa) + self.cb_approved_only.setObjectName(_fromUtf8("cb_approved_only")) + self.verticalLayout_3.addWidget(self.cb_approved_only) + self.cb_type_as_filename = QtGui.QCheckBox(self.gb_caa) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cb_type_as_filename.sizePolicy().hasHeightForWidth()) + 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.verticalLayout.addWidget(self.gb_caa) + spacerItem1 = QtGui.QSpacerItem(275, 91, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.verticalLayout.addItem(spacerItem1) self.retranslateUi(CoverOptionsPage) QtCore.QMetaObject.connectSlotsByName(CoverOptionsPage) @@ -54,4 +114,18 @@ class Ui_CoverOptionsPage(object): self.save_images_to_tags.setText(_("Embed cover images into tags")) self.save_images_to_files.setText(_("Save cover images as separate files")) self.save_images_overwrite.setText(_("Overwrite the file if it already exists")) + self.groupBox.setTitle(_("Coverart Providers")) + self.caprovider_amazon.setText(_("Amazon")) + self.caprovider_cdbaby.setText(_("CD Baby")) + self.caprovider_caa.setText(_("Cover Art Archive")) + self.caprovider_jamendo.setText(_("Jamendo")) + 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:")) + self.cb_image_size.setItemText(0, _("250 px")) + self.cb_image_size.setItemText(1, _("500 px")) + self.cb_image_size.setItemText(2, _("Full size")) + 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.")) diff --git a/picard/ui/ui_options_coverartproviders.py b/picard/ui/ui_options_coverartproviders.py deleted file mode 100644 index 5f4207f5b..000000000 --- a/picard/ui/ui_options_coverartproviders.py +++ /dev/null @@ -1,107 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'ui/options_coverartproviders.ui' -# -# Created: Tue Aug 28 11:21:43 2012 -# by: PyQt4 UI code generator 4.9.4 -# -# WARNING! All changes made in this file will be lost! - -from PyQt4 import QtCore, QtGui - -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - _fromUtf8 = lambda s: s - -class Ui_CoverartProvidersOptionsPage(object): - def setupUi(self, CoverartProvidersOptionsPage): - CoverartProvidersOptionsPage.setObjectName(_fromUtf8("CoverartProvidersOptionsPage")) - CoverartProvidersOptionsPage.resize(400, 362) - self.verticalLayout = QtGui.QVBoxLayout(CoverartProvidersOptionsPage) - self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.groupBox = QtGui.QGroupBox(CoverartProvidersOptionsPage) - self.groupBox.setObjectName(_fromUtf8("groupBox")) - self.verticalLayout_2 = QtGui.QVBoxLayout(self.groupBox) - self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2")) - self.caprovider_amazon = QtGui.QCheckBox(self.groupBox) - self.caprovider_amazon.setObjectName(_fromUtf8("caprovider_amazon")) - self.verticalLayout_2.addWidget(self.caprovider_amazon) - self.caprovider_cdbaby = QtGui.QCheckBox(self.groupBox) - self.caprovider_cdbaby.setObjectName(_fromUtf8("caprovider_cdbaby")) - self.verticalLayout_2.addWidget(self.caprovider_cdbaby) - self.caprovider_caa = QtGui.QCheckBox(self.groupBox) - self.caprovider_caa.setObjectName(_fromUtf8("caprovider_caa")) - self.verticalLayout_2.addWidget(self.caprovider_caa) - self.caprovider_jamendo = QtGui.QCheckBox(self.groupBox) - self.caprovider_jamendo.setObjectName(_fromUtf8("caprovider_jamendo")) - self.verticalLayout_2.addWidget(self.caprovider_jamendo) - self.caprovider_whitelist = QtGui.QCheckBox(self.groupBox) - self.caprovider_whitelist.setObjectName(_fromUtf8("caprovider_whitelist")) - self.verticalLayout_2.addWidget(self.caprovider_whitelist) - self.verticalLayout.addWidget(self.groupBox) - self.gb_caa = QtGui.QGroupBox(CoverartProvidersOptionsPage) - self.gb_caa.setEnabled(False) - self.gb_caa.setObjectName(_fromUtf8("gb_caa")) - self.verticalLayout_3 = QtGui.QVBoxLayout(self.gb_caa) - self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3")) - self.horizontalLayout = QtGui.QHBoxLayout() - self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - self.label = QtGui.QLabel(self.gb_caa) - self.label.setObjectName(_fromUtf8("label")) - self.horizontalLayout.addWidget(self.label) - spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout.addItem(spacerItem) - self.cb_image_size = QtGui.QComboBox(self.gb_caa) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.cb_image_size.sizePolicy().hasHeightForWidth()) - self.cb_image_size.setSizePolicy(sizePolicy) - self.cb_image_size.setObjectName(_fromUtf8("cb_image_size")) - self.cb_image_size.addItem(_fromUtf8("")) - self.cb_image_size.addItem(_fromUtf8("")) - self.cb_image_size.addItem(_fromUtf8("")) - self.horizontalLayout.addWidget(self.cb_image_size) - self.verticalLayout_3.addLayout(self.horizontalLayout) - self.label_2 = QtGui.QLabel(self.gb_caa) - self.label_2.setObjectName(_fromUtf8("label_2")) - self.verticalLayout_3.addWidget(self.label_2) - self.le_image_types = QtGui.QLineEdit(self.gb_caa) - self.le_image_types.setObjectName(_fromUtf8("le_image_types")) - self.verticalLayout_3.addWidget(self.le_image_types) - self.cb_approved_only = QtGui.QCheckBox(self.gb_caa) - self.cb_approved_only.setObjectName(_fromUtf8("cb_approved_only")) - self.verticalLayout_3.addWidget(self.cb_approved_only) - self.cb_type_as_filename = QtGui.QCheckBox(self.gb_caa) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.cb_type_as_filename.sizePolicy().hasHeightForWidth()) - 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.verticalLayout.addWidget(self.gb_caa) - spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout.addItem(spacerItem1) - - self.retranslateUi(CoverartProvidersOptionsPage) - QtCore.QObject.connect(self.caprovider_caa, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.gb_caa.setEnabled) - QtCore.QMetaObject.connectSlotsByName(CoverartProvidersOptionsPage) - - def retranslateUi(self, CoverartProvidersOptionsPage): - CoverartProvidersOptionsPage.setWindowTitle(_("Form")) - self.groupBox.setTitle(_("Coverart Providers")) - self.caprovider_amazon.setText(_("Amazon")) - self.caprovider_cdbaby.setText(_("CD Baby")) - self.caprovider_caa.setText(_("Cover Art Archive")) - self.caprovider_jamendo.setText(_("Jamendo")) - 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:")) - self.cb_image_size.setItemText(0, _("250 px")) - self.cb_image_size.setItemText(1, _("500 px")) - self.cb_image_size.setItemText(2, _("Full size")) - 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.")) diff --git a/ui/options_cover.ui b/ui/options_cover.ui index c0645fe67..b36ff212d 100644 --- a/ui/options_cover.ui +++ b/ui/options_cover.ui @@ -1,53 +1,48 @@ - + + CoverOptionsPage - - + + 0 0 - 293 - 279 + 524 + 484 - - - 9 - - - 6 - + - - + + Location - - - 9 - - + + 2 + + 9 + - - + + Embed cover images into tags - - + + Save cover images as separate files - + - - + + Overwrite the file if it already exists @@ -55,12 +50,147 @@ + + + + Coverart Providers + + + + + + Amazon + + + + + + + CD Baby + + + + + + + Cover Art Archive + + + + + + + Jamendo + + + + + + + Sites on the whitelist + + + + + + + + + + false + + + Cover Art Archive + + + + + + + + Only use images of the following size: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 250 px + + + + + 500 px + + + + + Full size + + + + + + + + + + Download only images of the following types: + + + + + + + + + + Download only approved images + + + + + + + + 0 + 0 + + + + Use the first image type as the filename. This will not change the filename of front images. + + + + + + - + Qt::Vertical - + 275 91 diff --git a/ui/options_coverartproviders.ui b/ui/options_coverartproviders.ui deleted file mode 100644 index a7946933f..000000000 --- a/ui/options_coverartproviders.ui +++ /dev/null @@ -1,186 +0,0 @@ - - - CoverartProvidersOptionsPage - - - - 0 - 0 - 400 - 362 - - - - Form - - - - - - Coverart Providers - - - - - - Amazon - - - - - - - CD Baby - - - - - - - Cover Art Archive - - - - - - - Jamendo - - - - - - - Sites on the whitelist - - - - - - - - - - false - - - Cover Art Archive - - - - - - - - Only use images of the following size: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 250 px - - - - - 500 px - - - - - Full size - - - - - - - - - - Download only images of the following types: - - - - - - - - - - Download only approved images - - - - - - - - 0 - 0 - - - - Use the first image type as the filename. This will not change the filename of front images. - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - caprovider_caa - toggled(bool) - gb_caa - setEnabled(bool) - - - 203 - 95 - - - 199 - 242 - - - - -