Merge pull request gitextensions#1681 from feinstaub/topic_choose_com…

…mit_dlg

FormChooseCommit: double click behaves like OK button instead of opening the CommitInfo dialog

GitUI/GitUI.csproj

@@ -135,6 +135,7 @@
     <Compile Include="UserControls\ExListView.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="UserControls\RevisionGridClasses\DoubleClickRevisionEventArgs.cs" />
     <Compile Include="UserControls\RevisionGridClasses\DvcsGraph.Graph.cs">
       <DependentUpon>DvcsGraph.cs</DependentUpon>
       <SubType>Component</SubType>

GitUI/HelperDialogs/FormChooseCommit.cs

@@ -33,11 +33,8 @@ public FormChooseCommit(GitUICommands aCommands, string preselectCommit)
 
         }
 
-
         public GitCommands.GitRevision SelectedRevision { get; private set; }
 
-
-
         protected override void OnLoad(EventArgs e)
         {
             revisionGrid.Load();
@@ -55,5 +52,15 @@ private void btnOK_Click(object sender, EventArgs e)
                 Close();
             }
         }
+
+        private void revisionGrid_DoubleClickRevision(object sender, UserControls.RevisionGridClasses.DoubleClickRevisionEventArgs e)
+        {
+            if (e.Revision != null)
+            {
+                SelectedRevision = e.Revision;
+                DialogResult = DialogResult.OK;
+                Close();
+            }
+        }
     }
 }

GitUI/UserControls/RevisionGrid.cs

@@ -18,6 +18,7 @@
 using GitUI.Script;
 using Gravatar;
 using ResourceManager.Translation;
+using GitUI.UserControls.RevisionGridClasses;
 
 namespace GitUI
 {
@@ -67,6 +68,7 @@ public sealed partial class RevisionGrid : GitModuleControl
         private RevisionGridLayout layout;
         private int rowHeigth;
         public event GitModuleChangedEventHandler GitModuleChanged;
+        public event EventHandler<DoubleClickRevisionEventArgs> DoubleClickRevision;
 
         public RevisionGrid()
         {
@@ -216,6 +218,15 @@ public bool ShowUncommitedChangesIfPossible
             get; set;
         }
 
+        [Description("Do not open the commit info dialog on double click. This is used if the double click event is handled elseswhere.")]
+        [Category("Behavior")]
+        [DefaultValue(false)]
+        public bool DoubleClickDoesNotOpenCommitInfo
+        {
+            get;
+            set;
+        }
+
         private IndexWatcher _IndexWatcher;
         [Browsable(false)]
         public IndexWatcher IndexWatcher
@@ -1481,7 +1492,16 @@ private void RefreshGravatar(Image image)
 
         private void RevisionsDoubleClick(object sender, EventArgs e)
         {
-            ViewSelectedRevisions();
+            if (DoubleClickRevision != null)
+            {
+                var selectedRevisions = GetSelectedRevisions();
+                DoubleClickRevision(this, new DoubleClickRevisionEventArgs(selectedRevisions.FirstOrDefault()));
+            }
+
+            if (!DoubleClickDoesNotOpenCommitInfo)
+            {
+                ViewSelectedRevisions();
+            }
         }
 
         public void ViewSelectedRevisions()

GitUI/UserControls/RevisionGridClasses/DoubleClickRevisionEventArgs.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using GitCommands;
+
+namespace GitUI.UserControls.RevisionGridClasses
+{
+    public class DoubleClickRevisionEventArgs : EventArgs
+    {
+        GitRevision _revision;
+
+        public DoubleClickRevisionEventArgs(GitRevision revision)
+        {
+            _revision = revision;
+        }
+
+        public GitRevision Revision { get { return _revision; } }
+    }
+}