birkeh/qtMultimediaDB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added resolution to series and movies

Browse Source
This commit is contained in:
birkeh
2019-02-20 22:59:28 +01:00
parent 44fda299d2
commit 217fac56e4
2 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmainwindow.cpp
+45 -13
View File
@@ -125,7 +125,7 @@ cMainWindow::cMainWindow(QWidget *parent) :
ui->m_lpMoviesFilterProgress->setCheckState(static_cast<Qt::CheckState>(settings.value("movieFilter/hasProgress", Qt::PartiallyChecked).toUInt())); ui->m_lpMoviesFilterProgress->setCheckState(static_cast<Qt::CheckState>(settings.value("movieFilter/hasProgress", Qt::PartiallyChecked).toUInt()));
ui->m_lpMoviesFilterDone->setCheckState(static_cast<Qt::CheckState>(settings.value("movieFilter/hasDone", Qt::PartiallyChecked).toUInt())); ui->m_lpMoviesFilterDone->setCheckState(static_cast<Qt::CheckState>(settings.value("movieFilter/hasDone", Qt::PartiallyChecked).toUInt()));
m_lpSeriesListModel = new QStandardItemModel(0, 3); m_lpSeriesListModel = new QStandardItemModel(0, 4);
initDB(); initDB();
ui->m_lpSeriesList1->setModel(m_lpSeriesListModel); ui->m_lpSeriesList1->setModel(m_lpSeriesListModel);
@@ -164,7 +164,7 @@ cMainWindow::cMainWindow(QWidget *parent) :
qint32 iWidth1 = 0; qint32 iWidth1 = 0;
qint32 iWidth2; qint32 iWidth2;
for(int z = 0;z < 3;z++) for(int z = 0;z < 4;z++)
iWidth1 += ui->m_lpSeriesList1->columnWidth(z); iWidth1 += ui->m_lpSeriesList1->columnWidth(z);
iWidth1 += 2; iWidth1 += 2;
@@ -693,6 +693,7 @@ void cMainWindow::setSeriesStyle(QList<QStandardItem*>lpItems)
lpItems.at(0)->setForeground(QBrush(Qt::black)); lpItems.at(0)->setForeground(QBrush(Qt::black));
lpItems.at(1)->setForeground(QBrush(Qt::black)); lpItems.at(1)->setForeground(QBrush(Qt::black));
lpItems.at(2)->setForeground(QBrush(Qt::black)); lpItems.at(2)->setForeground(QBrush(Qt::black));
lpItems.at(3)->setForeground(QBrush(Qt::black));
QList<cSeason*> seasonList = lpSerie->seasonList(); QList<cSeason*> seasonList = lpSerie->seasonList();
for(int season = 0;season < seasonList.count();season++) for(int season = 0;season < seasonList.count();season++)
@@ -706,7 +707,7 @@ void cMainWindow::setSeriesStyle(QList<QStandardItem*>lpItems)
if(!lpSeason->seasonNumber() && !bDisplaySeason0) if(!lpSeason->seasonNumber() && !bDisplaySeason0)
continue; continue;
lpItems.at(lpSeason->seasonNumber()+3-iMin)->setData(QVariant::fromValue(lpSeason), Qt::UserRole); lpItems.at(lpSeason->seasonNumber()+4-iMin)->setData(QVariant::fromValue(lpSeason), Qt::UserRole);
for(int y = 0;y < lpSeason->episodeList().count();y++) for(int y = 0;y < lpSeason->episodeList().count();y++)
{ {
@@ -781,6 +782,7 @@ void cMainWindow::setSeriesStyle(QList<QStandardItem*>lpItems)
lpItems.at(0)->setFont(font); lpItems.at(0)->setFont(font);
lpItems.at(1)->setFont(font); lpItems.at(1)->setFont(font);
lpItems.at(2)->setFont(font); lpItems.at(2)->setFont(font);
lpItems.at(3)->setFont(font);
} }
if(lpSerie->cliffhanger()) if(lpSerie->cliffhanger())
@@ -788,9 +790,11 @@ void cMainWindow::setSeriesStyle(QList<QStandardItem*>lpItems)
lpItems.at(0)->setFont(fontI); lpItems.at(0)->setFont(fontI);
lpItems.at(1)->setFont(fontI); lpItems.at(1)->setFont(fontI);
lpItems.at(2)->setFont(fontI); lpItems.at(2)->setFont(fontI);
lpItems.at(3)->setFont(fontI);
lpItems.at(0)->setForeground(QBrush(Qt::red)); lpItems.at(0)->setForeground(QBrush(Qt::red));
lpItems.at(1)->setForeground(QBrush(Qt::red)); lpItems.at(1)->setForeground(QBrush(Qt::red));
lpItems.at(2)->setForeground(QBrush(Qt::red)); lpItems.at(2)->setForeground(QBrush(Qt::red));
lpItems.at(3)->setForeground(QBrush(Qt::red));
} }
if(bHasProg) if(bHasProg)
@@ -798,21 +802,25 @@ void cMainWindow::setSeriesStyle(QList<QStandardItem*>lpItems)
lpItems.at(0)->setForeground(QBrush(Qt::white)); lpItems.at(0)->setForeground(QBrush(Qt::white));
lpItems.at(1)->setForeground(QBrush(Qt::white)); lpItems.at(1)->setForeground(QBrush(Qt::white));
lpItems.at(2)->setForeground(QBrush(Qt::white)); lpItems.at(2)->setForeground(QBrush(Qt::white));
lpItems.at(3)->setForeground(QBrush(Qt::white));
lpItems.at(0)->setBackground(QBrush(Qt::blue)); lpItems.at(0)->setBackground(QBrush(Qt::blue));
lpItems.at(1)->setBackground(QBrush(Qt::blue)); lpItems.at(1)->setBackground(QBrush(Qt::blue));
lpItems.at(2)->setBackground(QBrush(Qt::blue)); lpItems.at(2)->setBackground(QBrush(Qt::blue));
lpItems.at(3)->setBackground(QBrush(Qt::blue));
} }
else if(bHasInit) else if(bHasInit)
{ {
lpItems.at(0)->setBackground(QBrush(Qt::lightGray)); lpItems.at(0)->setBackground(QBrush(Qt::lightGray));
lpItems.at(1)->setBackground(QBrush(Qt::lightGray)); lpItems.at(1)->setBackground(QBrush(Qt::lightGray));
lpItems.at(2)->setBackground(QBrush(Qt::lightGray)); lpItems.at(2)->setBackground(QBrush(Qt::lightGray));
lpItems.at(3)->setBackground(QBrush(Qt::lightGray));
} }
else else
{ {
lpItems.at(0)->setBackground(QBrush(Qt::green)); lpItems.at(0)->setBackground(QBrush(Qt::green));
lpItems.at(1)->setBackground(QBrush(Qt::green)); lpItems.at(1)->setBackground(QBrush(Qt::green));
lpItems.at(2)->setBackground(QBrush(Qt::green)); lpItems.at(2)->setBackground(QBrush(Qt::green));
lpItems.at(3)->setBackground(QBrush(Qt::green));
} }
if(lpSerie->download().length()) if(lpSerie->download().length())
@@ -821,6 +829,7 @@ void cMainWindow::setSeriesStyle(QList<QStandardItem*>lpItems)
lpItems.at(0)->setToolTip(szOpen); lpItems.at(0)->setToolTip(szOpen);
lpItems.at(1)->setToolTip(szOpen); lpItems.at(1)->setToolTip(szOpen);
lpItems.at(2)->setToolTip(szOpen); lpItems.at(2)->setToolTip(szOpen);
lpItems.at(3)->setToolTip(szOpen);
} }
void cMainWindow::setMovieStyle(QStandardItem* /*lpItem*/) void cMainWindow::setMovieStyle(QStandardItem* /*lpItem*/)
@@ -844,10 +853,10 @@ void cMainWindow::displaySeries()
qint32 iSeries = 0; qint32 iSeries = 0;
qint32 iEpisodes = 0; qint32 iEpisodes = 0;
m_lpSeriesListModel->setColumnCount(iMax-iMin+2); m_lpSeriesListModel->setColumnCount(iMax-iMin+3);
QStringList header; QStringList header;
header << "Nr" << "Serie" << "Year"; header << tr("Nr") << tr("Serie") << tr("Year") << tr("Res");
for(int z = iMin;z <= iMax;z++) for(int z = iMin;z <= iMax;z++)
header.append(QString("Season %1").arg(z)); header.append(QString("Season %1").arg(z));
@@ -878,12 +887,15 @@ void cMainWindow::displaySeries()
lpItems.at(2)->setText(lpSerie->firstAired().toString("yyyy")); lpItems.at(2)->setText(lpSerie->firstAired().toString("yyyy"));
lpItems.at(2)->setTextAlignment(Qt::AlignRight); lpItems.at(2)->setTextAlignment(Qt::AlignRight);
lpItems.at(3)->setText(lpSerie->resolution());
lpItems.at(3)->setTextAlignment(Qt::AlignRight);
QList<cSeason*> seasonList = lpSerie->seasonList(); QList<cSeason*> seasonList = lpSerie->seasonList();
for(int season = 0;season < seasonList.count();season++) for(int season = 0;season < seasonList.count();season++)
{ {
cSeason* lpSeason = seasonList.at(season); cSeason* lpSeason = seasonList.at(season);
if(lpSeason->seasonNumber() || bDisplaySeason0) if(lpSeason->seasonNumber() || bDisplaySeason0)
lpItems.at(lpSeason->seasonNumber()+3-iMin)->setData(QVariant::fromValue(lpSeason), Qt::UserRole); lpItems.at(lpSeason->seasonNumber()+4-iMin)->setData(QVariant::fromValue(lpSeason), Qt::UserRole);
} }
m_lpSeriesListModel->appendRow(lpItems); m_lpSeriesListModel->appendRow(lpItems);
@@ -899,13 +911,13 @@ void cMainWindow::displaySeries()
} }
} }
for(int z = 3;z < m_lpSeriesListModel->columnCount();z++) for(int z = 4;z < m_lpSeriesListModel->columnCount();z++)
{ {
ui->m_lpSeriesList1->setColumnWidth(z, 0); ui->m_lpSeriesList1->setColumnWidth(z, 0);
ui->m_lpSeriesList2->resizeColumnToContents(z); ui->m_lpSeriesList2->resizeColumnToContents(z);
} }
for(int z = 2;z >= 0;z--) for(int z = 3;z >= 0;z--)
ui->m_lpSeriesList1->resizeColumnToContents(z); ui->m_lpSeriesList1->resizeColumnToContents(z);
if(selected.isValid()) if(selected.isValid())
@@ -916,12 +928,13 @@ void cMainWindow::displaySeries()
m_szOldSelected = ""; m_szOldSelected = "";
for(int z = 3;z < m_lpSeriesListModel->columnCount();z++) for(int z = 4;z < m_lpSeriesListModel->columnCount();z++)
ui->m_lpSeriesList1->setColumnHidden(z, true); ui->m_lpSeriesList1->setColumnHidden(z, true);
ui->m_lpSeriesList2->setColumnHidden(0, true); ui->m_lpSeriesList2->setColumnHidden(0, true);
ui->m_lpSeriesList2->setColumnHidden(1, true); ui->m_lpSeriesList2->setColumnHidden(1, true);
ui->m_lpSeriesList2->setColumnHidden(2, true); ui->m_lpSeriesList2->setColumnHidden(2, true);
ui->m_lpSeriesList2->setColumnHidden(3, true);
ui->m_lpSeriesCount->setText(QString("%1").arg(iSeries)); ui->m_lpSeriesCount->setText(QString("%1").arg(iSeries));
ui->m_lpEpisodesCount->setText(QString("%1").arg(iEpisodes)); ui->m_lpEpisodesCount->setText(QString("%1").arg(iEpisodes));
@@ -960,7 +973,14 @@ void cMainWindow::displayMovies()
} }
} }
QStandardItem* lpItem = new QStandardItem(QString("<b>%1</b> (%2)&nbsp;&nbsp;<br><i>%3</i>").arg(lpMovie->movieTitle()).arg(lpMovie->releaseDate().year()).arg(lpMovie->tagline())); QString szText;
if(lpMovie->resolution().isEmpty())
szText = QString("<b>%1</b> (%2)&nbsp;&nbsp;<br><i>%3</i>").arg(lpMovie->movieTitle()).arg(lpMovie->releaseDate().year()).arg(lpMovie->tagline());
else
szText = QString("<b>%1</b> (%2) [%4]&nbsp;&nbsp;<br><i>%3</i>").arg(lpMovie->movieTitle()).arg(lpMovie->releaseDate().year()).arg(lpMovie->tagline()).arg(lpMovie->resolution());
QStandardItem* lpItem = new QStandardItem(szText);
lpItem->setData(QVariant::fromValue(lpMovie), Qt::UserRole); lpItem->setData(QVariant::fromValue(lpMovie), Qt::UserRole);
if(lpRoot) if(lpRoot)
@@ -1733,9 +1753,9 @@ void cMainWindow::onActionMovieDelete()
void cMainWindow::onActionEdit() void cMainWindow::onActionEdit()
{ {
QModelIndex index = ui->m_lpSeriesList1->selectionModel()->selectedRows().at(0); QModelIndex index = ui->m_lpSeriesList1->selectionModel()->selectedRows().at(0);
QStandardItem* lpRes = m_lpSeriesListModel->item(index.row(), 3);
cSerie* lpSerie = m_lpSeriesListModel->itemFromIndex(index)->data(Qt::UserRole).value<cSerie*>(); cSerie* lpSerie = m_lpSeriesListModel->itemFromIndex(index)->data(Qt::UserRole).value<cSerie*>();
if(!lpSerie) if(!lpSerie)
return; return;
@@ -1754,6 +1774,8 @@ void cMainWindow::onActionEdit()
lpSerie->del(m_db); lpSerie->del(m_db);
lpSerie->save(m_db); lpSerie->save(m_db);
lpRes->setText(lpSerie->resolution());
QList<QStandardItem*> lpItems; QList<QStandardItem*> lpItems;
QStandardItem* lpItem; QStandardItem* lpItem;
int iColumn = 0; int iColumn = 0;
@@ -1795,6 +1817,16 @@ void cMainWindow::onActionMovieEdit()
*/ */
QStandardItem* lpItem = m_lpMoviesListModel->itemFromIndex(ui->m_lpMoviesList->selectionModel()->selectedRows().at(0)); QStandardItem* lpItem = m_lpMoviesListModel->itemFromIndex(ui->m_lpMoviesList->selectionModel()->selectedRows().at(0));
QString szText;
if(lpMovie->resolution().isEmpty())
szText = QString("<b>%1</b> (%2)&nbsp;&nbsp;<br><i>%3</i>").arg(lpMovie->movieTitle()).arg(lpMovie->releaseDate().year()).arg(lpMovie->tagline());
else
szText = QString("<b>%1</b> (%2) [%4]&nbsp;&nbsp;<br><i>%3</i>").arg(lpMovie->movieTitle()).arg(lpMovie->releaseDate().year()).arg(lpMovie->tagline()).arg(lpMovie->resolution());
lpItem->setText(szText);
setMovieStyle(lpItem); setMovieStyle(lpItem);
emit m_lpMoviesListModel->layoutChanged(); emit m_lpMoviesListModel->layoutChanged();
cseasondelegate.cpp
+3 -3
View File
@@ -25,7 +25,7 @@
void cSeasonDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const void cSeasonDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{ {
if(index.column() > 2) if(index.column() > 3)
{ {
cSeason* lpSeason = nullptr; cSeason* lpSeason = nullptr;
@@ -84,11 +84,11 @@ void cSeasonDelegate::paint(QPainter *painter, const QStyleOptionViewItem &optio
QSize cSeasonDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const QSize cSeasonDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
{ {
if(index.column() > 2) if(index.column() > 3)
{ {
qint32 iTotal = -1; qint32 iTotal = -1;
qint32 z; qint32 z;
cSeason* lpSeason = 0; cSeason* lpSeason = nullptr;
if(index.data(Qt::UserRole).canConvert<cSeason*>()) if(index.data(Qt::UserRole).canConvert<cSeason*>())
lpSeason = qvariant_cast<cSeason*>(index.data(Qt::UserRole)); lpSeason = qvariant_cast<cSeason*>(index.data(Qt::UserRole));