Mercurial > repos > IBDev-IBBoard.WarFoundry.GUI.WinForms
changeset 234:870877498db9
Re #382: WinForms builds from Linux/Mono fail on Windows/.Net
* Rebuild FrmArmyTree from scratch, in case old file hasn't migrated through the versions properly
* Add edit and delete icons
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Sat, 03 Dec 2011 14:48:40 +0000 |
| parents | 6691a8c6f976 |
| children | 5b8f0a6bf0b2 |
| files | FrmArmyTree.cs FrmArmyTree.resx IBBoard.WarFoundry.GUI.WinForms.csproj Properties/Resources.Designer.cs Properties/Resources.resx icons/edit-delete.png icons/gtk-edit.png |
| diffstat | 7 files changed, 112 insertions(+), 277 deletions(-) [+] |
line wrap: on
line diff
--- a/FrmArmyTree.cs Sat Nov 26 14:50:44 2011 +0000 +++ b/FrmArmyTree.cs Sat Dec 03 14:48:40 2011 +0000 @@ -1,48 +1,32 @@ -// This file (FrmArmyTree.cs) is a part of the IBBoard.WarFoundry.GUI.WinForms project and is copyright 2009 IBBoard. -// -// The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license. - -using System; -using System.Drawing; +using System; using System.Collections.Generic; using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; using System.Windows.Forms; using IBBoard.Commands; +using IBBoard.WarFoundry.API.Objects; +using IBBoard.WarFoundry.API; using IBBoard.Lang; using IBBoard.Windows.Forms.I18N; +using IBBoard.WarFoundry.API.Commands; using IBBoard.Windows.Forms; -using IBBoard.WarFoundry.API; -using IBBoard.WarFoundry.API.Commands; -using IBBoard.WarFoundry.API.Objects; namespace IBBoard.WarFoundry.GUI.WinForms { - /// <summary> - /// Summary description for FrmArmyTree. - /// </summary> - public class FrmArmyTree : IBBoard.Windows.Forms.IBBForm + public partial class FrmArmyTree : IBBoard.Windows.Forms.IBBForm { - private System.Windows.Forms.TreeView treeView; - private IContainer components; private Dictionary<string, TreeNode> nodes; - private System.Windows.Forms.ContextMenu contextMenu; - private IBBMenuItem miDeleteUnit; - private IBBMenuItem miEditUnit; - private ObjectAddDelegate UnitAddedMethod; private ObjectRemoveDelegate UnitRemovedMethod; private StringValChangedDelegate UnitNameChangedMethod, ArmyNameChangedMethod, TreeNameChangedMethod; - private ToolBar toolBar; - private IBBToolBarButton bttnEdit; - private IBBToolBarButton bttnDelete; - private ImageList imageList; - private IBBMenuItem miEditArmy; private CommandStack commandStack; - public GameSystem CurrentGameSystem - { - get { return WarFoundryCore.CurrentGameSystem; } - set { WarFoundryCore.CurrentGameSystem = value; } - } + public GameSystem CurrentGameSystem + { + get { return WarFoundryCore.CurrentGameSystem; } + set { WarFoundryCore.CurrentGameSystem = value; } + } public FrmArmyTree(CommandStack cmdStack) { @@ -58,7 +42,7 @@ miDeleteUnit.Name = "miDeleteUnit"; miEditUnit.Name = "miEditUnit"; miEditArmy.Name = "miEditArmy"; - WarFoundryCore.ArmyChanged+= new ArmyChangedDelegate(FrmArmyTree_ArmyChanged); + WarFoundryCore.ArmyChanged += new ArmyChangedDelegate(FrmArmyTree_ArmyChanged); TranslateForm(); Translation.TranslationChanged += new MethodInvoker(TranslateForm); } @@ -72,147 +56,16 @@ ControlTranslator.TranslateComponent(comp); } - foreach (IBBMenuItem mi in contextMenu.MenuItems) + foreach (IBBToolStripMenuItem mi in contextMenuStrip.Items) { - ControlTranslator.TranslateComponent(mi); + ControlTranslator.TranslateComponent(mi); } - foreach (TreeNode node in nodes.Values) - { - node.Text = CreateNodeName((ICostedWarFoundryObject)node.Tag); - } - } - - /// <summary> - /// Clean up any resources being used. - /// </summary> - protected override void Dispose( bool disposing ) - { - if( disposing ) + foreach (TreeNode node in nodes.Values) { - if(components != null) - { - components.Dispose(); - } + node.Text = CreateNodeName((ICostedWarFoundryObject)node.Tag); } - base.Dispose( disposing ); - Translation.TranslationChanged -= new MethodInvoker(TranslateForm); - WarFoundryCore.ArmyChanged -= new ArmyChangedDelegate(FrmArmyTree_ArmyChanged); } - - #region Windows Form Designer generated code - /// <summary> - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// </summary> - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmArmyTree)); - this.contextMenu = new System.Windows.Forms.ContextMenu(); - this.miEditUnit = new IBBoard.Windows.Forms.IBBMenuItem(); - this.miDeleteUnit = new IBBoard.Windows.Forms.IBBMenuItem(); - this.imageList = new System.Windows.Forms.ImageList(this.components); - this.toolBar = new System.Windows.Forms.ToolBar(); - this.bttnEdit = new IBBoard.Windows.Forms.IBBToolBarButton(); - this.bttnDelete = new IBBoard.Windows.Forms.IBBToolBarButton(); - this.treeView = new System.Windows.Forms.TreeView(); - this.miEditArmy = new IBBoard.Windows.Forms.IBBMenuItem(); - this.SuspendLayout(); - // - // contextMenu - // - this.contextMenu.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { - this.miEditArmy, - this.miEditUnit, - this.miDeleteUnit}); - this.contextMenu.Popup += new System.EventHandler(this.contextMenu_Popup); - // - // miEditUnit - // - this.miEditUnit.Index = 1; - this.miEditUnit.Text = "&edit unit"; - this.miEditUnit.Click += new System.EventHandler(this.miEdit_Click); - // - // miDeleteUnit - // - this.miDeleteUnit.Index = 2; - this.miDeleteUnit.Text = "&delete unit"; - this.miDeleteUnit.Click += new System.EventHandler(this.miDelete_Click); - // - // imageList - // - this.imageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList.ImageStream"))); - this.imageList.TransparentColor = System.Drawing.Color.Transparent; - this.imageList.Images.SetKeyName(0, "gtk-edit.png"); - this.imageList.Images.SetKeyName(1, "edit-delete.png"); - // - // toolBar - // - this.toolBar.Buttons.AddRange(new System.Windows.Forms.ToolBarButton[] { - this.bttnEdit, - this.bttnDelete}); - this.toolBar.ButtonSize = new System.Drawing.Size(16, 16); - this.toolBar.DropDownArrows = true; - this.toolBar.ImageList = this.imageList; - this.toolBar.Location = new System.Drawing.Point(0, 0); - this.toolBar.Name = "toolBar"; - this.toolBar.ShowToolTips = true; - this.toolBar.Size = new System.Drawing.Size(240, 28); - this.toolBar.TabIndex = 3; - this.toolBar.ButtonClick += new System.Windows.Forms.ToolBarButtonClickEventHandler(this.toolBar_ButtonClick); - // - // bttnEdit - // - this.bttnEdit.Enabled = false; - this.bttnEdit.ImageIndex = 0; - this.bttnEdit.Name = "bttnEdit"; - // - // bttnDelete - // - this.bttnDelete.Enabled = false; - this.bttnDelete.ImageIndex = 1; - this.bttnDelete.Name = "bttnDelete"; - // - // treeView - // - this.treeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.treeView.ContextMenu = this.contextMenu; - this.treeView.FullRowSelect = true; - this.treeView.Location = new System.Drawing.Point(0, 28); - this.treeView.Name = "treeView"; - this.treeView.Size = new System.Drawing.Size(240, 250); - this.treeView.TabIndex = 0; - this.treeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterSelect); - this.treeView.DoubleClick += new System.EventHandler(this.treeView_DoubleClick); - this.treeView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.treeView_MouseDown); - // - // miEditArmy - // - this.miEditArmy.Index = 0; - this.miEditArmy.Text = "&edit army"; - this.miEditArmy.Click += new System.EventHandler(this.miEditArmy_Click); - // - // FrmArmyTree - // - this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); - this.ClientSize = new System.Drawing.Size(240, 277); - this.ControlBox = false; - this.Controls.Add(this.toolBar); - this.Controls.Add(this.treeView); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "FrmArmyTree"; - this.Text = "FrmArmyTree"; - this.ResumeLayout(false); - this.PerformLayout(); - - } - #endregion - private void ClearArmy() { nodes.Clear(); @@ -257,10 +110,10 @@ root.ExpandAll(); } } - + private string CreateNodeName(ICostedWarFoundryObject obj) { - return Translation.GetTranslation("treeNodeText", "{0} ({1} pts)", obj.Name, obj.Points, CurrentGameSystem.GetPointsAbbrev(obj.Points)); + return Translation.GetTranslation("treeNodeText", "{0} ({1} pts)", obj.Name, obj.Points, CurrentGameSystem.GetPointsAbbrev(obj.Points)); } private void NodePointsValueChanged(WarFoundryObject obj, double oldValue, double newValue) @@ -285,7 +138,7 @@ { TreeNode temp = new TreeNode(CreateNodeName(unit)); temp.Tag = unit; - unit.NameChanged+= UnitNameChangedMethod; + unit.NameChanged += UnitNameChangedMethod; unit.PointsValueChanged += NodePointsValueChanged; nodes[unit.ID] = temp; return temp; @@ -327,7 +180,7 @@ public new FrmMain MdiParent { - get { return (FrmMain) base.MdiParent; } + get { return (FrmMain)base.MdiParent; } set { base.MdiParent = value; } } @@ -343,48 +196,22 @@ private void RemoveUnitFromTree(Unit unit) { TreeNode unitNode = nodes[unit.ID]; - unit.NameChanged-= UnitNameChangedMethod; + unit.NameChanged -= UnitNameChangedMethod; - if (unitNode!=null) + if (unitNode != null) { unitNode.Remove(); nodes.Remove(unit.ID); } } - - private void contextMenu_Popup(object sender, System.EventArgs e) - { - TreeNode node = treeView.SelectedNode; - Object tag = (node != null) ? node.Tag : null; - - if (tag is Unit) - { - miDeleteUnit.Visible = true; - miEditUnit.Visible = true; - miEditArmy.Visible = false; - } - else if (tag is Army) - { - miDeleteUnit.Visible = false; - miEditUnit.Visible = false; - miEditArmy.Visible = true; - } - else - { - miDeleteUnit.Visible = false; - miEditUnit.Visible = false; - miEditArmy.Visible = false; - } - } - private void treeView_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e) { if (e.Button == MouseButtons.Right) { TreeNode tn = treeView.GetNodeAt(e.X, e.Y); - if (tn!=null) + if (tn != null) { treeView.SelectedNode = tn; } @@ -407,19 +234,19 @@ if (selected.Tag != null && selected.Tag is Unit) { - Unit unit = (Unit) selected.Tag; + Unit unit = (Unit)selected.Tag; commandStack.Execute(new RemoveUnitCommand(unit)); } } private void miEdit_Click(object sender, System.EventArgs e) - { + { EditTreeItem(); } private void treeView_DoubleClick(object sender, System.EventArgs e) { - EditTreeItem(); + EditTreeItem(); } private void EditTreeItem() @@ -429,7 +256,7 @@ if (tagData is Unit) { - Unit unit = (Unit) tagData; + Unit unit = (Unit)tagData; MdiParent.OpenUnitDialog(unit); } else if (tagData is Army) @@ -458,24 +285,12 @@ { TreeNode node = nodes[obj.ID]; - if (node!=null) + if (node != null) { node.Text = obj.Name; } } - private void toolBar_ButtonClick(object sender, ToolBarButtonClickEventArgs e) - { - if (e.Button == bttnDelete) - { - DeleteUnit(); - } - else if (e.Button == bttnEdit) - { - EditTreeItem(); - } - } - private void treeView_AfterSelect(object sender, TreeViewEventArgs e) { TreeNode node = treeView.SelectedNode; @@ -495,5 +310,34 @@ FrmEditArmy editForm = new FrmEditArmy(commandStack, army); editForm.ShowDialog(this.ParentForm); } + + private void bttnEdit_Click(object sender, EventArgs e) + { + EditTreeItem(); + } + + private void bttnDelete_Click(object sender, EventArgs e) + { + DeleteUnit(); + } + + private void contextMenuStrip_Opening(object sender, CancelEventArgs e) + { + TreeNode node = treeView.SelectedNode; + Object tag = (node != null) ? node.Tag : null; + bool tagIsUnit = (tag is Unit); + bool tagIsArmy = (tag is Army); + + if (!tagIsUnit && !tagIsArmy) + { + e.Cancel = true; + } + else + { + miDeleteUnit.Visible = tagIsUnit; + miEditUnit.Visible = tagIsUnit; + miEditArmy.Visible = tagIsArmy; + } + } } }
--- a/FrmArmyTree.resx Sat Nov 26 14:50:44 2011 +0000 +++ b/FrmArmyTree.resx Sat Dec 03 14:48:40 2011 +0000 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <root> <!-- Microsoft ResX Schema @@ -117,49 +117,13 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <metadata name="contextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <metadata name="toolStripContainer1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="contextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>116, 17</value> + </metadata> + <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> - <metadata name="imageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>133, 17</value> - </metadata> - <data name="imageList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64"> - <value> - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABO - BwAAAk1TRnQBSQFMAgEBAgEAAQQBAAEEAQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA - AwABEAMAAQEBAAEYBgABDEUAAagCVgGRAZQBkwGtAbABrwYAAZABlAGSAZ4BnwGeAZ8BjAGKBgABwQFE - AUMBjgJjAa0BZAFjbAABpAFbAVkBhgGLAYkBhQGKAYgBhQGKAYgBhQGKAYgBhAGJAYcBgwGIAYYBggGH - AYUBgwGIAYYBgwGIAYYBgwGIAYYBowFaAVkB0ggAAY0BjwGOA/oBlgGUAZMBogGDAYIBnAGSAZEBlgGa - AZgB7ALhAaEBegF4AZsBngGdAZgBmwGaAYsBjgGNAfkC3gGgAmxsAAOBCf8D/gP3A+kD4gPlA+oD7wF/ - AYQBggHOCAABqAJWAYsBfwF+AfUC8gGZAZwBmwGrAa0BrAGLAXsBeAHdAc8BzgGoAnsBzQGxAbABmAGb - AZoB6QLdAZwBigGJAboCPWwAA4ED/wPsA+0D7gMAAQIBWQGPAZYBqQGzA8IBygLLA+IBewF/AX0BzAsA - AYoBgAF/Ac0BgQGAAYoBfAF5AcUCswGHAYABfQHLAbwBuwGgAY8BjgHCAqgBfAGAAX8B4QLXAY8BhgGF - bwADgQP/BuwD7QECAVkBjwEmAUIBTAE2AVcBawECAVkBjwGvAcEBzAPvAX8BhAGCAc8LAAJ0AXMByAG5 - AbgBgQFzAXABogGRApACigGwAaIBoQGQAYUBhAGyAZ8BngF8AYABfwG6AaoBqQF5AXQBc28AA4ED/wbs - Bu0BOQFbAXABigGrAcIBVQGFAaMBAgFZAY8BygHcAecBhAGJAYcB0gIAAdIIAAFqAW4BbQHMAskBagJk - AasBqAGnAW0BbwFuAa4BrQGsAWwBbQFsAbEBrwGuAW8BcQFwAbICsAFtAW8Bbm8AA4ED/wPrBuwD7QEC - AVkBjwHEAeUB7QFkAZ8ByAFXAYQBoAECAVkBjwFqAYABiQMAAdICAAGaATcBGAGHAUoBIAGHAUoBIAGH - AUoBIAGHAUoBIAGHAUoBIAGHAUoBIAGHAUoBIAGHAUoBIAGHAUoBIAGHAUoBIAGHAUoBIAGHAUoBIAGH - AUoBIAGHAUoBIAGaATcBGGYAA4ED/wbrBuwD7QECAVkBjwHFAeYB7QFpAaoBzwFWAYMBoAECAVkBjwGp - ARIBHQMAAYcBSgEgAd0BuwGcAc8BnwFyAc8BnwFyAc8BnwFyAc8BnwFyAc8BnwFyAc8BnwFyAc8BnwFy - Ac8BnwFyAc8BnwFyAc8BnwFyAc8BnwFyAc8BnwFyAd0BuwGcAYcBSgEgZgADgQP/BusJ7APtAQIBWQGP - AccB6wHvAWoBrAHSAVcBhwGkAQIBWQGPAakBEgEdAYcBSgEgAd0BuwGcAd0BuwGcAd0BuwGcAd0BuwGc - Ad0BuwGcAd0BuwGcAd0BuwGcAd0BuwGcAd0BuwGcAd0BuwGcAd0BuwGcAd0BuwGcAd0BuwGcAd0BuwGc - AYcBSgEgZgADgQP/A+oG6wzsAQIBWQGPAccB6wHvAWoBrAHSAVYBgQGfAQIBWQGPAYcBSgEgAd0BuwGc - AcoBigFYAcoBigFYAcoBigFYAcoBigFYAcoBigFYAcoBigFYAcoBigFYAcoBigFYAcoBigFYAcoBigFY - AcoBigFYAcoBigFYAd0BuwGcAYcBSgEgZgADgQP/BuoG6wnsAe8C8AECAVkBjwHGAeoB7gFxAa0BzwEC - AVkBjwGHAUoBIAHdAbsBnAGGAVIBLAGGAVEBKwGGAVEBKwGGAVEBKwGGAVEBKwGGAVEBKwGGAVIBLAGG - AVIBLAGGAVIBLAGGAVIBLAGGAVIBLAGGAVIBLAHdAbsBnAGHAUoBIGYAA4ED/wPsBuoM6wHvAvAD/wEC - AVkBjwECAVkBjwGIASABNAGHAUoBIAHdAbsBnAFqAVsBTgPJCZwSmwFqAVsBTgHdAbsBnAGHAUoBIGYA - A4Ee/wGFAYoBiAYAAYcBSgEgAd0BuwGcAXcBfAF6A9kMvQm8A78DwAF3AXwBegHdAbsBnAGHAUoBIGYA - AbECZR6BAaMBYAFfBgABrQElARABhwFKASABhQGKAYgD5wPXDNYG1QPaA9wBhQGKAYgBhwFKASABrQEl - ARCWAAGFAYoBiAPxCesP6gPpAYUBigGInAABoAFuAW0BhQGKAYgBhQGKAYgBhQGKAYgBhQGKAYgBhQGK - AYgBhQGKAYgBhQGKAYgBhQGKAYgBhQGKAYgBhQGKAYgBoAFuAW1mAAFCAU0BPgcAAT4DAAEoAwABQAMA - ARADAAEBAQABAQUAAYAXAAP/AQAC/wGMAWMEAAHAAQEBgAEDBAABwAEBAYABAwQAAcABAQHAAQcEAAHA - AQEBwAEHBAABwAEAAcABBwQAAcABAgYAAcABAQYAAcAHAAHABwABwAcAAcAHAAHAAQMGAAHAAQMGAAL/ - AcABAwQAAv8BwAEDBAAL -</value> - </data> </root> \ No newline at end of file
--- a/IBBoard.WarFoundry.GUI.WinForms.csproj Sat Nov 26 14:50:44 2011 +0000 +++ b/IBBoard.WarFoundry.GUI.WinForms.csproj Sat Dec 03 14:48:40 2011 +0000 @@ -114,13 +114,17 @@ </ItemGroup> <ItemGroup> <Content Include="App.ico" /> + <Content Include="icons\dialog-warning.png" /> <Content Include="icons\document-new.png" /> <Content Include="icons\document-open.png" /> <Content Include="icons\document-save.png" /> <None Include="app.config" /> <None Include="icons\edit-redo.png" /> <None Include="icons\edit-undo.png" /> + <Content Include="icons\edit-delete.png" /> + <Content Include="icons\gtk-edit.png" /> <Content Include="icons\list-add.png" /> + <Content Include="icons\logo-large.png" /> <Content Include="icons\warning-sml.png" /> <Content Include="libs\log4net.dll" /> <Content Include="WarFoundryPref.xml"> @@ -129,6 +133,12 @@ <Compile Include="AssemblyInfo.cs"> <SubType>Code</SubType> </Compile> + <Compile Include="FrmArmyTree.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="FrmArmyTree.Designer.cs"> + <DependentUpon>FrmArmyTree.cs</DependentUpon> + </Compile> <Compile Include="FrmEditArmy.cs"> <SubType>Form</SubType> </Compile> @@ -141,9 +151,6 @@ <Compile Include="FrmAbout.Designer.cs"> <DependentUpon>FrmAbout.cs</DependentUpon> </Compile> - <Compile Include="FrmArmyTree.cs"> - <SubType>Form</SubType> - </Compile> <Compile Include="FrmEditUnitEquipment.cs"> <SubType>Form</SubType> </Compile> @@ -199,7 +206,6 @@ </EmbeddedResource> <EmbeddedResource Include="FrmArmyTree.resx"> <DependentUpon>FrmArmyTree.cs</DependentUpon> - <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="FrmEditArmy.resx"> <DependentUpon>FrmEditArmy.cs</DependentUpon>
--- a/Properties/Resources.Designer.cs Sat Nov 26 14:50:44 2011 +0000 +++ b/Properties/Resources.Designer.cs Sat Dec 03 14:48:40 2011 +0000 @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:4.0.30319.235 +// Runtime Version:4.0.30319.239 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -81,6 +81,13 @@ } } + internal static System.Drawing.Bitmap edit_delete { + get { + object obj = ResourceManager.GetObject("edit-delete", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap edit_redo { get { object obj = ResourceManager.GetObject("edit-redo", resourceCulture); @@ -95,6 +102,13 @@ } } + internal static System.Drawing.Bitmap gtk_edit { + get { + object obj = ResourceManager.GetObject("gtk-edit", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap list_add { get { object obj = ResourceManager.GetObject("list-add", resourceCulture);
--- a/Properties/Resources.resx Sat Nov 26 14:50:44 2011 +0000 +++ b/Properties/Resources.resx Sat Dec 03 14:48:40 2011 +0000 @@ -117,26 +117,33 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <data name="edit-redo" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\icons\edit-redo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="edit-undo" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\icons\edit-undo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="document-save" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\icons\document-save.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="document-new" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\icons\document-new.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> + <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <data name="document-open" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\icons\document-open.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="list-add" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\icons\list-add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="edit-undo" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\icons\edit-undo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="document-new" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\icons\document-new.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="edit-redo" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\icons\edit-redo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="gtk-edit" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\icons\gtk-edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="document-save" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\icons\document-save.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="warning-sml" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\icons\warning-sml.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="edit-delete" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\icons\edit-delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> </root> \ No newline at end of file