1 files changed, 21 insertions, 5 deletions

diff --git a/shemov.cpp b/shemov.cpp
index f9859be..130bd66 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -339,8 +339,10 @@ void SheMov::createActions(){
 	connect(mPlaySelectedFSA, SIGNAL(triggered()), mFSWidget, SLOT(playSelected()));
 	mNewMovieWizardA = new QAction(tr("Archive movie..."), this);
 	connect(mNewMovieWizardA, SIGNAL(triggered()), this, SLOT(newMovieWizard()));
-	mArchiveSelectedA = new QAction(tr("Archive selected..."), this);
-	connect(mArchiveSelectedA, SIGNAL(triggered()), this, SLOT(newMovieWizardWithFiles()));
+    mArchiveSelectedMovsA = new QAction(tr("Archive selected movies..."), this);
+    connect(mArchiveSelectedMovsA, SIGNAL(triggered()), this, SLOT(newMovieWizardWithFiles()));
+    mArchiveSelectedPicsA = new QAction(tr("Archive selected pics..."), this);
+    connect(mArchiveSelectedPicsA, SIGNAL(triggered()), this, SLOT(newPicsDialogWithFiles()));
 	mConsistencyA = new QAction(tr("Check consisteny..."), this);
 	connect(mConsistencyA, SIGNAL(triggered()), this, SLOT(checkConsistency()));
     mAnalyzerA = new QAction(QIcon(":/higheels.png"), tr("Analyze Db..."), this);
@@ -693,10 +695,11 @@ void SheMov::createMenus(){
 	fileMenu->addAction(mPlaySelectedFSA);
 	fileMenu->addSeparator();
 	fileMenu->addAction(mNewMovieWizardA);
+    fileMenu->addAction(mNewPicsA);
+    fileMenu->addSeparator();
 	fileMenu->addAction(mConsistencyA);
     fileMenu->addAction(mAnalyzerA);
     fileMenu->addAction(mMappingEditorA);
-    fileMenu->addAction(mNewPicsA);
 	fileMenu->addSeparator();
 	fileMenu->addAction(mQuitA);
 	menuBar()->addMenu(fileMenu);
@@ -825,8 +828,8 @@ void SheMov::createMenus(){
 	mFSWidget->fileView()->addAction(mMarkA);
     mFSWidget->fileView()->addAction(createSeparator());
 
-    mFSWidget->fileView()->addAction(mNewPicsA);
-	mFSWidget->fileView()->addAction(mArchiveSelectedA);
+    mFSWidget->fileView()->addAction(mArchiveSelectedPicsA);
+    mFSWidget->fileView()->addAction(mArchiveSelectedMovsA);
 
 	//ArchiveTreeView context menu
 	mATree->seriesWidget()->seriesTree()->addAction(mNewSeriesA);
@@ -1109,3 +1112,16 @@ void SheMov::newPicsDialog(){
     NewPicsDialog npd(this);
     npd.exec();
 }
+
+void SheMov::newPicsDialogWithFiles(){
+    QModelIndexList selected = mFSWidget->fileView()->selectionModel()->selectedRows();
+    if(selected.isEmpty()){
+        return;
+    }
+    QStringList files;
+    foreach(QModelIndex idx, selected){
+        files << idx.data(QFileSystemModel::FilePathRole).toString();
+    }
+    NewPicsDialog npd(files, this);
+    npd.exec();
+}