Implemented "open with" submenu in ArchiveTreeView

Changes:
-changed signature of ArchiveTreeView::playSelected() to take a QString
argument for the preferred player
-Bugfix in SeriesTreeModel::findSortedMovies: use SeriesId for
mSortedMovieListQuery
-SheMov: use mOpenWithMapperAV for mATree instead of deprecated mAVWidget

4 files changed, 19 insertions, 8 deletions

diff --git a/archivetreeview.cpp b/archivetreeview.cpp
index ec58fb4..94bebcd 100644
--- a/archivetreeview.cpp
+++ b/archivetreeview.cpp
@@ -137,7 +137,7 @@ void ArchiveTreeView::setMappingItems(QList<int>seriesPartIds, MappingTableModel
 	}
 }
 
-void ArchiveTreeView::playSelected(){
+void ArchiveTreeView::playSelected(const QString &preferred){
 	QModelIndexList selected = mSeriesWidget->seriesTree()->selectionModel()->selectedRows();
 	if(selected.isEmpty()){
 		return;
@@ -152,7 +152,7 @@ void ArchiveTreeView::playSelected(){
 			}
 		}
 	}
-	QPair<QString, QStringList> progData = Helper::programData("movieviewer");
+	QPair<QString, QStringList> progData = Helper::programData("movieviewer", preferred);
 	QString program = progData.first;
 	QStringList args = progData.second;
 	args << files;
diff --git a/archivetreeview.h b/archivetreeview.h
index b978791..a01af10 100644
--- a/archivetreeview.h
+++ b/archivetreeview.h
@@ -32,7 +32,7 @@ class ArchiveTreeView : public QWidget
 	private slots:
 		void currentChanged(const QItemSelection &selected, const QItemSelection &deselected);
 		void setMappingItems(const QList<int> seriesPartIds, MappingTableModel *model, MappingTableWidget *widget);
-		void playSelected();
+		void playSelected(const QString &preferred = QString());
 
 	private:
 		//widgets
diff --git a/seriestreemodel.cpp b/seriestreemodel.cpp
index aa35731..b521647 100644
--- a/seriestreemodel.cpp
+++ b/seriestreemodel.cpp
@@ -219,8 +219,8 @@ QFileInfoList SeriesTreeModel::findSortedMovies(const QModelIndex &from) const{
 		return QFileInfoList();
 	}
 	QFileInfoList retval;
-	int seriesPartId = from.data(SeriesPartIdRole).toInt();
-	mSortedMovieListQuery->bindValue(":id", seriesPartId);
+	int seriesId = from.data(SeriesIdRole).toInt();
+	mSortedMovieListQuery->bindValue(":id", seriesId);
 	if(mSortedMovieListQuery->exec()){
 		while(mSortedMovieListQuery->next()){
 			QString path = Helper::createArchivePath(mSortedMovieListQuery->value(0).toString(), mSortedMovieListQuery->value(1).toString());
diff --git a/shemov.cpp b/shemov.cpp
index a33c172..b79f6be 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -362,6 +362,8 @@ void SheMov::createActions(){
 	connect(mNewSeriesA, SIGNAL(triggered()), mATree->seriesWidget(), SLOT(newSeries()));
 	mDeleteFromSeriesA = new QAction(tr("Delete entries..."), this);
 	connect(mDeleteFromSeriesA, SIGNAL(triggered()), mATree->seriesWidget(), SLOT(deleteFromSeries()));
+	mPlaySelectedAVA = new QAction(tr("Play selected movies..."), this);
+	connect(mPlaySelectedAVA, SIGNAL(triggered()), mATree, SLOT(playSelected()));
 	mExpandAllSeriesA = new QAction(tr("Expand all"), this);
 	connect(mExpandAllSeriesA, SIGNAL(triggered()), mATree->seriesWidget()->seriesTree(), SLOT(expandAll()));
 	mCollapseAllSeriesA = new QAction(tr("Collapse all"), this);
@@ -373,7 +375,7 @@ void SheMov::createActions(){
 	mOpenWithMapperFS = new QSignalMapper(this);
 	mOpenWithMapperAV = new QSignalMapper(this);
 	connect(mOpenWithMapperFS, SIGNAL(mapped(QString)), mFSWidget, SLOT(playSelected(QString)));
-	connect(mOpenWithMapperAV, SIGNAL(mapped(QString)), mAVWidget, SLOT(playSelected(QString)));
+	connect(mOpenWithMapperAV, SIGNAL(mapped(QString)), mATree, SLOT(playSelected(QString)));
 
 }
 
@@ -460,7 +462,7 @@ void SheMov::createMenus(){
 	mFSWidget->fileView()->addAction(mArchiveA);
 
 	//ArchiveViewWidget context menu
-	mOpenWithMenuAV = new QMenu(tr("Open with"), this);
+	/*mOpenWithMenuAV = new QMenu(tr("Open with"), this);
 	mAVWidget->fileView()->addAction(mPlaySelectedAVA);
 	createOpenWithMenuAV();
 	mOpenWithMenuAVA = new QAction(tr("Open with"), this);
@@ -468,7 +470,7 @@ void SheMov::createMenus(){
 	mAVWidget->fileView()->addAction(mOpenWithMenuAVA);
 	QAction *sep5 = new QAction(this);
 	sep5->setSeparator(true);
-	mAVWidget->fileView()->addAction(sep5);
+	mAVWidget->fileView()->addAction(sep5);*/
 	mAVWidget->fileView()->addAction(mEditArchiveFileA);
 	mAVWidget->fileView()->addAction(mCopyToPartsA);
 	mAVWidget->fileView()->addAction(mAddMovieManuallyA);
@@ -489,6 +491,15 @@ void SheMov::createMenus(){
 	QAction *sep8 = new QAction(this);
 	sep8->setSeparator(true);
 	mATree->seriesWidget()->seriesTree()->addAction(sep8);
+	mOpenWithMenuAV = new QMenu(tr("Open with"), this);
+	mATree->seriesWidget()->seriesTree()->addAction(mPlaySelectedAVA);
+	createOpenWithMenuAV();
+	mOpenWithMenuAVA = new QAction(tr("Open with"), this);
+	mOpenWithMenuAVA->setMenu(mOpenWithMenuAV);
+	mATree->seriesWidget()->seriesTree()->addAction(mOpenWithMenuAVA);
+	QAction *sep9 = new QAction(this);
+	sep9->setSeparator(true);
+	mATree->seriesWidget()->seriesTree()->addAction(sep9);
 	mATree->seriesWidget()->seriesTree()->addAction(mExpandCurrentA);
 	mATree->seriesWidget()->seriesTree()->addAction(mExpandAllSeriesA);
 	mATree->seriesWidget()->seriesTree()->addAction(mCollapseAllSeriesA);