# HG changeset patch # User IBBoard # Date 1336848984 -3600 # Node ID 7b091ea868197b4a519edbe21211908ec511e113 # Parent c549fd4ff4bf54f8d1e985f0c84ca746d0db4d02 * Commit code that MonoDevelop insists on reformatting diff -r c549fd4ff4bf -r 7b091ea86819 gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs Thu May 10 21:01:42 2012 +0100 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs Sat May 12 19:56:24 2012 +0100 @@ -47,58 +47,143 @@ // Widget IBBoard.WarFoundry.GUI.GTK.FrmMainWindow this.UIManager = new global::Gtk.UIManager (); global::Gtk.ActionGroup w1 = new global::Gtk.ActionGroup ("Default"); - this.menuFile = new global::Gtk.Action ("menuFile", global::Mono.Unix.Catalog.GetString ("File"), null, null); + this.menuFile = new global::Gtk.Action ( + "menuFile", + global::Mono.Unix.Catalog.GetString("File"), + null, + null + ); this.menuFile.ShortLabel = global::Mono.Unix.Catalog.GetString ("File"); w1.Add (this.menuFile, null); - this.miNewArmy = new global::Gtk.Action ("miNewArmy", global::Mono.Unix.Catalog.GetString ("Create army"), null, "gtk-new"); + this.miNewArmy = new global::Gtk.Action ( + "miNewArmy", + global::Mono.Unix.Catalog.GetString("Create army"), + null, + "gtk-new" + ); this.miNewArmy.ShortLabel = global::Mono.Unix.Catalog.GetString ("Create army"); w1.Add (this.miNewArmy, null); - this.miOpenArmy = new global::Gtk.Action ("miOpenArmy", global::Mono.Unix.Catalog.GetString ("Open army"), null, "gtk-open"); + this.miOpenArmy = new global::Gtk.Action ( + "miOpenArmy", + global::Mono.Unix.Catalog.GetString("Open army"), + null, + "gtk-open" + ); this.miOpenArmy.ShortLabel = global::Mono.Unix.Catalog.GetString ("Open army"); w1.Add (this.miOpenArmy, null); - this.miSaveArmy = new global::Gtk.Action ("miSaveArmy", global::Mono.Unix.Catalog.GetString ("Save army"), null, "gtk-save"); + this.miSaveArmy = new global::Gtk.Action ( + "miSaveArmy", + global::Mono.Unix.Catalog.GetString("Save army"), + null, + "gtk-save" + ); this.miSaveArmy.Sensitive = false; this.miSaveArmy.ShortLabel = global::Mono.Unix.Catalog.GetString ("Save army"); w1.Add (this.miSaveArmy, null); - this.miSaveArmyAs = new global::Gtk.Action ("miSaveArmyAs", global::Mono.Unix.Catalog.GetString ("Save army as"), null, "gtk-save-as"); + this.miSaveArmyAs = new global::Gtk.Action ( + "miSaveArmyAs", + global::Mono.Unix.Catalog.GetString("Save army as"), + null, + "gtk-save-as" + ); this.miSaveArmyAs.Sensitive = false; this.miSaveArmyAs.ShortLabel = global::Mono.Unix.Catalog.GetString ("Save army as"); w1.Add (this.miSaveArmyAs, null); - this.miCloseArmy = new global::Gtk.Action ("miCloseArmy", global::Mono.Unix.Catalog.GetString ("Close army"), null, "gtk-close"); + this.miCloseArmy = new global::Gtk.Action ( + "miCloseArmy", + global::Mono.Unix.Catalog.GetString("Close army"), + null, + "gtk-close" + ); this.miCloseArmy.Sensitive = false; this.miCloseArmy.ShortLabel = global::Mono.Unix.Catalog.GetString ("Close army"); w1.Add (this.miCloseArmy, null); - this.miReloadFiles = new global::Gtk.Action ("miReloadFiles", global::Mono.Unix.Catalog.GetString ("Reload files"), null, "gtk-refresh"); + this.miReloadFiles = new global::Gtk.Action ( + "miReloadFiles", + global::Mono.Unix.Catalog.GetString("Reload files"), + null, + "gtk-refresh" + ); this.miReloadFiles.ShortLabel = global::Mono.Unix.Catalog.GetString ("Reload files"); w1.Add (this.miReloadFiles, null); - this.miExit = new global::Gtk.Action ("miExit", global::Mono.Unix.Catalog.GetString ("Exit"), null, "gtk-quit"); + this.miExit = new global::Gtk.Action ( + "miExit", + global::Mono.Unix.Catalog.GetString("Exit"), + null, + "gtk-quit" + ); this.miExit.ShortLabel = global::Mono.Unix.Catalog.GetString ("Exit"); w1.Add (this.miExit, null); - this.menuEdit = new global::Gtk.Action ("menuEdit", global::Mono.Unix.Catalog.GetString ("Edit"), null, null); + this.menuEdit = new global::Gtk.Action ( + "menuEdit", + global::Mono.Unix.Catalog.GetString("Edit"), + null, + null + ); this.menuEdit.ShortLabel = global::Mono.Unix.Catalog.GetString ("Edit"); w1.Add (this.menuEdit, null); - this.miUndo = new global::Gtk.Action ("miUndo", global::Mono.Unix.Catalog.GetString ("Undo"), null, "gtk-undo"); + this.miUndo = new global::Gtk.Action ( + "miUndo", + global::Mono.Unix.Catalog.GetString("Undo"), + null, + "gtk-undo" + ); this.miUndo.Sensitive = false; this.miUndo.ShortLabel = global::Mono.Unix.Catalog.GetString ("Undo"); w1.Add (this.miUndo, null); - this.miRedo = new global::Gtk.Action ("miRedo", global::Mono.Unix.Catalog.GetString ("Redo"), null, "gtk-redo"); + this.miRedo = new global::Gtk.Action ( + "miRedo", + global::Mono.Unix.Catalog.GetString("Redo"), + null, + "gtk-redo" + ); this.miRedo.Sensitive = false; this.miRedo.ShortLabel = global::Mono.Unix.Catalog.GetString ("Redo"); w1.Add (this.miRedo, null); - this.menuHelp = new global::Gtk.Action ("menuHelp", global::Mono.Unix.Catalog.GetString ("Help"), null, null); + this.menuHelp = new global::Gtk.Action ( + "menuHelp", + global::Mono.Unix.Catalog.GetString("Help"), + null, + null + ); this.menuHelp.ShortLabel = global::Mono.Unix.Catalog.GetString ("Help"); w1.Add (this.menuHelp, null); - this.miAbout = new global::Gtk.Action ("miAbout", global::Mono.Unix.Catalog.GetString ("About"), null, "gtk-about"); + this.miAbout = new global::Gtk.Action ( + "miAbout", + global::Mono.Unix.Catalog.GetString("About"), + null, + "gtk-about" + ); this.miAbout.ShortLabel = global::Mono.Unix.Catalog.GetString ("About"); w1.Add (this.miAbout, null); - this.miDebugInformation = new global::Gtk.Action ("miDebugInformation", global::Mono.Unix.Catalog.GetString ("Debug Information"), null, null); + this.miDebugInformation = new global::Gtk.Action ( + "miDebugInformation", + global::Mono.Unix.Catalog.GetString("Debug Information"), + null, + null + ); this.miDebugInformation.ShortLabel = global::Mono.Unix.Catalog.GetString ("Debug Information"); w1.Add (this.miDebugInformation, null); - this.bttnNewArmy = new global::Gtk.Action ("bttnNewArmy", null, null, "gtk-new"); + this.bttnNewArmy = new global::Gtk.Action ( + "bttnNewArmy", + null, + null, + "gtk-new" + ); w1.Add (this.bttnNewArmy, null); - this.bttnOpenArmy = new global::Gtk.Action ("bttnOpenArmy", null, null, "gtk-open"); + this.bttnOpenArmy = new global::Gtk.Action ( + "bttnOpenArmy", + null, + null, + "gtk-open" + ); w1.Add (this.bttnOpenArmy, null); - this.bttnSaveArmy = new global::Gtk.Action ("bttnSaveArmy", null, null, "gtk-save"); + this.bttnSaveArmy = new global::Gtk.Action ( + "bttnSaveArmy", + null, + null, + "gtk-save" + ); this.bttnSaveArmy.Sensitive = false; w1.Add (this.bttnSaveArmy, null); this.bttnUndo = new global::Gtk.Action ("bttnUndo", null, null, "gtk-undo"); @@ -111,20 +196,45 @@ w1.Add (this.goDown, null); this.add = new global::Gtk.Action ("add", null, null, "gtk-add"); w1.Add (this.add, null); - this.miExportArmyAs = new global::Gtk.Action ("miExportArmyAs", global::Mono.Unix.Catalog.GetString ("Export army as..."), null, "gtk-convert"); + this.miExportArmyAs = new global::Gtk.Action ( + "miExportArmyAs", + global::Mono.Unix.Catalog.GetString("Export army as..."), + null, + "gtk-convert" + ); this.miExportArmyAs.Sensitive = false; this.miExportArmyAs.ShortLabel = global::Mono.Unix.Catalog.GetString ("Export army as..."); w1.Add (this.miExportArmyAs, null); - this.miExportArmyAsBasicHTML = new global::Gtk.Action ("miExportArmyAsBasicHTML", global::Mono.Unix.Catalog.GetString ("Basic HTML"), null, null); + this.miExportArmyAsBasicHTML = new global::Gtk.Action ( + "miExportArmyAsBasicHTML", + global::Mono.Unix.Catalog.GetString("Basic HTML"), + null, + null + ); this.miExportArmyAsBasicHTML.ShortLabel = global::Mono.Unix.Catalog.GetString ("Basic HTML"); w1.Add (this.miExportArmyAsBasicHTML, null); - this.miPreferences = new global::Gtk.Action ("miPreferences", global::Mono.Unix.Catalog.GetString ("preferences"), null, "gtk-preferences"); + this.miPreferences = new global::Gtk.Action ( + "miPreferences", + global::Mono.Unix.Catalog.GetString("preferences"), + null, + "gtk-preferences" + ); this.miPreferences.ShortLabel = global::Mono.Unix.Catalog.GetString ("preferences"); w1.Add (this.miPreferences, null); - this.miExportArmyAsTransformedXml = new global::Gtk.Action ("miExportArmyAsTransformedXml", global::Mono.Unix.Catalog.GetString ("transformed xml"), null, null); + this.miExportArmyAsTransformedXml = new global::Gtk.Action ( + "miExportArmyAsTransformedXml", + global::Mono.Unix.Catalog.GetString("transformed xml"), + null, + null + ); this.miExportArmyAsTransformedXml.ShortLabel = global::Mono.Unix.Catalog.GetString ("transformed xml"); w1.Add (this.miExportArmyAsTransformedXml, null); - this.miEditArmy = new global::Gtk.Action ("miEditArmy", global::Mono.Unix.Catalog.GetString ("_edit army"), null, "gtk-edit"); + this.miEditArmy = new global::Gtk.Action ( + "miEditArmy", + global::Mono.Unix.Catalog.GetString("_edit army"), + null, + "gtk-edit" + ); this.miEditArmy.Sensitive = false; this.miEditArmy.ShortLabel = global::Mono.Unix.Catalog.GetString ("_edit army"); w1.Add (this.miEditArmy, null); diff -r c549fd4ff4bf -r 7b091ea86819 gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.cs --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.cs Thu May 10 21:01:42 2012 +0100 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.cs Sat May 12 19:56:24 2012 +0100 @@ -25,7 +25,11 @@ this.Events = ((global::Gdk.EventMask)(256)); this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmNewArmy"; this.Title = global::Mono.Unix.Catalog.GetString ("Create new army"); - this.Icon = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", global::Gtk.IconSize.Menu); + this.Icon = global::Stetic.IconLoader.LoadIcon ( + this, + "gtk-new", + global::Gtk.IconSize.Menu + ); this.WindowPosition = ((global::Gtk.WindowPosition)(4)); this.SkipPagerHint = true; this.SkipTaskbarHint = true; diff -r c549fd4ff4bf -r 7b091ea86819 gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs Thu May 10 21:01:42 2012 +0100 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs Sat May 12 19:56:24 2012 +0100 @@ -19,7 +19,11 @@ // Widget IBBoard.WarFoundry.GUI.GTK.FrmNewUnit this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmNewUnit"; this.Title = global::Mono.Unix.Catalog.GetString ("Add new unit"); - this.Icon = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", global::Gtk.IconSize.Menu); + this.Icon = global::Stetic.IconLoader.LoadIcon ( + this, + "gtk-new", + global::Gtk.IconSize.Menu + ); this.WindowPosition = ((global::Gtk.WindowPosition)(4)); this.Modal = true; this.SkipPagerHint = true; diff -r c549fd4ff4bf -r 7b091ea86819 gtk-gui/IBBoard.WarFoundry.GUI.GTK.ValidationFailureWidget.cs --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.ValidationFailureWidget.cs Thu May 10 21:01:42 2012 +0100 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.ValidationFailureWidget.cs Sat May 12 19:56:24 2012 +0100 @@ -22,7 +22,11 @@ // Container child hbox1.Gtk.Box+BoxChild this.image1 = new global::Gtk.Image (); this.image1.Name = "image1"; - this.image1.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-warning", global::Gtk.IconSize.Dialog); + this.image1.Pixbuf = global::Stetic.IconLoader.LoadIcon ( + this, + "gtk-dialog-warning", + global::Gtk.IconSize.Dialog + ); this.hbox1.Add (this.image1); global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.image1])); w1.Position = 0; diff -r c549fd4ff4bf -r 7b091ea86819 gtk-gui/generated.cs --- a/gtk-gui/generated.cs Thu May 10 21:01:42 2012 +0100 +++ b/gtk-gui/generated.cs Sat May 12 19:56:24 2012 +0100 @@ -37,10 +37,27 @@ 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.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))); + 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); } }