Merge pull request #899 from horde3d/enhancementDoubleClickDiff

External diff by double clicking the file. Addresses issue #688

Author: Murmele

src/ui/DoubleTreeWidget.cpp

@@ -158,6 +158,10 @@ DoubleTreeWidget::DoubleTreeWidget(const git::Repository &repo, QWidget *parent)
           });
 
   stagedFiles->setModel(new TreeProxy(true, mDiffTreeModel, this));
+  connect(stagedFiles, &QAbstractItemView::doubleClicked,
+          [this, repoView](const QModelIndex &index) {
+            openExternalDiffTool(index, repoView, true);
+          });
 
   QHBoxLayout *hBoxLayout = new QHBoxLayout();
   QLabel *label = new QLabel(kStagedFiles);
@@ -184,6 +188,10 @@ DoubleTreeWidget::DoubleTreeWidget(const git::Repository &repo, QWidget *parent)
           });
 
   unstagedFiles->setModel(new TreeProxy(false, mDiffTreeModel, this));
+  connect(unstagedFiles, &QAbstractItemView::doubleClicked,
+          [this, repoView](const QModelIndex &index) {
+            openExternalDiffTool(index, repoView, false);
+          });
 
   hBoxLayout = new QHBoxLayout();
   mUnstagedCommitedFiles = new QLabel(kUnstagedFiles);
@@ -347,6 +355,25 @@ void DoubleTreeWidget::showFileContextMenu(const QPoint &pos, RepoView *view,
   menu->popup(tree->mapToGlobal(pos));
 }
 
+void DoubleTreeWidget::openExternalDiffTool(const QModelIndex &index,
+                                            RepoView *view, bool staged) {
+  const auto diff = view->diff();
+  if (!diff.isValid())
+    return;
+
+  const bool statusDiff = diff.isStatusDiff();
+  QStringList files;
+  auto node = index.data(Qt::UserRole).value<Node *>();
+  addNodeToMenu(view->repo().index(), files, node, staged, statusDiff);
+  if (files.isEmpty())
+    return;
+
+  FileContextMenu fileMenu(view, files, git::Index(), nullptr);
+  auto doubleClickAction = fileMenu.doubleClickAction();
+  if (doubleClickAction)
+    doubleClickAction->trigger();
+}
+
 QList<QModelIndex> DoubleTreeWidget::selectedIndices() const {
   QList<QModelIndex> list;
 

src/ui/DoubleTreeWidget.h

@@ -54,6 +54,8 @@ private slots:
   void collapseCountChanged(int count);
   static void showFileContextMenu(const QPoint &pos, RepoView *view,
                                   QTreeView *tree, bool staged);
+  static void openExternalDiffTool(const QModelIndex &index, RepoView *view,
+                                   bool staged);
 
 private:
   enum View {

src/ui/FileContextMenu.cpp

@@ -168,7 +168,7 @@ FileContextMenu::FileContextMenu(RepoView *view, const QStringList &files,
   addExternalToolsAction(showTools);
   addExternalToolsAction(editTools);
   addExternalToolsAction(diffTools);
-  addExternalToolsAction(diffToLocalTools);
+  mDoubleClickAction = addExternalToolsAction(diffToLocalTools);
   addExternalToolsAction(mergeTools);
 
   if (!isEmpty())
@@ -527,10 +527,10 @@ bool FileContextMenu::exportFile(const RepoView *view, const QString &folder,
   return true;
 }
 
-void FileContextMenu::addExternalToolsAction(
-    const QList<ExternalTool *> &tools) {
+QAction *
+FileContextMenu::addExternalToolsAction(const QList<ExternalTool *> &tools) {
   if (tools.isEmpty())
-    return;
+    return nullptr;
 
   // Add action.
   QAction *action = addAction(tools.first()->name(), [this, tools] {
@@ -570,4 +570,5 @@ void FileContextMenu::addExternalToolsAction(
       break;
     }
   }
+  return action->isEnabled() ? action : nullptr;
 }

src/ui/FileContextMenu.h

@@ -25,11 +25,14 @@ class FileContextMenu : public QMenu {
   FileContextMenu(RepoView *view, const QStringList &files,
                   const git::Index &index = git::Index(),
                   QWidget *parent = nullptr);
+
+  QAction *doubleClickAction() { return mDoubleClickAction; }
+
 private slots:
   void ignoreFile();
 
 private:
-  void addExternalToolsAction(const QList<ExternalTool *> &tools);
+  QAction *addExternalToolsAction(const QList<ExternalTool *> &tools);
   bool exportFile(const RepoView *view, const QString &folder,
                   const QString &file);
   void handleUncommittedChanges(const git::Index &index,
@@ -39,6 +42,7 @@ private slots:
 
   RepoView *mView;
   QStringList mFiles;
+  QAction *mDoubleClickAction;
 
   friend class TestTreeView;
 };