added "open with vfs" to filetree

3 files changed, 69 insertions, 68 deletions

diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h
index ebf82033..8baa62b6 100644
--- a/src/modinfodialogconflicts.h
+++ b/src/modinfodialogconflicts.h
@@ -60,10 +60,6 @@ private:
 
   void onOverwriteActivated(const QModelIndex& index);
   void onOverwrittenActivated(const QModelIndex& index);
-
-  void onOverwriteTreeContext(const QPoint &pos);
-  void onOverwrittenTreeContext(const QPoint &pos);
-  void onNoConflictTreeContext(const QPoint &pos);
 };
 
 
diff --git a/src/modinfodialogfiletree.cpp b/src/modinfodialogfiletree.cpp
index 00471a72..23d65fdb 100644
--- a/src/modinfodialogfiletree.cpp
+++ b/src/modinfodialogfiletree.cpp
@@ -24,6 +24,7 @@ FileTreeTab::FileTreeTab(ModInfoDialogTabContext cx)
 
   m_actions.newFolder = new QAction(tr("&New Folder"), ui->filetree);
   m_actions.open = new QAction(tr("&Open/Execute"), ui->filetree);
+  m_actions.runHooked = new QAction(tr("Open with &VFS"), ui->filetree);
   m_actions.preview = new QAction(tr("&Preview"), ui->filetree);
   m_actions.explore = new QAction(tr("Open in &Explorer"), ui->filetree);
   m_actions.rename = new QAction(tr("&Rename"), ui->filetree);
@@ -33,6 +34,7 @@ FileTreeTab::FileTreeTab(ModInfoDialogTabContext cx)
 
   connect(m_actions.newFolder, &QAction::triggered, [&]{ onCreateDirectory(); });
   connect(m_actions.open, &QAction::triggered, [&]{ onOpen(); });
+  connect(m_actions.runHooked, &QAction::triggered, [&]{ onRunHooked(); });
   connect(m_actions.preview, &QAction::triggered, [&]{ onPreview(); });
   connect(m_actions.explore, &QAction::triggered, [&]{ onExplore(); });
   connect(m_actions.rename, &QAction::triggered, [&]{ onRename(); });
@@ -146,6 +148,19 @@ void FileTreeTab::onOpen()
     .run();
 }
 
