Mercurial > repos > IBBoard.WarFoundry.GUI.GTK

changeset 163:a8f847c1e305

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Random MonoDevelop code cleanup
author IBBoard <dev@ibboard.co.uk>
date Sun, 05 Aug 2012 21:01:18 +0100
parents 354c1d2ad086
children 219340630150
files IBBoard.WarFoundry.GUI.GTK.csproj IBBoard.WarFoundry.GUI.GTK.sln gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs gtk-gui/generated.cs
diffstat 5 files changed, 36 insertions(+), 174 deletions(-) [+]
line wrap: on
line diff
--- a/IBBoard.WarFoundry.GUI.GTK.csproj	Sun Aug 05 21:01:00 2012 +0100
+++ b/IBBoard.WarFoundry.GUI.GTK.csproj	Sun Aug 05 21:01:18 2012 +0100
@@ -15,9 +15,9 @@
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
+    <DebugSymbols>True</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>False</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -25,7 +25,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
+    <Optimize>True</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
--- a/IBBoard.WarFoundry.GUI.GTK.sln	Sun Aug 05 21:01:00 2012 +0100
+++ b/IBBoard.WarFoundry.GUI.GTK.sln	Sun Aug 05 21:01:18 2012 +0100
@@ -83,11 +83,10 @@
 		$2.WhileBraceForcement = AddBraces
 		$2.UsingBraceForcement = AddBraces
 		$2.FixedBraceForcement = AddBraces
-		$2.PlaceElseOnNewLine = True
-		$2.PlaceCatchOnNewLine = True
-		$2.PlaceFinallyOnNewLine = True
-		$2.PlaceWhileOnNewLine = True
-		$2.PlaceArrayInitializersOnNewLine = AlwaysNewLine
+		$2.ElseNewLinePlacement = NewLine
+		$2.ElseIfNewLinePlacement = SameLine
+		$2.CatchNewLinePlacement = NewLine
+		$2.FinallyNewLinePlacement = NewLine
 		$2.BeforeMethodDeclarationParentheses = False
 		$2.BeforeMethodCallParentheses = False
 		$2.BeforeConstructorDeclarationParentheses = False
@@ -101,9 +100,8 @@
 		$2.scope = text/x-csharp
 		$0.TextStylePolicy = $3
 		$3.FileWidth = 120
-		$3.TabWidth = 4
-		$3.RemoveTrailingWhitespace = True
-		$3.inheritsSet = Mono
+		$3.TabsToSpaces = False
+		$3.inheritsSet = VisualStudio
 		$3.inheritsScope = text/plain
 		$3.scope = text/plain
 		$0.StandardHeader = $4
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs	Sun Aug 05 21:01:00 2012 +0100
+++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs	Sun Aug 05 21:01:18 2012 +0100
@@ -48,143 +48,58 @@
 			// 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");
@@ -197,54 +112,24 @@
 			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);
-			this.miAddDataFile = new global::Gtk.Action (
-				"miAddDataFile",
-				global::Mono.Unix.Catalog.GetString("Add data file"),
-				null,
-				null
-			);
+			this.miAddDataFile = new global::Gtk.Action ("miAddDataFile", global::Mono.Unix.Catalog.GetString ("Add data file"), null, null);
 			this.miAddDataFile.ShortLabel = global::Mono.Unix.Catalog.GetString ("Add data file");
 			w1.Add (this.miAddDataFile, null);
 			this.UIManager.InsertActionGroup (w1, 0);
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs	Sun Aug 05 21:01:00 2012 +0100
+++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs	Sun Aug 05 21:01:18 2012 +0100
@@ -19,11 +19,7 @@
 			// 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;
--- a/gtk-gui/generated.cs	Sun Aug 05 21:01:00 2012 +0100
+++ b/gtk-gui/generated.cs	Sun Aug 05 21:01:18 2012 +0100
@@ -37,27 +37,10 @@
 						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);
 					}
 				}