From b057e1d73a179fdbdc344d3a820dde9488c7f417 Mon Sep 17 00:00:00 2001 From: Herwig Birke Date: Wed, 7 Nov 2018 17:42:15 +0100 Subject: [PATCH] switched from QTreeWidget to QTreeView --- cdiscover.ui | 3 +++ cedit.cpp | 31 +++++++++++++++--------- cedit.h | 4 +++ cedit.ui | 37 +++++++++++++--------------- cepisodedetails.cpp | 19 +++++++++------ cepisodedetails.h | 2 ++ cepisodedetails.ui | 19 +++++---------- cmoviedetails.cpp | 36 ++++++++++++++++----------- cmoviedetails.h | 3 +++ cmoviedetails.ui | 38 +++++++++-------------------- cmoviediscover.ui | 3 +++ cmovieedit.cpp | 32 +++++++++++++++--------- cmovieedit.h | 9 ++++--- cmovieedit.ui | 38 +++++++++-------------------- cmoviesearch.cpp | 59 ++++++++++++++++++++++++--------------------- cmoviesearch.h | 14 +++-------- cmoviesearch.ui | 30 +++++------------------ csearch.cpp | 36 ++++++++++++++++++--------- csearch.h | 6 ++++- csearch.ui | 27 +++++---------------- 20 files changed, 217 insertions(+), 229 deletions(-) diff --git a/cdiscover.ui b/cdiscover.ui index 1b1de44..a837084 100644 --- a/cdiscover.ui +++ b/cdiscover.ui @@ -137,6 +137,9 @@ QAbstractItemView::NoEditTriggers + + true + diff --git a/cedit.cpp b/cedit.cpp index 7b1bac8..5a175b8 100644 --- a/cedit.cpp +++ b/cedit.cpp @@ -44,6 +44,8 @@ cEdit::cEdit(QWidget *parent) : m_lpAllProgress(0), m_lpAllDone(0), m_lpVerticalSpacer(0), + m_lpDetailsActorsModel(0), + m_lpDetailsGenreModel(0), m_lpSerie(0) { ui->setupUi(this); @@ -53,6 +55,12 @@ cEdit::cEdit(QWidget *parent) : QString color = QString("background-color: rgb(%1,%2,%3,%4);").arg(col.red()).arg(col.green()).arg(col.blue()).arg(95); ui->m_lpScrollArea->setStyleSheet(color); + m_lpDetailsActorsModel = new QStandardItemModel(0, 0); + ui->m_lpDetailsActors->setModel(m_lpDetailsActorsModel); + + m_lpDetailsGenreModel = new QStandardItemModel(0, 0); + ui->m_lpDetailsGenre->setModel(m_lpDetailsGenreModel); + connect(ui->m_lpAllInit, SIGNAL(clicked()), this, SLOT(lpAllInit_clicked())); connect(ui->m_lpAllProgress, SIGNAL(clicked()), this, SLOT(lpAllProgress_clicked())); connect(ui->m_lpAllDone, SIGNAL(clicked()), this, SLOT(lpAllDone_clicked())); @@ -84,6 +92,9 @@ cEdit::~cEdit() } } + delete m_lpDetailsActorsModel; + delete m_lpDetailsGenreModel; + delete ui; } @@ -271,26 +282,22 @@ void cEdit::on_m_lpTabWidget_tabBarClicked(int index) ui->m_lpDetailsOverview->setText(m_lpSerie->overview()); ui->m_lpDetailsSeasonTab->clear(); - QTreeWidgetItem* lpItem; for(int x = 0;x < m_lpSerie->cast().count();x++) { - QStringList tmp = m_lpSerie->cast().at(x).split(","); - lpItem = new QTreeWidgetItem(ui->m_lpDetailsActors); - lpItem->setText(0, tmp.at(0)); - if(tmp.count() > 1) - lpItem->setText(1, tmp.at(1)); + QList items; + QStringList tmp = m_lpSerie->cast().at(x).split(","); - ui->m_lpDetailsActors->addTopLevelItem(lpItem); + items.append(new QStandardItem(tmp.at(0))); + if(tmp.count() > 1) + items.append(new QStandardItem(tmp.at(1))); + + m_lpDetailsActorsModel->appendRow(items); } ui->m_lpDetailsActors->resizeColumnToContents(0); ui->m_lpDetailsActors->resizeColumnToContents(1); for(int x = 0;x < m_lpSerie->genre().count();x++) - { - lpItem = new QTreeWidgetItem(ui->m_lpDetailsGenre); - lpItem->setText(0, m_lpSerie->genre().at(x)); - ui->m_lpDetailsGenre->addTopLevelItem(lpItem); - } + m_lpDetailsGenreModel->appendRow(new QStandardItem(m_lpSerie->genre().at(x))); for(int x = 0;x < m_lpSerie->seasonList().count();x++) { cSeason* lpSeason = m_lpSerie->seasonList().at(x); diff --git a/cedit.h b/cedit.h index dd44749..787e72d 100644 --- a/cedit.h +++ b/cedit.h @@ -5,6 +5,7 @@ #include "cserie.h" #include +#include namespace Ui { @@ -134,6 +135,9 @@ private: QSpacerItem* m_lpVerticalSpacer; /*!< TODO: describe */ + QStandardItemModel* m_lpDetailsActorsModel; + QStandardItemModel* m_lpDetailsGenreModel; + cSerie* m_lpSerie; /*!< TODO: describe */ }; diff --git a/cedit.ui b/cedit.ui index 79014a9..b5dfe9a 100644 --- a/cedit.ui +++ b/cedit.ui @@ -19,7 +19,7 @@ - 0 + 1 @@ -148,23 +148,16 @@ - - - 2 + + + QAbstractItemView::NoEditTriggers + + + true false - - - 1 - - - - - 2 - - @@ -192,15 +185,19 @@ - + + + QAbstractItemView::NoEditTriggers + + + true + false - - - 1 - - + + 0 + diff --git a/cepisodedetails.cpp b/cepisodedetails.cpp index 491e1be..e1e8837 100644 --- a/cepisodedetails.cpp +++ b/cepisodedetails.cpp @@ -11,14 +11,19 @@ cEpisodeDetails::cEpisodeDetails(QWidget *parent) : QWidget(parent), ui(new Ui::cEpisodeDetails), + m_lpDetailsActorsModel(0), m_lpEpisode(0), m_bLoaded(false) { ui->setupUi(this); + + m_lpDetailsActorsModel = new QStandardItemModel(0, 0); + ui->m_lpDetailsActors->setModel(m_lpDetailsActorsModel); } cEpisodeDetails::~cEpisodeDetails() { + delete m_lpDetailsActorsModel; delete ui; } @@ -28,16 +33,16 @@ void cEpisodeDetails::setEpisode(cEpisode* lpEpisode) ui->m_lpEpisodeTitle->setText(lpEpisode->name()); ui->m_lpOverview->setText(lpEpisode->overview()); - QTreeWidgetItem* lpItem; for(int x = 0;x < lpEpisode->guestStars().count();x++) { - QStringList tmp = lpEpisode->guestStars().at(x).split(","); - lpItem = new QTreeWidgetItem(ui->m_lpDetailsActors); - lpItem->setText(0, tmp.at(0)); - if(tmp.count() > 1) - lpItem->setText(1, tmp.at(1)); + QStringList tmp = lpEpisode->guestStars().at(x).split(","); + QList items; - ui->m_lpDetailsActors->addTopLevelItem(lpItem); + items << new QStandardItem(tmp.at(0)); + if(tmp.count() > 1) + items << new QStandardItem(tmp.at(1)); + + m_lpDetailsActorsModel->appendRow(items); } ui->m_lpDetailsActors->resizeColumnToContents(0); ui->m_lpDetailsActors->resizeColumnToContents(1); diff --git a/cepisodedetails.h b/cepisodedetails.h index f305774..00c0803 100644 --- a/cepisodedetails.h +++ b/cepisodedetails.h @@ -2,6 +2,7 @@ #define CEPISODEDETAILS_H #include +#include #include "cepisode.h" @@ -49,6 +50,7 @@ public: void loadImages(); private: Ui::cEpisodeDetails* ui; /*!< TODO: describe */ + QStandardItemModel* m_lpDetailsActorsModel; cEpisode* m_lpEpisode; /*!< TODO: describe */ bool m_bLoaded; /*!< TODO: describe */ }; diff --git a/cepisodedetails.ui b/cepisodedetails.ui index fb7dead..ff57943 100644 --- a/cepisodedetails.ui +++ b/cepisodedetails.ui @@ -54,23 +54,16 @@ - - - 2 + + + QAbstractItemView::NoEditTriggers + + + true false - - - 1 - - - - - 2 - - diff --git a/cmoviedetails.cpp b/cmoviedetails.cpp index f766fe6..3b25614 100644 --- a/cmoviedetails.cpp +++ b/cmoviedetails.cpp @@ -6,13 +6,24 @@ cMovieDetails::cMovieDetails(QWidget *parent) : QWidget(parent), - ui(new Ui::cMovieDetails) + ui(new Ui::cMovieDetails), + m_lpActorsModel(0), + m_lpGenreModel(0) { ui->setupUi(this); + + m_lpActorsModel = new QStandardItemModel(0, 0); + ui->m_lpDetailsActors->setModel(m_lpActorsModel); + + m_lpGenreModel = new QStandardItemModel(0, 9); + ui->m_lpDetailsGenre->setModel(m_lpGenreModel); } cMovieDetails::~cMovieDetails() { + delete m_lpActorsModel; + delete m_lpGenreModel; + delete ui; } @@ -31,24 +42,21 @@ void cMovieDetails::setMovie(cMovie* lpMovie) ui->m_lpDetailsOverview->setText(lpMovie->overview()); - ui->m_lpDetailsActors->clear(); - QTreeWidgetItem* lpItem; + m_lpActorsModel->clear(); for(int x = 0;x < lpMovie->cast().count();x++) { - QStringList str = lpMovie->cast().at(x).split(","); - lpItem = new QTreeWidgetItem(ui->m_lpDetailsActors); - lpItem->setText(0, str.at(0)); - lpItem->setText(1, str.at(1)); - ui->m_lpDetailsActors->addTopLevelItem(lpItem); + QList items; + QStringList str = lpMovie->cast().at(x).split(","); + + items.append(new QStandardItem(str.at(0))); + items.append(new QStandardItem(str.at(1))); + m_lpActorsModel->appendRow(items); } ui->m_lpDetailsActors->resizeColumnToContents(0); - ui->m_lpDetailsGenre->clear(); + m_lpGenreModel->clear(); for(int x = 0;x < lpMovie->genres().count();x++) - { - lpItem = new QTreeWidgetItem(ui->m_lpDetailsGenre); - lpItem->setText(0, lpMovie->genres().at(x)); - ui->m_lpDetailsGenre->addTopLevelItem(lpItem); - } + m_lpGenreModel->appendRow(new QStandardItem(lpMovie->genres().at(x))); + ui->m_lpDetailsGenre->resizeColumnToContents(0); } diff --git a/cmoviedetails.h b/cmoviedetails.h index 87345d6..b62e80d 100644 --- a/cmoviedetails.h +++ b/cmoviedetails.h @@ -5,6 +5,7 @@ #include "cmovie.h" #include +#include namespace Ui { @@ -44,6 +45,8 @@ public: void setMovie(cMovie* lpMovie); private: Ui::cMovieDetails* ui; /*!< TODO: describe */ + QStandardItemModel* m_lpActorsModel; + QStandardItemModel* m_lpGenreModel; }; #endif // CMOVIEDETAILS_H diff --git a/cmoviedetails.ui b/cmoviedetails.ui index aeeecae..aaa627b 100644 --- a/cmoviedetails.ui +++ b/cmoviedetails.ui @@ -115,23 +115,16 @@ - - - 2 + + + QAbstractItemView::NoEditTriggers + + + true false - - - 1 - - - - - 2 - - @@ -146,23 +139,16 @@ - - - 2 + + + QAbstractItemView::NoEditTriggers + + + true false - - - 1 - - - - - 2 - - diff --git a/cmoviediscover.ui b/cmoviediscover.ui index 2313628..55d551d 100644 --- a/cmoviediscover.ui +++ b/cmoviediscover.ui @@ -144,6 +144,9 @@ QAbstractItemView::NoEditTriggers + + true + diff --git a/cmovieedit.cpp b/cmovieedit.cpp index 6ecb415..4adbb11 100644 --- a/cmovieedit.cpp +++ b/cmovieedit.cpp @@ -7,13 +7,24 @@ cMovieEdit::cMovieEdit(QWidget *parent) : QDialog(parent), ui(new Ui::cMovieEdit), - m_lpMovie(0) + m_lpMovie(0), + m_lpActorsModel(0), + m_lpGenreModel(0) { ui->setupUi(this); + + m_lpActorsModel = new QStandardItemModel(0, 0); + ui->m_lpDetailsActors->setModel(m_lpActorsModel); + + m_lpGenreModel = new QStandardItemModel(0, 0); + ui->m_lpDetailsGenre->setModel(m_lpGenreModel); } cMovieEdit::~cMovieEdit() { + delete m_lpActorsModel; + delete m_lpGenreModel; + delete ui; } @@ -51,22 +62,19 @@ void cMovieEdit::setMovie(cMovie *lpMovie) ui->m_lpDetailsOverview->setText(m_lpMovie->overview()); - QTreeWidgetItem* lpItem; for(int x = 0;x < m_lpMovie->cast().count();x++) { - QStringList str = m_lpMovie->cast().at(x).split(","); - lpItem = new QTreeWidgetItem(ui->m_lpDetailsActors); - lpItem->setText(0, str.at(0)); - lpItem->setText(1, str.at(1)); - ui->m_lpDetailsActors->addTopLevelItem(lpItem); + QList items; + QStringList str = m_lpMovie->cast().at(x).split(","); + + items.append(new QStandardItem(str.at(0))); + items.append(new QStandardItem(str.at(1))); + m_lpActorsModel->appendRow(items); } ui->m_lpDetailsActors->resizeColumnToContents(0); for(int x = 0;x < m_lpMovie->genres().count();x++) - { - lpItem = new QTreeWidgetItem(ui->m_lpDetailsGenre); - lpItem->setText(0, m_lpMovie->genres().at(x)); - ui->m_lpDetailsGenre->addTopLevelItem(lpItem); - } + m_lpGenreModel->appendRow(new QStandardItem(m_lpMovie->genres().at(x))); + ui->m_lpDetailsGenre->resizeColumnToContents(0); } diff --git a/cmovieedit.h b/cmovieedit.h index 2c7cbf0..7c8282b 100644 --- a/cmovieedit.h +++ b/cmovieedit.h @@ -5,6 +5,8 @@ #include "cmovie.h" #include +#include + namespace Ui { class cMovieEdit; @@ -64,9 +66,10 @@ private slots: void on_m_lpDone_clicked(); private: - Ui::cMovieEdit *ui; /*!< TODO: describe */ - - cMovie* m_lpMovie; /*!< TODO: describe */ + Ui::cMovieEdit* ui; /*!< TODO: describe */ + cMovie* m_lpMovie; /*!< TODO: describe */ + QStandardItemModel* m_lpActorsModel; + QStandardItemModel* m_lpGenreModel; }; #endif // CMOVIEEDIT_H diff --git a/cmovieedit.ui b/cmovieedit.ui index 7e4c954..18ddbe8 100644 --- a/cmovieedit.ui +++ b/cmovieedit.ui @@ -140,23 +140,16 @@ - - - 2 + + + QAbstractItemView::NoEditTriggers + + + true false - - - 1 - - - - - 2 - - @@ -171,23 +164,16 @@ - - - 2 + + + QAbstractItemView::NoEditTriggers + + + true false - - - 1 - - - - - 2 - - diff --git a/cmoviesearch.cpp b/cmoviesearch.cpp index ed8a5e6..ad6406c 100644 --- a/cmoviesearch.cpp +++ b/cmoviesearch.cpp @@ -12,7 +12,8 @@ cMovieSearch::cMovieSearch(QWidget *parent) : QDialog(parent), - ui(new Ui::cMovieSearch) + ui(new Ui::cMovieSearch), + m_lpResultsModel(0) { ui->setupUi(this); ui->m_lpSearchButton->setEnabled(false); @@ -21,6 +22,9 @@ cMovieSearch::cMovieSearch(QWidget *parent) : ui->m_lpButtonBox->button(QDialogButtonBox::Ok)->setEnabled(false); ui->m_lpSearch->setFocus(); ui->m_lpSearchButton->setDefault(true); + + m_lpResultsModel = new QStandardItemModel(0, 0); + ui->m_lpResults->setModel(m_lpResultsModel); } cMovieSearch::~cMovieSearch() @@ -61,24 +65,26 @@ void cMovieSearch::on_m_lpSearchButton_clicked() QList movieList = theMovieDBV3.searchMovie(szSearchText, iYear, "de-DE"); - ui->m_lpResults->clear(); + m_lpResultsModel->clear(); for(int z = 0;z < movieList.count();z++) { cMovie* lpMovie = movieList.at(z); - QTreeWidgetItem* lpNew = new QTreeWidgetItem(ui->m_lpResults); - lpNew->setText(0, lpMovie->movieTitle()); - lpNew->setText(1, QString("%1").arg(lpMovie->releaseDate().year())); - lpNew->setData(0, Qt::UserRole, QVariant::fromValue(lpMovie)); - lpNew->setData(1, Qt::UserRole, QVariant::fromValue(lpMovie)); - lpNew->setCheckState(0, Qt::Unchecked); - ui->m_lpResults->addTopLevelItem(lpNew); + QList items; + + items.append(new QStandardItem(lpMovie->movieTitle())); + items.append(new QStandardItem(QString::number(lpMovie->releaseDate().year()))); + items[0]->setData(QVariant::fromValue(lpMovie)); + items[1]->setData(QVariant::fromValue(lpMovie)); + items[0]->setCheckState(Qt::Unchecked); + + m_lpResultsModel->appendRow(items); } ui->m_lpResults->resizeColumnToContents(0); ui->m_lpResults->resizeColumnToContents(1); - ui->m_lpResults->sortItems(0, Qt::AscendingOrder); + m_lpResultsModel->sort(0, Qt::AscendingOrder); delete lpDialog; } @@ -87,11 +93,11 @@ QList cMovieSearch::id() { QList idList; - for(int x = 0;x < ui->m_lpResults->topLevelItemCount();x++) + for(int x = 0;x < m_lpResultsModel->rowCount();x++) { - if(ui->m_lpResults->topLevelItem(x)->checkState(0) == Qt::Checked) + if(m_lpResultsModel->item(x, 0)->checkState() == Qt::Checked) { - cMovie* lpMovie = ui->m_lpResults->topLevelItem(x)->data(0, Qt::UserRole).value(); + cMovie* lpMovie = m_lpResultsModel->item(x, 0)->data().value(); idList.append(lpMovie->movieID()); } } @@ -121,8 +127,17 @@ qint16 cMovieSearch::year() return(ui->m_lpYear->value()); } -void cMovieSearch::on_m_lpResults_clicked(const QModelIndex &/*index*/) +void cMovieSearch::on_m_lpResults_clicked(const QModelIndex& index) { + cMovie* lpMovie = m_lpResultsModel->itemFromIndex(index)->data().value(); + + if(lpMovie->cast().isEmpty()) + { + cTheMovieDBV3 theMovieDB; + theMovieDB.loadCastMovie(lpMovie); + } + ui->m_lpMovieDetails->setMovie(lpMovie); + setButtonBox(); } @@ -141,9 +156,9 @@ void cMovieSearch::setButtonBox() if(ui->m_lpTabWidget->currentIndex() == 0) { ui->m_lpButtonBox->button(QDialogButtonBox::Ok)->setEnabled(false); - for(int x = 0;x < ui->m_lpResults->topLevelItemCount();x++) + for(int x = 0;x < m_lpResultsModel->rowCount();x++) { - if(ui->m_lpResults->topLevelItem(x)->checkState(0) == Qt::Checked) + if(m_lpResultsModel->item(x, 0)->checkState() == Qt::Checked) { ui->m_lpButtonBox->button(QDialogButtonBox::Ok)->setEnabled(true); return; @@ -171,15 +186,3 @@ void cMovieSearch::setButtonBox() // if(index.isValid()) // accept(); //} - -void cMovieSearch::on_m_lpResults_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) -{ - cMovie* lpMovie = current->data(0, Qt::UserRole).value(); - - if(lpMovie->cast().isEmpty()) - { - cTheMovieDBV3 theMovieDB; - theMovieDB.loadCastMovie(lpMovie); - } - ui->m_lpMovieDetails->setMovie(lpMovie); -} diff --git a/cmoviesearch.h b/cmoviesearch.h index 4129162..436c5f4 100644 --- a/cmoviesearch.h +++ b/cmoviesearch.h @@ -3,7 +3,7 @@ #include #include -#include +#include namespace Ui { @@ -103,17 +103,9 @@ private slots: void on_m_lpResults_clicked(const QModelIndex &index); // void on_m_lpResults_doubleClicked(const QModelIndex &index); - /*! - \brief - - \fn on_m_lpResults_currentItemChanged - \param current - \param previous - */ - void on_m_lpResults_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); - private: - Ui::cMovieSearch *ui; /*!< TODO: describe */ + Ui::cMovieSearch* ui; /*!< TODO: describe */ + QStandardItemModel* m_lpResultsModel; /*! \brief diff --git a/cmoviesearch.ui b/cmoviesearch.ui index 3ca3cb9..8beb273 100644 --- a/cmoviesearch.ui +++ b/cmoviesearch.ui @@ -51,36 +51,18 @@ - + - + QAbstractItemView::NoEditTriggers + + true + QAbstractItemView::SingleSelection - - 3 - - - false - - - - 1 - - - - - 2 - - - - - 3 - - @@ -93,7 +75,7 @@ 0 0 - 563 + 590 372 diff --git a/csearch.cpp b/csearch.cpp index 10dfb0a..3e073c5 100644 --- a/csearch.cpp +++ b/csearch.cpp @@ -11,7 +11,8 @@ cSearch::cSearch(QWidget *parent) : QDialog(parent), - ui(new Ui::cSearch) + ui(new Ui::cSearch), + m_lpResultsModel(0) { ui->setupUi(this); ui->m_lpSearchButton->setEnabled(false); @@ -20,10 +21,14 @@ cSearch::cSearch(QWidget *parent) : ui->m_lpButtonBox->button(QDialogButtonBox::Ok)->setEnabled(false); ui->m_lpSearch->setFocus(); ui->m_lpSearchButton->setDefault(true); + + m_lpResultsModel = new QStandardItemModel(0, 0); + ui->m_lpResults->setModel(m_lpResultsModel); } cSearch::~cSearch() { + delete m_lpResultsModel; delete ui; } @@ -46,35 +51,44 @@ void cSearch::on_m_lpSearchButton_clicked() QList serieList3 = theMovieDBV3.searchSerie(ui->m_lpSearch->text(), -1, "de-DE"); - ui->m_lpResults->clear(); + m_lpResultsModel->clear(); for(int z = 0;z < serieList3.count();z++) { cSerie* lpSerie = serieList3.at(z); - QTreeWidgetItem* lpNew = new QTreeWidgetItem(ui->m_lpResults); - lpNew->setText(0, lpSerie->seriesName()); - lpNew->setText(2, QString("%1").arg(lpSerie->firstAired().year())); - lpNew->setData(0, Qt::UserRole, QVariant::fromValue(lpSerie->seriesID())); - ui->m_lpResults->addTopLevelItem(lpNew); +// QTreeWidgetItem* lpNew = new QTreeWidgetItem(ui->m_lpResults); +// lpNew->setText(0, lpSerie->seriesName()); +// lpNew->setText(2, QString("%1").arg(lpSerie->firstAired().year())); +// lpNew->setData(0, Qt::UserRole, QVariant::fromValue(lpSerie->seriesID())); +// ui->m_lpResults->addTopLevelItem(lpNew); + + QList items; + + items.append(new QStandardItem(lpSerie->seriesName())); + items.append(new QStandardItem(QString::number(lpSerie->firstAired().year()))); + items[0]->setData(QVariant::fromValue(lpSerie)); + items[1]->setData(QVariant::fromValue(lpSerie)); + + m_lpResultsModel->appendRow(items); } ui->m_lpResults->resizeColumnToContents(0); ui->m_lpResults->resizeColumnToContents(1); - ui->m_lpResults->sortItems(0, Qt::AscendingOrder); + m_lpResultsModel->sort(0); delete lpDialog; } qint32 cSearch::id() { - if(!ui->m_lpResults->selectedItems().count()) + if(!ui->m_lpResults->selectionModel()->selectedRows().count()) { qint32 iID = ui->m_lpSearch->text().toInt(); if(iID) return(iID); return(-1); } - return(ui->m_lpResults->selectedItems().at(0)->data(0, Qt::UserRole).toInt()); + return(m_lpResultsModel->itemFromIndex(ui->m_lpResults->selectionModel()->selectedRows().at(0))->data(Qt::UserRole).value()->seriesID()); } QString cSearch::placeholderName() @@ -111,7 +125,7 @@ void cSearch::setButtonBox() { if(ui->m_lpTabWidget->currentIndex() == 0) { - if(ui->m_lpResults->selectedItems().count()) + if(ui->m_lpResults->selectionModel()->selectedIndexes().count()) ui->m_lpButtonBox->button(QDialogButtonBox::Ok)->setEnabled(true); else ui->m_lpButtonBox->button(QDialogButtonBox::Ok)->setEnabled(false); diff --git a/csearch.h b/csearch.h index 7582108..a625ccf 100644 --- a/csearch.h +++ b/csearch.h @@ -1,7 +1,10 @@ #ifndef CSEARCH_H #define CSEARCH_H + #include +#include + namespace Ui { class cSearch; @@ -107,7 +110,8 @@ private slots: void on_m_lpResults_doubleClicked(const QModelIndex &index); private: - Ui::cSearch *ui; /*!< TODO: describe */ + Ui::cSearch* ui; /*!< TODO: describe */ + QStandardItemModel* m_lpResultsModel; /*! \brief diff --git a/csearch.ui b/csearch.ui index 7ed8a4d..803e8e0 100644 --- a/csearch.ui +++ b/csearch.ui @@ -53,28 +53,13 @@ - - - 3 + + + QAbstractItemView::NoEditTriggers + + + true - - false - - - - 1 - - - - - 2 - - - - - 3 - -