From ad322157891cec53a7b660629d7c244e75df81d5 Mon Sep 17 00:00:00 2001 From: Arno Date: Sat, 24 Jul 2010 17:15:00 +0200 Subject: Act on doubleClick in FileTreeWidget When doubleclicking a picture in FileTreeWidget the pictureViewer is shown. Doubleclicking a movie file launches the default movie player. Since PictureViewer is now used in FileSystemWidget and ArchiveTreeView a global instance is needed. The appropriate place for this is a singleton. Since we already had a singleton for QAbstractItemModels I renamed it to SmGlobals and added a function to return a PictureViewer object. Renaming it was quite easy thanks to QtCreator's ability to rename variable names. --- newmoviewizard.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'newmoviewizard.cpp') diff --git a/newmoviewizard.cpp b/newmoviewizard.cpp index cacd891..9a47a64 100644 --- a/newmoviewizard.cpp +++ b/newmoviewizard.cpp @@ -26,7 +26,7 @@ #include "smtreeitem.h" #include "seriestreemodel.h" #include "filestreemodel.h" -#include "smmodelsingleton.h" +#include "smglobals.h" #include "mappingtablewidget.h" #include "mappingtablemodel.h" #include "filestreemodel.h" @@ -40,8 +40,8 @@ NewMovieWizard::NewMovieWizard(QWidget *parent) : QWizard(parent){ void NewMovieWizard::accept(){ //conjure up models - SeriesTreeModel *seriesModel = static_cast(SmModelSingleton::instance()->model("SeriesModel")); - FilesTreeModel *filesModel = static_cast(SmModelSingleton::instance()->model("FilesModel")); + SeriesTreeModel *seriesModel = static_cast(SmGlobals::instance()->model("SeriesModel")); + FilesTreeModel *filesModel = static_cast(SmGlobals::instance()->model("FilesModel")); //handle series QString series = field("title").toString(); @@ -97,14 +97,14 @@ void NewMovieWizard::accept(){ MovieMappingPage *actorPage = static_cast(page(1)); MappingTableItemModel *actorItemModel = actorPage->model(); QStringList actors = actorItemModel->stringList(); - MappingTableModel *actorModel = static_cast(SmModelSingleton::instance()->model("actors")); + MappingTableModel *actorModel = static_cast(SmGlobals::instance()->model("actors")); actorModel->setMappings(actors, seriesPartId); //handle genres MovieMappingPage *genrePage = static_cast(page(2)); MappingTableItemModel *genreItemModel = genrePage->model(); QStringList genres = genreItemModel->stringList(); - MappingTableModel *genreModel = static_cast(SmModelSingleton::instance()->model("genres")); + MappingTableModel *genreModel = static_cast(SmGlobals::instance()->model("genres")); genreModel->setMappings(genres, seriesPartId); //done @@ -148,7 +148,7 @@ MovieInfoPage::MovieInfoPage(QWidget *parent) : QWizardPage(parent){ l1->setBuddy(mTitle); movieTitleLayout->addWidget(l1); movieTitleLayout->addWidget(mTitle); - SeriesTreeModel *seriesModel = static_cast(SmModelSingleton::instance()->model("SeriesModel")); + SeriesTreeModel *seriesModel = static_cast(SmGlobals::instance()->model("SeriesModel")); QCompleter *completer = new QCompleter(this); completer->setModel(seriesModel); mTitle->setCompleter(completer); @@ -290,7 +290,7 @@ void MovieInfoPage::typeChanged(QString type){ } void MovieInfoPage::setNextDvdNo(){ - SeriesTreeModel *seriesTreeModel = static_cast(SmModelSingleton::instance()->model("SeriesModel")); + SeriesTreeModel *seriesTreeModel = static_cast(SmGlobals::instance()->model("SeriesModel")); int nextdvd = seriesTreeModel->findNextDvdNo(); mDvdNo->setValue(nextdvd + 1); } @@ -309,7 +309,7 @@ MovieMappingPage::MovieMappingPage(const QString &table, QWidget *parent) : QWiz } WizardTreeModel::WizardTreeModel(QStringList &headers, QObject *parent) : SmTreeModel(headers, parent){ - FilesTreeModel *filesModel = static_cast(SmModelSingleton::instance()->model("FilesModel")); + FilesTreeModel *filesModel = static_cast(SmGlobals::instance()->model("FilesModel")); mFileTypeMap = filesModel->fileTypes(); } -- cgit v1.2.3-70-g09d2