diff options
| -rw-r--r-- | archivetreeview.cpp | 1 | ||||
| -rw-r--r-- | shemov.cpp | 3 | ||||
| -rw-r--r-- | shemov.h | 2 | ||||
| -rw-r--r-- | smubermodel.cpp | 8 |
4 files changed, 11 insertions, 3 deletions
diff --git a/archivetreeview.cpp b/archivetreeview.cpp index 09bb0fb..824ac42 100644 --- a/archivetreeview.cpp +++ b/archivetreeview.cpp @@ -32,4 +32,5 @@ ArchiveTreeView::ArchiveTreeView(QWidget *parent) : QWidget(parent), mUberModel( splitter->addWidget(mSeriesView); splitter->addWidget(mFilesView); mainLayout->addWidget(splitter); + setLayout(mainLayout); } @@ -44,6 +44,7 @@ #include "moviemodelsingleton.h" #include "listmodelsingleton.h" #include "pictureviewer.h" +#include "archivetreeview.h" SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags), mOpenWithGroupFS(0), mOpenWithGroupAV(0) { qApp->setWindowIcon(QIcon(":/shemov.png")); @@ -74,6 +75,8 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla mAVWidget = new ArchiveViewWidget(mMovieModel, mGenreModel, mActorModel); mTab->addTab(mAVWidget, tr("Archive")); connect(mAVWidget, SIGNAL(windowTitle(const QString &)), this, SLOT(newWindowTitle(const QString &))); + mATree = new ArchiveTreeView; + mTab->addTab(mATree, "Tree"); mAEdit = new ArchiveEditDialog(this); mFSWidget->setArchiveDialog(mAEdit); @@ -26,6 +26,7 @@ class ListModel; class ArchiveViewWidget; class EditArchiveItemDialog; class ArchiveItemEditDialog; +class ArchiveTreeView; class SheMov : public QMainWindow { Q_OBJECT @@ -114,6 +115,7 @@ class SheMov : public QMainWindow { QTabWidget *mTab; FilesystemWidget *mFSWidget; ArchiveViewWidget *mAVWidget; + ArchiveTreeView *mATree; ArchiveEditDialog *mAEdit; ArchiveItemEditDialog *mAItemEdit; MovieModel *mMovieModel; diff --git a/smubermodel.cpp b/smubermodel.cpp index 784904a..9bb8195 100644 --- a/smubermodel.cpp +++ b/smubermodel.cpp @@ -21,12 +21,14 @@ SmUberModel::SmUberModel(QObject *parent) : QObject(parent), mSeriesModel(0), mF mDb.setUserName("shemov"); mDb.setPassword("shemov"); mDb.setDatabaseName("shemov2"); + mDb.open(); mSeriesPartsQuery = new QSqlQuery(mDb); - mSeriesPartsQuery->prepare("SELECT iseriespart_id, iseriespart, iseries_id, iquality FROM seriesparts WHERE iseries_id = :id ORDER BY iseriespart"); + mSeriesPartsQuery->prepare("SELECT iseriesparts_id, iseriespart, iseries_id, iquality FROM seriesparts WHERE iseries_id = :id ORDER BY iseriespart"); //series model QStringList seriesHeaders = QStringList() << tr("Name") << tr("Quality") << tr("Id"); mSeriesModel = new SmTreeModel(seriesHeaders, this); + populateSeriesmodel(); } SmUberModel::~SmUberModel(){ @@ -39,14 +41,14 @@ void SmUberModel::populateSeriesmodel(){ while(seriesQuery.next()){ QList<QVariant> seriesData; seriesData << seriesQuery.value(1) << QVariant() << seriesQuery.value(0); - SmTreeItem *seriesItem = new SmTreeItem(seriesData); + SmTreeItem *seriesItem = new SmTreeItem(seriesData, root); root->appendChild(seriesItem); mSeriesPartsQuery->bindValue(":id", seriesQuery.value(0)); mSeriesPartsQuery->exec(); while(mSeriesPartsQuery->next()){ QList<QVariant> partsData; QString title = QString("%1 %2").arg(seriesData.at(0).toString()).arg(mSeriesPartsQuery->value(1).toInt()); - partsData << title << mSeriesPartsQuery->value(2) << mSeriesPartsQuery->value(0); + partsData << title << mSeriesPartsQuery->value(3) << mSeriesPartsQuery->value(0); seriesItem->appendChild(new SmTreeItem(partsData, seriesItem)); } } |