diff options
author | Lluis Sanchez <lluis@xamarin.com> | 2014-03-07 14:03:28 +0400 |
---|---|---|
committer | Lluis Sanchez <lluis@xamarin.com> | 2014-03-07 14:03:28 +0400 |
commit | 291064299685503a9228366c2ae50f3ca15cdd41 (patch) | |
tree | 707d33be39c4968d64d40bf07c1983b1a4c0b238 /main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui | |
parent | 69e19bee14550cd3b621a42bbc4290a156d892c0 (diff) | |
parent | a77a3285026ea55412923dcecaa0fd1ab33bafc6 (diff) |
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
version-checks
Diffstat (limited to 'main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui')
2 files changed, 2 insertions, 3 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs index 10ad380cee..69b893645f 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs @@ -144,6 +144,7 @@ namespace MonoDevelop.VersionControl.Dialogs this.buttonCommit.Name = "buttonCommit"; this.buttonCommit.UseUnderline = true; this.buttonCommit.Label = global::Mono.Unix.Catalog.GetString ("C_ommit"); + this.AddActionWidget (this.buttonCommit, -5); w12.Add (this.buttonCommit); global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w12 [this.buttonCommit])); w14.Position = 1; @@ -157,7 +158,6 @@ namespace MonoDevelop.VersionControl.Dialogs this.label2.MnemonicWidget = this.textview; this.label3.MnemonicWidget = this.textview; this.Hide (); - this.buttonCommit.Clicked += new global::System.EventHandler (this.OnButtonCommitClicked); } } } diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/gui.stetic b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/gui.stetic index 1153fdedb6..f094d26872 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/gui.stetic +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/gui.stetic @@ -1192,8 +1192,7 @@ <property name="Type">TextOnly</property> <property name="Label" translatable="yes">C_ommit</property> <property name="UseUnderline">True</property> - <property name="ResponseId">-1</property> - <signal name="Clicked" handler="OnButtonCommitClicked" /> + <property name="ResponseId">-5</property> </widget> <packing> <property name="Position">1</property> |