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. --- seriestreewidget.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'seriestreewidget.cpp') diff --git a/seriestreewidget.cpp b/seriestreewidget.cpp index 46ef609..ef802f6 100644 --- a/seriestreewidget.cpp +++ b/seriestreewidget.cpp @@ -25,7 +25,7 @@ #include "seriestreewidget.h" #include "smtreemodel.h" -#include "smmodelsingleton.h" +#include "smglobals.h" #include "seriestreemodel.h" #include "filestreemodel.h" #include "helper.h" @@ -46,7 +46,7 @@ SeriesTreeWidget::SeriesTreeWidget(QWidget *parent) : QWidget(parent){ //the view mView = new SeriesTreeView; mProxy = new SeriesTreeSortModel(this); - mModel = static_cast(SmModelSingleton::instance()->model("SeriesModel")); + mModel = static_cast(SmGlobals::instance()->model("SeriesModel")); mProxy->setSourceModel(mModel); mView->setModel(mProxy); mView->setSortingEnabled(true); @@ -229,7 +229,7 @@ void SeriesTreeWidget::addCover(){ QString fileName = mCoverDialog->file(); QFileInfo fi(fileName); if(fi.exists()){ - FilesTreeModel *filesModel = static_cast(SmModelSingleton::instance()->model("FilesModel")); + FilesTreeModel *filesModel = static_cast(SmGlobals::instance()->model("FilesModel")); int seriesPartId = real.data(SeriesTreeModel::SeriesPartIdRole).toInt(); int type = mCoverDialog->fileType(); if(filesModel->addFile(fileName, type, 0, -1, seriesPartId, -1)){ @@ -274,7 +274,7 @@ AddCoverDialog::AddCoverDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(par fileLayout->addWidget(mSelectFile); //file type - mFilesModel = static_cast(SmModelSingleton::instance()->model("FilesModel")); + mFilesModel = static_cast(SmGlobals::instance()->model("FilesModel")); QHash coverTypes = mFilesModel->coverTypes(); mFileType = new QComboBox; QStringList types; -- cgit v1.2.3-70-g09d2