diff options
| author | am <am@f440f766-f032-0410-8965-dc7d17de2ca0> | 2009-07-21 13:48:56 +0000 |
|---|---|---|
| committer | am <am@f440f766-f032-0410-8965-dc7d17de2ca0> | 2009-07-21 13:48:56 +0000 |
| commit | 84ed109c159dcbd0c9395717d54599e902060b26 (patch) | |
| tree | 01bb4a4d6148ec46952a1cdd5e923bb7b642305e /editarchiveitemdialog.cpp | |
| parent | ec3418479b28ca8e162f84d76c2eed78c27a114c (diff) | |
| download | SheMov-84ed109c159dcbd0c9395717d54599e902060b26.tar.gz SheMov-84ed109c159dcbd0c9395717d54599e902060b26.tar.bz2 SheMov-84ed109c159dcbd0c9395717d54599e902060b26.zip | |
-Made CoverItem behave consistent
-get QModelIndex from MovieModel by movieId
-ArchiveView: added delegates for dvd and size, MovieItem now returns size as int
-Finished EditArchiveItemDialog
-Reverted covereditor, it became too convoluted
git-svn-id: file:///var/svn/repos2/shemov/trunk@393 f440f766-f032-0410-8965-dc7d17de2ca0
Diffstat (limited to 'editarchiveitemdialog.cpp')
| -rw-r--r-- | editarchiveitemdialog.cpp | 63 |
1 files changed, 30 insertions, 33 deletions
diff --git a/editarchiveitemdialog.cpp b/editarchiveitemdialog.cpp index 333c410..6a77300 100644 --- a/editarchiveitemdialog.cpp +++ b/editarchiveitemdialog.cpp @@ -94,6 +94,8 @@ EditArchiveItemDialog::EditArchiveItemDialog(ListModel *genre, ListModel *actors titleLayout->addWidget(l6); titleLayout->addWidget(mTitle); w1Layout->addLayout(titleLayout); + w1->setLayout(w1Layout); + w1->setMinimumWidth(500); //list editors QWidget *w2 = new QWidget; @@ -102,8 +104,8 @@ EditArchiveItemDialog::EditArchiveItemDialog(ListModel *genre, ListModel *actors w2Layout->addWidget(genreEditor); ListEditor *actorsEditor = new ListEditor(mActorsModel); w2Layout->addWidget(actorsEditor); - mCoverEditor = new CoverEditor(CoverEditor::Update); - w2Layout->addWidget(mCoverEditor); + w2Layout->addStretch(); + w2->setLayout(w2Layout); //splitter QSplitter *splitter = new QSplitter; @@ -116,7 +118,7 @@ EditArchiveItemDialog::EditArchiveItemDialog(ListModel *genre, ListModel *actors mUpdate = new QPushButton(tr("Update")); connect(mUpdate, SIGNAL(clicked()), this, SLOT(updateMovie())); mClose = new QPushButton(tr("Close")); - connect(mClose, SIGNAL(triggered()), this, SLOT(reject())); + connect(mClose, SIGNAL(clicked()), this, SLOT(reject())); buttonLayout->addWidget(mUpdate); buttonLayout->addWidget(mClose); @@ -139,7 +141,6 @@ void EditArchiveItemDialog::setMovie(const QModelIndex &movie){ mCovers = movie.data(MovieModel::CoverRole).toList(); setActors(); setMovieInfo(movie); - setCovers(movie); } void EditArchiveItemDialog::setActors(){ @@ -156,44 +157,34 @@ void EditArchiveItemDialog::setActors(){ void EditArchiveItemDialog::setMovieInfo(const QModelIndex &movie){ QString html("<html><body style=\"color:#CD0003\"><ul>"); QModelIndex idx = mMovieModel->index(movie.row(), MovieItem::Title, QModelIndex()); - html.append(tr("<li>Title: %1</li>")).arg(idx.data().toString()); + html.append(QString(tr("<li>Title: %1</li>")).arg(idx.data().toString())); mTitle->setText(idx.data().toString()); idx = mMovieModel->index(movie.row(), MovieItem::Filename, QModelIndex()); - html.append(tr("<li>Filename: %1</li>")).arg(idx.data().toString()); + html.append(QString(tr("<li>Filename: %1</li>")).arg(idx.data().toString())); idx = mMovieModel->index(movie.row(), MovieItem::Md5Sum, QModelIndex()); - html.append(tr("<li>Md5-Sum: %1</li>")).arg(idx.data().toString()); + html.append(QString(tr("<li>Md5-Sum: %1</li>")).arg(idx.data().toString())); idx = mMovieModel->index(movie.row(), MovieItem::Size, QModelIndex()); QLocale l; - html.append(tr("<li>Size: %1</li>")).arg(l.toString(idx.data().toLongLong())); + html.append(QString(tr("<li>Size: %1</li>")).arg(l.toString(idx.data().toLongLong()))); idx = mMovieModel->index(movie.row(), MovieItem::Genre, QModelIndex()); - html.append(tr("<li>Genre: %1</li>")).arg(idx.data().toString()); + html.append(QString(tr("<li>Genre: %1</li>")).arg(idx.data().toString())); int genreIndex = mGenre->findText(idx.data().toString()); if(genreIndex != -1){ mGenre->setCurrentIndex(genreIndex); } idx = mMovieModel->index(movie.row(), MovieItem::Quality, QModelIndex()); - html.append(tr("<li>Quality: %1</li>")).arg(l.toString(idx.data().toInt())); + html.append(QString(tr("<li>Quality: %1</li>")).arg(l.toString(idx.data().toInt()))); mQuality->setValue(idx.data().toInt()); idx = mMovieModel->index(movie.row(), MovieItem::Dvd, QModelIndex()); int dvd = idx.data().toInt(); if(dvd != -1){ - html.append(tr("<li>On DVD %1</li>")).arg(l.toString(dvd)); + html.append(QString(tr("<li>On DVD %1</li>")).arg(l.toString(dvd))); }else{ - html.append(tr("<li>Not on DVD</li>)")); + html.append(QString(tr("<li>Not on DVD</li>"))); } mDvd->setValue(dvd); -} - -void EditArchiveItemDialog::setCovers(const QModelIndex &movie){ - mCovers.clear(); - QList<QVariant> covers = movie.data(MovieModel::CoverRole).toList(); - QStringList coverNames; - foreach(QVariant v, covers){ - CoverItem i = v.value<CoverItem>(); - coverNames << i.fileName(); - //mModelCovers << i.fileName(); - } - mCoverEditor->setCovers(coverNames); + html.append("</ul></body></html>"); + mMovieInfo->setHtml(html); } void EditArchiveItemDialog::addActor(){ @@ -222,14 +213,20 @@ void EditArchiveItemDialog::updateMovie(){ ++it; } mMovieModel->setActors(mMovieId, actors); - + QString genreName = mGenre->currentText(); + QModelIndex genreIdx = mGenreModel->index(genreName); + QModelIndex genreMovieIndex = mMovieModel->index(mMovieId, MovieItem::Genre); + QVariant genreId = genreIdx.data(ListModel::IdRole); + mMovieModel->setDataAt(genreMovieIndex, genreId); + QModelIndex dvdIdx = mMovieModel->index(mMovieId, MovieItem::Dvd); + mMovieModel->setDataAt(dvdIdx, mDvd->value()); + QModelIndex qualityIdx = mMovieModel->index(mMovieId, MovieItem::Quality); + mMovieModel->setDataAt(qualityIdx, mQuality->value()); + QString title = mTitle->text().trimmed().toLower(); + QModelIndex titleIdx = mMovieModel->index(mMovieId, MovieItem::Title); + if(!title.isEmpty()){ + mMovieModel->setDataAt(titleIdx, title); + } + setMovieInfo(titleIdx); } -void EditArchiveItemDialog::updateCovers(){ - QString front = mCoverEditor->frontCover(); - QString back = mCoverEditor->backCover(); - QString covers = mCoverEditor->covers(); - QList<CoverItem> coverList; - ///if(front - -} |