Open containing folder for editor tabs

Author: vorlov-playrix

src/ui/FileSystemBrowser.cpp

@@ -5,7 +5,6 @@
 #include "src/ui/MainWindow.h"
 #include "src/util/Utils.h"
 #include "src/editors/EditorBase.h"
-#include "src/Application.h"
 #include <qaction.h>
 #include <qmenu.h>
 #include <qevent.h>
@@ -35,33 +34,18 @@ FileSystemBrowser::~FileSystemBrowser()
     delete ui;
 }
 
-void FileSystemBrowser::createActions(Application& app)
-{
-    app.getOrCreateShortcutSettingsSection("global", "Global");
-
-#ifdef Q_OS_WIN
-    const QString showInOSName = "Open in Explorer";
-#elif Q_OS_MAC
-    const QString showInOSName = "Reveal in Finder";
-#else
-    const QString showInOSName = "Open in a file manager";
-#endif
-    app.registerAction("global", "show_in_os", showInOSName,
-                       "Opens a file folder in an OS file manager",
-                       QIcon(), QKeySequence(), false);
-}
-
 void FileSystemBrowser::setupContextMenu()
 {
     setContextMenuPolicy(Qt::DefaultContextMenu);
 
-    Application* app = qobject_cast<Application*>(qApp);
-
-    auto actionShowInOS = app->getAction("global/show_in_os");
-    connect(actionShowInOS, &QAction::triggered, this, &FileSystemBrowser::showFileInOS);
+    QAction* actionOpenContainingFolder = new QAction(this);
+    actionOpenContainingFolder->setText("Open Containing Folder");
+    actionOpenContainingFolder->setToolTip("Opens a file folder in an OS file manager");
+    actionOpenContainingFolder->setStatusTip("Opens a file folder in an OS file manager");
+    connect(actionOpenContainingFolder, &QAction::triggered, this, &FileSystemBrowser::openContainingFolderForSelection);
 
     contextMenu = new QMenu(this);
-    contextMenu->addAction(actionShowInOS);
+    contextMenu->addAction(actionOpenContainingFolder);
 }
 
 void FileSystemBrowser::contextMenuEvent(QContextMenuEvent* event)
@@ -71,7 +55,7 @@ void FileSystemBrowser::contextMenuEvent(QContextMenuEvent* event)
     contextMenu->exec(event->globalPos());
 }
 
