From 0e5186349df8d9fae820e9d5c5b91a0e78a160c7 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 30 Jul 2009 20:20:58 +0000 Subject: some details dialog improvements git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1090 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/mad/detailsdialog.cpp | 35 ++-- src/plugins/Input/mad/detailsdialog.h | 1 - src/plugins/Input/mad/detailsdialog.ui | 325 +++++++++++++++++--------------- 3 files changed, 189 insertions(+), 172 deletions(-) (limited to 'src/plugins/Input') 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 p); - QList 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 @@ 0 0 - 588 - 371 + 608 + 362 Dialog - - 6 - - - 6 - - - 6 - - + + + + + + 0 + 0 + + + + + 110 + 110 + + + + + 110 + 110 + + + + @@ -56,56 +69,39 @@ - + ID3v1 Tag - - - - - false - - - <!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> - - - - - + + + - + 0 0 + + Title: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + - - + + - + 0 0 - - Track number: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - + @@ -121,26 +117,17 @@ p, li { white-space: pre-wrap; } - - - - - + + - + 0 0 - - Year: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + @@ -156,51 +143,57 @@ p, li { white-space: pre-wrap; } - - - - - 0 - 0 - - - + + + + QLayout::SetDefaultConstraint + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + Disc number: + + + + + + + ? + + + + - - - - Create - - - - - + + - Delete - - - - - - - - 0 - 0 - + Composer: - - - - - 0 - 0 - - - + + - + @@ -216,7 +209,7 @@ p, li { white-space: pre-wrap; } - + @@ -226,15 +219,8 @@ p, li { white-space: pre-wrap; } - - - - Disc number: - - - - - + + 0 @@ -242,31 +228,66 @@ p, li { white-space: pre-wrap; } - Title: + Track: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - Composer: - - - - - - - - 0 - 0 - - - + + + + + + + 0 + 0 + + + + ? + + + + + + + + 0 + 0 + + + + Year: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + ? + + + + + + 2012 + + + + - + @@ -282,10 +303,17 @@ p, li { white-space: pre-wrap; } - - - - Save + + + + false + + + <!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> @@ -330,38 +358,37 @@ p, li { white-space: pre-wrap; } - 312 - 20 + 192 + 23 - + - Закрыть + Create - - - - - 0 - 0 - + + + + Delete - - - 110 - 110 - + + + + + + Save - - - 110 - 110 - + + + + + + Close -- cgit v1.2.3-13-gbd6f