+void FileTreeTab::onRunHooked()
+{
+  auto selection = singleSelection();
+  if (!selection.isValid()) {
+    return;
+  }
+
+  core().processRunner()
+    .setFromFile(parentWidget(), m_fs->filePath(selection), true)
+    .setWaitForCompletion()
+    .run();
+}
+
 void FileTreeTab::onPreview()
 {
   auto selection = singleSelection();
@@ -342,75 +357,53 @@ void FileTreeTab::onContextMenu(const QPoint &pos)
 
   QMenu menu(ui->filetree);
 
-  bool enableNewFolder = true;
-  bool enableOpen = true;
-  bool enablePreview = true;
-  bool enableExplore = true;
-  bool enableRename = true;
-  bool enableDelete = true;
-  bool enableHide = true;
-  bool enableUnhide = true;
+  bool enableNewFolder = false;
+  bool enableRun = false;
+  bool enableOpen = false;
+  bool enablePreview = false;
+  bool enableExplore = false;
+  bool enableRename = false;
+  bool enableDelete = false;
+  bool enableHide = false;
+  bool enableUnhide = false;
 
   if (selection.size() == 0) {
     // no selection, only new folder and explore
-    enableOpen = false;
-    enablePreview = false;
-    enableRename = false;
-    enableDelete = false;
-    enableHide = false;
-    enableUnhide = false;
+    enableNewFolder = true;
+    enableExplore = true;
   } else if (selection.size() == 1) {
     // single selection
+    enableNewFolder = true;
+    enableRename = true;
+    enableDelete = true;
 
     // only enable open action if a file is selected
     bool hasFiles = false;
 
-    for (auto index : selection) {
-      if (m_fs->fileInfo(index).isFile()) {
-        hasFiles = true;
-        break;
-      }
-    }
-
-    if (!hasFiles) {
-      enableOpen = false;
-      enablePreview = false;
-    }
-
     const QString fileName = m_fs->fileName(selection[0]);
 
-    if (!canPreviewFile(plugin(), false, fileName)) {
-      enablePreview = false;
-    }
-
-    if (!canExploreFile(false, fileName)) {
-      enableExplore = false;
-    }
-
-    if (!canHideFile(false, fileName)) {
-      enableHide = false;
+    if (m_fs->fileInfo(selection[0]).isFile()) {
+      if (canRunFile(false, fileName)) {
+        enableRun = true;
+      } else if (canOpenFile(false, fileName)) {
+        enableOpen = true;
+      }
     }
 
-    if (!canUnhideFile(false, fileName)) {
-      enableUnhide = false;
-    }
+    enablePreview = canPreviewFile(plugin(), false, fileName);
+    enableExplore = canExploreFile(false, fileName);
+    enableHide = canHideFile(false, fileName);
+    enableUnhide = canUnhideFile(false, fileName);
   } else {
-    // this is a multiple selection, don't show open action so users don't open
-    // a thousand files
-    enableOpen = false;
-    enablePreview = false;
-
-    // can't explore multiple files
-    enableExplore = false;
-
-    // can't rename multiple files
-    enableRename = false;
+    // this is a multiple selection, don't show open or explore actions so users
+    // don't open a thousand files
+    enableNewFolder = true;
+    enablePreview = true;
+    enableDelete = true;
 
     if (selection.size() < max_scan_for_context_menu) {
       // if the number of selected items is low, checking them to accurately
       // show the menu items is worth it
-      enableHide = false;
-      enableUnhide = false;
 
       for (const auto& index : selection) {
         const QString fileName = m_fs->fileName(index);
@@ -431,11 +424,14 @@ void FileTreeTab::onContextMenu(const QPoint &pos)
     }
   }
 
-  menu.addAction(m_actions.newFolder);
-  m_actions.newFolder->setEnabled(enableNewFolder);
-
-  menu.addAction(m_actions.open);
-  m_actions.open->setEnabled(enableOpen);
+  if (enableRun) {
+    m_actions.open->setText(tr("&Execute"));
+    menu.addAction(m_actions.open);
+  } else if (enableOpen) {
+    m_actions.open->setText(tr("&Open"));
+    menu.addAction(m_actions.open);
+    menu.addAction(m_actions.runHooked);
+  }
 
   menu.addAction(m_actions.preview);
   m_actions.preview->setEnabled(enablePreview);
@@ -443,12 +439,19 @@ void FileTreeTab::onContextMenu(const QPoint &pos)
   menu.addAction(m_actions.explore);
   m_actions.explore->setEnabled(enableExplore);
 
+  menu.addSeparator();
+
+  menu.addAction(m_actions.newFolder);
+  m_actions.newFolder->setEnabled(enableNewFolder);
+
   menu.addAction(m_actions.rename);
   m_actions.rename->setEnabled(enableRename);
 
   menu.addAction(m_actions.del);
   m_actions.del->setEnabled(enableDelete);
 
+  menu.addSeparator();
+
   menu.addAction(m_actions.hide);
   m_actions.hide->setEnabled(enableHide);
 
diff --git a/src/modinfodialogfiletree.h b/src/modinfodialogfiletree.h
index 494a7e14..2f2e501c 100644
--- a/src/modinfodialogfiletree.h
+++ b/src/modinfodialogfiletree.h
@@ -20,14 +20,15 @@ public:
 private:
   struct Actions
   {
-    QAction *newFolder = nullptr;
-    QAction *open = nullptr;
-    QAction *preview = nullptr;
-    QAction *explore = nullptr;
-    QAction *rename = nullptr;
-    QAction *del = nullptr;
-    QAction *hide = nullptr;
-    QAction *unhide = nullptr;
+    QAction* newFolder = nullptr;
+    QAction* open = nullptr;
+    QAction* runHooked = nullptr;
+    QAction* preview = nullptr;
+    QAction* explore = nullptr;
+    QAction* rename = nullptr;
+    QAction* del = nullptr;
+    QAction* hide = nullptr;
+    QAction* unhide = nullptr;
   };
 
   QFileSystemModel* m_fs;
@@ -35,6 +36,7 @@ private:
 
   void onCreateDirectory();
   void onOpen();
+  void onRunHooked();
   void onPreview();
   void onExplore();
   void onRename();