-void FileSystemBrowser::showFileInOS()
+void FileSystemBrowser::openContainingFolderForSelection()
 {
     auto selection = ui->view->selectionModel()->selectedIndexes();
     for (auto modelIndex : selection)

src/ui/FileSystemBrowser.h

@@ -14,18 +14,15 @@ class FileSystemBrowser;
 
 class QToolButton;
 class QMenu;
-class Application;
 
 class FileSystemBrowser : public QDockWidget
 {
     Q_OBJECT
 
 public:
 
-    static void createActions(Application& app);
-
     explicit FileSystemBrowser(QWidget *parent = nullptr);
-    ~FileSystemBrowser();
+    virtual ~FileSystemBrowser() override;
 
     void setDirectory(const QString& dir);
 
@@ -55,7 +52,7 @@ private slots:
     virtual void contextMenuEvent(QContextMenuEvent* event) override;
 
     void setupContextMenu();
-    void showFileInOS();
+    void openContainingFolderForSelection();
 
     Ui::FileSystemBrowser *ui;
     QMenu* contextMenu = nullptr;

src/ui/MainWindow.cpp

@@ -14,6 +14,7 @@
 #include "src/util/Settings.h"
 #include "src/util/SettingsEntry.h"
 #include "src/util/RecentlyUsed.h"
+#include "src/util/Utils.h"
 #include "src/cegui/CEGUIManager.h"
 #include "src/cegui/CEGUIProject.h"
 #include "src/editors/NoEditor.h"
@@ -85,7 +86,6 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(projectManager, &ProjectManager::itemOpenRequested, this, &MainWindow::openEditorTab);
     addDockWidget(Qt::DockWidgetArea::LeftDockWidgetArea, projectManager);
 
-    FileSystemBrowser::createActions(*qobject_cast<Application*>(qApp));
     fsBrowser = new FileSystemBrowser(this);
     //fsBrowser->setVisible(false);
     connect(fsBrowser, &FileSystemBrowser::fileOpenRequested, this, &MainWindow::openEditorTab);
@@ -603,6 +603,8 @@ void MainWindow::slot_tabBarCustomContextMenuRequested(const QPoint& pos)
     menu->addSeparator();
     menu->addAction(ui->actionCloseOtherTabs);
     menu->addAction(ui->actionCloseAllTabs);
+    menu->addSeparator();
+    menu->addAction(ui->actionOpenContainingFolder);
 
     /*
     if (tabIdx >= 0)
@@ -660,6 +662,7 @@ void MainWindow::on_tabs_currentChanged(int index)
     ui->actionSaveAs->setEnabled(hasEditor);
     ui->actionCloseTab->setEnabled(hasEditor);
     ui->actionCloseOtherTabs->setEnabled(hasEditor);
+    ui->actionOpenContainingFolder->setEnabled(hasEditor);
 
     if (currentEditor)
     {
@@ -767,6 +770,12 @@ void MainWindow::on_actionCloseAllTabs_triggered()
     }
 }
 
+void MainWindow::on_actionOpenContainingFolder_triggered()
+{
+    if (auto editor = getEditorForTab(ui->tabs->currentWidget()))
+        Utils::showInGraphicalShell(editor->getFilePath());
+}
+
 void MainWindow::on_actionPreviousTab_triggered()
 {
     if (ui->tabs->count() < 2) return;

src/ui/MainWindow.h

@@ -83,6 +83,7 @@ private slots:
     void on_actionCloseTab_triggered();
     void on_actionCloseOtherTabs_triggered();
     void on_actionCloseAllTabs_triggered();
+    void on_actionOpenContainingFolder_triggered();
     void on_actionPreviousTab_triggered();
     void on_actionNextTab_triggered();
     void on_actionZoomIn_triggered();

ui/MainWindow.ui

@@ -200,6 +200,8 @@
     <addaction name="separator"/>
     <addaction name="actionCloseOtherTabs"/>
     <addaction name="actionCloseAllTabs"/>
+    <addaction name="separator"/>
+    <addaction name="actionOpenContainingFolder"/>
    </widget>
    <widget class="QMenu" name="menuEditor">
     <property name="enabled">
@@ -306,7 +308,10 @@
      <normaloff>:/icons/actions/close_other_tabs.png</normaloff>:/icons/actions/close_other_tabs.png</iconset>
    </property>
    <property name="text">
-    <string>Close Other</string>
+    <string>Close Other Tabs</string>
+   </property>
+   <property name="toolTip">
+    <string>Close Other Tabs</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Shift+F4</string>
@@ -318,7 +323,10 @@
      <normaloff>:/icons/actions/close_all_tabs.png</normaloff>:/icons/actions/close_all_tabs.png</iconset>
    </property>
    <property name="text">
-    <string>Close All</string>
+    <string>Close All Tabs</string>
+   </property>
+   <property name="toolTip">
+    <string>Close All Tabs</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+F4</string>
@@ -701,6 +709,25 @@
     <string>CEGUI Debug Info</string>
    </property>
   </action>
+  <action name="actionOpenContainingFolder">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Open Containing Folder</string>
+   </property>
+   <property name="toolTip">
+    <string>Opens a file folder in an OS file manager</string>
+   </property>
+  </action>
+  <action name="actionTabCopyFullPath">
+   <property name="text">
+    <string>Copy Full Path</string>
+   </property>
+   <property name="toolTip">
+    <string>Copy the full file path to the clipboard</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="../data/Resources.qrc"/>