diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2013-08-09 02:29:34 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2013-08-09 02:29:34 +0400 |
| commit | 4e575d4cdb5775d6e2983bb232606adfc2d74c14 (patch) | |
| tree | 6c56c3710aceb4cc465cc2c986e11c433f660535 /main/src/addins/VersionControl/MonoDevelop.VersionControl | |
| parent | d74610147b6107c4d9434d42d8b88dd1baab63e2 (diff) | |
[VersionControl] BXC13821 - Commit dialog has broken image in 4.1.9
Diffstat (limited to 'main/src/addins/VersionControl/MonoDevelop.VersionControl')
2 files changed, 8 insertions, 24 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 cbe86d9f4c..10ad380cee 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 @@ -16,7 +16,7 @@ namespace MonoDevelop.VersionControl.Dialogs private global::Gtk.TextView textview; private global::Gtk.Button button29; private global::Gtk.Button buttonCommit; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); @@ -79,7 +79,7 @@ namespace MonoDevelop.VersionControl.Dialogs // Container child hbox1.Gtk.Box+BoxChild this.label3 = new global::Gtk.Label (); this.label3.Name = "label3"; - this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("1/1"); + this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("?/?"); this.hbox1.Add (this.label3); global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label3])); w6.PackType = ((global::Gtk.PackType)(1)); @@ -143,27 +143,12 @@ namespace MonoDevelop.VersionControl.Dialogs this.buttonCommit.CanFocus = true; this.buttonCommit.Name = "buttonCommit"; this.buttonCommit.UseUnderline = true; - // Container child buttonCommit.Gtk.Container+ContainerChild - global::Gtk.Alignment w14 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); - // Container child GtkAlignment.Gtk.Container+ContainerChild - global::Gtk.HBox w15 = new global::Gtk.HBox (); - w15.Spacing = 2; - // Container child GtkHBox.Gtk.Container+ContainerChild - global::Gtk.Image w16 = new global::Gtk.Image (); - w16.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "vc-commit", global::Gtk.IconSize.Menu); - w15.Add (w16); - // Container child GtkHBox.Gtk.Container+ContainerChild - global::Gtk.Label w18 = new global::Gtk.Label (); - w18.LabelProp = global::Mono.Unix.Catalog.GetString ("C_ommit"); - w18.UseUnderline = true; - w15.Add (w18); - w14.Add (w15); - this.buttonCommit.Add (w14); + this.buttonCommit.Label = global::Mono.Unix.Catalog.GetString ("C_ommit"); w12.Add (this.buttonCommit); - global::Gtk.ButtonBox.ButtonBoxChild w22 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w12 [this.buttonCommit])); - w22.Position = 1; - w22.Expand = false; - w22.Fill = false; + global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w12 [this.buttonCommit])); + w14.Position = 1; + w14.Expand = false; + w14.Fill = false; if ((this.Child != null)) { this.Child.ShowAll (); } 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 33c04f9c99..1c101caee2 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/gui.stetic +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/gui.stetic @@ -1213,8 +1213,7 @@ <property name="MemberName" /> <property name="CanDefault">True</property> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:vc-commit Menu</property> + <property name="Type">TextOnly</property> <property name="Label" translatable="yes">C_ommit</property> <property name="UseUnderline">True</property> <property name="ResponseId">-1</property> |