diff options
Diffstat (limited to 'main/src/addins/MonoDevelop.SourceEditor2/gtk-gui')
13 files changed, 942 insertions, 859 deletions
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs index 1b7c8e870b..1047bb7150 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs @@ -2,86 +2,92 @@ // This file has been generated by the GUI designer. Do not modify. namespace MonoDevelop.SourceEditor { - partial class GotoLineNumberWidget + public partial class GotoLineNumberWidget { private global::Gtk.HBox hbox1; + private global::Gtk.Entry entryLineNumber; + private global::Gtk.Button buttonGoToLine; + private global::Gtk.EventBox eventbox2; + private global::Gtk.Image image2; + private global::Gtk.Button closeButton; + private global::Gtk.EventBox eventbox1; + private global::Gtk.Image image1; - - protected virtual void Build () + + protected virtual void Build() { - global::Stetic.Gui.Initialize (this); + global::Stetic.Gui.Initialize(this); // Widget MonoDevelop.SourceEditor.GotoLineNumberWidget - global::Stetic.BinContainer.Attach (this); + global::Stetic.BinContainer.Attach(this); this.Name = "MonoDevelop.SourceEditor.GotoLineNumberWidget"; // Container child MonoDevelop.SourceEditor.GotoLineNumberWidget.Gtk.Container+ContainerChild - this.hbox1 = new global::Gtk.HBox (); + this.hbox1 = new global::Gtk.HBox(); this.hbox1.Name = "hbox1"; // Container child hbox1.Gtk.Box+BoxChild - this.entryLineNumber = new global::Gtk.Entry (); + this.entryLineNumber = new global::Gtk.Entry(); this.entryLineNumber.CanFocus = true; this.entryLineNumber.Name = "entryLineNumber"; this.entryLineNumber.IsEditable = true; this.entryLineNumber.InvisibleChar = '●'; - this.hbox1.Add (this.entryLineNumber); - global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.entryLineNumber])); + this.hbox1.Add(this.entryLineNumber); + global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.entryLineNumber])); w1.Position = 0; w1.Expand = false; // Container child hbox1.Gtk.Box+BoxChild - this.buttonGoToLine = new global::Gtk.Button (); + this.buttonGoToLine = new global::Gtk.Button(); this.buttonGoToLine.CanDefault = true; this.buttonGoToLine.CanFocus = true; this.buttonGoToLine.Name = "buttonGoToLine"; this.buttonGoToLine.Relief = ((global::Gtk.ReliefStyle)(2)); // Container child buttonGoToLine.Gtk.Container+ContainerChild - this.eventbox2 = new global::Gtk.EventBox (); + this.eventbox2 = new global::Gtk.EventBox(); this.eventbox2.Name = "eventbox2"; this.eventbox2.AboveChild = true; this.eventbox2.VisibleWindow = false; // Container child eventbox2.Gtk.Container+ContainerChild - this.image2 = new global::Gtk.Image (); + this.image2 = new global::Gtk.Image(); this.image2.Name = "image2"; - this.image2.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-jump-to", global::Gtk.IconSize.Menu); - this.eventbox2.Add (this.image2); - this.buttonGoToLine.Add (this.eventbox2); - this.buttonGoToLine.Label = null; - this.hbox1.Add (this.buttonGoToLine); - global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonGoToLine])); + this.image2.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-jump-to", global::Gtk.IconSize.Menu); + this.eventbox2.Add(this.image2); + this.buttonGoToLine.Add(this.eventbox2); + this.hbox1.Add(this.buttonGoToLine); + global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.buttonGoToLine])); w4.Position = 1; w4.Expand = false; w4.Fill = false; // Container child hbox1.Gtk.Box+BoxChild - this.closeButton = new global::Gtk.Button (); + this.closeButton = new global::Gtk.Button(); this.closeButton.CanFocus = true; this.closeButton.Name = "closeButton"; this.closeButton.Relief = ((global::Gtk.ReliefStyle)(2)); // Container child closeButton.Gtk.Container+ContainerChild - this.eventbox1 = new global::Gtk.EventBox (); + this.eventbox1 = new global::Gtk.EventBox(); this.eventbox1.Name = "eventbox1"; this.eventbox1.AboveChild = true; this.eventbox1.VisibleWindow = false; // Container child eventbox1.Gtk.Container+ContainerChild - this.image1 = new global::Gtk.Image (); + this.image1 = new global::Gtk.Image(); this.image1.Name = "image1"; - this.image1.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-close", global::Gtk.IconSize.Menu); - this.eventbox1.Add (this.image1); - this.closeButton.Add (this.eventbox1); - this.closeButton.Label = null; - this.hbox1.Add (this.closeButton); - global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.closeButton])); + this.image1.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-close", global::Gtk.IconSize.Menu); + this.eventbox1.Add(this.image1); + this.closeButton.Add(this.eventbox1); + this.hbox1.Add(this.closeButton); + global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.closeButton])); w7.Position = 2; w7.Expand = false; w7.Fill = false; - this.Add (this.hbox1); - if ((this.Child != null)) { - this.Child.ShowAll (); + this.Add(this.hbox1); + if ((this.Child != null)) + { + this.Child.ShowAll(); } - this.Show (); + this.Show(); } } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs index 0fab32c065..dfd5170cc2 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs @@ -5,289 +5,315 @@ namespace MonoDevelop.SourceEditor.OptionPanels public partial class BehaviorPanel { private global::Gtk.VBox vbox1; + private global::Gtk.Label GtkLabel5; + private global::Gtk.Alignment alignment3; + private global::Gtk.VBox vbox4; + private global::Gtk.CheckButton autoInsertBraceCheckbutton; + private global::Gtk.HBox hbox2; + private global::Gtk.Label fixed1; + private global::Gtk.CheckButton smartSemicolonPlaceCheckbutton; + private global::Gtk.CheckButton checkbuttonOnTheFlyFormatting; + private global::Gtk.CheckButton checkbuttonFormatOnSave; + private global::Gtk.CheckButton checkbuttonAutoSetSearchPatternCasing; + private global::Gtk.CheckButton checkbuttonGenerateFormattingUndoStep; + private global::Gtk.Label GtkLabel6; + private global::Gtk.Alignment GtkAlignment; + private global::Gtk.VBox vbox2; + private global::Gtk.HBox hbox1; + private global::Gtk.Label label1; + private global::Gtk.ComboBox indentationCombobox; + private global::Gtk.CheckButton tabAsReindentCheckbutton; + private global::Gtk.Label GtkLabel8; + private global::Gtk.Alignment alignment4; + private global::Gtk.VBox vbox5; + private global::Gtk.CheckButton useViModesCheck; + private global::Gtk.HBox hbox3; + private global::Gtk.Label label2; + private global::Gtk.ComboBox controlLeftRightCombobox; - protected virtual void Build () + protected virtual void Build() { - global::Stetic.Gui.Initialize (this); + global::Stetic.Gui.Initialize(this); // Widget MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel - global::Stetic.BinContainer.Attach (this); + global::Stetic.BinContainer.Attach(this); this.Name = "MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel"; // Container child MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.Gtk.Container+ContainerChild - this.vbox1 = new global::Gtk.VBox (); + this.vbox1 = new global::Gtk.VBox(); this.vbox1.Name = "vbox1"; this.vbox1.Spacing = 6; // Container child vbox1.Gtk.Box+BoxChild - this.GtkLabel5 = new global::Gtk.Label (); + this.GtkLabel5 = new global::Gtk.Label(); this.GtkLabel5.Name = "GtkLabel5"; this.GtkLabel5.Xalign = 0F; - this.GtkLabel5.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Automatic behaviors</b>"); + this.GtkLabel5.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Automatic behaviors</b>"); this.GtkLabel5.UseMarkup = true; - this.vbox1.Add (this.GtkLabel5); - global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel5])); + this.vbox1.Add(this.GtkLabel5); + global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel5])); w1.Position = 0; w1.Expand = false; w1.Fill = false; // Container child vbox1.Gtk.Box+BoxChild - this.alignment3 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F); + this.alignment3 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F); this.alignment3.Name = "alignment3"; this.alignment3.LeftPadding = ((uint)(12)); // Container child alignment3.Gtk.Container+ContainerChild - this.vbox4 = new global::Gtk.VBox (); + this.vbox4 = new global::Gtk.VBox(); this.vbox4.Name = "vbox4"; this.vbox4.Spacing = 6; // Container child vbox4.Gtk.Box+BoxChild - this.autoInsertBraceCheckbutton = new global::Gtk.CheckButton (); + this.autoInsertBraceCheckbutton = new global::Gtk.CheckButton(); this.autoInsertBraceCheckbutton.CanFocus = true; this.autoInsertBraceCheckbutton.Name = "autoInsertBraceCheckbutton"; - this.autoInsertBraceCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Insert matching brace"); + this.autoInsertBraceCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Insert matching brace"); this.autoInsertBraceCheckbutton.DrawIndicator = true; this.autoInsertBraceCheckbutton.UseUnderline = true; - this.vbox4.Add (this.autoInsertBraceCheckbutton); - global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.autoInsertBraceCheckbutton])); + this.vbox4.Add(this.autoInsertBraceCheckbutton); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.autoInsertBraceCheckbutton])); w2.Position = 0; w2.Expand = false; w2.Fill = false; // Container child vbox4.Gtk.Box+BoxChild - this.hbox2 = new global::Gtk.HBox (); + this.hbox2 = new global::Gtk.HBox(); this.hbox2.Name = "hbox2"; this.hbox2.Spacing = 6; // Container child hbox2.Gtk.Box+BoxChild - this.fixed1 = new global::Gtk.Label (); + this.fixed1 = new global::Gtk.Label(); this.fixed1.Name = "fixed1"; - this.hbox2.Add (this.fixed1); - global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.fixed1])); + this.hbox2.Add(this.fixed1); + global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.fixed1])); w3.Position = 0; w3.Expand = false; w3.Fill = false; w3.Padding = ((uint)(6)); // Container child hbox2.Gtk.Box+BoxChild - this.smartSemicolonPlaceCheckbutton = new global::Gtk.CheckButton (); + this.smartSemicolonPlaceCheckbutton = new global::Gtk.CheckButton(); this.smartSemicolonPlaceCheckbutton.CanFocus = true; this.smartSemicolonPlaceCheckbutton.Name = "smartSemicolonPlaceCheckbutton"; - this.smartSemicolonPlaceCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Smart semicolon placement"); + this.smartSemicolonPlaceCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Smart semicolon placement"); this.smartSemicolonPlaceCheckbutton.Active = true; this.smartSemicolonPlaceCheckbutton.DrawIndicator = true; this.smartSemicolonPlaceCheckbutton.UseUnderline = true; - this.hbox2.Add (this.smartSemicolonPlaceCheckbutton); - global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.smartSemicolonPlaceCheckbutton])); + this.hbox2.Add(this.smartSemicolonPlaceCheckbutton); + global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.smartSemicolonPlaceCheckbutton])); w4.Position = 1; - this.vbox4.Add (this.hbox2); - global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox2])); + this.vbox4.Add(this.hbox2); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.hbox2])); w5.Position = 1; w5.Expand = false; w5.Fill = false; // Container child vbox4.Gtk.Box+BoxChild - this.checkbuttonOnTheFlyFormatting = new global::Gtk.CheckButton (); + this.checkbuttonOnTheFlyFormatting = new global::Gtk.CheckButton(); this.checkbuttonOnTheFlyFormatting.CanFocus = true; this.checkbuttonOnTheFlyFormatting.Name = "checkbuttonOnTheFlyFormatting"; - this.checkbuttonOnTheFlyFormatting.Label = global::Mono.Unix.Catalog.GetString ("_Enable on the fly code formatting"); + this.checkbuttonOnTheFlyFormatting.Label = global::Mono.Unix.Catalog.GetString("_Enable on the fly code formatting"); this.checkbuttonOnTheFlyFormatting.DrawIndicator = true; this.checkbuttonOnTheFlyFormatting.UseUnderline = true; - this.vbox4.Add (this.checkbuttonOnTheFlyFormatting); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonOnTheFlyFormatting])); + this.vbox4.Add(this.checkbuttonOnTheFlyFormatting); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonOnTheFlyFormatting])); w6.Position = 2; w6.Expand = false; w6.Fill = false; // Container child vbox4.Gtk.Box+BoxChild - this.checkbuttonFormatOnSave = new global::Gtk.CheckButton (); + this.checkbuttonFormatOnSave = new global::Gtk.CheckButton(); this.checkbuttonFormatOnSave.CanFocus = true; this.checkbuttonFormatOnSave.Name = "checkbuttonFormatOnSave"; - this.checkbuttonFormatOnSave.Label = global::Mono.Unix.Catalog.GetString ("_Format document on save"); + this.checkbuttonFormatOnSave.Label = global::Mono.Unix.Catalog.GetString("_Format document on save"); this.checkbuttonFormatOnSave.DrawIndicator = true; this.checkbuttonFormatOnSave.UseUnderline = true; - this.vbox4.Add (this.checkbuttonFormatOnSave); - global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonFormatOnSave])); + this.vbox4.Add(this.checkbuttonFormatOnSave); + global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonFormatOnSave])); w7.Position = 3; w7.Expand = false; w7.Fill = false; // Container child vbox4.Gtk.Box+BoxChild - this.checkbuttonAutoSetSearchPatternCasing = new global::Gtk.CheckButton (); + this.checkbuttonAutoSetSearchPatternCasing = new global::Gtk.CheckButton(); this.checkbuttonAutoSetSearchPatternCasing.CanFocus = true; this.checkbuttonAutoSetSearchPatternCasing.Name = "checkbuttonAutoSetSearchPatternCasing"; - this.checkbuttonAutoSetSearchPatternCasing.Label = global::Mono.Unix.Catalog.GetString ("_Automatically set search pattern case sensitivity"); + this.checkbuttonAutoSetSearchPatternCasing.Label = global::Mono.Unix.Catalog.GetString("_Automatically set search pattern case sensitivity"); this.checkbuttonAutoSetSearchPatternCasing.DrawIndicator = true; this.checkbuttonAutoSetSearchPatternCasing.UseUnderline = true; - this.vbox4.Add (this.checkbuttonAutoSetSearchPatternCasing); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonAutoSetSearchPatternCasing])); + this.vbox4.Add(this.checkbuttonAutoSetSearchPatternCasing); + global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonAutoSetSearchPatternCasing])); w8.Position = 4; w8.Expand = false; w8.Fill = false; // Container child vbox4.Gtk.Box+BoxChild - this.checkbuttonGenerateFormattingUndoStep = new global::Gtk.CheckButton (); + this.checkbuttonGenerateFormattingUndoStep = new global::Gtk.CheckButton(); this.checkbuttonGenerateFormattingUndoStep.CanFocus = true; this.checkbuttonGenerateFormattingUndoStep.Name = "checkbuttonGenerateFormattingUndoStep"; - this.checkbuttonGenerateFormattingUndoStep.Label = global::Mono.Unix.Catalog.GetString ("_Generate additional undo steps for formatting"); + this.checkbuttonGenerateFormattingUndoStep.Label = global::Mono.Unix.Catalog.GetString("_Generate additional undo steps for formatting"); this.checkbuttonGenerateFormattingUndoStep.DrawIndicator = true; this.checkbuttonGenerateFormattingUndoStep.UseUnderline = true; - this.vbox4.Add (this.checkbuttonGenerateFormattingUndoStep); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonGenerateFormattingUndoStep])); + this.vbox4.Add(this.checkbuttonGenerateFormattingUndoStep); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonGenerateFormattingUndoStep])); w9.Position = 5; w9.Expand = false; w9.Fill = false; - this.alignment3.Add (this.vbox4); - this.vbox1.Add (this.alignment3); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment3])); + this.alignment3.Add(this.vbox4); + this.vbox1.Add(this.alignment3); + global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment3])); w11.Position = 1; w11.Expand = false; w11.Fill = false; // Container child vbox1.Gtk.Box+BoxChild - this.GtkLabel6 = new global::Gtk.Label (); + this.GtkLabel6 = new global::Gtk.Label(); this.GtkLabel6.Name = "GtkLabel6"; this.GtkLabel6.Xalign = 0F; - this.GtkLabel6.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Indentation</b>"); + this.GtkLabel6.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Indentation</b>"); this.GtkLabel6.UseMarkup = true; - this.vbox1.Add (this.GtkLabel6); - global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel6])); + this.vbox1.Add(this.GtkLabel6); + global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel6])); w12.Position = 2; w12.Expand = false; w12.Fill = false; // Container child vbox1.Gtk.Box+BoxChild - this.GtkAlignment = new global::Gtk.Alignment (0F, 0F, 1F, 1F); + this.GtkAlignment = new global::Gtk.Alignment(0F, 0F, 1F, 1F); this.GtkAlignment.Name = "GtkAlignment"; this.GtkAlignment.LeftPadding = ((uint)(12)); // Container child GtkAlignment.Gtk.Container+ContainerChild - this.vbox2 = new global::Gtk.VBox (); + this.vbox2 = new global::Gtk.VBox(); this.vbox2.Name = "vbox2"; this.vbox2.Spacing = 6; // Container child vbox2.Gtk.Box+BoxChild - this.hbox1 = new global::Gtk.HBox (); + this.hbox1 = new global::Gtk.HBox(); this.hbox1.Name = "hbox1"; this.hbox1.Spacing = 6; // Container child hbox1.Gtk.Box+BoxChild - this.label1 = new global::Gtk.Label (); + this.label1 = new global::Gtk.Label(); this.label1.Name = "label1"; - this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Indentation mode:"); + this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("_Indentation mode:"); this.label1.UseUnderline = true; - this.hbox1.Add (this.label1); - global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label1])); + this.hbox1.Add(this.label1); + global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label1])); w13.Position = 0; w13.Expand = false; w13.Fill = false; // Container child hbox1.Gtk.Box+BoxChild - this.indentationCombobox = global::Gtk.ComboBox.NewText (); + this.indentationCombobox = global::Gtk.ComboBox.NewText(); this.indentationCombobox.Name = "indentationCombobox"; - this.hbox1.Add (this.indentationCombobox); - global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.indentationCombobox])); + this.hbox1.Add(this.indentationCombobox); + global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.indentationCombobox])); w14.Position = 1; w14.Expand = false; w14.Fill = false; - this.vbox2.Add (this.hbox1); - global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1])); + this.vbox2.Add(this.hbox1); + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox1])); w15.Position = 0; w15.Expand = false; w15.Fill = false; // Container child vbox2.Gtk.Box+BoxChild - this.tabAsReindentCheckbutton = new global::Gtk.CheckButton (); + this.tabAsReindentCheckbutton = new global::Gtk.CheckButton(); this.tabAsReindentCheckbutton.CanFocus = true; this.tabAsReindentCheckbutton.Name = "tabAsReindentCheckbutton"; - this.tabAsReindentCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Interpret tab _keystroke as reindent command"); + this.tabAsReindentCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Interpret tab _keystroke as reindent command"); this.tabAsReindentCheckbutton.DrawIndicator = true; this.tabAsReindentCheckbutton.UseUnderline = true; - this.vbox2.Add (this.tabAsReindentCheckbutton); - global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.tabAsReindentCheckbutton])); + this.vbox2.Add(this.tabAsReindentCheckbutton); + global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.tabAsReindentCheckbutton])); w16.Position = 1; w16.Expand = false; w16.Fill = false; - this.GtkAlignment.Add (this.vbox2); - this.vbox1.Add (this.GtkAlignment); - global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkAlignment])); + this.GtkAlignment.Add(this.vbox2); + this.vbox1.Add(this.GtkAlignment); + global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkAlignment])); w18.Position = 3; w18.Expand = false; w18.Fill = false; // Container child vbox1.Gtk.Box+BoxChild - this.GtkLabel8 = new global::Gtk.Label (); + this.GtkLabel8 = new global::Gtk.Label(); this.GtkLabel8.Name = "GtkLabel8"; this.GtkLabel8.Xalign = 0F; - this.GtkLabel8.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Navigation</b>"); + this.GtkLabel8.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Navigation</b>"); this.GtkLabel8.UseMarkup = true; - this.vbox1.Add (this.GtkLabel8); - global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel8])); + this.vbox1.Add(this.GtkLabel8); + global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel8])); w19.Position = 4; w19.Expand = false; w19.Fill = false; // Container child vbox1.Gtk.Box+BoxChild - this.alignment4 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F); + this.alignment4 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F); this.alignment4.Name = "alignment4"; this.alignment4.LeftPadding = ((uint)(12)); // Container child alignment4.Gtk.Container+ContainerChild - this.vbox5 = new global::Gtk.VBox (); + this.vbox5 = new global::Gtk.VBox(); this.vbox5.Name = "vbox5"; this.vbox5.Spacing = 6; // Container child vbox5.Gtk.Box+BoxChild - this.useViModesCheck = new global::Gtk.CheckButton (); + this.useViModesCheck = new global::Gtk.CheckButton(); this.useViModesCheck.CanFocus = true; this.useViModesCheck.Name = "useViModesCheck"; - this.useViModesCheck.Label = global::Mono.Unix.Catalog.GetString ("Use _Vi modes"); + this.useViModesCheck.Label = global::Mono.Unix.Catalog.GetString("Use _Vi modes"); this.useViModesCheck.DrawIndicator = true; this.useViModesCheck.UseUnderline = true; - this.vbox5.Add (this.useViModesCheck); - global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.useViModesCheck])); + this.vbox5.Add(this.useViModesCheck); + global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.useViModesCheck])); w20.Position = 0; w20.Expand = false; w20.Fill = false; // Container child vbox5.Gtk.Box+BoxChild - this.hbox3 = new global::Gtk.HBox (); + this.hbox3 = new global::Gtk.HBox(); this.hbox3.Name = "hbox3"; this.hbox3.Spacing = 6; // Container child hbox3.Gtk.Box+BoxChild - this.label2 = new global::Gtk.Label (); + this.label2 = new global::Gtk.Label(); this.label2.Name = "label2"; - this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Word _break mode:"); + this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("Word _break mode:"); this.label2.UseUnderline = true; - this.hbox3.Add (this.label2); - global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label2])); + this.hbox3.Add(this.label2); + global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.label2])); w21.Position = 0; w21.Expand = false; w21.Fill = false; // Container child hbox3.Gtk.Box+BoxChild - this.controlLeftRightCombobox = global::Gtk.ComboBox.NewText (); + this.controlLeftRightCombobox = global::Gtk.ComboBox.NewText(); this.controlLeftRightCombobox.Name = "controlLeftRightCombobox"; - this.hbox3.Add (this.controlLeftRightCombobox); - global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.controlLeftRightCombobox])); + this.hbox3.Add(this.controlLeftRightCombobox); + global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.controlLeftRightCombobox])); w22.Position = 1; w22.Expand = false; w22.Fill = false; - this.vbox5.Add (this.hbox3); - global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox3])); + this.vbox5.Add(this.hbox3); + global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox3])); w23.Position = 1; w23.Expand = false; w23.Fill = false; - this.alignment4.Add (this.vbox5); - this.vbox1.Add (this.alignment4); - global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment4])); + this.alignment4.Add(this.vbox5); + this.vbox1.Add(this.alignment4); + global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment4])); w25.Position = 5; w25.Expand = false; w25.Fill = false; - this.Add (this.vbox1); - if ((this.Child != null)) { - this.Child.ShowAll (); + this.Add(this.vbox1); + if ((this.Child != null)) + { + this.Child.ShowAll(); } - this.Show (); + this.Show(); } } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.cs index 4b433ec225..d20c095ede 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.cs @@ -5,46 +5,79 @@ namespace MonoDevelop.SourceEditor.OptionPanels public partial class ColorShemeEditor { private global::Gtk.HBox hbox1; + private global::Gtk.Label label2; + private global::Gtk.Entry entryName; + private global::Gtk.Label label3; + private global::Gtk.Entry entryDescription; + private global::Gtk.HPaned hpaned1; + private global::Gtk.VBox vbox2; + private global::Gtk.Label label1; + private global::Gtk.ScrolledWindow GtkScrolledWindow; + private global::Gtk.TreeView treeviewColors; + private global::Gtk.VBox vbox3; + private global::Gtk.Notebook notebookColorChooser; + private global::Gtk.VBox vbox4; + private global::Gtk.Table table1; + private global::Gtk.ColorButton colorbuttonBg; + private global::Gtk.ColorButton colorbuttonFg; + private global::Gtk.Label label5; + private global::Gtk.Label label7; + private global::Gtk.CheckButton checkbuttonBold; + private global::Gtk.CheckButton checkbuttonItalic; + private global::Gtk.Label label4; + private global::Gtk.VBox vbox5; + private global::Gtk.Table table2; + private global::Gtk.ColorButton colorbuttonBorder; + private global::Gtk.ColorButton colorbuttonPrimary; + private global::Gtk.ColorButton colorbuttonSecondary; + private global::Gtk.Label label10; + private global::Gtk.Label label11; + private global::Gtk.Label label9; + private global::Gtk.Label label6; + private global::Gtk.Label label8; + private global::Gtk.ScrolledWindow scrolledwindowTextEditor; + private global::Gtk.Button buttonCancel; + private global::Gtk.Button buttonOk; - - protected virtual void Build () + + protected virtual void Build() { - global::Stetic.Gui.Initialize (this); + global::Stetic.Gui.Initialize(this); // Widget MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor this.Name = "MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor"; - this.Title = global::Mono.Unix.Catalog.GetString ("Edit color sheme"); + this.Title = global::Mono.Unix.Catalog.GetString("Edit color sheme"); this.WindowPosition = ((global::Gtk.WindowPosition)(4)); this.BorderWidth = ((uint)(6)); // Internal child MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.VBox @@ -52,115 +85,116 @@ namespace MonoDevelop.SourceEditor.OptionPanels w1.Name = "dialog1_VBox"; w1.BorderWidth = ((uint)(2)); // Container child dialog1_VBox.Gtk.Box+BoxChild - this.hbox1 = new global::Gtk.HBox (); + this.hbox1 = new global::Gtk.HBox(); this.hbox1.Name = "hbox1"; this.hbox1.Spacing = 6; this.hbox1.BorderWidth = ((uint)(6)); // Container child hbox1.Gtk.Box+BoxChild - this.label2 = new global::Gtk.Label (); + this.label2 = new global::Gtk.Label(); this.label2.Name = "label2"; this.label2.Xalign = 0F; - this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("_Name:"); + this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("_Name:"); this.label2.UseUnderline = true; - this.hbox1.Add (this.label2); - global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label2])); + this.hbox1.Add(this.label2); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label2])); w2.Position = 0; w2.Expand = false; w2.Fill = false; // Container child hbox1.Gtk.Box+BoxChild - this.entryName = new global::Gtk.Entry (); + this.entryName = new global::Gtk.Entry(); this.entryName.CanFocus = true; this.entryName.Name = "entryName"; this.entryName.IsEditable = true; this.entryName.InvisibleChar = '●'; - this.hbox1.Add (this.entryName); - global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.entryName])); + this.hbox1.Add(this.entryName); + global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.entryName])); w3.Position = 1; // Container child hbox1.Gtk.Box+BoxChild - this.label3 = new global::Gtk.Label (); + this.label3 = new global::Gtk.Label(); this.label3.Name = "label3"; - this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("_Description:"); + this.label3.LabelProp = global::Mono.Unix.Catalog.GetString("_Description:"); this.label3.UseUnderline = true; - this.hbox1.Add (this.label3); - global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label3])); + this.hbox1.Add(this.label3); + global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label3])); w4.Position = 2; w4.Expand = false; w4.Fill = false; // Container child hbox1.Gtk.Box+BoxChild - this.entryDescription = new global::Gtk.Entry (); + this.entryDescription = new global::Gtk.Entry(); this.entryDescription.CanFocus = true; this.entryDescription.Name = "entryDescription"; this.entryDescription.IsEditable = true; this.entryDescription.InvisibleChar = '●'; - this.hbox1.Add (this.entryDescription); - global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.entryDescription])); + this.hbox1.Add(this.entryDescription); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.entryDescription])); w5.Position = 3; - w1.Add (this.hbox1); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1 [this.hbox1])); + w1.Add(this.hbox1); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1[this.hbox1])); w6.Position = 0; w6.Expand = false; w6.Fill = false; // Container child dialog1_VBox.Gtk.Box+BoxChild - this.hpaned1 = new global::Gtk.HPaned (); + this.hpaned1 = new global::Gtk.HPaned(); this.hpaned1.CanFocus = true; this.hpaned1.Name = "hpaned1"; this.hpaned1.Position = 415; // Container child hpaned1.Gtk.Paned+PanedChild - this.vbox2 = new global::Gtk.VBox (); + this.vbox2 = new global::Gtk.VBox(); this.vbox2.Name = "vbox2"; this.vbox2.Spacing = 6; // Container child vbox2.Gtk.Box+BoxChild - this.label1 = new global::Gtk.Label (); + this.label1 = new global::Gtk.Label(); this.label1.Name = "label1"; this.label1.Xalign = 0F; - this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Colors"); + this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("_Colors"); this.label1.UseUnderline = true; - this.vbox2.Add (this.label1); - global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label1])); + this.vbox2.Add(this.label1); + global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.label1])); w7.Position = 0; w7.Expand = false; w7.Fill = false; // Container child vbox2.Gtk.Box+BoxChild - this.GtkScrolledWindow = new global::Gtk.ScrolledWindow (); + this.GtkScrolledWindow = new global::Gtk.ScrolledWindow(); this.GtkScrolledWindow.Name = "GtkScrolledWindow"; this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1)); // Container child GtkScrolledWindow.Gtk.Container+ContainerChild - this.treeviewColors = new global::Gtk.TreeView (); + this.treeviewColors = new global::Gtk.TreeView(); this.treeviewColors.CanFocus = true; this.treeviewColors.Name = "treeviewColors"; - this.GtkScrolledWindow.Add (this.treeviewColors); - this.vbox2.Add (this.GtkScrolledWindow); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow])); + this.GtkScrolledWindow.Add(this.treeviewColors); + this.vbox2.Add(this.GtkScrolledWindow); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.GtkScrolledWindow])); w9.Position = 1; - this.hpaned1.Add (this.vbox2); - global::Gtk.Paned.PanedChild w10 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.vbox2])); + this.hpaned1.Add(this.vbox2); + global::Gtk.Paned.PanedChild w10 = ((global::Gtk.Paned.PanedChild)(this.hpaned1[this.vbox2])); w10.Resize = false; // Container child hpaned1.Gtk.Paned+PanedChild - this.vbox3 = new global::Gtk.VBox (); + this.vbox3 = new global::Gtk.VBox(); this.vbox3.Name = "vbox3"; this.vbox3.Spacing = 6; // Container child vbox3.Gtk.Box+BoxChild - this.notebookColorChooser = new global::Gtk.Notebook (); + this.notebookColorChooser = new global::Gtk.Notebook(); this.notebookColorChooser.CanFocus = true; this.notebookColorChooser.Name = "notebookColorChooser"; this.notebookColorChooser.CurrentPage = 1; this.notebookColorChooser.ShowBorder = false; this.notebookColorChooser.BorderWidth = ((uint)(8)); // Container child notebookColorChooser.Gtk.Notebook+NotebookChild - this.vbox4 = new global::Gtk.VBox (); + this.vbox4 = new global::Gtk.VBox(); this.vbox4.Name = "vbox4"; this.vbox4.Spacing = 6; // Container child vbox4.Gtk.Box+BoxChild - this.table1 = new global::Gtk.Table (((uint)(2)), ((uint)(2)), false); + this.table1 = new global::Gtk.Table(((uint)(2)), ((uint)(2)), false); + this.table1.Name = "table1"; this.table1.RowSpacing = ((uint)(6)); this.table1.ColumnSpacing = ((uint)(6)); // Container child table1.Gtk.Table+TableChild - this.colorbuttonBg = new global::Gtk.ColorButton (); + this.colorbuttonBg = new global::Gtk.ColorButton(); this.colorbuttonBg.CanFocus = true; this.colorbuttonBg.Events = ((global::Gdk.EventMask)(784)); this.colorbuttonBg.Name = "colorbuttonBg"; - this.table1.Add (this.colorbuttonBg); - global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1 [this.colorbuttonBg])); + this.table1.Add(this.colorbuttonBg); + global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.colorbuttonBg])); w11.TopAttach = ((uint)(1)); w11.BottomAttach = ((uint)(2)); w11.LeftAttach = ((uint)(1)); @@ -168,90 +202,90 @@ namespace MonoDevelop.SourceEditor.OptionPanels w11.XOptions = ((global::Gtk.AttachOptions)(4)); w11.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.colorbuttonFg = new global::Gtk.ColorButton (); + this.colorbuttonFg = new global::Gtk.ColorButton(); this.colorbuttonFg.CanFocus = true; this.colorbuttonFg.Events = ((global::Gdk.EventMask)(784)); this.colorbuttonFg.Name = "colorbuttonFg"; - this.table1.Add (this.colorbuttonFg); - global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1 [this.colorbuttonFg])); + this.table1.Add(this.colorbuttonFg); + global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.colorbuttonFg])); w12.LeftAttach = ((uint)(1)); w12.RightAttach = ((uint)(2)); w12.XOptions = ((global::Gtk.AttachOptions)(4)); w12.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.label5 = new global::Gtk.Label (); + this.label5 = new global::Gtk.Label(); this.label5.Name = "label5"; this.label5.Xalign = 1F; - this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("_Background:"); + this.label5.LabelProp = global::Mono.Unix.Catalog.GetString("_Background:"); this.label5.UseUnderline = true; - this.table1.Add (this.label5); - global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.label5])); + this.table1.Add(this.label5); + global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.label5])); w13.TopAttach = ((uint)(1)); w13.BottomAttach = ((uint)(2)); w13.XOptions = ((global::Gtk.AttachOptions)(4)); w13.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.label7 = new global::Gtk.Label (); + this.label7 = new global::Gtk.Label(); this.label7.Name = "label7"; this.label7.Xalign = 1F; - this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("_Foreground:"); + this.label7.LabelProp = global::Mono.Unix.Catalog.GetString("_Foreground:"); this.label7.UseUnderline = true; - this.table1.Add (this.label7); - global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.label7])); + this.table1.Add(this.label7); + global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.label7])); w14.XOptions = ((global::Gtk.AttachOptions)(4)); w14.YOptions = ((global::Gtk.AttachOptions)(4)); - this.vbox4.Add (this.table1); - global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.table1])); + this.vbox4.Add(this.table1); + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.table1])); w15.Position = 0; w15.Expand = false; w15.Fill = false; // Container child vbox4.Gtk.Box+BoxChild - this.checkbuttonBold = new global::Gtk.CheckButton (); + this.checkbuttonBold = new global::Gtk.CheckButton(); this.checkbuttonBold.CanFocus = true; this.checkbuttonBold.Name = "checkbuttonBold"; - this.checkbuttonBold.Label = global::Mono.Unix.Catalog.GetString ("B_old"); + this.checkbuttonBold.Label = global::Mono.Unix.Catalog.GetString("B_old"); this.checkbuttonBold.DrawIndicator = true; this.checkbuttonBold.UseUnderline = true; - this.vbox4.Add (this.checkbuttonBold); - global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonBold])); + this.vbox4.Add(this.checkbuttonBold); + global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonBold])); w16.Position = 1; w16.Expand = false; w16.Fill = false; // Container child vbox4.Gtk.Box+BoxChild - this.checkbuttonItalic = new global::Gtk.CheckButton (); + this.checkbuttonItalic = new global::Gtk.CheckButton(); this.checkbuttonItalic.CanFocus = true; this.checkbuttonItalic.Name = "checkbuttonItalic"; - this.checkbuttonItalic.Label = global::Mono.Unix.Catalog.GetString ("Italic"); + this.checkbuttonItalic.Label = global::Mono.Unix.Catalog.GetString("Italic"); this.checkbuttonItalic.DrawIndicator = true; this.checkbuttonItalic.UseUnderline = true; - this.vbox4.Add (this.checkbuttonItalic); - global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonItalic])); + this.vbox4.Add(this.checkbuttonItalic); + global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonItalic])); w17.Position = 2; w17.Expand = false; w17.Fill = false; - this.notebookColorChooser.Add (this.vbox4); + this.notebookColorChooser.Add(this.vbox4); // Notebook tab - this.label4 = new global::Gtk.Label (); + this.label4 = new global::Gtk.Label(); this.label4.Name = "label4"; - this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("page1"); - this.notebookColorChooser.SetTabLabel (this.vbox4, this.label4); - this.label4.ShowAll (); + this.label4.LabelProp = global::Mono.Unix.Catalog.GetString("page1"); + this.notebookColorChooser.SetTabLabel(this.vbox4, this.label4); + this.label4.ShowAll(); // Container child notebookColorChooser.Gtk.Notebook+NotebookChild - this.vbox5 = new global::Gtk.VBox (); + this.vbox5 = new global::Gtk.VBox(); this.vbox5.Name = "vbox5"; this.vbox5.Spacing = 6; // Container child vbox5.Gtk.Box+BoxChild - this.table2 = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false); + this.table2 = new global::Gtk.Table(((uint)(3)), ((uint)(2)), false); this.table2.Name = "table2"; this.table2.RowSpacing = ((uint)(6)); this.table2.ColumnSpacing = ((uint)(6)); // Container child table2.Gtk.Table+TableChild - this.colorbuttonBorder = new global::Gtk.ColorButton (); + this.colorbuttonBorder = new global::Gtk.ColorButton(); this.colorbuttonBorder.CanFocus = true; this.colorbuttonBorder.Events = ((global::Gdk.EventMask)(784)); this.colorbuttonBorder.Name = "colorbuttonBorder"; - this.table2.Add (this.colorbuttonBorder); - global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table2 [this.colorbuttonBorder])); + this.table2.Add(this.colorbuttonBorder); + global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table2[this.colorbuttonBorder])); w19.TopAttach = ((uint)(2)); w19.BottomAttach = ((uint)(3)); w19.LeftAttach = ((uint)(1)); @@ -259,23 +293,23 @@ namespace MonoDevelop.SourceEditor.OptionPanels w19.XOptions = ((global::Gtk.AttachOptions)(4)); w19.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.colorbuttonPrimary = new global::Gtk.ColorButton (); + this.colorbuttonPrimary = new global::Gtk.ColorButton(); this.colorbuttonPrimary.CanFocus = true; this.colorbuttonPrimary.Events = ((global::Gdk.EventMask)(784)); this.colorbuttonPrimary.Name = "colorbuttonPrimary"; - this.table2.Add (this.colorbuttonPrimary); - global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table2 [this.colorbuttonPrimary])); + this.table2.Add(this.colorbuttonPrimary); + global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table2[this.colorbuttonPrimary])); w20.LeftAttach = ((uint)(1)); w20.RightAttach = ((uint)(2)); w20.XOptions = ((global::Gtk.AttachOptions)(4)); w20.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.colorbuttonSecondary = new global::Gtk.ColorButton (); + this.colorbuttonSecondary = new global::Gtk.ColorButton(); this.colorbuttonSecondary.CanFocus = true; this.colorbuttonSecondary.Events = ((global::Gdk.EventMask)(784)); this.colorbuttonSecondary.Name = "colorbuttonSecondary"; - this.table2.Add (this.colorbuttonSecondary); - global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table2 [this.colorbuttonSecondary])); + this.table2.Add(this.colorbuttonSecondary); + global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table2[this.colorbuttonSecondary])); w21.TopAttach = ((uint)(1)); w21.BottomAttach = ((uint)(2)); w21.LeftAttach = ((uint)(1)); @@ -283,80 +317,80 @@ namespace MonoDevelop.SourceEditor.OptionPanels w21.XOptions = ((global::Gtk.AttachOptions)(4)); w21.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.label10 = new global::Gtk.Label (); + this.label10 = new global::Gtk.Label(); this.label10.Name = "label10"; this.label10.Xalign = 1F; - this.label10.LabelProp = global::Mono.Unix.Catalog.GetString ("_Secondary Color:"); + this.label10.LabelProp = global::Mono.Unix.Catalog.GetString("_Secondary Color:"); this.label10.UseUnderline = true; - this.table2.Add (this.label10); - global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.table2 [this.label10])); + this.table2.Add(this.label10); + global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.table2[this.label10])); w22.TopAttach = ((uint)(1)); w22.BottomAttach = ((uint)(2)); w22.XOptions = ((global::Gtk.AttachOptions)(4)); w22.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.label11 = new global::Gtk.Label (); + this.label11 = new global::Gtk.Label(); this.label11.Name = "label11"; this.label11.Xalign = 1F; - this.label11.LabelProp = global::Mono.Unix.Catalog.GetString ("_Border Color:"); + this.label11.LabelProp = global::Mono.Unix.Catalog.GetString("_Border Color:"); this.label11.UseUnderline = true; - this.table2.Add (this.label11); - global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table2 [this.label11])); + this.table2.Add(this.label11); + global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table2[this.label11])); w23.TopAttach = ((uint)(2)); w23.BottomAttach = ((uint)(3)); w23.XOptions = ((global::Gtk.AttachOptions)(4)); w23.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.label9 = new global::Gtk.Label (); + this.label9 = new global::Gtk.Label(); this.label9.Name = "label9"; this.label9.Xalign = 1F; - this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("_Primary Color:"); + this.label9.LabelProp = global::Mono.Unix.Catalog.GetString("_Primary Color:"); this.label9.UseUnderline = true; - this.table2.Add (this.label9); - global::Gtk.Table.TableChild w24 = ((global::Gtk.Table.TableChild)(this.table2 [this.label9])); + this.table2.Add(this.label9); + global::Gtk.Table.TableChild w24 = ((global::Gtk.Table.TableChild)(this.table2[this.label9])); w24.XOptions = ((global::Gtk.AttachOptions)(4)); w24.YOptions = ((global::Gtk.AttachOptions)(4)); - this.vbox5.Add (this.table2); - global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.table2])); + this.vbox5.Add(this.table2); + global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.table2])); w25.Position = 0; w25.Expand = false; w25.Fill = false; - this.notebookColorChooser.Add (this.vbox5); - global::Gtk.Notebook.NotebookChild w26 = ((global::Gtk.Notebook.NotebookChild)(this.notebookColorChooser [this.vbox5])); + this.notebookColorChooser.Add(this.vbox5); + global::Gtk.Notebook.NotebookChild w26 = ((global::Gtk.Notebook.NotebookChild)(this.notebookColorChooser[this.vbox5])); w26.Position = 1; // Notebook tab - this.label6 = new global::Gtk.Label (); + this.label6 = new global::Gtk.Label(); this.label6.Name = "label6"; - this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("page2"); - this.notebookColorChooser.SetTabLabel (this.vbox5, this.label6); - this.label6.ShowAll (); - this.vbox3.Add (this.notebookColorChooser); - global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.notebookColorChooser])); + this.label6.LabelProp = global::Mono.Unix.Catalog.GetString("page2"); + this.notebookColorChooser.SetTabLabel(this.vbox5, this.label6); + this.label6.ShowAll(); + this.vbox3.Add(this.notebookColorChooser); + global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.notebookColorChooser])); w27.Position = 0; w27.Expand = false; w27.Fill = false; // Container child vbox3.Gtk.Box+BoxChild - this.label8 = new global::Gtk.Label (); + this.label8 = new global::Gtk.Label(); this.label8.Name = "label8"; this.label8.Xalign = 0F; - this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("_Preview:"); + this.label8.LabelProp = global::Mono.Unix.Catalog.GetString("_Preview:"); this.label8.UseUnderline = true; - this.vbox3.Add (this.label8); - global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.label8])); + this.vbox3.Add(this.label8); + global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.label8])); w28.Position = 1; w28.Expand = false; w28.Fill = false; // Container child vbox3.Gtk.Box+BoxChild - this.scrolledwindowTextEditor = new global::Gtk.ScrolledWindow (); + this.scrolledwindowTextEditor = new global::Gtk.ScrolledWindow(); this.scrolledwindowTextEditor.CanFocus = true; this.scrolledwindowTextEditor.Name = "scrolledwindowTextEditor"; this.scrolledwindowTextEditor.ShadowType = ((global::Gtk.ShadowType)(1)); - this.vbox3.Add (this.scrolledwindowTextEditor); - global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.scrolledwindowTextEditor])); + this.vbox3.Add(this.scrolledwindowTextEditor); + global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.scrolledwindowTextEditor])); w29.Position = 2; - this.hpaned1.Add (this.vbox3); - w1.Add (this.hpaned1); - global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(w1 [this.hpaned1])); + this.hpaned1.Add(this.vbox3); + w1.Add(this.hpaned1); + global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(w1[this.hpaned1])); w31.Position = 1; // Internal child MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.ActionArea global::Gtk.HButtonBox w32 = this.ActionArea; @@ -365,38 +399,39 @@ namespace MonoDevelop.SourceEditor.OptionPanels w32.BorderWidth = ((uint)(5)); w32.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.buttonCancel = new global::Gtk.Button (); + this.buttonCancel = new global::Gtk.Button(); this.buttonCancel.CanDefault = true; this.buttonCancel.CanFocus = true; this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.UseStock = true; this.buttonCancel.UseUnderline = true; this.buttonCancel.Label = "gtk-cancel"; - this.AddActionWidget (this.buttonCancel, -6); - global::Gtk.ButtonBox.ButtonBoxChild w33 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w32 [this.buttonCancel])); + this.AddActionWidget(this.buttonCancel, -6); + global::Gtk.ButtonBox.ButtonBoxChild w33 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w32[this.buttonCancel])); w33.Expand = false; w33.Fill = false; // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.buttonOk = new global::Gtk.Button (); + this.buttonOk = new global::Gtk.Button(); this.buttonOk.CanDefault = true; this.buttonOk.CanFocus = true; this.buttonOk.Name = "buttonOk"; this.buttonOk.UseStock = true; this.buttonOk.UseUnderline = true; this.buttonOk.Label = "gtk-ok"; - this.AddActionWidget (this.buttonOk, -5); - global::Gtk.ButtonBox.ButtonBoxChild w34 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w32 [this.buttonOk])); + this.AddActionWidget(this.buttonOk, -5); + global::Gtk.ButtonBox.ButtonBoxChild w34 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w32[this.buttonOk])); w34.Position = 1; w34.Expand = false; w34.Fill = false; - if ((this.Child != null)) { - this.Child.ShowAll (); + if ((this.Child != null)) + { + this.Child.ShowAll(); } this.DefaultWidth = 760; this.DefaultHeight = 458; this.label2.MnemonicWidget = this.entryName; this.label3.MnemonicWidget = this.entryDescription; - this.Show (); + this.Show(); } } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.cs index 2ec1f37faa..5bce3c3b27 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.cs @@ -2,196 +2,167 @@ // This file has been generated by the GUI designer. Do not modify. namespace MonoDevelop.SourceEditor.OptionPanels { - internal partial class CompletionAppearancePanel + public partial class CompletionAppearancePanel { private global::Gtk.VBox vbox1; - private global::Gtk.HBox hbox1; - private global::Gtk.Label label2; - private global::Gtk.SpinButton spinbutton1; - private global::Gtk.Label label3; + private global::Gtk.Alignment alignment3; + private global::Gtk.VBox vbox5; + private global::Gtk.CheckButton filterByBrowsableCheckbutton; + private global::Gtk.HBox hbox2; + private global::Gtk.Fixed fixed1; + private global::Gtk.RadioButton normalOnlyRadiobutton; + private global::Gtk.Alignment alignment1; + private global::Gtk.Label label4; + private global::Gtk.HBox hbox3; + private global::Gtk.Fixed fixed2; + private global::Gtk.RadioButton includeAdvancedRadiobutton; + private global::Gtk.Alignment alignment2; + private global::Gtk.Label label5; - protected virtual void Build () + protected virtual void Build() { - global::Stetic.Gui.Initialize (this); + global::Stetic.Gui.Initialize(this); // Widget MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel - global::Stetic.BinContainer.Attach (this); + global::Stetic.BinContainer.Attach(this); this.Name = "MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel"; // Container child MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.Gtk.Container+ContainerChild - this.vbox1 = new global::Gtk.VBox (); + this.vbox1 = new global::Gtk.VBox(); this.vbox1.Name = "vbox1"; this.vbox1.Spacing = 6; // Container child vbox1.Gtk.Box+BoxChild - this.hbox1 = new global::Gtk.HBox (); - this.hbox1.Name = "hbox1"; - this.hbox1.Spacing = 6; - // Container child hbox1.Gtk.Box+BoxChild - this.label2 = new global::Gtk.Label (); - this.label2.Name = "label2"; - this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Completion list has"); - this.hbox1.Add (this.label2); - global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label2])); - w1.Position = 0; - w1.Expand = false; - w1.Fill = false; - // Container child hbox1.Gtk.Box+BoxChild - this.spinbutton1 = new global::Gtk.SpinButton (0, 100, 1); - this.spinbutton1.CanFocus = true; - this.spinbutton1.Name = "spinbutton1"; - this.spinbutton1.Adjustment.PageIncrement = 10; - this.spinbutton1.ClimbRate = 1; - this.spinbutton1.Numeric = true; - this.hbox1.Add (this.spinbutton1); - global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.spinbutton1])); - w2.Position = 1; - w2.Expand = false; - w2.Fill = false; - // Container child hbox1.Gtk.Box+BoxChild - this.label3 = new global::Gtk.Label (); - this.label3.Name = "label3"; - this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("rows"); - this.hbox1.Add (this.label3); - global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label3])); - w3.Position = 2; - w3.Expand = false; - w3.Fill = false; - this.vbox1.Add (this.hbox1); - global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1])); - w4.Position = 0; - w4.Expand = false; - w4.Fill = false; - // Container child vbox1.Gtk.Box+BoxChild - this.alignment3 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F); + this.alignment3 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F); this.alignment3.Name = "alignment3"; this.alignment3.LeftPadding = ((uint)(12)); // Container child alignment3.Gtk.Container+ContainerChild - this.vbox5 = new global::Gtk.VBox (); + this.vbox5 = new global::Gtk.VBox(); this.vbox5.Name = "vbox5"; this.vbox5.Spacing = 6; // Container child vbox5.Gtk.Box+BoxChild - this.filterByBrowsableCheckbutton = new global::Gtk.CheckButton (); + this.filterByBrowsableCheckbutton = new global::Gtk.CheckButton(); this.filterByBrowsableCheckbutton.CanFocus = true; this.filterByBrowsableCheckbutton.Name = "filterByBrowsableCheckbutton"; - this.filterByBrowsableCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Filter members by [EditorBrowsable] attribute"); + this.filterByBrowsableCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Filter members by [EditorBrowsable] attribute"); this.filterByBrowsableCheckbutton.Active = true; this.filterByBrowsableCheckbutton.DrawIndicator = true; this.filterByBrowsableCheckbutton.UseUnderline = true; - this.vbox5.Add (this.filterByBrowsableCheckbutton); - global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.filterByBrowsableCheckbutton])); - w5.Position = 0; - w5.Expand = false; - w5.Fill = false; + this.vbox5.Add(this.filterByBrowsableCheckbutton); + global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.filterByBrowsableCheckbutton])); + w1.Position = 0; + w1.Expand = false; + w1.Fill = false; // Container child vbox5.Gtk.Box+BoxChild - this.hbox2 = new global::Gtk.HBox (); + this.hbox2 = new global::Gtk.HBox(); this.hbox2.Name = "hbox2"; this.hbox2.Spacing = 6; // Container child hbox2.Gtk.Box+BoxChild - this.fixed1 = new global::Gtk.Fixed (); + this.fixed1 = new global::Gtk.Fixed(); this.fixed1.Name = "fixed1"; this.fixed1.HasWindow = false; - this.hbox2.Add (this.fixed1); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.fixed1])); - w6.Position = 0; - w6.Expand = false; - w6.Padding = ((uint)(6)); + this.hbox2.Add(this.fixed1); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.fixed1])); + w2.Position = 0; + w2.Expand = false; + w2.Padding = ((uint)(6)); // Container child hbox2.Gtk.Box+BoxChild - this.normalOnlyRadiobutton = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_Show Normal members only")); + this.normalOnlyRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("_Show Normal members only")); this.normalOnlyRadiobutton.CanFocus = true; this.normalOnlyRadiobutton.Name = "normalOnlyRadiobutton"; this.normalOnlyRadiobutton.DrawIndicator = true; this.normalOnlyRadiobutton.UseUnderline = true; - this.normalOnlyRadiobutton.Group = new global::GLib.SList (global::System.IntPtr.Zero); - this.hbox2.Add (this.normalOnlyRadiobutton); - global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.normalOnlyRadiobutton])); - w7.Position = 1; - this.vbox5.Add (this.hbox2); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox2])); - w8.Position = 1; - w8.Expand = false; - w8.Fill = false; + this.normalOnlyRadiobutton.Group = new global::GLib.SList(global::System.IntPtr.Zero); + this.hbox2.Add(this.normalOnlyRadiobutton); + global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.normalOnlyRadiobutton])); + w3.Position = 1; + this.vbox5.Add(this.hbox2); + global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox2])); + w4.Position = 1; + w4.Expand = false; + w4.Fill = false; // Container child vbox5.Gtk.Box+BoxChild - this.alignment1 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F); + this.alignment1 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F); this.alignment1.Name = "alignment1"; this.alignment1.LeftPadding = ((uint)(38)); // Container child alignment1.Gtk.Container+ContainerChild - this.label4 = new global::Gtk.Label (); + this.label4 = new global::Gtk.Label(); this.label4.Name = "label4"; this.label4.Xalign = 0F; - this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("<i>EditorBrowsableState.Always</i>"); + this.label4.LabelProp = global::Mono.Unix.Catalog.GetString("<i>EditorBrowsableState.Always</i>"); this.label4.UseMarkup = true; - this.alignment1.Add (this.label4); - this.vbox5.Add (this.alignment1); - global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.alignment1])); - w10.Position = 2; - w10.Expand = false; - w10.Fill = false; + this.alignment1.Add(this.label4); + this.vbox5.Add(this.alignment1); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.alignment1])); + w6.Position = 2; + w6.Expand = false; + w6.Fill = false; // Container child vbox5.Gtk.Box+BoxChild - this.hbox3 = new global::Gtk.HBox (); + this.hbox3 = new global::Gtk.HBox(); this.hbox3.Name = "hbox3"; this.hbox3.Spacing = 6; // Container child hbox3.Gtk.Box+BoxChild - this.fixed2 = new global::Gtk.Fixed (); + this.fixed2 = new global::Gtk.Fixed(); this.fixed2.Name = "fixed2"; this.fixed2.HasWindow = false; - this.hbox3.Add (this.fixed2); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.fixed2])); - w11.Position = 0; - w11.Expand = false; - w11.Padding = ((uint)(6)); + this.hbox3.Add(this.fixed2); + global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.fixed2])); + w7.Position = 0; + w7.Expand = false; + w7.Padding = ((uint)(6)); // Container child hbox3.Gtk.Box+BoxChild - this.includeAdvancedRadiobutton = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("Show Normal and _Advanced members")); + this.includeAdvancedRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("Show Normal and _Advanced members")); this.includeAdvancedRadiobutton.CanFocus = true; this.includeAdvancedRadiobutton.Name = "includeAdvancedRadiobutton"; this.includeAdvancedRadiobutton.DrawIndicator = true; this.includeAdvancedRadiobutton.UseUnderline = true; this.includeAdvancedRadiobutton.Group = this.normalOnlyRadiobutton.Group; - this.hbox3.Add (this.includeAdvancedRadiobutton); - global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.includeAdvancedRadiobutton])); - w12.Position = 1; - this.vbox5.Add (this.hbox3); - global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox3])); - w13.Position = 3; - w13.Expand = false; - w13.Fill = false; + this.hbox3.Add(this.includeAdvancedRadiobutton); + global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.includeAdvancedRadiobutton])); + w8.Position = 1; + this.vbox5.Add(this.hbox3); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox3])); + w9.Position = 3; + w9.Expand = false; + w9.Fill = false; // Container child vbox5.Gtk.Box+BoxChild - this.alignment2 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F); + this.alignment2 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F); this.alignment2.Name = "alignment2"; this.alignment2.LeftPadding = ((uint)(38)); // Container child alignment2.Gtk.Container+ContainerChild - this.label5 = new global::Gtk.Label (); + this.label5 = new global::Gtk.Label(); this.label5.Name = "label5"; this.label5.Xalign = 0F; - this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("<i>EditorBrowsableState.Always and EditorBrowsableState.Advanced</i>"); + this.label5.LabelProp = global::Mono.Unix.Catalog.GetString("<i>EditorBrowsableState.Always and EditorBrowsableState.Advanced</i>"); this.label5.UseMarkup = true; - this.alignment2.Add (this.label5); - this.vbox5.Add (this.alignment2); - global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.alignment2])); - w15.Position = 4; - w15.Expand = false; - w15.Fill = false; - this.alignment3.Add (this.vbox5); - this.vbox1.Add (this.alignment3); - global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment3])); - w17.Position = 1; - w17.Expand = false; - w17.Fill = false; - this.Add (this.vbox1); - if ((this.Child != null)) { - this.Child.ShowAll (); + this.alignment2.Add(this.label5); + this.vbox5.Add(this.alignment2); + global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.alignment2])); + w11.Position = 4; + w11.Expand = false; + w11.Fill = false; + this.alignment3.Add(this.vbox5); + this.vbox1.Add(this.alignment3); + global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment3])); + w13.Position = 0; + w13.Expand = false; + w13.Fill = false; + this.Add(this.vbox1); + if ((this.Child != null)) + { + this.Child.ShowAll(); } - this.Hide (); + this.Hide(); } } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs index 7b6d6bd809..3576fb7b88 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs @@ -5,201 +5,219 @@ namespace MonoDevelop.SourceEditor.OptionPanels internal partial class CompletionOptionsPanel { private global::Gtk.VBox vbox1; + private global::Gtk.Alignment alignment3; + private global::Gtk.VBox vbox5; + private global::Gtk.CheckButton autoCodeCompletionCheckbutton; + private global::Gtk.HBox hbox4; + private global::Gtk.Fixed fixed3; + private global::Gtk.CheckButton includeKeywordsCheckbutton; + private global::Gtk.HBox hbox5; + private global::Gtk.Fixed fixed4; + private global::Gtk.CheckButton includeCodeSnippetsCheckbutton; + private global::Gtk.CheckButton showImportsCheckbutton; + private global::Gtk.CheckButton insertParenthesesCheckbutton; + private global::Gtk.HBox hbox2; + private global::Gtk.Fixed fixed1; + private global::Gtk.RadioButton openingRadiobutton; + private global::Gtk.HBox hbox3; + private global::Gtk.Fixed fixed2; + private global::Gtk.RadioButton bothRadiobutton; - protected virtual void Build () + protected virtual void Build() { - global::Stetic.Gui.Initialize (this); + global::Stetic.Gui.Initialize(this); // Widget MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel - global::Stetic.BinContainer.Attach (this); + global::Stetic.BinContainer.Attach(this); this.Name = "MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel"; // Container child MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.Gtk.Container+ContainerChild - this.vbox1 = new global::Gtk.VBox (); + this.vbox1 = new global::Gtk.VBox(); this.vbox1.Name = "vbox1"; this.vbox1.Spacing = 6; // Container child vbox1.Gtk.Box+BoxChild - this.alignment3 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F); + this.alignment3 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F); this.alignment3.Name = "alignment3"; this.alignment3.LeftPadding = ((uint)(12)); // Container child alignment3.Gtk.Container+ContainerChild - this.vbox5 = new global::Gtk.VBox (); + this.vbox5 = new global::Gtk.VBox(); this.vbox5.Name = "vbox5"; this.vbox5.Spacing = 6; // Container child vbox5.Gtk.Box+BoxChild - this.autoCodeCompletionCheckbutton = new global::Gtk.CheckButton (); + this.autoCodeCompletionCheckbutton = new global::Gtk.CheckButton(); this.autoCodeCompletionCheckbutton.CanFocus = true; this.autoCodeCompletionCheckbutton.Name = "autoCodeCompletionCheckbutton"; - this.autoCodeCompletionCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Show completion list after a character is typed"); + this.autoCodeCompletionCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Show completion list after a character is typed"); this.autoCodeCompletionCheckbutton.DrawIndicator = true; this.autoCodeCompletionCheckbutton.UseUnderline = true; - this.vbox5.Add (this.autoCodeCompletionCheckbutton); - global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.autoCodeCompletionCheckbutton])); + this.vbox5.Add(this.autoCodeCompletionCheckbutton); + global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.autoCodeCompletionCheckbutton])); w1.Position = 0; w1.Expand = false; w1.Fill = false; // Container child vbox5.Gtk.Box+BoxChild - this.hbox4 = new global::Gtk.HBox (); + this.hbox4 = new global::Gtk.HBox(); this.hbox4.Name = "hbox4"; this.hbox4.Spacing = 6; // Container child hbox4.Gtk.Box+BoxChild - this.fixed3 = new global::Gtk.Fixed (); + this.fixed3 = new global::Gtk.Fixed(); this.fixed3.Name = "fixed3"; this.fixed3.HasWindow = false; - this.hbox4.Add (this.fixed3); - global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.fixed3])); + this.hbox4.Add(this.fixed3); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.fixed3])); w2.Position = 0; w2.Expand = false; w2.Padding = ((uint)(6)); // Container child hbox4.Gtk.Box+BoxChild - this.includeKeywordsCheckbutton = new global::Gtk.CheckButton (); + this.includeKeywordsCheckbutton = new global::Gtk.CheckButton(); this.includeKeywordsCheckbutton.CanFocus = true; this.includeKeywordsCheckbutton.Name = "includeKeywordsCheckbutton"; - this.includeKeywordsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Include _keywords in completion list"); + this.includeKeywordsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Include _keywords in completion list"); this.includeKeywordsCheckbutton.DrawIndicator = true; this.includeKeywordsCheckbutton.UseUnderline = true; - this.hbox4.Add (this.includeKeywordsCheckbutton); - global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.includeKeywordsCheckbutton])); + this.hbox4.Add(this.includeKeywordsCheckbutton); + global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.includeKeywordsCheckbutton])); w3.Position = 1; - this.vbox5.Add (this.hbox4); - global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox4])); + this.vbox5.Add(this.hbox4); + global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox4])); w4.Position = 1; w4.Expand = false; w4.Fill = false; // Container child vbox5.Gtk.Box+BoxChild - this.hbox5 = new global::Gtk.HBox (); + this.hbox5 = new global::Gtk.HBox(); this.hbox5.Name = "hbox5"; this.hbox5.Spacing = 6; // Container child hbox5.Gtk.Box+BoxChild - this.fixed4 = new global::Gtk.Fixed (); + this.fixed4 = new global::Gtk.Fixed(); this.fixed4.Name = "fixed4"; this.fixed4.HasWindow = false; - this.hbox5.Add (this.fixed4); - global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.fixed4])); + this.hbox5.Add(this.fixed4); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox5[this.fixed4])); w5.Position = 0; w5.Expand = false; w5.Padding = ((uint)(6)); // Container child hbox5.Gtk.Box+BoxChild - this.includeCodeSnippetsCheckbutton = new global::Gtk.CheckButton (); + this.includeCodeSnippetsCheckbutton = new global::Gtk.CheckButton(); this.includeCodeSnippetsCheckbutton.CanFocus = true; this.includeCodeSnippetsCheckbutton.Name = "includeCodeSnippetsCheckbutton"; - this.includeCodeSnippetsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Include _code snippets in completion list"); + this.includeCodeSnippetsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Include _code snippets in completion list"); this.includeCodeSnippetsCheckbutton.DrawIndicator = true; this.includeCodeSnippetsCheckbutton.UseUnderline = true; - this.hbox5.Add (this.includeCodeSnippetsCheckbutton); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.includeCodeSnippetsCheckbutton])); + this.hbox5.Add(this.includeCodeSnippetsCheckbutton); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox5[this.includeCodeSnippetsCheckbutton])); w6.Position = 1; - this.vbox5.Add (this.hbox5); - global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox5])); + this.vbox5.Add(this.hbox5); + global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox5])); w7.Position = 2; w7.Expand = false; w7.Fill = false; // Container child vbox5.Gtk.Box+BoxChild - this.showImportsCheckbutton = new global::Gtk.CheckButton (); + this.showImportsCheckbutton = new global::Gtk.CheckButton(); this.showImportsCheckbutton.CanFocus = true; this.showImportsCheckbutton.Name = "showImportsCheckbutton"; - this.showImportsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Show import items"); + this.showImportsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Show import items"); this.showImportsCheckbutton.DrawIndicator = true; this.showImportsCheckbutton.UseUnderline = true; - this.vbox5.Add (this.showImportsCheckbutton); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.showImportsCheckbutton])); + this.vbox5.Add(this.showImportsCheckbutton); + global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.showImportsCheckbutton])); w8.Position = 3; w8.Expand = false; w8.Fill = false; // Container child vbox5.Gtk.Box+BoxChild - this.insertParenthesesCheckbutton = new global::Gtk.CheckButton (); + this.insertParenthesesCheckbutton = new global::Gtk.CheckButton(); this.insertParenthesesCheckbutton.CanFocus = true; this.insertParenthesesCheckbutton.Name = "insertParenthesesCheckbutton"; - this.insertParenthesesCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("A_utomatically insert parentheses after completion:"); + this.insertParenthesesCheckbutton.Label = global::Mono.Unix.Catalog.GetString("A_utomatically insert parentheses after completion:"); this.insertParenthesesCheckbutton.DrawIndicator = true; this.insertParenthesesCheckbutton.UseUnderline = true; - this.vbox5.Add (this.insertParenthesesCheckbutton); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.insertParenthesesCheckbutton])); + this.vbox5.Add(this.insertParenthesesCheckbutton); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.insertParenthesesCheckbutton])); w9.Position = 4; w9.Expand = false; w9.Fill = false; // Container child vbox5.Gtk.Box+BoxChild - this.hbox2 = new global::Gtk.HBox (); + this.hbox2 = new global::Gtk.HBox(); this.hbox2.Name = "hbox2"; this.hbox2.Spacing = 6; // Container child hbox2.Gtk.Box+BoxChild - this.fixed1 = new global::Gtk.Fixed (); + this.fixed1 = new global::Gtk.Fixed(); this.fixed1.Name = "fixed1"; this.fixed1.HasWindow = false; - this.hbox2.Add (this.fixed1); - global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.fixed1])); + this.hbox2.Add(this.fixed1); + global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.fixed1])); w10.Position = 0; w10.Expand = false; w10.Padding = ((uint)(6)); // Container child hbox2.Gtk.Box+BoxChild - this.openingRadiobutton = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_Opening only")); + this.openingRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("_Opening only")); this.openingRadiobutton.CanFocus = true; this.openingRadiobutton.Name = "openingRadiobutton"; this.openingRadiobutton.DrawIndicator = true; this.openingRadiobutton.UseUnderline = true; - this.openingRadiobutton.Group = new global::GLib.SList (global::System.IntPtr.Zero); - this.hbox2.Add (this.openingRadiobutton); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.openingRadiobutton])); + this.openingRadiobutton.Group = new global::GLib.SList(global::System.IntPtr.Zero); + this.hbox2.Add(this.openingRadiobutton); + global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.openingRadiobutton])); w11.Position = 1; - this.vbox5.Add (this.hbox2); - global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox2])); + this.vbox5.Add(this.hbox2); + global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox2])); w12.Position = 5; w12.Expand = false; w12.Fill = false; // Container child vbox5.Gtk.Box+BoxChild - this.hbox3 = new global::Gtk.HBox (); + this.hbox3 = new global::Gtk.HBox(); this.hbox3.Name = "hbox3"; this.hbox3.Spacing = 6; // Container child hbox3.Gtk.Box+BoxChild - this.fixed2 = new global::Gtk.Fixed (); + this.fixed2 = new global::Gtk.Fixed(); this.fixed2.Name = "fixed2"; this.fixed2.HasWindow = false; - this.hbox3.Add (this.fixed2); - global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.fixed2])); + this.hbox3.Add(this.fixed2); + global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.fixed2])); w13.Position = 0; w13.Expand = false; w13.Padding = ((uint)(6)); // Container child hbox3.Gtk.Box+BoxChild - this.bothRadiobutton = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_Both opening and closing")); + this.bothRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("_Both opening and closing")); this.bothRadiobutton.CanFocus = true; this.bothRadiobutton.Name = "bothRadiobutton"; this.bothRadiobutton.DrawIndicator = true; this.bothRadiobutton.UseUnderline = true; this.bothRadiobutton.Group = this.openingRadiobutton.Group; - this.hbox3.Add (this.bothRadiobutton); - global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.bothRadiobutton])); + this.hbox3.Add(this.bothRadiobutton); + global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.bothRadiobutton])); w14.Position = 1; - this.vbox5.Add (this.hbox3); - global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox3])); + this.vbox5.Add(this.hbox3); + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox3])); w15.Position = 6; w15.Expand = false; w15.Fill = false; - this.alignment3.Add (this.vbox5); - this.vbox1.Add (this.alignment3); - global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment3])); + this.alignment3.Add(this.vbox5); + this.vbox1.Add(this.alignment3); + global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment3])); w17.Position = 0; w17.Expand = false; w17.Fill = false; - this.Add (this.vbox1); - if ((this.Child != null)) { - this.Child.ShowAll (); + this.Add(this.vbox1); + if ((this.Child != null)) + { + this.Child.ShowAll(); } - this.Hide (); + this.Hide(); } } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs index 27fc99c53f..73a12ec8ea 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs @@ -5,222 +5,242 @@ namespace MonoDevelop.SourceEditor.OptionPanels internal partial class GeneralOptionsPanel { private global::Gtk.VBox vbox1; + private global::Gtk.Label GtkLabel13; + private global::Gtk.Alignment alignment2; + private global::Gtk.VBox vbox4; + private global::Gtk.HBox hbox3; + private global::Gtk.Fixed fixed2; + private global::Gtk.HBox hbox1; + private global::Gtk.Label label1; + private global::Gtk.ComboBox comboboxLineEndings; + private global::Gtk.Label GtkLabel14; + private global::Gtk.Alignment alignment3; + private global::Gtk.VBox vbox5; + private global::Gtk.CheckButton foldingCheckbutton; + private global::Gtk.CheckButton foldregionsCheckbutton; + private global::Gtk.CheckButton foldCommentsCheckbutton; + private global::Gtk.Label GtkLabel15; + private global::Gtk.Alignment alignment4; + private global::Gtk.VBox vbox6; + private global::Gtk.CheckButton wordWrapCheckbutton; + private global::Gtk.CheckButton antiAliasingCheckbutton; - protected virtual void Build () + protected virtual void Build() { - global::Stetic.Gui.Initialize (this); + global::Stetic.Gui.Initialize(this); // Widget MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel - global::Stetic.BinContainer.Attach (this); + global::Stetic.BinContainer.Attach(this); this.Name = "MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel"; // Container child MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.Gtk.Container+ContainerChild - this.vbox1 = new global::Gtk.VBox (); + this.vbox1 = new global::Gtk.VBox(); this.vbox1.Name = "vbox1"; this.vbox1.Spacing = 6; // Container child vbox1.Gtk.Box+BoxChild - this.GtkLabel13 = new global::Gtk.Label (); + this.GtkLabel13 = new global::Gtk.Label(); this.GtkLabel13.Name = "GtkLabel13"; this.GtkLabel13.Xalign = 0F; - this.GtkLabel13.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Coding</b>"); + this.GtkLabel13.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Coding</b>"); this.GtkLabel13.UseMarkup = true; - this.vbox1.Add (this.GtkLabel13); - global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel13])); + this.vbox1.Add(this.GtkLabel13); + global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel13])); w1.Position = 0; w1.Expand = false; w1.Fill = false; // Container child vbox1.Gtk.Box+BoxChild - this.alignment2 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F); + this.alignment2 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F); this.alignment2.Name = "alignment2"; this.alignment2.LeftPadding = ((uint)(12)); // Container child alignment2.Gtk.Container+ContainerChild - this.vbox4 = new global::Gtk.VBox (); + this.vbox4 = new global::Gtk.VBox(); this.vbox4.Name = "vbox4"; this.vbox4.Spacing = 6; // Container child vbox4.Gtk.Box+BoxChild - this.hbox3 = new global::Gtk.HBox (); + this.hbox3 = new global::Gtk.HBox(); this.hbox3.Name = "hbox3"; this.hbox3.Spacing = 6; // Container child hbox3.Gtk.Box+BoxChild - this.fixed2 = new global::Gtk.Fixed (); + this.fixed2 = new global::Gtk.Fixed(); this.fixed2.Name = "fixed2"; this.fixed2.HasWindow = false; - this.hbox3.Add (this.fixed2); - global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.fixed2])); + this.hbox3.Add(this.fixed2); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.fixed2])); w2.Position = 0; w2.Expand = false; w2.Padding = ((uint)(6)); - this.vbox4.Add (this.hbox3); - global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox3])); + this.vbox4.Add(this.hbox3); + global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.hbox3])); w3.Position = 0; w3.Expand = false; w3.Fill = false; // Container child vbox4.Gtk.Box+BoxChild - this.hbox1 = new global::Gtk.HBox (); + this.hbox1 = new global::Gtk.HBox(); this.hbox1.Name = "hbox1"; this.hbox1.Spacing = 6; // Container child hbox1.Gtk.Box+BoxChild - this.label1 = new global::Gtk.Label (); + this.label1 = new global::Gtk.Label(); this.label1.Name = "label1"; - this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Line ending conversion:"); + this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("_Line ending conversion:"); this.label1.UseUnderline = true; - this.hbox1.Add (this.label1); - global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label1])); + this.hbox1.Add(this.label1); + global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label1])); w4.Position = 0; w4.Expand = false; w4.Fill = false; // Container child hbox1.Gtk.Box+BoxChild - this.comboboxLineEndings = global::Gtk.ComboBox.NewText (); + this.comboboxLineEndings = global::Gtk.ComboBox.NewText(); this.comboboxLineEndings.Name = "comboboxLineEndings"; - this.hbox1.Add (this.comboboxLineEndings); - global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.comboboxLineEndings])); + this.hbox1.Add(this.comboboxLineEndings); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.comboboxLineEndings])); w5.Position = 1; w5.Expand = false; w5.Fill = false; - this.vbox4.Add (this.hbox1); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox1])); + this.vbox4.Add(this.hbox1); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.hbox1])); w6.Position = 1; w6.Expand = false; w6.Fill = false; - this.alignment2.Add (this.vbox4); - this.vbox1.Add (this.alignment2); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment2])); + this.alignment2.Add(this.vbox4); + this.vbox1.Add(this.alignment2); + global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment2])); w8.Position = 1; w8.Expand = false; w8.Fill = false; // Container child vbox1.Gtk.Box+BoxChild - this.GtkLabel14 = new global::Gtk.Label (); + this.GtkLabel14 = new global::Gtk.Label(); this.GtkLabel14.Name = "GtkLabel14"; this.GtkLabel14.Xalign = 0F; - this.GtkLabel14.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Code Folding</b>"); + this.GtkLabel14.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Code Folding</b>"); this.GtkLabel14.UseMarkup = true; - this.vbox1.Add (this.GtkLabel14); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel14])); + this.vbox1.Add(this.GtkLabel14); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel14])); w9.Position = 2; w9.Expand = false; w9.Fill = false; // Container child vbox1.Gtk.Box+BoxChild - this.alignment3 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F); + this.alignment3 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F); this.alignment3.Name = "alignment3"; this.alignment3.LeftPadding = ((uint)(12)); // Container child alignment3.Gtk.Container+ContainerChild - this.vbox5 = new global::Gtk.VBox (); + this.vbox5 = new global::Gtk.VBox(); this.vbox5.Name = "vbox5"; this.vbox5.Spacing = 6; // Container child vbox5.Gtk.Box+BoxChild - this.foldingCheckbutton = new global::Gtk.CheckButton (); + this.foldingCheckbutton = new global::Gtk.CheckButton(); this.foldingCheckbutton.CanFocus = true; this.foldingCheckbutton.Name = "foldingCheckbutton"; - this.foldingCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Enable code _folding"); + this.foldingCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Enable code _folding"); this.foldingCheckbutton.DrawIndicator = true; this.foldingCheckbutton.UseUnderline = true; - this.vbox5.Add (this.foldingCheckbutton); - global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.foldingCheckbutton])); + this.vbox5.Add(this.foldingCheckbutton); + global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.foldingCheckbutton])); w10.Position = 0; w10.Expand = false; w10.Fill = false; // Container child vbox5.Gtk.Box+BoxChild - this.foldregionsCheckbutton = new global::Gtk.CheckButton (); + this.foldregionsCheckbutton = new global::Gtk.CheckButton(); this.foldregionsCheckbutton.CanFocus = true; this.foldregionsCheckbutton.Name = "foldregionsCheckbutton"; - this.foldregionsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Fold #_regions by default"); + this.foldregionsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Fold #_regions by default"); this.foldregionsCheckbutton.DrawIndicator = true; this.foldregionsCheckbutton.UseUnderline = true; - this.vbox5.Add (this.foldregionsCheckbutton); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.foldregionsCheckbutton])); + this.vbox5.Add(this.foldregionsCheckbutton); + global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.foldregionsCheckbutton])); w11.Position = 1; w11.Expand = false; w11.Fill = false; // Container child vbox5.Gtk.Box+BoxChild - this.foldCommentsCheckbutton = new global::Gtk.CheckButton (); + this.foldCommentsCheckbutton = new global::Gtk.CheckButton(); this.foldCommentsCheckbutton.CanFocus = true; this.foldCommentsCheckbutton.Name = "foldCommentsCheckbutton"; - this.foldCommentsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Fold _comments by default"); + this.foldCommentsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Fold _comments by default"); this.foldCommentsCheckbutton.DrawIndicator = true; this.foldCommentsCheckbutton.UseUnderline = true; - this.vbox5.Add (this.foldCommentsCheckbutton); - global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.foldCommentsCheckbutton])); + this.vbox5.Add(this.foldCommentsCheckbutton); + global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.foldCommentsCheckbutton])); w12.Position = 2; w12.Expand = false; w12.Fill = false; - this.alignment3.Add (this.vbox5); - this.vbox1.Add (this.alignment3); - global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment3])); + this.alignment3.Add(this.vbox5); + this.vbox1.Add(this.alignment3); + global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment3])); w14.Position = 3; w14.Expand = false; w14.Fill = false; // Container child vbox1.Gtk.Box+BoxChild - this.GtkLabel15 = new global::Gtk.Label (); + this.GtkLabel15 = new global::Gtk.Label(); this.GtkLabel15.Name = "GtkLabel15"; this.GtkLabel15.Xalign = 0F; - this.GtkLabel15.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Appearance</b>"); + this.GtkLabel15.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Appearance</b>"); this.GtkLabel15.UseMarkup = true; - this.vbox1.Add (this.GtkLabel15); - global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel15])); + this.vbox1.Add(this.GtkLabel15); + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel15])); w15.Position = 4; w15.Expand = false; w15.Fill = false; // Container child vbox1.Gtk.Box+BoxChild - this.alignment4 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F); + this.alignment4 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F); this.alignment4.Name = "alignment4"; this.alignment4.LeftPadding = ((uint)(12)); // Container child alignment4.Gtk.Container+ContainerChild - this.vbox6 = new global::Gtk.VBox (); + this.vbox6 = new global::Gtk.VBox(); this.vbox6.Name = "vbox6"; this.vbox6.Spacing = 6; // Container child vbox6.Gtk.Box+BoxChild - this.wordWrapCheckbutton = new global::Gtk.CheckButton (); + this.wordWrapCheckbutton = new global::Gtk.CheckButton(); this.wordWrapCheckbutton.CanFocus = true; this.wordWrapCheckbutton.Name = "wordWrapCheckbutton"; - this.wordWrapCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Word wrap"); + this.wordWrapCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Word wrap"); this.wordWrapCheckbutton.DrawIndicator = true; this.wordWrapCheckbutton.UseUnderline = true; - this.vbox6.Add (this.wordWrapCheckbutton); - global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.wordWrapCheckbutton])); + this.vbox6.Add(this.wordWrapCheckbutton); + global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox6[this.wordWrapCheckbutton])); w16.Position = 0; w16.Expand = false; w16.Fill = false; // Container child vbox6.Gtk.Box+BoxChild - this.antiAliasingCheckbutton = new global::Gtk.CheckButton (); + this.antiAliasingCheckbutton = new global::Gtk.CheckButton(); this.antiAliasingCheckbutton.CanFocus = true; this.antiAliasingCheckbutton.Name = "antiAliasingCheckbutton"; - this.antiAliasingCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Use anti aliasing"); + this.antiAliasingCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Use anti aliasing"); this.antiAliasingCheckbutton.DrawIndicator = true; this.antiAliasingCheckbutton.UseUnderline = true; - this.vbox6.Add (this.antiAliasingCheckbutton); - global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.antiAliasingCheckbutton])); + this.vbox6.Add(this.antiAliasingCheckbutton); + global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox6[this.antiAliasingCheckbutton])); w17.Position = 1; w17.Expand = false; w17.Fill = false; - this.alignment4.Add (this.vbox6); - this.vbox1.Add (this.alignment4); - global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment4])); + this.alignment4.Add(this.vbox6); + this.vbox1.Add(this.alignment4); + global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment4])); w19.Position = 5; w19.Expand = false; w19.Fill = false; - this.Add (this.vbox1); - if ((this.Child != null)) { - this.Child.ShowAll (); + this.Add(this.vbox1); + if ((this.Child != null)) + { + this.Child.ShowAll(); } this.label1.MnemonicWidget = this.comboboxLineEndings; - this.Show (); + this.Show(); } } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs index b3e59c99f9..28afed11c1 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs @@ -5,176 +5,177 @@ namespace MonoDevelop.SourceEditor.OptionPanels public partial class HighlightingPanel { private global::Gtk.VBox vbox4; - + private global::Gtk.Label GtkLabel5; - + private global::Gtk.Alignment GtkAlignment; - + private global::Gtk.VBox vbox5; - + private global::Gtk.HBox hbox1; - + private global::Gtk.ScrolledWindow scrolledwindow1; - + private global::Gtk.TreeView styleTreeview; - + private global::Gtk.VBox vbox1; - + private global::Gtk.Button buttonNew; - + private global::Gtk.Button buttonEdit; - + private global::Gtk.HBox hbox2; - + private global::Gtk.Button addButton; - + private global::Gtk.Button removeButton; - + private global::Gtk.Button buttonExport; - protected virtual void Build () + protected virtual void Build() { - global::Stetic.Gui.Initialize (this); + global::Stetic.Gui.Initialize(this); // Widget MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel - global::Stetic.BinContainer.Attach (this); + global::Stetic.BinContainer.Attach(this); this.Name = "MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel"; // Container child MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.Gtk.Container+ContainerChild - this.vbox4 = new global::Gtk.VBox (); + this.vbox4 = new global::Gtk.VBox(); this.vbox4.Name = "vbox4"; this.vbox4.Spacing = 6; // Container child vbox4.Gtk.Box+BoxChild - this.GtkLabel5 = new global::Gtk.Label (); + this.GtkLabel5 = new global::Gtk.Label(); this.GtkLabel5.Name = "GtkLabel5"; this.GtkLabel5.Xalign = 0F; - this.GtkLabel5.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Color scheme</b>"); + this.GtkLabel5.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Color scheme</b>"); this.GtkLabel5.UseMarkup = true; - this.vbox4.Add (this.GtkLabel5); - global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.GtkLabel5])); + this.vbox4.Add(this.GtkLabel5); + global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.GtkLabel5])); w1.Position = 0; w1.Expand = false; w1.Fill = false; // Container child vbox4.Gtk.Box+BoxChild - this.GtkAlignment = new global::Gtk.Alignment (0F, 0F, 1F, 1F); + this.GtkAlignment = new global::Gtk.Alignment(0F, 0F, 1F, 1F); this.GtkAlignment.Name = "GtkAlignment"; this.GtkAlignment.LeftPadding = ((uint)(12)); // Container child GtkAlignment.Gtk.Container+ContainerChild - this.vbox5 = new global::Gtk.VBox (); + this.vbox5 = new global::Gtk.VBox(); this.vbox5.Name = "vbox5"; this.vbox5.Spacing = 6; // Container child vbox5.Gtk.Box+BoxChild - this.hbox1 = new global::Gtk.HBox (); + this.hbox1 = new global::Gtk.HBox(); this.hbox1.Name = "hbox1"; this.hbox1.Spacing = 6; // Container child hbox1.Gtk.Box+BoxChild - this.scrolledwindow1 = new global::Gtk.ScrolledWindow (); + this.scrolledwindow1 = new global::Gtk.ScrolledWindow(); this.scrolledwindow1.CanFocus = true; this.scrolledwindow1.Name = "scrolledwindow1"; this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1)); // Container child scrolledwindow1.Gtk.Container+ContainerChild - global::Gtk.Viewport w2 = new global::Gtk.Viewport (); + global::Gtk.Viewport w2 = new global::Gtk.Viewport(); w2.ShadowType = ((global::Gtk.ShadowType)(0)); // Container child GtkViewport.Gtk.Container+ContainerChild - this.styleTreeview = new global::Gtk.TreeView (); + this.styleTreeview = new global::Gtk.TreeView(); this.styleTreeview.CanFocus = true; this.styleTreeview.Name = "styleTreeview"; this.styleTreeview.HeadersVisible = false; - w2.Add (this.styleTreeview); - this.scrolledwindow1.Add (w2); - this.hbox1.Add (this.scrolledwindow1); - global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.scrolledwindow1])); + w2.Add(this.styleTreeview); + this.scrolledwindow1.Add(w2); + this.hbox1.Add(this.scrolledwindow1); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow1])); w5.Position = 0; // Container child hbox1.Gtk.Box+BoxChild - this.vbox1 = new global::Gtk.VBox (); + this.vbox1 = new global::Gtk.VBox(); this.vbox1.Name = "vbox1"; this.vbox1.Spacing = 6; // Container child vbox1.Gtk.Box+BoxChild - this.buttonNew = new global::Gtk.Button (); + this.buttonNew = new global::Gtk.Button(); this.buttonNew.CanFocus = true; this.buttonNew.Name = "buttonNew"; this.buttonNew.UseStock = true; this.buttonNew.UseUnderline = true; this.buttonNew.Label = "gtk-new"; - this.vbox1.Add (this.buttonNew); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.buttonNew])); + this.vbox1.Add(this.buttonNew); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.buttonNew])); w6.Position = 0; w6.Expand = false; w6.Fill = false; // Container child vbox1.Gtk.Box+BoxChild - this.buttonEdit = new global::Gtk.Button (); + this.buttonEdit = new global::Gtk.Button(); this.buttonEdit.CanFocus = true; this.buttonEdit.Name = "buttonEdit"; this.buttonEdit.UseUnderline = true; - this.buttonEdit.Label = global::Mono.Unix.Catalog.GetString ("_Edit"); - this.vbox1.Add (this.buttonEdit); - global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.buttonEdit])); + this.buttonEdit.Label = global::Mono.Unix.Catalog.GetString("_Edit"); + this.vbox1.Add(this.buttonEdit); + global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.buttonEdit])); w7.Position = 1; w7.Expand = false; w7.Fill = false; - this.hbox1.Add (this.vbox1); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox1])); + this.hbox1.Add(this.vbox1); + global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.vbox1])); w8.Position = 1; w8.Expand = false; w8.Fill = false; - this.vbox5.Add (this.hbox1); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox1])); + this.vbox5.Add(this.hbox1); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox1])); w9.Position = 0; // Container child vbox5.Gtk.Box+BoxChild - this.hbox2 = new global::Gtk.HBox (); + this.hbox2 = new global::Gtk.HBox(); this.hbox2.Name = "hbox2"; this.hbox2.Spacing = 6; // Container child hbox2.Gtk.Box+BoxChild - this.addButton = new global::Gtk.Button (); + this.addButton = new global::Gtk.Button(); this.addButton.CanFocus = true; this.addButton.Name = "addButton"; this.addButton.UseStock = true; this.addButton.UseUnderline = true; this.addButton.Label = "gtk-add"; - this.hbox2.Add (this.addButton); - global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.addButton])); + this.hbox2.Add(this.addButton); + global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.addButton])); w10.PackType = ((global::Gtk.PackType)(1)); w10.Position = 0; w10.Expand = false; w10.Fill = false; // Container child hbox2.Gtk.Box+BoxChild - this.removeButton = new global::Gtk.Button (); + this.removeButton = new global::Gtk.Button(); this.removeButton.CanFocus = true; this.removeButton.Name = "removeButton"; this.removeButton.UseStock = true; this.removeButton.UseUnderline = true; this.removeButton.Label = "gtk-remove"; - this.hbox2.Add (this.removeButton); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.removeButton])); + this.hbox2.Add(this.removeButton); + global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.removeButton])); w11.PackType = ((global::Gtk.PackType)(1)); w11.Position = 1; w11.Expand = false; w11.Fill = false; // Container child hbox2.Gtk.Box+BoxChild - this.buttonExport = new global::Gtk.Button (); + this.buttonExport = new global::Gtk.Button(); this.buttonExport.CanFocus = true; this.buttonExport.Name = "buttonExport"; this.buttonExport.UseUnderline = true; - this.buttonExport.Label = global::Mono.Unix.Catalog.GetString ("Export"); - this.hbox2.Add (this.buttonExport); - global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonExport])); + this.buttonExport.Label = global::Mono.Unix.Catalog.GetString("Export"); + this.hbox2.Add(this.buttonExport); + global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.buttonExport])); w12.PackType = ((global::Gtk.PackType)(1)); w12.Position = 2; w12.Expand = false; w12.Fill = false; - this.vbox5.Add (this.hbox2); - global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox2])); + this.vbox5.Add(this.hbox2); + global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox2])); w13.PackType = ((global::Gtk.PackType)(1)); w13.Position = 1; w13.Expand = false; w13.Fill = false; - this.GtkAlignment.Add (this.vbox5); - this.vbox4.Add (this.GtkAlignment); - global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.GtkAlignment])); + this.GtkAlignment.Add(this.vbox5); + this.vbox4.Add(this.GtkAlignment); + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.GtkAlignment])); w15.Position = 1; - this.Add (this.vbox4); - if ((this.Child != null)) { - this.Child.ShowAll (); + this.Add(this.vbox4); + if ((this.Child != null)) + { + this.Child.ShowAll(); } - this.Show (); + this.Show(); } } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs index e186e1dc05..7da2e57e69 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs @@ -5,176 +5,194 @@ namespace MonoDevelop.SourceEditor.OptionPanels public partial class MarkerPanel { private global::Gtk.VBox vbox1; + private global::Gtk.Label GtkLabel9; + private global::Gtk.Alignment alignment1; + private global::Gtk.VBox vbox3; + private global::Gtk.CheckButton showLineNumbersCheckbutton; + private global::Gtk.CheckButton underlineErrorsCheckbutton; + private global::Gtk.CheckButton highlightMatchingBracketCheckbutton; + private global::Gtk.CheckButton highlightCurrentLineCheckbutton; + private global::Gtk.CheckButton showRulerCheckbutton; + private global::Gtk.CheckButton enableAnimationCheckbutton1; + private global::Gtk.CheckButton enableHighlightUsagesCheckbutton; + private global::Gtk.CheckButton drawIndentMarkersCheckbutton; + private global::Gtk.CheckButton enableQuickDiffCheckbutton; + private global::Gtk.Table table1; + private global::Gtk.CheckButton checkbuttonLineEndings; + private global::Gtk.CheckButton checkbuttonSpaces; + private global::Gtk.CheckButton checkbuttonTabs; + private global::Gtk.Label label1; + private global::Gtk.ComboBox showWhitespacesCombobox; - - protected virtual void Build () + + protected virtual void Build() { - global::Stetic.Gui.Initialize (this); + global::Stetic.Gui.Initialize(this); // Widget MonoDevelop.SourceEditor.OptionPanels.MarkerPanel - global::Stetic.BinContainer.Attach (this); + global::Stetic.BinContainer.Attach(this); this.Name = "MonoDevelop.SourceEditor.OptionPanels.MarkerPanel"; // Container child MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.Gtk.Container+ContainerChild - this.vbox1 = new global::Gtk.VBox (); + this.vbox1 = new global::Gtk.VBox(); this.vbox1.Name = "vbox1"; this.vbox1.Spacing = 6; // Container child vbox1.Gtk.Box+BoxChild - this.GtkLabel9 = new global::Gtk.Label (); + this.GtkLabel9 = new global::Gtk.Label(); this.GtkLabel9.Name = "GtkLabel9"; this.GtkLabel9.Xalign = 0F; - this.GtkLabel9.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>General</b>"); + this.GtkLabel9.LabelProp = global::Mono.Unix.Catalog.GetString("<b>General</b>"); this.GtkLabel9.UseMarkup = true; - this.vbox1.Add (this.GtkLabel9); - global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel9])); + this.vbox1.Add(this.GtkLabel9); + global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel9])); w1.Position = 0; w1.Expand = false; w1.Fill = false; // Container child vbox1.Gtk.Box+BoxChild - this.alignment1 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F); + this.alignment1 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F); this.alignment1.Name = "alignment1"; this.alignment1.LeftPadding = ((uint)(12)); // Container child alignment1.Gtk.Container+ContainerChild - this.vbox3 = new global::Gtk.VBox (); + this.vbox3 = new global::Gtk.VBox(); this.vbox3.Name = "vbox3"; this.vbox3.Spacing = 6; // Container child vbox3.Gtk.Box+BoxChild - this.showLineNumbersCheckbutton = new global::Gtk.CheckButton (); + this.showLineNumbersCheckbutton = new global::Gtk.CheckButton(); this.showLineNumbersCheckbutton.CanFocus = true; this.showLineNumbersCheckbutton.Name = "showLineNumbersCheckbutton"; - this.showLineNumbersCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Show line numbers"); + this.showLineNumbersCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Show line numbers"); this.showLineNumbersCheckbutton.DrawIndicator = true; this.showLineNumbersCheckbutton.UseUnderline = true; - this.vbox3.Add (this.showLineNumbersCheckbutton); - global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.showLineNumbersCheckbutton])); + this.vbox3.Add(this.showLineNumbersCheckbutton); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.showLineNumbersCheckbutton])); w2.Position = 0; w2.Expand = false; w2.Fill = false; // Container child vbox3.Gtk.Box+BoxChild - this.underlineErrorsCheckbutton = new global::Gtk.CheckButton (); + this.underlineErrorsCheckbutton = new global::Gtk.CheckButton(); this.underlineErrorsCheckbutton.CanFocus = true; this.underlineErrorsCheckbutton.Name = "underlineErrorsCheckbutton"; - this.underlineErrorsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Underline errors"); + this.underlineErrorsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Underline errors"); this.underlineErrorsCheckbutton.DrawIndicator = true; this.underlineErrorsCheckbutton.UseUnderline = true; - this.vbox3.Add (this.underlineErrorsCheckbutton); - global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.underlineErrorsCheckbutton])); + this.vbox3.Add(this.underlineErrorsCheckbutton); + global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.underlineErrorsCheckbutton])); w3.Position = 1; w3.Expand = false; w3.Fill = false; // Container child vbox3.Gtk.Box+BoxChild - this.highlightMatchingBracketCheckbutton = new global::Gtk.CheckButton (); + this.highlightMatchingBracketCheckbutton = new global::Gtk.CheckButton(); this.highlightMatchingBracketCheckbutton.CanFocus = true; this.highlightMatchingBracketCheckbutton.Name = "highlightMatchingBracketCheckbutton"; - this.highlightMatchingBracketCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Highlight matching braces"); + this.highlightMatchingBracketCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Highlight matching braces"); this.highlightMatchingBracketCheckbutton.DrawIndicator = true; this.highlightMatchingBracketCheckbutton.UseUnderline = true; - this.vbox3.Add (this.highlightMatchingBracketCheckbutton); - global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.highlightMatchingBracketCheckbutton])); + this.vbox3.Add(this.highlightMatchingBracketCheckbutton); + global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.highlightMatchingBracketCheckbutton])); w4.Position = 2; w4.Expand = false; w4.Fill = false; // Container child vbox3.Gtk.Box+BoxChild - this.highlightCurrentLineCheckbutton = new global::Gtk.CheckButton (); + this.highlightCurrentLineCheckbutton = new global::Gtk.CheckButton(); this.highlightCurrentLineCheckbutton.CanFocus = true; this.highlightCurrentLineCheckbutton.Name = "highlightCurrentLineCheckbutton"; - this.highlightCurrentLineCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Highlight _current line"); + this.highlightCurrentLineCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Highlight _current line"); this.highlightCurrentLineCheckbutton.DrawIndicator = true; this.highlightCurrentLineCheckbutton.UseUnderline = true; - this.vbox3.Add (this.highlightCurrentLineCheckbutton); - global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.highlightCurrentLineCheckbutton])); + this.vbox3.Add(this.highlightCurrentLineCheckbutton); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.highlightCurrentLineCheckbutton])); w5.Position = 3; w5.Expand = false; w5.Fill = false; // Container child vbox3.Gtk.Box+BoxChild - this.showRulerCheckbutton = new global::Gtk.CheckButton (); + this.showRulerCheckbutton = new global::Gtk.CheckButton(); this.showRulerCheckbutton.CanFocus = true; this.showRulerCheckbutton.Name = "showRulerCheckbutton"; - this.showRulerCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Show _column ruler"); + this.showRulerCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Show _column ruler"); this.showRulerCheckbutton.DrawIndicator = true; this.showRulerCheckbutton.UseUnderline = true; - this.vbox3.Add (this.showRulerCheckbutton); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.showRulerCheckbutton])); + this.vbox3.Add(this.showRulerCheckbutton); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.showRulerCheckbutton])); w6.Position = 4; w6.Expand = false; w6.Fill = false; // Container child vbox3.Gtk.Box+BoxChild - this.enableAnimationCheckbutton1 = new global::Gtk.CheckButton (); + this.enableAnimationCheckbutton1 = new global::Gtk.CheckButton(); this.enableAnimationCheckbutton1.CanFocus = true; this.enableAnimationCheckbutton1.Name = "enableAnimationCheckbutton1"; - this.enableAnimationCheckbutton1.Label = global::Mono.Unix.Catalog.GetString ("_Enable animations"); + this.enableAnimationCheckbutton1.Label = global::Mono.Unix.Catalog.GetString("_Enable animations"); this.enableAnimationCheckbutton1.DrawIndicator = true; this.enableAnimationCheckbutton1.UseUnderline = true; - this.vbox3.Add (this.enableAnimationCheckbutton1); - global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.enableAnimationCheckbutton1])); + this.vbox3.Add(this.enableAnimationCheckbutton1); + global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.enableAnimationCheckbutton1])); w7.Position = 5; w7.Expand = false; w7.Fill = false; // Container child vbox3.Gtk.Box+BoxChild - this.enableHighlightUsagesCheckbutton = new global::Gtk.CheckButton (); + this.enableHighlightUsagesCheckbutton = new global::Gtk.CheckButton(); this.enableHighlightUsagesCheckbutton.CanFocus = true; this.enableHighlightUsagesCheckbutton.Name = "enableHighlightUsagesCheckbutton"; - this.enableHighlightUsagesCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Highlight _identifier references"); + this.enableHighlightUsagesCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Highlight _identifier references"); this.enableHighlightUsagesCheckbutton.DrawIndicator = true; this.enableHighlightUsagesCheckbutton.UseUnderline = true; - this.vbox3.Add (this.enableHighlightUsagesCheckbutton); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.enableHighlightUsagesCheckbutton])); + this.vbox3.Add(this.enableHighlightUsagesCheckbutton); + global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.enableHighlightUsagesCheckbutton])); w8.Position = 6; w8.Expand = false; w8.Fill = false; // Container child vbox3.Gtk.Box+BoxChild - this.drawIndentMarkersCheckbutton = new global::Gtk.CheckButton (); + this.drawIndentMarkersCheckbutton = new global::Gtk.CheckButton(); this.drawIndentMarkersCheckbutton.CanFocus = true; this.drawIndentMarkersCheckbutton.Name = "drawIndentMarkersCheckbutton"; - this.drawIndentMarkersCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Show indentation guides"); + this.drawIndentMarkersCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Show indentation guides"); this.drawIndentMarkersCheckbutton.DrawIndicator = true; this.drawIndentMarkersCheckbutton.UseUnderline = true; - this.vbox3.Add (this.drawIndentMarkersCheckbutton); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.drawIndentMarkersCheckbutton])); + this.vbox3.Add(this.drawIndentMarkersCheckbutton); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.drawIndentMarkersCheckbutton])); w9.Position = 7; w9.Expand = false; w9.Fill = false; // Container child vbox3.Gtk.Box+BoxChild - this.enableQuickDiffCheckbutton = new global::Gtk.CheckButton (); + this.enableQuickDiffCheckbutton = new global::Gtk.CheckButton(); this.enableQuickDiffCheckbutton.CanFocus = true; this.enableQuickDiffCheckbutton.Name = "enableQuickDiffCheckbutton"; - this.enableQuickDiffCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Visualize changed lines"); + this.enableQuickDiffCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Visualize changed lines"); this.enableQuickDiffCheckbutton.DrawIndicator = true; this.enableQuickDiffCheckbutton.UseUnderline = true; - this.vbox3.Add (this.enableQuickDiffCheckbutton); - global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.enableQuickDiffCheckbutton])); + this.vbox3.Add(this.enableQuickDiffCheckbutton); + global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.enableQuickDiffCheckbutton])); w10.Position = 8; w10.Expand = false; w10.Fill = false; // Container child vbox3.Gtk.Box+BoxChild - this.table1 = new global::Gtk.Table (((uint)(4)), ((uint)(4)), false); + this.table1 = new global::Gtk.Table(((uint)(4)), ((uint)(4)), false); this.table1.Name = "table1"; this.table1.RowSpacing = ((uint)(6)); this.table1.ColumnSpacing = ((uint)(6)); // Container child table1.Gtk.Table+TableChild - this.checkbuttonLineEndings = new global::Gtk.CheckButton (); + this.checkbuttonLineEndings = new global::Gtk.CheckButton(); this.checkbuttonLineEndings.CanFocus = true; this.checkbuttonLineEndings.Name = "checkbuttonLineEndings"; - this.checkbuttonLineEndings.Label = global::Mono.Unix.Catalog.GetString ("Include Line Endings"); + this.checkbuttonLineEndings.Label = global::Mono.Unix.Catalog.GetString("Include Line Endings"); this.checkbuttonLineEndings.DrawIndicator = true; this.checkbuttonLineEndings.UseUnderline = true; - this.table1.Add (this.checkbuttonLineEndings); - global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1 [this.checkbuttonLineEndings])); + this.table1.Add(this.checkbuttonLineEndings); + global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.checkbuttonLineEndings])); w11.TopAttach = ((uint)(3)); w11.BottomAttach = ((uint)(4)); w11.LeftAttach = ((uint)(1)); @@ -182,14 +200,14 @@ namespace MonoDevelop.SourceEditor.OptionPanels w11.XOptions = ((global::Gtk.AttachOptions)(4)); w11.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.checkbuttonSpaces = new global::Gtk.CheckButton (); + this.checkbuttonSpaces = new global::Gtk.CheckButton(); this.checkbuttonSpaces.CanFocus = true; this.checkbuttonSpaces.Name = "checkbuttonSpaces"; - this.checkbuttonSpaces.Label = global::Mono.Unix.Catalog.GetString ("Include _Spaces"); + this.checkbuttonSpaces.Label = global::Mono.Unix.Catalog.GetString("Include _Spaces"); this.checkbuttonSpaces.DrawIndicator = true; this.checkbuttonSpaces.UseUnderline = true; - this.table1.Add (this.checkbuttonSpaces); - global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1 [this.checkbuttonSpaces])); + this.table1.Add(this.checkbuttonSpaces); + global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.checkbuttonSpaces])); w12.TopAttach = ((uint)(1)); w12.BottomAttach = ((uint)(2)); w12.LeftAttach = ((uint)(1)); @@ -197,14 +215,14 @@ namespace MonoDevelop.SourceEditor.OptionPanels w12.XOptions = ((global::Gtk.AttachOptions)(4)); w12.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.checkbuttonTabs = new global::Gtk.CheckButton (); + this.checkbuttonTabs = new global::Gtk.CheckButton(); this.checkbuttonTabs.CanFocus = true; this.checkbuttonTabs.Name = "checkbuttonTabs"; - this.checkbuttonTabs.Label = global::Mono.Unix.Catalog.GetString ("Include Tabs"); + this.checkbuttonTabs.Label = global::Mono.Unix.Catalog.GetString("Include Tabs"); this.checkbuttonTabs.DrawIndicator = true; this.checkbuttonTabs.UseUnderline = true; - this.table1.Add (this.checkbuttonTabs); - global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.checkbuttonTabs])); + this.table1.Add(this.checkbuttonTabs); + global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.checkbuttonTabs])); w13.TopAttach = ((uint)(2)); w13.BottomAttach = ((uint)(3)); w13.LeftAttach = ((uint)(1)); @@ -212,38 +230,39 @@ namespace MonoDevelop.SourceEditor.OptionPanels w13.XOptions = ((global::Gtk.AttachOptions)(4)); w13.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.label1 = new global::Gtk.Label (); + this.label1 = new global::Gtk.Label(); this.label1.Name = "label1"; - this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Show invisible characters:"); + this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("_Show invisible characters:"); this.label1.UseUnderline = true; - this.table1.Add (this.label1); - global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1])); + this.table1.Add(this.label1); + global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.label1])); w14.XOptions = ((global::Gtk.AttachOptions)(4)); w14.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.showWhitespacesCombobox = global::Gtk.ComboBox.NewText (); + this.showWhitespacesCombobox = global::Gtk.ComboBox.NewText(); this.showWhitespacesCombobox.Name = "showWhitespacesCombobox"; - this.table1.Add (this.showWhitespacesCombobox); - global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1 [this.showWhitespacesCombobox])); + this.table1.Add(this.showWhitespacesCombobox); + global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1[this.showWhitespacesCombobox])); w15.LeftAttach = ((uint)(1)); w15.RightAttach = ((uint)(4)); w15.XOptions = ((global::Gtk.AttachOptions)(4)); w15.YOptions = ((global::Gtk.AttachOptions)(4)); - this.vbox3.Add (this.table1); - global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.table1])); + this.vbox3.Add(this.table1); + global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.table1])); w16.Position = 9; w16.Fill = false; - this.alignment1.Add (this.vbox3); - this.vbox1.Add (this.alignment1); - global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment1])); + this.alignment1.Add(this.vbox3); + this.vbox1.Add(this.alignment1); + global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment1])); w18.Position = 1; w18.Expand = false; w18.Fill = false; - this.Add (this.vbox1); - if ((this.Child != null)) { - this.Child.ShowAll (); + this.Add(this.vbox1); + if ((this.Child != null)) + { + this.Child.ShowAll(); } - this.Show (); + this.Show(); } } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs index 8d919b5500..efa3323b30 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs @@ -5,21 +5,29 @@ namespace MonoDevelop.SourceEditor.OptionPanels public partial class NewColorShemeDialog { private global::Gtk.Table table1; + private global::Gtk.ComboBox comboboxBaseStyle; + private global::Gtk.Entry entryDescription; + private global::Gtk.Entry entryName; + private global::Gtk.Label label1; + private global::Gtk.Label label2; + private global::Gtk.Label label3; + private global::Gtk.Button buttonCancel; + private global::Gtk.Button buttonOk; - - protected virtual void Build () + + protected virtual void Build() { - global::Stetic.Gui.Initialize (this); + global::Stetic.Gui.Initialize(this); // Widget MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog this.Name = "MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog"; - this.Title = global::Mono.Unix.Catalog.GetString ("Create new color sheme"); + this.Title = global::Mono.Unix.Catalog.GetString("Create new color sheme"); this.WindowPosition = ((global::Gtk.WindowPosition)(4)); this.BorderWidth = ((uint)(6)); // Internal child MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.VBox @@ -27,26 +35,26 @@ namespace MonoDevelop.SourceEditor.OptionPanels w1.Name = "dialog1_VBox"; w1.BorderWidth = ((uint)(2)); // Container child dialog1_VBox.Gtk.Box+BoxChild - this.table1 = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false); + this.table1 = new global::Gtk.Table(((uint)(3)), ((uint)(2)), false); this.table1.Name = "table1"; this.table1.RowSpacing = ((uint)(6)); this.table1.ColumnSpacing = ((uint)(6)); // Container child table1.Gtk.Table+TableChild - this.comboboxBaseStyle = global::Gtk.ComboBox.NewText (); + this.comboboxBaseStyle = global::Gtk.ComboBox.NewText(); this.comboboxBaseStyle.Name = "comboboxBaseStyle"; - this.table1.Add (this.comboboxBaseStyle); - global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.comboboxBaseStyle])); + this.table1.Add(this.comboboxBaseStyle); + global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.comboboxBaseStyle])); w2.LeftAttach = ((uint)(1)); w2.RightAttach = ((uint)(2)); w2.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.entryDescription = new global::Gtk.Entry (); + this.entryDescription = new global::Gtk.Entry(); this.entryDescription.CanFocus = true; this.entryDescription.Name = "entryDescription"; this.entryDescription.IsEditable = true; this.entryDescription.InvisibleChar = '●'; - this.table1.Add (this.entryDescription); - global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryDescription])); + this.table1.Add(this.entryDescription); + global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.entryDescription])); w3.TopAttach = ((uint)(2)); w3.BottomAttach = ((uint)(3)); w3.LeftAttach = ((uint)(1)); @@ -54,13 +62,13 @@ namespace MonoDevelop.SourceEditor.OptionPanels w3.XOptions = ((global::Gtk.AttachOptions)(4)); w3.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.entryName = new global::Gtk.Entry (); + this.entryName = new global::Gtk.Entry(); this.entryName.CanFocus = true; this.entryName.Name = "entryName"; this.entryName.IsEditable = true; this.entryName.InvisibleChar = '●'; - this.table1.Add (this.entryName); - global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryName])); + this.table1.Add(this.entryName); + global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1[this.entryName])); w4.TopAttach = ((uint)(1)); w4.BottomAttach = ((uint)(2)); w4.LeftAttach = ((uint)(1)); @@ -68,41 +76,41 @@ namespace MonoDevelop.SourceEditor.OptionPanels w4.XOptions = ((global::Gtk.AttachOptions)(4)); w4.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.label1 = new global::Gtk.Label (); + this.label1 = new global::Gtk.Label(); this.label1.Name = "label1"; this.label1.Xalign = 0F; - this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Based on:"); + this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("_Based on:"); this.label1.UseMarkup = true; this.label1.UseUnderline = true; - this.table1.Add (this.label1); - global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1])); + this.table1.Add(this.label1); + global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.label1])); w5.XOptions = ((global::Gtk.AttachOptions)(4)); w5.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.label2 = new global::Gtk.Label (); + this.label2 = new global::Gtk.Label(); this.label2.Name = "label2"; this.label2.Xalign = 0F; - this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("_Name:"); + this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("_Name:"); this.label2.UseUnderline = true; - this.table1.Add (this.label2); - global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.label2])); + this.table1.Add(this.label2); + global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.label2])); w6.TopAttach = ((uint)(1)); w6.BottomAttach = ((uint)(2)); w6.XOptions = ((global::Gtk.AttachOptions)(4)); w6.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.label3 = new global::Gtk.Label (); + this.label3 = new global::Gtk.Label(); this.label3.Name = "label3"; - this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("_Description:"); + this.label3.LabelProp = global::Mono.Unix.Catalog.GetString("_Description:"); this.label3.UseUnderline = true; - this.table1.Add (this.label3); - global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.label3])); + this.table1.Add(this.label3); + global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.label3])); w7.TopAttach = ((uint)(2)); w7.BottomAttach = ((uint)(3)); w7.XOptions = ((global::Gtk.AttachOptions)(4)); w7.YOptions = ((global::Gtk.AttachOptions)(4)); - w1.Add (this.table1); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(w1 [this.table1])); + w1.Add(this.table1); + global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(w1[this.table1])); w8.Position = 0; w8.Expand = false; w8.Fill = false; @@ -113,38 +121,39 @@ namespace MonoDevelop.SourceEditor.OptionPanels w9.BorderWidth = ((uint)(5)); w9.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.buttonCancel = new global::Gtk.Button (); + this.buttonCancel = new global::Gtk.Button(); this.buttonCancel.CanDefault = true; this.buttonCancel.CanFocus = true; this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.UseStock = true; this.buttonCancel.UseUnderline = true; this.buttonCancel.Label = "gtk-cancel"; - this.AddActionWidget (this.buttonCancel, -6); - global::Gtk.ButtonBox.ButtonBoxChild w10 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9 [this.buttonCancel])); + this.AddActionWidget(this.buttonCancel, -6); + global::Gtk.ButtonBox.ButtonBoxChild w10 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9[this.buttonCancel])); w10.Expand = false; w10.Fill = false; // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.buttonOk = new global::Gtk.Button (); + this.buttonOk = new global::Gtk.Button(); this.buttonOk.CanDefault = true; this.buttonOk.CanFocus = true; this.buttonOk.Name = "buttonOk"; this.buttonOk.UseStock = true; this.buttonOk.UseUnderline = true; this.buttonOk.Label = "gtk-ok"; - this.AddActionWidget (this.buttonOk, -5); - global::Gtk.ButtonBox.ButtonBoxChild w11 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9 [this.buttonOk])); + this.AddActionWidget(this.buttonOk, -5); + global::Gtk.ButtonBox.ButtonBoxChild w11 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9[this.buttonOk])); w11.Position = 1; w11.Expand = false; w11.Fill = false; - if ((this.Child != null)) { - this.Child.ShowAll (); + if ((this.Child != null)) + { + this.Child.ShowAll(); } this.DefaultWidth = 393; this.DefaultHeight = 148; this.label2.MnemonicWidget = this.entryName; this.label3.MnemonicWidget = this.entryDescription; - this.Show (); + this.Show(); } } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.PrintSettingsWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.PrintSettingsWidget.cs index 397cff6550..a4f72fc66a 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.PrintSettingsWidget.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.PrintSettingsWidget.cs @@ -4,16 +4,17 @@ namespace MonoDevelop.SourceEditor { internal partial class PrintSettingsWidget { - protected virtual void Build () + protected virtual void Build() { - global::Stetic.Gui.Initialize (this); + global::Stetic.Gui.Initialize(this); // Widget MonoDevelop.SourceEditor.PrintSettingsWidget - global::Stetic.BinContainer.Attach (this); + global::Stetic.BinContainer.Attach(this); this.Name = "MonoDevelop.SourceEditor.PrintSettingsWidget"; - if ((this.Child != null)) { - this.Child.ShowAll (); + if ((this.Child != null)) + { + this.Child.ShowAll(); } - this.Hide (); + this.Hide(); } } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs index 1768c2468d..95a85dd82a 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs @@ -5,58 +5,80 @@ namespace MonoDevelop.SourceEditor public partial class SearchAndReplaceWidget { private global::Gtk.Table table; + private global::Gtk.Button buttonSearchMode; + private global::Gtk.Arrow searchButtonModeArrow; + private global::Gtk.HBox hbox1; + private global::MonoDevelop.Components.SearchEntry searchEntry; + private global::Gtk.Button buttonSearchBackward; + private global::Gtk.EventBox eventbox2; + private global::Gtk.Image image2; + private global::Gtk.Button buttonSearchForward; + private global::Gtk.EventBox eventbox3; + private global::Gtk.Image image3; + private global::Gtk.Button closeButton; + private global::Gtk.EventBox eventbox4; + private global::Gtk.Image image4; + private global::Gtk.HBox hbox2; + private global::Gtk.Entry entryReplace; + private global::Gtk.Button buttonReplace; + private global::Gtk.EventBox eventbox5; + private global::Gtk.Image image5; + private global::Gtk.Button buttonReplaceAll; + private global::Gtk.HBox hbox3; + private global::Gtk.EventBox eventbox6; + private global::Gtk.Image image6; + private global::Gtk.Label label1; - - protected virtual void Build () + + protected virtual void Build() { - global::Stetic.Gui.Initialize (this); + global::Stetic.Gui.Initialize(this); // Widget MonoDevelop.SourceEditor.SearchAndReplaceWidget - global::Stetic.BinContainer.Attach (this); + global::Stetic.BinContainer.Attach(this); this.Name = "MonoDevelop.SourceEditor.SearchAndReplaceWidget"; // Container child MonoDevelop.SourceEditor.SearchAndReplaceWidget.Gtk.Container+ContainerChild - this.table = new global::Gtk.Table (((uint)(2)), ((uint)(2)), false); + this.table = new global::Gtk.Table(((uint)(2)), ((uint)(2)), false); this.table.Name = "table"; this.table.BorderWidth = ((uint)(4)); // Container child table.Gtk.Table+TableChild - this.buttonSearchMode = new global::Gtk.Button (); + this.buttonSearchMode = new global::Gtk.Button(); this.buttonSearchMode.CanFocus = true; this.buttonSearchMode.Name = "buttonSearchMode"; // Container child buttonSearchMode.Gtk.Container+ContainerChild - this.searchButtonModeArrow = new global::Gtk.Arrow (((global::Gtk.ArrowType)(0)), ((global::Gtk.ShadowType)(0))); + this.searchButtonModeArrow = new global::Gtk.Arrow(((global::Gtk.ArrowType)(0)), ((global::Gtk.ShadowType)(0))); this.searchButtonModeArrow.Name = "searchButtonModeArrow"; - this.buttonSearchMode.Add (this.searchButtonModeArrow); - this.buttonSearchMode.Label = null; - this.table.Add (this.buttonSearchMode); - global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table [this.buttonSearchMode])); + this.buttonSearchMode.Add(this.searchButtonModeArrow); + this.table.Add(this.buttonSearchMode); + global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table[this.buttonSearchMode])); w2.XOptions = ((global::Gtk.AttachOptions)(4)); w2.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table.Gtk.Table+TableChild - this.hbox1 = new global::Gtk.HBox (); + this.hbox1 = new global::Gtk.HBox(); this.hbox1.Name = "hbox1"; // Container child hbox1.Gtk.Box+BoxChild - this.searchEntry = new global::MonoDevelop.Components.SearchEntry (); + this.searchEntry = new global::MonoDevelop.Components.SearchEntry(); this.searchEntry.Name = "searchEntry"; this.searchEntry.ForceFilterButtonVisible = false; this.searchEntry.HasFrame = true; @@ -65,166 +87,162 @@ namespace MonoDevelop.SourceEditor this.searchEntry.ActiveFilterID = 0; this.searchEntry.Ready = false; this.searchEntry.HasFocus = false; - this.hbox1.Add (this.searchEntry); - global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.searchEntry])); + this.hbox1.Add(this.searchEntry); + global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.searchEntry])); w3.Position = 0; // Container child hbox1.Gtk.Box+BoxChild - this.buttonSearchBackward = new global::Gtk.Button (); + this.buttonSearchBackward = new global::Gtk.Button(); this.buttonSearchBackward.CanFocus = true; this.buttonSearchBackward.Name = "buttonSearchBackward"; this.buttonSearchBackward.Relief = ((global::Gtk.ReliefStyle)(2)); // Container child buttonSearchBackward.Gtk.Container+ContainerChild - this.eventbox2 = new global::Gtk.EventBox (); + this.eventbox2 = new global::Gtk.EventBox(); this.eventbox2.Name = "eventbox2"; this.eventbox2.AboveChild = true; this.eventbox2.VisibleWindow = false; // Container child eventbox2.Gtk.Container+ContainerChild - this.image2 = new global::Gtk.Image (); + this.image2 = new global::Gtk.Image(); this.image2.Name = "image2"; - this.image2.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-up", global::Gtk.IconSize.Menu); - this.eventbox2.Add (this.image2); - this.buttonSearchBackward.Add (this.eventbox2); - this.buttonSearchBackward.Label = null; - this.hbox1.Add (this.buttonSearchBackward); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonSearchBackward])); + this.image2.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-go-up", global::Gtk.IconSize.Menu); + this.eventbox2.Add(this.image2); + this.buttonSearchBackward.Add(this.eventbox2); + this.hbox1.Add(this.buttonSearchBackward); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.buttonSearchBackward])); w6.Position = 1; w6.Expand = false; w6.Fill = false; // Container child hbox1.Gtk.Box+BoxChild - this.buttonSearchForward = new global::Gtk.Button (); + this.buttonSearchForward = new global::Gtk.Button(); this.buttonSearchForward.CanFocus = true; this.buttonSearchForward.Name = "buttonSearchForward"; this.buttonSearchForward.Relief = ((global::Gtk.ReliefStyle)(2)); // Container child buttonSearchForward.Gtk.Container+ContainerChild - this.eventbox3 = new global::Gtk.EventBox (); + this.eventbox3 = new global::Gtk.EventBox(); this.eventbox3.Name = "eventbox3"; this.eventbox3.AboveChild = true; this.eventbox3.VisibleWindow = false; // Container child eventbox3.Gtk.Container+ContainerChild - this.image3 = new global::Gtk.Image (); + this.image3 = new global::Gtk.Image(); this.image3.Name = "image3"; - this.image3.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-down", global::Gtk.IconSize.Menu); - this.eventbox3.Add (this.image3); - this.buttonSearchForward.Add (this.eventbox3); - this.buttonSearchForward.Label = null; - this.hbox1.Add (this.buttonSearchForward); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonSearchForward])); + this.image3.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-go-down", global::Gtk.IconSize.Menu); + this.eventbox3.Add(this.image3); + this.buttonSearchForward.Add(this.eventbox3); + this.hbox1.Add(this.buttonSearchForward); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.buttonSearchForward])); w9.Position = 2; w9.Expand = false; w9.Fill = false; // Container child hbox1.Gtk.Box+BoxChild - this.closeButton = new global::Gtk.Button (); + this.closeButton = new global::Gtk.Button(); this.closeButton.CanFocus = true; this.closeButton.Name = "closeButton"; this.closeButton.Relief = ((global::Gtk.ReliefStyle)(2)); // Container child closeButton.Gtk.Container+ContainerChild - this.eventbox4 = new global::Gtk.EventBox (); + this.eventbox4 = new global::Gtk.EventBox(); this.eventbox4.Name = "eventbox4"; this.eventbox4.AboveChild = true; this.eventbox4.VisibleWindow = false; // Container child eventbox4.Gtk.Container+ContainerChild - this.image4 = new global::Gtk.Image (); + this.image4 = new global::Gtk.Image(); this.image4.Name = "image4"; - this.image4.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-close", global::Gtk.IconSize.Menu); - this.eventbox4.Add (this.image4); - this.closeButton.Add (this.eventbox4); - this.closeButton.Label = null; - this.hbox1.Add (this.closeButton); - global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.closeButton])); + this.image4.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-close", global::Gtk.IconSize.Menu); + this.eventbox4.Add(this.image4); + this.closeButton.Add(this.eventbox4); + this.hbox1.Add(this.closeButton); + global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.closeButton])); w12.Position = 3; w12.Expand = false; w12.Fill = false; - this.table.Add (this.hbox1); - global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table [this.hbox1])); + this.table.Add(this.hbox1); + global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table[this.hbox1])); w13.LeftAttach = ((uint)(1)); w13.RightAttach = ((uint)(2)); w13.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table.Gtk.Table+TableChild - this.hbox2 = new global::Gtk.HBox (); + this.hbox2 = new global::Gtk.HBox(); this.hbox2.Name = "hbox2"; // Container child hbox2.Gtk.Box+BoxChild - this.entryReplace = new global::Gtk.Entry (); + this.entryReplace = new global::Gtk.Entry(); this.entryReplace.CanFocus = true; this.entryReplace.Name = "entryReplace"; this.entryReplace.IsEditable = true; this.entryReplace.InvisibleChar = '●'; - this.hbox2.Add (this.entryReplace); - global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.entryReplace])); + this.hbox2.Add(this.entryReplace); + global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.entryReplace])); w14.Position = 0; // Container child hbox2.Gtk.Box+BoxChild - this.buttonReplace = new global::Gtk.Button (); + this.buttonReplace = new global::Gtk.Button(); this.buttonReplace.CanFocus = true; this.buttonReplace.Name = "buttonReplace"; this.buttonReplace.Relief = ((global::Gtk.ReliefStyle)(2)); // Container child buttonReplace.Gtk.Container+ContainerChild - this.eventbox5 = new global::Gtk.EventBox (); + this.eventbox5 = new global::Gtk.EventBox(); this.eventbox5.Name = "eventbox5"; this.eventbox5.AboveChild = true; this.eventbox5.VisibleWindow = false; // Container child eventbox5.Gtk.Container+ContainerChild - this.image5 = new global::Gtk.Image (); + this.image5 = new global::Gtk.Image(); this.image5.Name = "image5"; - this.image5.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-find-and-replace", global::Gtk.IconSize.Menu); - this.eventbox5.Add (this.image5); - this.buttonReplace.Add (this.eventbox5); - this.buttonReplace.Label = null; - this.hbox2.Add (this.buttonReplace); - global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonReplace])); + this.image5.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-find-and-replace", global::Gtk.IconSize.Menu); + this.eventbox5.Add(this.image5); + this.buttonReplace.Add(this.eventbox5); + this.hbox2.Add(this.buttonReplace); + global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.buttonReplace])); w17.Position = 1; w17.Expand = false; w17.Fill = false; // Container child hbox2.Gtk.Box+BoxChild - this.buttonReplaceAll = new global::Gtk.Button (); + this.buttonReplaceAll = new global::Gtk.Button(); this.buttonReplaceAll.CanFocus = true; this.buttonReplaceAll.Name = "buttonReplaceAll"; this.buttonReplaceAll.Relief = ((global::Gtk.ReliefStyle)(2)); // Container child buttonReplaceAll.Gtk.Container+ContainerChild - this.hbox3 = new global::Gtk.HBox (); + this.hbox3 = new global::Gtk.HBox(); this.hbox3.Name = "hbox3"; this.hbox3.Spacing = 6; // Container child hbox3.Gtk.Box+BoxChild - this.eventbox6 = new global::Gtk.EventBox (); + this.eventbox6 = new global::Gtk.EventBox(); this.eventbox6.Name = "eventbox6"; this.eventbox6.AboveChild = true; this.eventbox6.VisibleWindow = false; // Container child eventbox6.Gtk.Container+ContainerChild - this.image6 = new global::Gtk.Image (); + this.image6 = new global::Gtk.Image(); this.image6.Name = "image6"; - this.image6.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-find-and-replace", global::Gtk.IconSize.Menu); - this.eventbox6.Add (this.image6); - this.hbox3.Add (this.eventbox6); - global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.eventbox6])); + this.image6.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-find-and-replace", global::Gtk.IconSize.Menu); + this.eventbox6.Add(this.image6); + this.hbox3.Add(this.eventbox6); + global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.eventbox6])); w19.Position = 0; w19.Expand = false; w19.Fill = false; // Container child hbox3.Gtk.Box+BoxChild - this.label1 = new global::Gtk.Label (); + this.label1 = new global::Gtk.Label(); this.label1.Name = "label1"; - this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("All"); - this.hbox3.Add (this.label1); - global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label1])); + this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("All"); + this.hbox3.Add(this.label1); + global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.label1])); w20.Position = 1; w20.Expand = false; w20.Fill = false; - this.buttonReplaceAll.Add (this.hbox3); - this.buttonReplaceAll.Label = null; - this.hbox2.Add (this.buttonReplaceAll); - global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonReplaceAll])); + this.buttonReplaceAll.Add(this.hbox3); + this.hbox2.Add(this.buttonReplaceAll); + global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.buttonReplaceAll])); w22.Position = 2; w22.Expand = false; w22.Fill = false; - this.table.Add (this.hbox2); - global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table [this.hbox2])); + this.table.Add(this.hbox2); + global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table[this.hbox2])); w23.TopAttach = ((uint)(1)); w23.BottomAttach = ((uint)(2)); w23.LeftAttach = ((uint)(1)); w23.RightAttach = ((uint)(2)); w23.YOptions = ((global::Gtk.AttachOptions)(4)); - this.Add (this.table); - if ((this.Child != null)) { - this.Child.ShowAll (); + this.Add(this.table); + if ((this.Child != null)) + { + this.Child.ShowAll(); } - this.Show (); + this.Show(); } } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs index 5cdc11900b..3c6a731de3 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs @@ -6,9 +6,10 @@ namespace Stetic { private static bool initialized; - internal static void Initialize (Gtk.Widget iconRenderer) + internal static void Initialize(Gtk.Widget iconRenderer) { - if ((Stetic.Gui.initialized == false)) { + if ((Stetic.Gui.initialized == false)) + { Stetic.Gui.initialized = true; } } @@ -17,50 +18,54 @@ namespace Stetic internal class BinContainer { private Gtk.Widget child; - + private Gtk.UIManager uimanager; - public static BinContainer Attach (Gtk.Bin bin) + public static BinContainer Attach(Gtk.Bin bin) { - BinContainer bc = new BinContainer (); - bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested); - bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated); - bin.Added += new Gtk.AddedHandler (bc.OnAdded); + BinContainer bc = new BinContainer(); + bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested); + bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated); + bin.Added += new Gtk.AddedHandler(bc.OnAdded); return bc; } - private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args) + private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args) { - if ((this.child != null)) { - args.Requisition = this.child.SizeRequest (); + if ((this.child != null)) + { + args.Requisition = this.child.SizeRequest(); } } - private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args) + private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args) { - if ((this.child != null)) { + if ((this.child != null)) + { this.child.Allocation = args.Allocation; } } - private void OnAdded (object sender, Gtk.AddedArgs args) + private void OnAdded(object sender, Gtk.AddedArgs args) { this.child = args.Widget; } - public void SetUiManager (Gtk.UIManager uim) + public void SetUiManager(Gtk.UIManager uim) { this.uimanager = uim; - this.child.Realized += new System.EventHandler (this.OnRealized); + this.child.Realized += new System.EventHandler(this.OnRealized); } - private void OnRealized (object sender, System.EventArgs args) + private void OnRealized(object sender, System.EventArgs args) { - if ((this.uimanager != null)) { + if ((this.uimanager != null)) + { Gtk.Widget w; w = this.child.Toplevel; - if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) { - ((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup); + if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w))) + { + ((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup); this.uimanager = null; } } @@ -69,32 +74,41 @@ namespace Stetic internal class IconLoader { - public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size) + public static Gdk.Pixbuf LoadIcon(Gtk.Widget widget, string name, Gtk.IconSize size) { - Gdk.Pixbuf res = widget.RenderIcon (name, size, null); - if ((res != null)) { + Gdk.Pixbuf res = widget.RenderIcon(name, size, null); + if ((res != null)) + { return res; - } else { + } + else + { int sz; int sy; - global::Gtk.Icon.SizeLookup (size, out sz, out sy); - try { - return Gtk.IconTheme.Default.LoadIcon (name, sz, 0); - } catch (System.Exception) { - if ((name != "gtk-missing-image")) { - return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size); - } else { - Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz); - Gdk.GC gc = new Gdk.GC (pmap); - gc.RgbFgColor = new Gdk.Color (255, 255, 255); - pmap.DrawRectangle (gc, true, 0, 0, sz, sz); - gc.RgbFgColor = new Gdk.Color (0, 0, 0); - pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1)); - gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round); - gc.RgbFgColor = new Gdk.Color (255, 0, 0); - pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4))); - pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4))); - return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz); + global::Gtk.Icon.SizeLookup(size, out sz, out sy); + try + { + return Gtk.IconTheme.Default.LoadIcon(name, sz, 0); + } + catch (System.Exception) + { + if ((name != "gtk-missing-image")) + { + return Stetic.IconLoader.LoadIcon(widget, "gtk-missing-image", size); + } + else + { + Gdk.Pixmap pmap = new Gdk.Pixmap(Gdk.Screen.Default.RootWindow, sz, sz); + Gdk.GC gc = new Gdk.GC(pmap); + gc.RgbFgColor = new Gdk.Color(255, 255, 255); + pmap.DrawRectangle(gc, true, 0, 0, sz, sz); + gc.RgbFgColor = new Gdk.Color(0, 0, 0); + pmap.DrawRectangle(gc, false, 0, 0, (sz - 1), (sz - 1)); + gc.SetLineAttributes(3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round); + gc.RgbFgColor = new Gdk.Color(255, 0, 0); + pmap.DrawLine(gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4))); + pmap.DrawLine(gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4))); + return Gdk.Pixbuf.FromDrawable(pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz); } } } @@ -103,12 +117,12 @@ namespace Stetic internal class ActionGroups { - public static Gtk.ActionGroup GetActionGroup (System.Type type) + public static Gtk.ActionGroup GetActionGroup(System.Type type) { - return Stetic.ActionGroups.GetActionGroup (type.FullName); + return Stetic.ActionGroups.GetActionGroup(type.FullName); } - public static Gtk.ActionGroup GetActionGroup (string name) + public static Gtk.ActionGroup GetActionGroup(string name) { return null; } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic index 9fbd1d4b4d..31f1e1e159 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic @@ -7,9 +7,8 @@ <import> <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" /> <widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" /> - <widget-library name="../../../../build/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll" /> <widget-library name="../../../../build/bin/Mono.TextEditor.dll" /> - <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll" internal="true" /> + <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll" internal="true" /> </import> <widget class="Gtk.Bin" id="MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel" design-size="454 364"> <property name="MemberName" /> @@ -2430,65 +2429,11 @@ <widget class="Gtk.Bin" id="MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel" design-size="427 423"> <property name="MemberName" /> <property name="Visible">False</property> - <property name="GeneratePublic">False</property> <child> <widget class="Gtk.VBox" id="vbox1"> <property name="MemberName" /> <property name="Spacing">6</property> <child> - <widget class="Gtk.HBox" id="hbox1"> - <property name="MemberName" /> - <property name="Spacing">6</property> - <child> - <widget class="Gtk.Label" id="label2"> - <property name="MemberName" /> - <property name="LabelProp" translatable="yes">Completion list has</property> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.SpinButton" id="spinbutton1"> - <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="Upper">100</property> - <property name="PageIncrement">10</property> - <property name="StepIncrement">1</property> - <property name="ClimbRate">1</property> - <property name="Numeric">True</property> - </widget> - <packing> - <property name="Position">1</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.Label" id="label3"> - <property name="MemberName" /> - <property name="LabelProp" translatable="yes">rows</property> - </widget> - <packing> - <property name="Position">2</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> <widget class="Gtk.Alignment" id="alignment3"> <property name="MemberName" /> <property name="LeftPadding">12</property> @@ -2635,7 +2580,7 @@ </child> </widget> <packing> - <property name="Position">1</property> + <property name="Position">0</property> <property name="AutoSize">True</property> <property name="Expand">False</property> <property name="Fill">False</property> |