diff options
| -rw-r--r-- | src/plugins/Input/mad/detailsdialog.cpp | 35 | ||||
| -rw-r--r-- | src/plugins/Input/mad/detailsdialog.h | 1 | ||||
| -rw-r--r-- | src/plugins/Input/mad/detailsdialog.ui | 325 |
3 files changed, 189 insertions, 172 deletions
diff --git a/src/plugins/Input/mad/detailsdialog.cpp b/src/plugins/Input/mad/detailsdialog.cpp index 64f6088e9..d215969ce 100644 --- a/src/plugins/Input/mad/detailsdialog.cpp +++ b/src/plugins/Input/mad/detailsdialog.cpp @@ -85,13 +85,6 @@ DetailsDialog::DetailsDialog(QWidget *parent, const QString &path) connect(ui.id3v1RadioButton, SIGNAL(clicked()), SLOT(loadTag())); connect(ui.id3v2RadioButton, SIGNAL(clicked()), SLOT(loadTag())); connect(ui.apeRadioButton, SIGNAL(clicked()), SLOT(loadTag())); - m_inputs << ui.titleLineEdit; - m_inputs << ui.artistLineEdit; - m_inputs << ui.albumLineEdit; - //m_inputs << ui.commentBrowser; - m_inputs << ui.yearLineEdit; - m_inputs << ui.trackLineEdit; - m_inputs << ui.genreLineEdit; ui.coverWidget->setPixmap(findCover(path)); } @@ -180,13 +173,15 @@ void DetailsDialog::loadTag() ui.saveButton->setEnabled(tag && m_rw); ui.createButton->setEnabled(!tag && m_rw); ui.deleteButton->setEnabled(tag && m_rw); - foreach(QLineEdit *le, m_inputs) - { - le->setEnabled(tag); - le->clear(); //clear old values - } - ui.commentBrowser->setEnabled(tag); + ui.tagGroupBox->setEnabled(tag); + //clear old values + ui.titleLineEdit->clear(); + ui.artistLineEdit->clear(); + ui.albumLineEdit->clear(); ui.commentBrowser->clear(); + ui.yearSpinBox->clear(); + ui.trackSpinBox->clear(); + ui.genreLineEdit->clear(); if (tag) { @@ -206,10 +201,8 @@ void DetailsDialog::loadTag() ui.albumLineEdit->setText(string); string = codec->toUnicode(comment.toCString(utf)).trimmed(); ui.commentBrowser->setText(string); - string = QString("%1").arg(tag->year()); - ui.yearLineEdit->setText(string); - string = QString("%1").arg(tag->track()); - ui.trackLineEdit->setText(string); + ui.yearSpinBox->setValue(tag->year()); + ui.trackSpinBox->setValue(tag->track()); string = codec->toUnicode(genre.toCString(utf)).trimmed(); ui.genreLineEdit->setText(string); } @@ -268,8 +261,8 @@ void DetailsDialog::save() tag->setComment(TagLib::String(codec->fromUnicode(ui.commentBrowser->toPlainText ()) .constData(), type)); tag->setGenre(TagLib::String(codec->fromUnicode(ui.genreLineEdit->text()).constData(), type)); - tag->setYear(ui.yearLineEdit->text().toUInt()); - tag->setTrack(ui.trackLineEdit->text().toUInt()); + tag->setYear(ui.yearSpinBox->value()); + tag->setTrack(ui.trackSpinBox->value()); f->save(selectedTag(), FALSE); delete f; @@ -290,9 +283,7 @@ void DetailsDialog::create() f->save(selectedTag(), FALSE); delete f; loadTag(); - foreach(QLineEdit *le, m_inputs) - le->setEnabled(TRUE); - ui.commentBrowser->setEnabled(TRUE); + ui.tagGroupBox->setEnabled(TRUE); ui.saveButton->setEnabled(m_rw); } diff --git a/src/plugins/Input/mad/detailsdialog.h b/src/plugins/Input/mad/detailsdialog.h index 98c8bedd9..2a4827d3d 100644 --- a/src/plugins/Input/mad/detailsdialog.h +++ b/src/plugins/Input/mad/detailsdialog.h @@ -54,7 +54,6 @@ private: void loadMPEGInfo(); uint selectedTag(); void showAudioProperties(QMap <QString, QString> p); - QList <QLineEdit *> m_inputs; Ui::DetailsDialog ui; QString m_path; QTextCodec *m_codec_v1; diff --git a/src/plugins/Input/mad/detailsdialog.ui b/src/plugins/Input/mad/detailsdialog.ui index 56ee2594a..afb8b05a0 100644 --- a/src/plugins/Input/mad/detailsdialog.ui +++ b/src/plugins/Input/mad/detailsdialog.ui @@ -6,26 +6,39 @@ <rect> <x>0</x> <y>0</y> - <width>588</width> - <height>371</height> + <width>608</width> + <height>362</height> </rect> </property> <property name="windowTitle"> <string>Dialog</string> </property> <layout class="QGridLayout" name="gridLayout"> - <property name="leftMargin"> - <number>6</number> - </property> - <property name="rightMargin"> - <number>6</number> - </property> - <property name="bottomMargin"> - <number>6</number> - </property> - <item row="0" column="0" colspan="4"> + <item row="0" column="0" colspan="7"> <widget class="QLineEdit" name="pathLineEdit"/> </item> + <item row="1" column="0"> + <widget class="CoverWidget" name="coverWidget" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>110</width> + <height>110</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>110</width> + <height>110</height> + </size> + </property> + </widget> + </item> <item row="1" column="1"> <widget class="QGroupBox" name="groupBox"> <property name="title"> @@ -56,56 +69,39 @@ </layout> </widget> </item> - <item row="1" column="2" rowspan="2" colspan="2"> + <item row="1" column="2" rowspan="2" colspan="5"> <widget class="QGroupBox" name="tagGroupBox"> <property name="title"> <string>ID3v1 Tag</string> </property> - <layout class="QGridLayout" name="gridLayout_3"> - <item row="7" column="4" colspan="3"> - <widget class="QTextBrowser" name="commentBrowser"> - <property name="readOnly"> - <bool>false</bool> - </property> - <property name="html"> - <string><!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:'Arial'; 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></string> - </property> - </widget> - </item> - <item row="5" column="6"> - <widget class="QLineEdit" name="trackLineEdit"> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QLabel" name="label_47"> <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="text"> + <string>Title:</string> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> + </property> </widget> </item> - <item row="5" column="5"> - <widget class="QLabel" name="label_42"> + <item row="0" column="1"> + <widget class="QLineEdit" name="titleLineEdit"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="text"> - <string>Track number:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> </widget> </item> - <item row="6" column="6"> - <widget class="QLineEdit" name="discLineEdit"/> - </item> - <item row="2" column="2"> + <item row="1" column="0"> <widget class="QLabel" name="label_43"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> @@ -121,26 +117,17 @@ p, li { white-space: pre-wrap; } </property> </widget> </item> - <item row="4" column="4" colspan="3"> - <widget class="QLineEdit" name="composerLineEdit"/> - </item> - <item row="5" column="2"> - <widget class="QLabel" name="label_44"> + <item row="1" column="1"> + <widget class="QLineEdit" name="artistLineEdit"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="text"> - <string>Year:</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> - </property> </widget> </item> - <item row="3" column="2"> + <item row="2" column="0"> <widget class="QLabel" name="label_45"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> @@ -156,51 +143,57 @@ p, li { white-space: pre-wrap; } </property> </widget> </item> - <item row="2" column="4" colspan="3"> - <widget class="QLineEdit" name="artistLineEdit"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> + <item row="2" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="sizeConstraint"> + <enum>QLayout::SetDefaultConstraint</enum> + </property> + <item> + <widget class="QLineEdit" name="albumLineEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_11"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Disc number:</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="discSpinBox"> + <property name="specialValueText"> + <string notr="true">?</string> + </property> + </widget> + </item> + </layout> </item> - <item row="8" column="4"> - <widget class="QPushButton" name="createButton"> - <property name="text"> - <string>Create</string> - </property> - </widget> - </item> - <item row="8" column="5"> - <widget class="QPushButton" name="deleteButton"> + <item row="3" column="0"> + <widget class="QLabel" name="label_8"> <property name="text"> - <string>Delete</string> - </property> - </widget> - </item> - <item row="5" column="4"> - <widget class="QLineEdit" name="yearLineEdit"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <string>Composer:</string> </property> </widget> </item> - <item row="1" column="4" colspan="3"> - <widget class="QLineEdit" name="titleLineEdit"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> + <item row="3" column="1"> + <widget class="QLineEdit" name="composerLineEdit"/> </item> - <item row="6" column="2"> + <item row="4" column="0"> <widget class="QLabel" name="label_46"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> @@ -216,7 +209,7 @@ p, li { white-space: pre-wrap; } </property> </widget> </item> - <item row="6" column="4"> + <item row="4" column="1"> <widget class="QLineEdit" name="genreLineEdit"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> @@ -226,15 +219,8 @@ p, li { white-space: pre-wrap; } </property> </widget> </item> - <item row="6" column="5"> - <widget class="QLabel" name="label_11"> - <property name="text"> - <string>Disc number:</string> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QLabel" name="label_47"> + <item row="5" column="0"> + <widget class="QLabel" name="label_42"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch> @@ -242,31 +228,66 @@ p, li { white-space: pre-wrap; } </sizepolicy> </property> <property name="text"> - <string>Title:</string> + <string>Track:</string> </property> <property name="alignment"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> </property> </widget> </item> - <item row="4" column="2" colspan="2"> - <widget class="QLabel" name="label_8"> - <property name="text"> - <string>Composer:</string> - </property> - </widget> - </item> - <item row="3" column="4" colspan="3"> - <widget class="QLineEdit" name="albumLineEdit"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> + <item row="5" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QSpinBox" name="trackSpinBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="specialValueText"> + <string notr="true">?</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_44"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Year:</string> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="yearSpinBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="specialValueText"> + <string notr="true">?</string> + </property> + <property name="suffix"> + <string/> + </property> + <property name="maximum"> + <number>2012</number> + </property> + </widget> + </item> + </layout> </item> - <item row="7" column="2" colspan="2"> + <item row="6" column="0"> <widget class="QLabel" name="label_48"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> @@ -282,10 +303,17 @@ p, li { white-space: pre-wrap; } </property> </widget> </item> - <item row="8" column="6"> - <widget class="QPushButton" name="saveButton"> - <property name="text"> - <string>Save</string> + <item row="6" column="1"> + <widget class="QTextBrowser" name="commentBrowser"> + <property name="readOnly"> + <bool>false</bool> + </property> + <property name="html"> + <string><!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:'Arial'; 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></string> </property> </widget> </item> @@ -330,38 +358,37 @@ p, li { white-space: pre-wrap; } </property> <property name="sizeHint" stdset="0"> <size> - <width>312</width> - <height>20</height> + <width>192</width> + <height>23</height> </size> </property> </spacer> </item> <item row="3" column="3"> - <widget class="QPushButton" name="closeButton"> + <widget class="QPushButton" name="createButton"> <property name="text"> - <string>Закрыть</string> + <string>Create</string> </property> </widget> </item> - <item row="1" column="0"> - <widget class="CoverWidget" name="coverWidget" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <item row="3" column="4"> + <widget class="QPushButton" name="deleteButton"> + <property name="text"> + <string>Delete</string> </property> - <property name="minimumSize"> - <size> - <width>110</width> - <height>110</height> - </size> + </widget> + </item> + <item row="3" column="5"> + <widget class="QPushButton" name="saveButton"> + <property name="text"> + <string>Save</string> </property> - <property name="maximumSize"> - <size> - <width>110</width> - <height>110</height> - </size> + </widget> + </item> + <item row="3" column="6"> + <widget class="QPushButton" name="closeButton"> + <property name="text"> + <string>Close</string> </property> </widget> </item> |