diff --git a/picard/ui/options/renaming.py b/picard/ui/options/renaming.py index a5c5aa28a..574905da0 100644 --- a/picard/ui/options/renaming.py +++ b/picard/ui/options/renaming.py @@ -80,9 +80,9 @@ class RenamingOptionsPage(OptionsPage): except Exception, e: raise OptionsCheckError(_("Script Error"), _("Multiple artist file naming format:") + " " + str(e)) if self.ui.rename_files.isChecked(): - if not unicode(self.ui.file_naming_format.toPlainText()).strip(): + if not unicode(self.ui.file_naming_format.toPlainText()).strip(): raise OptionsCheckError(_("Script Error"), _("The file naming format must not be empty.")) - if self.ui.use_va_format.isChecked() and not unicode(self.ui.va_file_naming_format.toPlainText()).strip(): + if self.ui.use_va_format.isChecked() and not unicode(self.ui.va_file_naming_format.toPlainText()).strip(): raise OptionsCheckError(_("Script Error"), _("The multiple artist file naming format must not be empty.")) def save(self): diff --git a/picard/ui/ui_options_renaming.py b/picard/ui/ui_options_renaming.py index 2233a6ee3..250ee435a 100644 --- a/picard/ui/ui_options_renaming.py +++ b/picard/ui/ui_options_renaming.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'ui/options_renaming.ui' # -# Created: Sun Jan 13 22:20:39 2008 -# by: PyQt4 UI code generator 4.3.1 +# Created: Sun Jan 4 22:14:10 2009 +# by: PyQt4 UI code generator 4.4.3 # # WARNING! All changes made in this file will be lost! @@ -12,170 +12,183 @@ from PyQt4 import QtCore, QtGui class Ui_RenamingOptionsPage(object): def setupUi(self, RenamingOptionsPage): RenamingOptionsPage.setObjectName("RenamingOptionsPage") - RenamingOptionsPage.resize(QtCore.QSize(QtCore.QRect(0,0,621,718).size()).expandedTo(RenamingOptionsPage.minimumSizeHint())) - + RenamingOptionsPage.resize(892, 782) self.vboxlayout = QtGui.QVBoxLayout(RenamingOptionsPage) self.vboxlayout.setObjectName("vboxlayout") - - self.rename_files = QtGui.QGroupBox(RenamingOptionsPage) - self.rename_files.setCheckable(True) + self.horizontalLayout = QtGui.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + self.label = QtGui.QLabel(RenamingOptionsPage) + font = QtGui.QFont() + font.setPointSize(14) + font.setWeight(75) + font.setBold(True) + self.label.setFont(font) + self.label.setObjectName("label") + self.horizontalLayout.addWidget(self.label) + self.rename_files = QtGui.QCheckBox(RenamingOptionsPage) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.rename_files.sizePolicy().hasHeightForWidth()) + self.rename_files.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setWeight(75) + font.setBold(True) + self.rename_files.setFont(font) self.rename_files.setObjectName("rename_files") - - self.gridlayout = QtGui.QGridLayout(self.rename_files) - self.gridlayout.setObjectName("gridlayout") - - self.label_3 = QtGui.QLabel(self.rename_files) + self.horizontalLayout.addWidget(self.rename_files) + self.vboxlayout.addLayout(self.horizontalLayout) + self.line = QtGui.QFrame(RenamingOptionsPage) + self.line.setFrameShadow(QtGui.QFrame.Plain) + self.line.setLineWidth(2) + self.line.setFrameShape(QtGui.QFrame.HLine) + self.line.setFrameShadow(QtGui.QFrame.Sunken) + self.line.setObjectName("line") + self.vboxlayout.addWidget(self.line) + self.ascii_filenames = QtGui.QCheckBox(RenamingOptionsPage) + self.ascii_filenames.setObjectName("ascii_filenames") + self.vboxlayout.addWidget(self.ascii_filenames) + self.windows_compatible_filenames = QtGui.QCheckBox(RenamingOptionsPage) + self.windows_compatible_filenames.setObjectName("windows_compatible_filenames") + self.vboxlayout.addWidget(self.windows_compatible_filenames) + self.groupBox = QtGui.QGroupBox(RenamingOptionsPage) + self.groupBox.setObjectName("groupBox") + self.verticalLayout_4 = QtGui.QVBoxLayout(self.groupBox) + self.verticalLayout_4.setObjectName("verticalLayout_4") + self.horizontalLayout_2 = QtGui.QHBoxLayout() + self.horizontalLayout_2.setObjectName("horizontalLayout_2") + self.label_3 = QtGui.QLabel(self.groupBox) + font = QtGui.QFont() + font.setWeight(75) + font.setBold(True) + self.label_3.setFont(font) + self.label_3.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.label_3.setObjectName("label_3") - self.gridlayout.addWidget(self.label_3,0,0,1,1) - - self.hboxlayout = QtGui.QHBoxLayout() - self.hboxlayout.setObjectName("hboxlayout") - - self.file_naming_format = QtGui.QTextEdit(self.rename_files) - - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Expanding) + self.horizontalLayout_2.addWidget(self.label_3) + self.file_naming_format_default = QtGui.QPushButton(self.groupBox) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.file_naming_format_default.sizePolicy().hasHeightForWidth()) + self.file_naming_format_default.setSizePolicy(sizePolicy) + self.file_naming_format_default.setMinimumSize(QtCore.QSize(0, 0)) + self.file_naming_format_default.setObjectName("file_naming_format_default") + self.horizontalLayout_2.addWidget(self.file_naming_format_default) + self.verticalLayout_4.addLayout(self.horizontalLayout_2) + self.file_naming_format = QtGui.QTextEdit(self.groupBox) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.file_naming_format.sizePolicy().hasHeightForWidth()) self.file_naming_format.setSizePolicy(sizePolicy) - self.file_naming_format.setMinimumSize(QtCore.QSize(0,0)) - self.file_naming_format.setCursor(QtCore.Qt.IBeamCursor) - self.file_naming_format.setLineWrapMode(QtGui.QTextEdit.NoWrap) + self.file_naming_format.setMinimumSize(QtCore.QSize(0, 0)) + font = QtGui.QFont() + font.setFamily("Monospace") + font.setPointSize(10) + self.file_naming_format.setFont(font) + self.file_naming_format.setProperty("cursor", QtCore.QVariant(QtCore.Qt.IBeamCursor)) + self.file_naming_format.setLineWrapMode(QtGui.QTextEdit.WidgetWidth) self.file_naming_format.setTabStopWidth(20) + self.file_naming_format.setAcceptRichText(True) self.file_naming_format.setObjectName("file_naming_format") - self.hboxlayout.addWidget(self.file_naming_format) - - self.vboxlayout1 = QtGui.QVBoxLayout() - self.vboxlayout1.setObjectName("vboxlayout1") - - self.file_naming_format_default = QtGui.QPushButton(self.rename_files) - self.file_naming_format_default.setObjectName("file_naming_format_default") - self.vboxlayout1.addWidget(self.file_naming_format_default) - - spacerItem = QtGui.QSpacerItem(20,40,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding) - self.vboxlayout1.addItem(spacerItem) - self.hboxlayout.addLayout(self.vboxlayout1) - self.gridlayout.addLayout(self.hboxlayout,1,0,1,1) - - self.windows_compatible_filenames = QtGui.QCheckBox(self.rename_files) - self.windows_compatible_filenames.setObjectName("windows_compatible_filenames") - self.gridlayout.addWidget(self.windows_compatible_filenames,2,0,1,1) - - self.ascii_filenames = QtGui.QCheckBox(self.rename_files) - self.ascii_filenames.setObjectName("ascii_filenames") - self.gridlayout.addWidget(self.ascii_filenames,3,0,1,1) - - self.hboxlayout1 = QtGui.QHBoxLayout() - self.hboxlayout1.setObjectName("hboxlayout1") - - self.label = QtGui.QLabel(self.rename_files) - - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Maximum,QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth()) - self.label.setSizePolicy(sizePolicy) - self.label.setObjectName("label") - self.hboxlayout1.addWidget(self.label) - - self.example_filename = QtGui.QLabel(self.rename_files) - + self.verticalLayout_4.addWidget(self.file_naming_format) + self.example_filename = QtGui.QLabel(self.groupBox) font = QtGui.QFont() font.setWeight(75) font.setItalic(False) font.setBold(True) self.example_filename.setFont(font) - self.example_filename.setFrameShape(QtGui.QFrame.StyledPanel) + self.example_filename.setFrameShape(QtGui.QFrame.NoFrame) self.example_filename.setFrameShadow(QtGui.QFrame.Plain) + self.example_filename.setLineWidth(1) self.example_filename.setTextFormat(QtCore.Qt.PlainText) self.example_filename.setWordWrap(True) + self.example_filename.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse) self.example_filename.setObjectName("example_filename") - self.hboxlayout1.addWidget(self.example_filename) - self.gridlayout.addLayout(self.hboxlayout1,4,0,1,1) - - self.use_va_format = QtGui.QGroupBox(self.rename_files) + self.verticalLayout_4.addWidget(self.example_filename) + self.vboxlayout.addWidget(self.groupBox) + self.use_va_format = QtGui.QGroupBox(RenamingOptionsPage) self.use_va_format.setCheckable(True) self.use_va_format.setObjectName("use_va_format") - - self.gridlayout1 = QtGui.QGridLayout(self.use_va_format) - self.gridlayout1.setObjectName("gridlayout1") - + self.verticalLayout_3 = QtGui.QVBoxLayout(self.use_va_format) + self.verticalLayout_3.setObjectName("verticalLayout_3") + self.horizontalLayout_3 = QtGui.QHBoxLayout() + self.horizontalLayout_3.setObjectName("horizontalLayout_3") self.label_4 = QtGui.QLabel(self.use_va_format) + font = QtGui.QFont() + font.setWeight(75) + font.setBold(True) + self.label_4.setFont(font) + self.label_4.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.label_4.setObjectName("label_4") - self.gridlayout1.addWidget(self.label_4,0,0,1,1) - - self.hboxlayout2 = QtGui.QHBoxLayout() - self.hboxlayout2.setObjectName("hboxlayout2") - - self.va_file_naming_format = QtGui.QTextEdit(self.use_va_format) - self.va_file_naming_format.setCursor(QtCore.Qt.IBeamCursor) - self.va_file_naming_format.setLineWrapMode(QtGui.QTextEdit.NoWrap) - self.va_file_naming_format.setTabStopWidth(20) - self.va_file_naming_format.setObjectName("va_file_naming_format") - self.hboxlayout2.addWidget(self.va_file_naming_format) - - self.vboxlayout2 = QtGui.QVBoxLayout() - self.vboxlayout2.setObjectName("vboxlayout2") - - self.va_file_naming_format_default = QtGui.QPushButton(self.use_va_format) - self.va_file_naming_format_default.setObjectName("va_file_naming_format_default") - self.vboxlayout2.addWidget(self.va_file_naming_format_default) - + self.horizontalLayout_3.addWidget(self.label_4) self.va_copy_from_above = QtGui.QPushButton(self.use_va_format) - self.va_copy_from_above.setObjectName("va_copy_from_above") - self.vboxlayout2.addWidget(self.va_copy_from_above) - - spacerItem1 = QtGui.QSpacerItem(20,40,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding) - self.vboxlayout2.addItem(spacerItem1) - self.hboxlayout2.addLayout(self.vboxlayout2) - self.gridlayout1.addLayout(self.hboxlayout2,1,0,1,1) - - self.hboxlayout3 = QtGui.QHBoxLayout() - self.hboxlayout3.setObjectName("hboxlayout3") - - self.label_5 = QtGui.QLabel(self.use_va_format) - - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Maximum,QtGui.QSizePolicy.Expanding) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.label_5.sizePolicy().hasHeightForWidth()) - self.label_5.setSizePolicy(sizePolicy) - self.label_5.setObjectName("label_5") - self.hboxlayout3.addWidget(self.label_5) - + sizePolicy.setHeightForWidth(self.va_copy_from_above.sizePolicy().hasHeightForWidth()) + self.va_copy_from_above.setSizePolicy(sizePolicy) + self.va_copy_from_above.setMinimumSize(QtCore.QSize(0, 0)) + self.va_copy_from_above.setObjectName("va_copy_from_above") + self.horizontalLayout_3.addWidget(self.va_copy_from_above) + self.va_file_naming_format_default = QtGui.QPushButton(self.use_va_format) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.va_file_naming_format_default.sizePolicy().hasHeightForWidth()) + self.va_file_naming_format_default.setSizePolicy(sizePolicy) + self.va_file_naming_format_default.setMinimumSize(QtCore.QSize(0, 0)) + self.va_file_naming_format_default.setObjectName("va_file_naming_format_default") + self.horizontalLayout_3.addWidget(self.va_file_naming_format_default) + self.verticalLayout_3.addLayout(self.horizontalLayout_3) + self.hboxlayout = QtGui.QHBoxLayout() + self.hboxlayout.setObjectName("hboxlayout") + self.va_file_naming_format = QtGui.QTextEdit(self.use_va_format) + font = QtGui.QFont() + font.setFamily("Monospace") + font.setPointSize(10) + self.va_file_naming_format.setFont(font) + self.va_file_naming_format.setProperty("cursor", QtCore.QVariant(QtCore.Qt.IBeamCursor)) + self.va_file_naming_format.setLineWrapMode(QtGui.QTextEdit.WidgetWidth) + self.va_file_naming_format.setTabStopWidth(20) + self.va_file_naming_format.setAcceptRichText(True) + self.va_file_naming_format.setObjectName("va_file_naming_format") + self.hboxlayout.addWidget(self.va_file_naming_format) + self.verticalLayout_3.addLayout(self.hboxlayout) self.example_va_filename = QtGui.QLabel(self.use_va_format) - font = QtGui.QFont() font.setWeight(75) font.setItalic(False) font.setBold(True) self.example_va_filename.setFont(font) - self.example_va_filename.setFrameShape(QtGui.QFrame.StyledPanel) + self.example_va_filename.setFrameShape(QtGui.QFrame.NoFrame) self.example_va_filename.setTextFormat(QtCore.Qt.PlainText) self.example_va_filename.setWordWrap(True) self.example_va_filename.setObjectName("example_va_filename") - self.hboxlayout3.addWidget(self.example_va_filename) - self.gridlayout1.addLayout(self.hboxlayout3,2,0,1,1) - self.gridlayout.addWidget(self.use_va_format,6,0,1,1) - - spacerItem2 = QtGui.QSpacerItem(20,40,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding) - self.gridlayout.addItem(spacerItem2,5,0,1,1) - self.vboxlayout.addWidget(self.rename_files) + self.verticalLayout_3.addWidget(self.example_va_filename) + self.vboxlayout.addWidget(self.use_va_format) self.retranslateUi(RenamingOptionsPage) QtCore.QMetaObject.connectSlotsByName(RenamingOptionsPage) def retranslateUi(self, RenamingOptionsPage): RenamingOptionsPage.setWindowTitle(_("Form")) - self.rename_files.setTitle(_("Rename Files")) - self.label_3.setText(_("File naming format:")) - self.file_naming_format_default.setText(_("Default")) - self.windows_compatible_filenames.setText(_("Replace Windows-incompatible characters")) + self.label.setText(_("Rename files")) + self.rename_files.setText(_("Enabled")) self.ascii_filenames.setText(_("Replace non-ASCII characters")) - self.label.setText(_("Preview: ")) - self.use_va_format.setTitle(_("Format multiple artists releases differently")) - self.label_4.setText(_("Multiple artist file naming format:")) - self.va_file_naming_format_default.setText(_("Default")) + self.windows_compatible_filenames.setText(_("Replace Windows-incompatible characters")) + self.groupBox.setTitle(_("Naming scheme")) + self.label_3.setText(_("Albums")) + self.file_naming_format_default.setText(_("Default")) + self.file_naming_format.setHtml(QtGui.QApplication.translate("RenamingOptionsPage", "\n" +"\n" +"

