Added default buttons to FormResolveConflicts and FormRebase.

amaiorano · Aug 23, 2009 · 4449536 · 4449536
1 parent 7b32de5
commit 4449536
Show file tree

Hide file tree

Showing 16 changed files with 63 additions and 39 deletions.
diff --git a/GitPlugin/GitPlugin.csproj b/GitPlugin/GitPlugin.csproj
@@ -187,8 +187,8 @@
     </PreBuildEvent>
     <PostBuildEvent>cd "$(ProjectDir)"
 mkdir "$(ProjectDir)$(OutDir)en-US"
-"C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\Bin\Resgen" "$(ProjectDir)Properties\Resources.resx"
-"$(SystemRoot)\Microsoft.NET\Framework\v2.0.50727\Al" /embed:"$(ProjectDir)Properties\Resources.resources" /culture:en-US /out:"$(ProjectDir)$(OutDir)en-US\GitPlugin.resources.dll"</PostBuildEvent>
+"$(ProjectDir)Resgen\Resgen" "$(ProjectDir)Properties\Resources.resx"
+"$(ProjectDir)Resgen\Al" /embed:"$(ProjectDir)Properties\Resources.resources" /culture:en-US /out:"$(ProjectDir)$(OutDir)en-US\GitPlugin.resources.dll"</PostBuildEvent>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>

diff --git a/GitPlugin/Properties/Resources.resources b/GitPlugin/Properties/Resources.resources
diff --git a/GitPlugin/Resgen/al.exe.config b/GitPlugin/Resgen/al.exe.config
@@ -0,0 +1,6 @@
+<?xml version ="1.0"?>
+<configuration>
+    <startup>
+        <supportedRuntime version="v2.0.50727"/>
+    </startup>
+</configuration>
diff --git a/GitUI/ApplyPatch.Designer.cs b/GitUI/ApplyPatch.Designer.cs
diff --git a/GitUI/Commit.Designer.cs b/GitUI/Commit.Designer.cs
diff --git a/GitUI/Commit.cs b/GitUI/Commit.cs
@@ -259,6 +259,8 @@ private void Stage(IList rows)
 
             Commit.Enabled = true;
             Amend.Enabled = true;
+            AcceptButton = Commit;
+            Commit.Focus();
         }
 
         private void Reset_Click(object sender, EventArgs e)

diff --git a/GitUI/FindAndReplaceForm.Designer.cs b/GitUI/FindAndReplaceForm.Designer.cs
diff --git a/GitUI/FormBranch.Designer.cs b/GitUI/FormBranch.Designer.cs
diff --git a/GitUI/FormCheckoutBranck.Designer.cs b/GitUI/FormCheckoutBranck.Designer.cs
diff --git a/GitUI/FormRebase.Designer.cs b/GitUI/FormRebase.Designer.cs
diff --git a/GitUI/FormRebase.cs b/GitUI/FormRebase.cs
@@ -72,12 +72,16 @@ private void EnableButtons()
 
             if (GitCommands.GitCommands.InTheMiddleOfConflictedMerge())
             {
+                AcceptButton = Mergetool;
+                Mergetool.Focus();
                 Mergetool.Text = ">Solve conflicts<";
                 MergeToolPanel.BackColor = Color.Black;
             }
             else
                 if (GitCommands.GitCommands.InTheMiddleOfRebase())
                 {
+                    AcceptButton = Resolved;
+                    Resolved.Focus();
                     Resolved.Text = ">Continue rebase<";
                     ContinuePanel.BackColor = Color.Black;
                 }

diff --git a/GitUI/FormResolveConflicts.Designer.cs b/GitUI/FormResolveConflicts.Designer.cs
diff --git a/GitUI/FormResolveConflicts.cs b/GitUI/FormResolveConflicts.cs
@@ -34,6 +34,8 @@ private void FormResolveConflicts_Load(object sender, EventArgs e)
 
         private void Initialize()
         {
+            button1.Focus();
+
             ConflictedFiles.DataSource = GitCommands.GitCommands.GetConflictedFiles();
             InitMergetool();
 

diff --git a/GitUI/MergePatch.Designer.cs b/GitUI/MergePatch.Designer.cs
diff --git a/GitUI/MergePatch.cs b/GitUI/MergePatch.cs
@@ -68,11 +68,13 @@ private void EnableButtons()
             if (GitCommands.GitCommands.InTheMiddleOfConflictedMerge())
             {
                 Mergetool.Text = ">Solve conflicts<";
+                AcceptButton = Mergetool;
             }
             else
                 if (GitCommands.GitCommands.InTheMiddleOfPatch())
                 {
                     Resolved.Text = ">Conflicts resolved<";
+                    AcceptButton = Resolved;
                 }
 
         }

diff --git a/GitUI/OpenDirectory.Designer.cs b/GitUI/OpenDirectory.Designer.cs