From 51bc87ebc73b5777ad36e35ec20445b07a0d7639 Mon Sep 17 00:00:00 2001 From: Arno Date: Sun, 7 Dec 2014 12:40:35 +0100 Subject: Redesign of NewMovieWizard Make it possible to add parent files to files, so we can identify already downloaded files even if we reencoded them. Record the md5sum in a new table files_origin. --- archiveview.cpp | 78 ++++++++++++++++++++++++++------------------------------- 1 file changed, 35 insertions(+), 43 deletions(-) (limited to 'archiveview.cpp') diff --git a/archiveview.cpp b/archiveview.cpp index 2f4c77c..95fc7aa 100644 --- a/archiveview.cpp +++ b/archiveview.cpp @@ -11,9 +11,12 @@ #include #include #include +#include +#include #include #include #include +#include #include #include #include @@ -361,10 +364,6 @@ void ArchiveTree::editMetadata(){ } MetadataEditor e(this); ArchiveController *c = SmGlobals::instance()->archiveController(); - QStringList sources = c->archiveTreeModel()->allSources(); - e.widget()->setSources(sources); - QStringList relGroups = c->archiveTreeModel()->allReleaseGroups(); - e.widget()->setReleaseGroups(relGroups); int pId = idx.data(ArchiveModel::SeriesPartIdRole).toInt(); QList curMetadata = c->archiveTreeModel()->metadataList(pId); e.widget()->setMetadata(curMetadata); @@ -741,61 +740,55 @@ MappingEditor::MappingEditor(const QString &caption, QWidget *parent, Qt::Window /* Metadata Editor Widget */ -MetadataEditorWidget::MetadataEditorWidget(QWidget *parent) : QWidget(parent) { +MetadataEditorWidget::MetadataEditorWidget(QWidget *parent) : QWidget(parent){ QLabel *captionL = new QLabel(tr("Edit Metadata")); - QFormLayout *dataLayout = new QFormLayout; + QGroupBox *genGB = new QGroupBox(tr("General")); + QFormLayout *genGBL = new QFormLayout; mReleaseYear = new QSpinBox; mReleaseYear->setMinimum(1900); mReleaseYear->setMaximum(3000); - dataLayout->addRow(tr("&Release Year"), mReleaseYear); - mSource = new QComboBox; - mSource->setEditable(true); - dataLayout->addRow(tr("&Source"), mSource); - mRelGroup = new QComboBox; - mRelGroup->setEditable(true); - dataLayout->addRow(tr("Release &Group"), mRelGroup); + genGBL->addRow(tr("&Release Year"), mReleaseYear); mSubject = new QLineEdit; - dataLayout->addRow(tr("Sub&ject"), mSubject); - mEncoderOpts = new QLineEdit; - dataLayout->addRow(tr("&Encoder Opts."), mEncoderOpts); - mPasses = new QSpinBox; - mPasses->setMinimum(0); - mPasses->setMaximum(10); - dataLayout->addRow(tr("&Passes"), mPasses); - - QVBoxLayout *commentLayout = new QVBoxLayout; - QLabel *commentL = new QLabel(tr("Comment")); - commentLayout->addWidget(commentL); + genGBL->addRow(tr("Name/Sub&ject"), mSubject); + genGB->setLayout(genGBL); + + QGroupBox *srcGB = new QGroupBox(tr("Source")); + QHBoxLayout *srcGBL = new QHBoxLayout; + mTorrent = new QRadioButton(tr("BitTorrent")); + mUsenet = new QRadioButton(tr("Usenet")); + srcGBL->addWidget(mTorrent); + srcGBL->addWidget(mUsenet); + srcGBL->addStretch(); + srcGB->setLayout(srcGBL); + + //comment + QGroupBox *commentGB = new QGroupBox(tr("Comment")); mComment = new QTextEdit; - commentLayout->addWidget(mComment); - - mWidgets << mReleaseYear << mSource << mRelGroup << mSubject << mEncoderOpts << mPasses << mComment; + QHBoxLayout *commentGBL = new QHBoxLayout; + commentGBL->addWidget(mComment); + commentGB->setLayout(commentGBL); QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->addWidget(captionL); - mainLayout->addLayout(dataLayout); - mainLayout->addLayout(commentLayout); - setLayout(mainLayout); -} -void MetadataEditorWidget::setSources(const QStringList &sources){ - mSource->clear(); - mSource->addItems(sources); -} + mainLayout->addWidget(genGB); + mainLayout->addWidget(srcGB); + mainLayout->addWidget(commentGB); + setLayout(mainLayout); -void MetadataEditorWidget::setReleaseGroups(const QStringList &relGroups){ - mRelGroup->clear(); - mRelGroup->addItems(relGroups); + connect(this, SIGNAL(oldSelected(QString)), this, SLOT(setOld(QString))); } void MetadataEditorWidget::setMetadata(const QList &data){ mReleaseYear->setValue(data.at(ArchiveModel::ReleaseYear).toInt()); - mSource->setCurrentText(data.at(ArchiveModel::Source).toString()); + QString src = data.at(ArchiveModel::Source).toString(); + if(src == "torrent"){ + mTorrent->toggle(); + }else{ + mUsenet->toggle(); + } mSubject->setText(data.at(ArchiveModel::Subject).toString()); - mRelGroup->setCurrentText(data.at(ArchiveModel::ReleaseGroup).toString()); - mEncoderOpts->setText(data.at(ArchiveModel::EncoderOpts).toString()); - mPasses->setValue(data.at(ArchiveModel::Passes).toInt()); mComment->setText(data.at(ArchiveModel::Comment).toString()); mAdded = data.at(ArchiveModel::Added).toDate(); } @@ -823,7 +816,6 @@ void MetadataEditorWidget::setEnabledAll(bool enabled){ } /* Metadata Editor */ - MetadataEditor::MetadataEditor(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f){ mWidget = new MetadataEditorWidget; -- cgit v1.2.3-70-g09d2