", None, QtGui.QApplication.UnicodeUTF8)) + self.example_filename.setText(_("fasdfasdfasdfasdfasdfsdfasfd")) + self.use_va_format.setTitle(_("Name compilations differently")) + self.label_4.setText(_("Compilations")) self.va_copy_from_above.setText(_("Copy from above")) - self.label_5.setText(_("Preview: ")) + self.va_file_naming_format_default.setText(_("Default")) + self.example_va_filename.setText(_("Blablablal hfajksdhfkladh flkahdf lkhasdflkhasd f")) diff --git a/ui/options_renaming.ui b/ui/options_renaming.ui index ffeec2682..b3671451b 100644 --- a/ui/options_renaming.ui +++ b/ui/options_renaming.ui @@ -5,8 +5,8 @@ 0 0 - 621 - 718 + 892 + 782 @@ -14,27 +14,97 @@ - + + + + + + 14 + 75 + true + + + + Rename files + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Enabled + + + + + + + + + QFrame::Plain + + + 2 + + + Qt::Horizontal + + + + + + + Replace non-ASCII characters + + + + + + + Replace Windows-incompatible characters + + + + + - Rename Files + Naming scheme - - true - - - - - - File naming format: - - - - - + + + - + + + + 75 + true + + + + Albums + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + - + 0 0 @@ -45,220 +115,205 @@ 0 - - IBeamCursor + + Default - - QTextEdit::NoWrap + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + Monospace + 10 + + + + IBeamCursor + + + QTextEdit::WidgetWidth + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Monospace'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> + + + 20 + + + true + + + + + + + + 75 + false + true + + + + QFrame::NoFrame + + + QFrame::Plain + + + 1 + + + fasdfasdfasdfasdfasdfsdfasfd + + + Qt::PlainText + + + true + + + Qt::LinksAccessibleByMouse + + + + + + + + + + Name compilations differently + + + true + + + + + + + + + 75 + true + - - 20 + + Compilations + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - Default - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - Replace Windows-incompatible characters - - - - - - - Replace non-ASCII characters - - - - - - - + - + 0 0 + + + 0 + 0 + + - Preview: + Copy from above - - - - 75 - false - true - + + + + 0 + 0 + - - QFrame::StyledPanel - - - QFrame::Plain + + + 0 + 0 + - + Default - - Qt::PlainText + + + + + + + + + + + Monospace + 10 + - + + IBeamCursor + + + QTextEdit::WidgetWidth + + + 20 + + true - - - - Format multiple artists releases differently + + + + + 75 + false + true + - + + QFrame::NoFrame + + + Blablablal hfajksdhfkladh flkahdf lkhasdflkhasd f + + + Qt::PlainText + + true - - - - - Multiple artist file naming format: - - - - - - - - - IBeamCursor - - - QTextEdit::NoWrap - - - 20 - - - - - - - - - Default - - - - - - - Copy from above - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - - 0 - 0 - - - - Preview: - - - - - - - - 75 - false - true - - - - QFrame::StyledPanel - - - - - - Qt::PlainText - - - true - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - -