Change new archive edit menu

Put actions for files and tree in submenus and use selectionModel
instead of currentIndex for retrieving the selected item in the tree.

3 files changed, 52 insertions, 20 deletions

diff --git a/archiveview.cpp b/archiveview.cpp
index 7684d47..9ca131d 100644
--- a/archiveview.cpp
+++ b/archiveview.cpp
@@ -262,24 +262,28 @@ void ArchiveTree::setModel(ArchiveProxy *model){
 }
 
 void ArchiveTree::edit(){
-    QModelIndex idx = currentIndex();
-    QString currentName = idx.data(ArchiveModel::NameRole).toString();
-    QString question = QString(tr("Rename %1 to:")).arg(currentName);
-    QString newName = QInputDialog::getText(this, tr("Rename"), question, QLineEdit::Normal, currentName);
-    if(!newName.isEmpty()){
-        QModelIndex realIdx = mProxy->mapToSource(idx);
-        mModel->setData(realIdx, newName, Qt::EditRole);
+    QModelIndex idx = firstSelected();
+    if(idx.isValid()){
+        QString currentName = idx.data(ArchiveModel::NameRole).toString();
+        QString question = QString(tr("Rename %1 to:")).arg(currentName);
+        QString newName = QInputDialog::getText(this, tr("Rename"), question, QLineEdit::Normal, currentName);
+        if(!newName.isEmpty()){
+            QModelIndex realIdx = mProxy->mapToSource(idx);
+            mModel->setData(realIdx, newName, Qt::EditRole);
+        }
     }
 }
 
 void ArchiveTree::remove(){
-    QModelIndex idx = currentIndex();
-    QModelIndex realIdx = mProxy->mapToSource(idx);
-    QString warningMsg = QString("Really remove %1?").arg(idx.data().toString());
-    int retval = QMessageBox::warning(this, tr("Question"), warningMsg, QMessageBox::Yes | QMessageBox::No);
-    if(retval == QMessageBox::Yes){
-        if(!mModel->removeNode(realIdx)){
-            impossible();
+    QModelIndex idx = firstSelected();
+    if(idx.isValid()){
+        QString warningMsg = QString("Really remove %1?").arg(idx.data().toString());
+        int retval = QMessageBox::warning(this, tr("Question"), warningMsg, QMessageBox::Yes | QMessageBox::No);
+        if(retval == QMessageBox::Yes){
+            QModelIndex realIdx = mProxy->mapToSource(idx);
+            if(!mModel->removeNode(realIdx)){
+                impossible();
+            }
         }
     }
 }
@@ -288,7 +292,10 @@ void ArchiveTree::editActors(){
     MappingEditor e(tr("Actors"), this);
     QStringList actors = mModel->allActors();
     e.widget()->fillCompleter(actors);
-    QModelIndex idx = currentIndex();
+    QModelIndex idx = firstSelected();
+    if(!idx.isValid()){
+        return;
+    }
     int pId = idx.data(ArchiveModel::SeriesPartIdRole).toInt();
     QStringList curActors = mModel->actors(QSet<int>() << pId);
     e.widget()->setDecorationItem(SmGlobals::instance()->iconFor("actor"));
@@ -306,7 +313,10 @@ void ArchiveTree::editGenres(){
     MappingEditor e(tr("Genres"), this);
     QStringList genres = mModel->allGenres();
     e.widget()->fillCompleter(genres);
-    QModelIndex idx = currentIndex();
+    QModelIndex idx = firstSelected();
+    if(!idx.isValid()){
+        return;
+    }
     int pId = idx.data(ArchiveModel::SeriesPartIdRole).toInt();
     QStringList curGenres = mModel->genres(QSet<int>() << pId);
     e.widget()->setDecorationItem(SmGlobals::instance()->iconFor("genre"));
@@ -321,13 +331,16 @@ void ArchiveTree::editGenres(){
 }
 
 void ArchiveTree::editMetadata(){
+    QModelIndex idx = firstSelected();
+    if(!idx.isValid()){
+        return;
+    }
     MetadataEditor e(this);
     ArchiveController *c = SmGlobals::instance()->archiveController();
     QStringList sources = c->archiveTreeModel()->allSources();
     e.widget()->setSources(sources);
     QStringList relGroups = c->archiveTreeModel()->allReleaseGroups();
     e.widget()->setReleaseGroups(relGroups);
-    QModelIndex idx = currentIndex();
     int pId = idx.data(ArchiveModel::SeriesPartIdRole).toInt();
     QList<QVariant> curMetadata = c->archiveTreeModel()->metadataList(pId);
     e.widget()->setMetadata(curMetadata);
@@ -340,7 +353,10 @@ void ArchiveTree::editMetadata(){
 }
 
 void ArchiveTree::editSeriesPart(){
-    QModelIndex idx = currentIndex();
+    QModelIndex idx = firstSelected();
+    if(!idx.isValid()){
+        return;
+    }
     int curPart = idx.data(ArchiveModel::SeriesPartRole).toInt();
     QString subtitle = idx.data(ArchiveModel::SubtitleRole).toString();
     PartEditor e(this);
@@ -359,6 +375,14 @@ void ArchiveTree::impossible(const QString msg){
     QMessageBox::critical(this, tr("Error"), msg);
 }
 
+QModelIndex ArchiveTree::firstSelected(){
+    QModelIndexList idxs = selectionModel()->selectedRows();
+    if(idxs.isEmpty()){
+        QModelIndex();
+    }
+    return idxs.first();
+}
+
 ArchiveFiles::ArchiveFiles(const QString &headerSettings, QWidget *parent) : SmTreeView(headerSettings, parent){
     setEditTriggers(QAbstractItemView::NoEditTriggers);
 }
diff --git a/archiveview.h b/archiveview.h
index 48517da..6abb86f 100644
--- a/archiveview.h
+++ b/archiveview.h
@@ -92,6 +92,7 @@ class ArchiveTree : public SmTreeView {
 
     private:
         void impossible(const QString msg = tr("Unable to perform function!"));
+        QModelIndex firstSelected();
         ArchiveProxy *mProxy;
         ArchiveModel *mModel;
 };
diff --git a/shemov.cpp b/shemov.cpp
index 9d4d585..78097f1 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -1049,6 +1049,8 @@ void SheMov::createMenus(){
     c->addActionForTree(mArchiveViewGenresA);
     c->addActionForTree(mArchiveViewPartnoA);
     c->addActionForTree(mArchiveViewMetadataA);
+    QMenu *archiveTreeM = new QMenu(tr("Archive"), this);
+    archiveTreeM->addActions(c->archiveTree()->actions());
 
     // Archive files (exp.)
     c->archiveFiles()->addAction(mArchiveFilesPlayA);
@@ -1057,9 +1059,14 @@ void SheMov::createMenus(){
     c->archiveFiles()->addAction(mArchiveFilesDvdNoA);
     c->archiveFiles()->addAction(mArchiveFilesTypeA);
     c->archiveFiles()->addAction(mArchiveFilesFileNoA);
-    mArchiveEditMenu->addActions(c->archiveTree()->actions());
+    QMenu *archiveFilesM = new QMenu(tr("Files"), this);
+    archiveFilesM->addActions(c->archiveFiles()->actions());
+
+    mArchiveEditMenu->addMenu(archiveTreeM);
+    mArchiveEditMenu->addMenu(archiveFilesM);
+    /*mArchiveEditMenu->addActions(c->archiveTree()->actions());
     mArchiveEditMenu->addAction(createSeparator());
-    mArchiveEditMenu->addActions(c->archiveFiles()->actions());
+    mArchiveEditMenu->addActions(c->archiveFiles()->actions());*/
 
 	QMenu *copyMenu = new QMenu(this);
 	copyMenu->addAction(mCopyUnixFullPathA);