From 80bf76dc318276f67eeec32b8f68e82cf4bb7e62 Mon Sep 17 00:00:00 2001 From: am Date: Sat, 18 Jul 2009 17:54:27 +0000 Subject: Again huge changes (should go on vacation more often :)) -turned archive tab into a QDialog -fixed duplicate handling in ListModel -fixed html output in archive dialog -actually made archiving work -changed covertype to text in database -fixed bug with covertype in coveritem git-svn-id: file:///var/svn/repos2/shemov/trunk@390 f440f766-f032-0410-8965-dc7d17de2ca0 --- archivefilewidget.cpp | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'archivefilewidget.cpp') diff --git a/archivefilewidget.cpp b/archivefilewidget.cpp index 8d7555c..c8c2644 100644 --- a/archivefilewidget.cpp +++ b/archivefilewidget.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -84,15 +83,8 @@ ArchiveFileWidget::ArchiveFileWidget(MovieModel *model, QWidget *parent, Qt::Win qualityTitleLayout->addWidget(mTitle); mainLayout->addLayout(qualityTitleLayout); - //archive button layout - QHBoxLayout *archiveButtonLayout = new QHBoxLayout; - mArchive = new QPushButton(tr("Archive")); - connect(mArchive, SIGNAL(clicked()), this, SIGNAL(archive())); - archiveButtonLayout->addStretch(); - archiveButtonLayout->addWidget(mArchive); - mainLayout->addLayout(archiveButtonLayout); - setLayout(mainLayout); + setMinimumWidth(600); } void ArchiveFileWidget::setMovieModel(MovieModel *model){ @@ -114,8 +106,7 @@ void ArchiveFileWidget::setFiles(const QStringList &files){ mFiles->clear(); mMd5Sums.clear(); mActorIdMap.clear(); - QString tableStart(""); - mFiles->append(tableStart); + QString html("
FilenameSizeMD5-SumMime type
"); QLocale l; foreach(QString f, files){ QFileInfo info(f); @@ -124,11 +115,11 @@ void ArchiveFileWidget::setFiles(const QStringList &files){ QString filename = info.fileName(); QString mimeType = Helper::mimeType(f); QString row = QString("").arg(filename).arg(l.toString(size)).arg(md5).arg(mimeType); - mFiles->append(row); + html.append(row); mMd5Sums.insert(f, md5); } - QString tableEnd("
FilenameSizeMD5-SumMime type
%1%2%3%4
"); - mFiles->append(tableEnd); + html.append(""); + mFiles->setHtml(html); } const QList ArchiveFileWidget::actorIds() const{ @@ -136,6 +127,7 @@ const QList ArchiveFileWidget::actorIds() const{ QList retval; while(i != mActorIdMap.constEnd()){ retval << i.value(); + ++i; } return retval; } @@ -180,13 +172,15 @@ void ArchiveFileWidget::removeActor(){ void ArchiveFileWidget::createActorList(){ mSelectedActors->clear(); + QString html("
    "); mSelectedActors->append("
      "); QHash::const_iterator i = mActorIdMap.constBegin(); while(i != mActorIdMap.constEnd()){ QString s = QString("
    • %1
      • ").arg(i.key()); - mSelectedActors->append(s); + html.append(s); ++i; } - mSelectedActors->append("
    "); + html.append("
"); + mSelectedActors->setHtml(html); } -- cgit v1.2.3-70-g09d2