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

1 files changed, 14 insertions, 3 deletions

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);