Changeset 512

Show
Ignore:
Timestamp:
03/06/10 16:09:02 (6 months ago)
Author:
ibboard
Message:

Re #88: Complete initial WinForms UI

  • Populate undo/redo menus
  • Remove unused image list
  • Fix toolstrip positioning problems
  • Update .csproj file so that SharpDevelop recognised the API project
Location:
IBBoard.WarFoundry.GUI.WinForms/trunk
Files:
1 removed
3 modified

Legend:

Unmodified
Added
Removed

  • IBBoard.WarFoundry.GUI.WinForms/trunk/FrmMain.cs

    r511 r512  
    4444 
    4545        private CommandStack commandStack; 
    46         private ToolStripButton[] categoryButtons; 
    4746 
    4847        public ObjectAddDelegate UnitAddedMethod; 
    … …  
    5655 
    5756        private System.ComponentModel.IContainer components; 
    58         private System.Windows.Forms.ImageList buttonIcons; 
    5957        private System.Windows.Forms.OpenFileDialog openArmyDialog; 
    6058        private System.Windows.Forms.SaveFileDialog saveArmyDialog; 
    … …  
    122120            InitializeComponent(); 
    123121            toolStripPanel.Join(mainToolStrip, 0, 0); 
    124             toolStripPanel.Join(catToolStrip, 1, 0); 
     122            toolStripPanel.Join(catToolStrip, mainToolStrip.Width+5, 0); 
    125123 
    126124            Preferences = new Preferences("WarFoundry"); 
    … …  
    219217            this.undoMenu = new System.Windows.Forms.ContextMenu(); 
    220218            this.redoMenu = new System.Windows.Forms.ContextMenu(); 
    221             this.buttonIcons = new System.Windows.Forms.ImageList(this.components); 
    222219            this.mainMenu = new System.Windows.Forms.MainMenu(this.components); 
    223220            this.openArmyDialog = new System.Windows.Forms.OpenFileDialog(); 
    … …  
    257254            this.menuStrip.SuspendLayout(); 
    258255            this.mainToolStrip.SuspendLayout(); 
    259             ((System.ComponentModel.ISupportInitialize) (this.sbMainPanel)).BeginInit(); 
    260             ((System.ComponentModel.ISupportInitialize) (this.sbErrorPanel)).BeginInit(); 
    261             ((System.ComponentModel.ISupportInitialize) (this.sbPointsPanel)).BeginInit(); 
     256            ((System.ComponentModel.ISupportInitialize)(this.sbMainPanel)).BeginInit(); 
     257            ((System.ComponentModel.ISupportInitialize)(this.sbErrorPanel)).BeginInit(); 
     258            ((System.ComponentModel.ISupportInitialize)(this.sbPointsPanel)).BeginInit(); 
    262259            this.SuspendLayout(); 
    263             //  
    264             // buttonIcons 
    265             //  
    266             this.buttonIcons.ImageStream = ((System.Windows.Forms.ImageListStreamer) (resources.GetObject("buttonIcons.ImageStream"))); 
    267             this.buttonIcons.TransparentColor = System.Drawing.Color.Transparent; 
    268             this.buttonIcons.Images.SetKeyName(0, ""); 
    269             this.buttonIcons.Images.SetKeyName(1, ""); 
    270             this.buttonIcons.Images.SetKeyName(2, ""); 
    271             this.buttonIcons.Images.SetKeyName(3, ""); 
    272             this.buttonIcons.Images.SetKeyName(4, ""); 
    273             this.buttonIcons.Images.SetKeyName(5, ""); 
    274             this.buttonIcons.Images.SetKeyName(6, ""); 
    275260            //  
    276261            // saveArmyDialog 
    … …  
    286271            //  
    287272            this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { 
    288             this.menuFile, 
    289             this.menuEdit, 
    290             this.menuHelp}); 
     273                                    this.menuFile, 
     274                                    this.menuEdit, 
     275                                    this.menuHelp}); 
    291276            this.menuStrip.Location = new System.Drawing.Point(0, 0); 
    292277            this.menuStrip.Name = "menuStrip"; 
    … …  
    298283            //  
    299284            this.menuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 
    300             this.miNewArmy, 
    301             this.miOpenArmy, 
    302             this.miSaveArmy, 
    303             this.miSaveArmyAs, 
    304             this.miExportArmyAs, 
    305             this.miCloseArmy, 
    306             this.toolStripSeparator1, 
    307             this.miReloadFiles, 
    308             this.toolStripSeparator2, 
    309             this.miExit}); 
     285                                    this.miNewArmy, 
     286                                    this.miOpenArmy, 
     287                                    this.miSaveArmy, 
     288                                    this.miSaveArmyAs, 
     289                                    this.miExportArmyAs, 
     290                                    this.miCloseArmy, 
     291                                    this.toolStripSeparator1, 
     292                                    this.miReloadFiles, 
     293                                    this.toolStripSeparator2, 
     294                                    this.miExit}); 
    310295            this.menuFile.Name = "menuFile"; 
    311296            this.menuFile.Size = new System.Drawing.Size(33, 20); 
    … …  
    345330            //  
    346331            this.miExportArmyAs.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 
    347             this.miExportArmyAsBasicHTML}); 
     332                                    this.miExportArmyAsBasicHTML}); 
    348333            this.miExportArmyAs.Enabled = false; 
    349334            this.miExportArmyAs.Name = "miExportArmyAs"; 
    … …  
    393378            //  
    394379            this.menuEdit.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 
    395             this.miUndo, 
    396             this.miRedo}); 
     380                                    this.miUndo, 
     381                                    this.miRedo}); 
    397382            this.menuEdit.Name = "menuEdit"; 
    398383            this.menuEdit.Size = new System.Drawing.Size(36, 20); 
    … …  
    418403            //  
    419404            this.menuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 
    420             this.miAbout}); 
     405                                    this.miAbout}); 
    421406            this.menuHelp.Name = "menuHelp"; 
    422407            this.menuHelp.Size = new System.Drawing.Size(39, 20); 
    … …  
    434419            this.mainToolStrip.Dock = System.Windows.Forms.DockStyle.None; 
    435420            this.mainToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { 
    436             this.bttnNewArmy, 
    437             this.bttnOpenArmy, 
    438             this.bttnSaveArmy, 
    439             this.toolStripSeparator3, 
    440             this.bttnUndo, 
    441             this.bttnRedo}); 
     421                                    this.bttnNewArmy, 
     422                                    this.bttnOpenArmy, 
     423                                    this.bttnSaveArmy, 
     424                                    this.toolStripSeparator3, 
     425                                    this.bttnUndo, 
     426                                    this.bttnRedo}); 
    442427            this.mainToolStrip.Location = new System.Drawing.Point(0, 24); 
    443428            this.mainToolStrip.Name = "mainToolStrip"; 
    444             this.mainToolStrip.Size = new System.Drawing.Size(182, 25); 
     429            this.mainToolStrip.Size = new System.Drawing.Size(151, 25); 
    445430            this.mainToolStrip.TabIndex = 8; 
    446431            //  
    … …  
    479464            //  
    480465            this.toolStripSeparator3.Name = "toolStripSeparator3"; 
    481             this.toolStripSeparator3.Size = new System.Drawing.Size(6, 23); 
     466            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25); 
    482467            //  
    483468            // bttnUndo 
    … …  
    514499            // statusBar 
    515500            //  
    516             this.statusBar.Location = new System.Drawing.Point(0, 546); 
     501            this.statusBar.Location = new System.Drawing.Point(0, 586); 
    517502            this.statusBar.Name = "statusBar"; 
    518503            this.statusBar.Panels.AddRange(new System.Windows.Forms.StatusBarPanel[] { 
    519             this.sbMainPanel, 
    520             this.sbErrorPanel, 
    521             this.sbPointsPanel}); 
     504                                    this.sbMainPanel, 
     505                                    this.sbErrorPanel, 
     506                                    this.sbPointsPanel}); 
    522507            this.statusBar.ShowPanels = true; 
    523508            this.statusBar.Size = new System.Drawing.Size(790, 22); 
    … …  
    561546            //  
    562547            this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); 
    563             this.ClientSize = new System.Drawing.Size(790, 568); 
     548            this.ClientSize = new System.Drawing.Size(790, 608); 
    564549            this.Controls.Add(this.mainToolStrip); 
    565550            this.Controls.Add(this.toolStripPanel); 
     551            this.Controls.Add(this.statusBar); 
    566552            this.Controls.Add(this.catToolStrip); 
    567             this.Controls.Add(this.statusBar); 
    568553            this.Controls.Add(this.menuStrip); 
    569             this.Icon = ((System.Drawing.Icon) (resources.GetObject("$this.Icon"))); 
     554            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); 
    570555            this.IsMdiContainer = true; 
    571556            this.MainMenuStrip = this.menuStrip; 
    … …  
    578563            this.mainToolStrip.ResumeLayout(false); 
    579564            this.mainToolStrip.PerformLayout(); 
    580             ((System.ComponentModel.ISupportInitialize) (this.sbMainPanel)).EndInit(); 
    581             ((System.ComponentModel.ISupportInitialize) (this.sbErrorPanel)).EndInit(); 
    582             ((System.ComponentModel.ISupportInitialize) (this.sbPointsPanel)).EndInit(); 
     565            ((System.ComponentModel.ISupportInitialize)(this.sbMainPanel)).EndInit(); 
     566            ((System.ComponentModel.ISupportInitialize)(this.sbErrorPanel)).EndInit(); 
     567            ((System.ComponentModel.ISupportInitialize)(this.sbPointsPanel)).EndInit(); 
    583568            this.ResumeLayout(false); 
    584569            this.PerformLayout(); 
    585  
    586570        } 
    587571        #endregion 
    … …  
    936920        { 
    937921            int catCount = cats.Length; 
    938             bool haveChanged = (categoryButtons == null || catCount != (categoryButtons.Length - 1)); 
     922            ToolStripItemCollection items = catToolStrip.Items; 
     923            bool haveChanged = (!catToolStrip.Visible || catCount != items.Count); 
    939924 
    940925            if (!haveChanged) 
    … …  
    942927                for (int i = 0; i < catCount; i++) 
    943928                { 
    944                     if (cats[i].Equals(categoryButtons[i+1].Tag)) 
     929                    if (cats[i].Equals(items[i+1].Tag)) 
    945930                    { 
    946931                        haveChanged = true; 
    … …  
    955940        private void RemoveCategoryButtons() 
    956941        { 
    957             if (categoryButtons!=null) 
    958             { 
    959                 this.Invoke(new MethodInvoker(catToolStrip.Items.Clear)); 
    960             } 
     942            this.Invoke(new MethodInvoker(catToolStrip.Items.Clear)); 
    961943        } 
    962944 
    … …  
    965947            int catCount = cats.Length; 
    966948            Category cat; 
    967             categoryButtons = new ToolStripButton[catCount]; 
    968  
    969             ToolStripButton button; 
     949            ToolStripButton[] categoryButtons = new ToolStripButton[catCount]; 
    970950 
    971951            for (int i = 0; i < catCount; i++) 
    972952            { 
    973953                cat = cats[i]; 
    974                 button = new ToolStripButton(); 
     954                ToolStripButton button = new ToolStripButton(); 
    975955                button.Text = cat.Name; 
    976956                button.Tag = cat; 
    977957                button.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.list_add; 
    978958                button.Enabled = false; 
     959                button.Click += new EventHandler(CreateUnitForCategoryButtonClick); 
    979960                categoryButtons[i] = button; 
    980961            } 
    981962 
    982963            this.Invoke(new ArrayMethodInvoker<ToolStripButton>(catToolStrip.Items.AddRange), new object[]{ categoryButtons }); 
     964        } 
     965 
     966        private void CreateUnitForCategoryButtonClick(object sender, EventArgs e) 
     967        { 
     968            if (sender is ToolStripButton) 
     969            { 
     970                ToolStripButton button = (ToolStripButton)sender; 
     971                object tag = button.Tag; 
     972 
     973                if (tag is Category) 
     974                { 
     975                    AddUnitFromCategory((Category)tag); 
     976                } 
     977            } 
    983978        } 
    984979 
    … …  
    997992        private void SetCategoryButtonState(bool state) 
    998993        { 
    999             if (categoryButtons!=null) 
    1000             { 
    1001                 for (int i = 0; i<categoryButtons.Length; i++) 
    1002                 { 
    1003                     categoryButtons[i].Enabled = state; 
    1004                 } 
     994            foreach (ToolStripButton button in catToolStrip.Items) 
     995            { 
     996                button.Enabled = state; 
    1005997            } 
    1006998        } 
    … …  
    10171009            bttnRedo.Enabled = commandStack.CanRedo(); 
    10181010            miRedo.Enabled = bttnRedo.Enabled; 
    1019             MenuItem[] menuItems = null; 
     1011 
     1012            PopulateRedoMenu(); 
     1013            PopulateUndoMenu(); 
     1014 
     1015            bttnSaveArmy.Enabled = commandStack.IsDirty() && CurrentArmy!=null; 
     1016            miSaveArmy.Enabled = commandStack.IsDirty() && CurrentArmy!=null; 
     1017        } 
     1018 
     1019        private void PopulateRedoMenu() 
     1020        { 
    10201021            int redoLength = commandStack.RedoLength; 
    10211022            int maxRedo = Math.Min(10, redoLength); 
    1022              
    1023             if (redoLength > 0) 
    1024             { 
    1025                 menuItems = new MenuItem[maxRedo]; 
    1026                 Command com; 
    1027                 MenuItem mi; 
    1028  
    1029                 for (int i = 0; i < maxRedo; i++) 
    1030                 { 
    1031                     com = commandStack.PeekRedoCommand(i+1); 
    1032  
    1033                     if (com == null) 
    1034                     { 
    1035                         break;  
    1036                     } 
    1037  
    1038                     mi = new MenuItem(com.Description); 
    1039                     mi.Click+=new EventHandler(redoMenu_Click); 
    1040                     menuItems[i] = mi; 
    1041                 } 
    1042             } 
    1043  
    1044             redoMenu.MenuItems.Clear(); 
    1045  
    1046             if (menuItems!=null && menuItems[0]!=null) 
    1047             { 
    1048                 bttnRedo.ToolTipText = menuItems[0].Text; 
    1049                 redoMenu.MenuItems.AddRange(menuItems); 
    1050             } 
    1051  
     1023            ToolStripItemCollection dropDownItems = bttnRedo.DropDownItems; 
     1024            dropDownItems.Clear(); 
     1025 
     1026            for (int i = 1; i <= maxRedo; i++) 
     1027            { 
     1028                Command cmd = commandStack.PeekRedoCommand(i); 
     1029 
     1030                if (cmd == null) 
     1031                { 
     1032                    break; 
     1033                } 
     1034 
     1035                dropDownItems.Add(cmd.Description, null, redoMenu_Click); 
     1036            } 
     1037        } 
     1038 
     1039        private void PopulateUndoMenu() 
     1040        { 
    10521041            int undoLength = commandStack.UndoLength; 
    10531042            int maxUndo = Math.Min(10, undoLength); 
    1054             MenuItem[] menuItemsUndo = null; 
    1055              
    1056             if (undoLength > 0) 
    1057             { 
    1058                 menuItemsUndo = new MenuItem[maxUndo]; 
    1059                 Command com; 
    1060                 MenuItem mi; 
    1061  
    1062                 for (int i = 0; i < maxUndo; i++) 
    1063                 { 
    1064                     com = commandStack.PeekUndoCommand(i+1); 
    1065  
    1066                     if (com == null) 
    1067                     { 
    1068                         break;  
    1069                     } 
    1070  
    1071                     mi = new MenuItem(com.UndoDescription); 
    1072                     mi.Click+=new EventHandler(undoMenu_Click); 
    1073                     menuItemsUndo[i] = mi; 
    1074                 } 
    1075             } 
    1076  
    1077             undoMenu.MenuItems.Clear(); 
    1078  
    1079             if (menuItemsUndo!=null && menuItemsUndo[0]!=null) 
    1080             { 
    1081                 bttnUndo.ToolTipText = menuItemsUndo[0].Text; 
    1082                 undoMenu.MenuItems.AddRange(menuItemsUndo); 
    1083             } 
    1084  
    1085             bttnSaveArmy.Enabled = commandStack.IsDirty() && CurrentArmy!=null; 
    1086             miSaveArmy.Enabled = commandStack.IsDirty() && CurrentArmy!=null; 
     1043            ToolStripItemCollection dropDownItems = bttnUndo.DropDownItems; 
     1044            dropDownItems.Clear(); 
     1045 
     1046            for (int i = 1; i <= maxUndo; i++) 
     1047            { 
     1048                Command cmd = commandStack.PeekUndoCommand(i); 
     1049 
     1050                if (cmd == null) 
     1051                { 
     1052                    break; 
     1053                } 
     1054 
     1055                dropDownItems.Add(cmd.UndoDescription, null, undoMenu_Click); 
     1056            } 
    10871057        } 
    10881058 
    … …  
    12531223        private void redoMenu_Click(object sender, EventArgs e) 
    12541224        { 
    1255             if (sender is MenuItem) 
    1256             { 
    1257                 MenuItem mi = (MenuItem)sender; 
    1258  
    1259                 if (mi.Parent == redoMenu) 
    1260                 { 
     1225            if (sender is ToolStripDropDownItem) 
     1226            { 
     1227                ToolStripDropDownItem item = (ToolStripDropDownItem)sender; 
    12611228                    //we know it's an redo menu item so find it's index and redo everything                  
    1262                     int max = mi.Index; 
    1263  
     1229                int max = bttnRedo.DropDownItems.IndexOf(item); 
     1230 
     1231                if (max >= 0) 
     1232                { 
    12641233                    for (int i = 0; i <= max; i++) 
    12651234                    { 
    … …  
    12721241        private void undoMenu_Click(object sender, EventArgs e) 
    12731242        { 
    1274             if (sender is MenuItem) 
    1275             { 
    1276                 MenuItem mi = (MenuItem)sender; 
    1277  
    1278                 if (mi.Parent == undoMenu) 
    1279                 { 
    1280                     //we know it's an undo menu item so find it's index and undo everything 
    1281                     int max = mi.Index; 
     1243            if (sender is ToolStripDropDownItem) 
     1244            { 
     1245                ToolStripDropDownItem item = (ToolStripDropDownItem)sender; 
     1246                //we know it's an redo menu item so find it's index and redo everything                  
     1247                int max = bttnUndo.DropDownItems.IndexOf(item); 
     1248 
     1249                if (max >= 0) 
     1250                { 
    12821251                    for (int i = 0; i <= max; i++) 
    12831252                    { 

  • IBBoard.WarFoundry.GUI.WinForms/trunk/FrmMain.resx

    r511 r512  
    1 <?xml version="1.0" encoding="utf-8"?> 
     1<?xml version="1.0" encoding="utf-8"?> 
    22<root> 
    33  <!--  
    … …  
    124124    <value>122, 17</value> 
    125125  </metadata> 
    126   <metadata name="buttonIcons.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
    127     <value>224, 17</value> 
    128   </metadata> 
    129   <data name="buttonIcons.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64"> 
    130     <value> 
    131         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w 
    132         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 
    133         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAM 
    134         GQAAAk1TRnQBSQFMAgEBBwEAAQkBAAEEAQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA 
    135         AwABIAMAAQEBAAEYBgABGBgAAQYBmgFOAQYBmgFOAQYBmgFOAQYBmgFOHgABawFwAW4BawFwAW4BawFw 
    136         AW4BawFwAW4BawFwAW4BawFwAW4BawFwAW4BawFwAW4BawFwAW4BawFwAW4BawFwAW4BawFwAW4BawFw 
    137         AW4BawFwAW4BawFwAW4BawFwAW5jAAEGAZoBTgEPAagBWgEsAdYBwAECAZkBmgEGAZoBTh4AAWsBcAFu 
    138         Hv8DAAn/AWsBcAFuYwABBgGaAU4BIwHHAa8BBQGdAZEBBgGaAU4hAAFrAXABbgP/AbYBuAG3AbYBuAG3 
    139         AbYBuAG3AbYBuAG3AbYBuAG3AbYBuAG3AbYBuAG3AbYBuAG3A/8DAAn/AWsBcAFuEgABpAFlATQBpAFl 
    140         ATQBpAFlATQBpAFlATRFAAEGAZoBTgE6Ad0BuAEGAZoBTg8AAQYBmgFOAQYBmgFODwABawFwAW4D7wGt 
    141         AbABrwGuAbACrgGwAa8BrQGwAa4BrQGwAa8BrQGwAa8BrQGwAa8BrQGwAa8B7wHuAe8DAAHuAe8B7gHv 
    142         Au4B7wHuAe8BawFwAW4SAAGkAWUBNAHmAc4BtwHmAc4BtwGkAWUBNEUAAQYBmgFOATcB2QGzAQYBmgFO 
    143         AQYBmgFODAABBgGaAU4BBgGaAU4BBgGaAU4MAAFrAXABbgPcAtsB3AHbBtwB2wHcAdsD3AHbBNwB2wHc 
    144         AdsC3AHbAwAB2wTcAdsD3AFrAXABbhIAAaQBZQE0AeYBzgG3AdkBrQGGAaQBZQE0RQABBgGaAU4BRgHi 
    145         Ab4BBQGmAZkBBgGaAU4BBgGaAU4BBgGaAU4GAAEGAZoBTgE0AeIBigEGAZoBTgEGAZoBTgkAAWsBcAFu 
    146         AaEBpAGjAaEBpAGiAaEBpAGjAaEBpAGjAaEBpAGjAaEBpAGjAaEBpAGjAaEBpAGjAaEBpAGjAaEBpAGj 
    147         AaEBpAGjAaEBpAGjAaEBpAGjAaEBpAGjAWsBcAFuEgABpAFlATQB5gHOAbcB2QGtAYYBpAFlATRFAAEK 
    148         AZ0BUgFkAewBsgEkAdYBzQELAaEBkwEGAZoBTgEGAZoBTgEGAZoBTgEGAZoBTgEGAZoBTgEeAdQBzAE0 
    149         AeIBigEGAZoBTgEGAZoBTgYAAWsBcAFuA/cD4wPuBvoByAHUAc4BjgFsAT8BiwFnATgBtAGuAZoD+gP8 
    150         A+4D4wPwAWsBcAFuBgABpAFlATQBpAFlATQBpAFlATQBpAFlATQBpAFlATQB2QGtAYYB2QGtAYYBpAFl 
    151         ATQBpAFlATQBpAFlATQBpAFlATQBpAFlATQ5AAEMAZ8BVQFjAekBsQExAeABugEXAdQBywEiAdYBmwEj 
    152         AdoBoQEjAdoBoQEjAdoBoQEjAdoBoQEjAd4B2QEWAdIBcwE0AeIBigEGAZoBTgEGAZoBTgMAAWsBcAFu 
    153         A/kD7gP6A+QBvwHLAcUBiwFnATgB4wHLAawB3AG/AZgBjwFrATsBrAGmAZID5AP6A+4D8QFrAXABbgYA 
    154         AaQBZQE0AeUBzAG0AdsBtwGVAdsBtgGUAdoBtAGSAdoBswGQAdkBrQGGAdgBqgGDAdcBqAF/AdcBpgF9 
    155         AeABvgGfAaQBZQE0OQABBgGaAU4BMAHCAZ0BYAHtAbEBJgHfAaUBGgHXAa8BGgHXAa8BCQHQAcgBFAHQ 
    156         AXcBFgHSAXMBFgHSAXMBFgHSAXMBFgHSAXMBNAHiAYoBBgGaAU4BBgGaAU4BawFwAW4D+QP6A+QBvwHL 
    157         AcUBiwFnATgB3AG/AZgBwAGfAXMBwAGfAXMB3wHIAasBiwFnATgBrAGmAZID5AP0A/EBawFwAW4GAAGk 
    158         AWUBNAHoAdMBwAHnAdEBuwHnAdEBvAHmAc4BtwHmAc4BtwHmAc4BtwHmAc4BtwHmAc0BtgHmAcwBtQHm 
    159         AcwBtgGkAWUBNDkAAQYBmgFOAQYBmgFOAUYB2AGpAWUB7wGxASQB3gGkASoB3QGXASQB2wGgASQB2wGg 
    160         ARoB1wGvARYB0gFzARYB0gFzARYB0gFzARgB0wF1AWwB8wGuAQYBmgFOAWsBcAFuA/oB6gLpAcQBzwHK 
    161         AYsBZwE4AdwBvwGYAb8BnwFxAb8BnwFxAb8BnwFxAcABnwFzAdgBuwGWAYsBZwE4Aa8BqQGVAeoB6QHq 
    162         A/IBawFwAW4GAAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAHmAc4BtwHmAc4BtwGkAWUBNAGk 
    163         AWUBNAGkAWUBNAGkAWUBNAGkAWUBNDwAAQYBmgFOAQYBmgFOAUUB2QGsAWcB7wGvAVAB6QGhASQB2wGg 
    164         ASQB2wGgASQB2wGgASQB2wGgARYB0gFzARYB0gFzAWwB8wGuAQYBmgFOAQABhAF3AWsBcAFuAfwB+wH8 
    165         AuwB6wGLAWcBOAGLAWcBOAGLAWcBOAGLAWcBOAHKAacBeQG9AZIBWAGLAWcBOAGLAWcBOAGLAWcBOAGL 
    166         AWcBOAPsA/MBawFwAW4SAAGkAWUBNAHmAc4BtwHmAc4BtwGkAWUBNEsAAQYBmgFOAQYBmgFOAQwBmwGP 
    167         AUkB3gGpAWoB8QGuAWsB8gGuAXMB9QGzAWEB7wGmARYB0gFzAWwB8wGuAQYBmgFOAQYBmgFOAwABawF1 
    168         AXID/QPuA+0B3gHiAd8BsAGYAXcBiwFnATgBygGnAXkBzgGzAY8BjgFrAT0BwwG8AawB7gLtAu4C7QHu 
    169         Ae0B8wH0AfMBawFwAW4SAAGkAWUBNAHmAc4BtwHmAc4BtwGkAWUBNFEAAQYBmgFOAQYBmgFOAQYBmgFO 
    170         AQYBmgFOAQYBmgFOAWwB8wGuAWwB8wGuAQYBmgFOAQYBmgFOBgABbgFxAWsB3QHmAeID/wHWAeEC3QHW 
    171         AckBtgGZAW4BiwFnATgB4gHLAasB0wG3AZIBmwF9AVQB5QHfAdUJ/wP0AWsBcAFuEgABpAFlATQB5gHO 
    172         AbcB5gHOAbcBpAFlATRdAAEGAZoBTgFsAfMBrgEGAZoBTgEGAZoBTgkAAYgBfwFrAXMBcQFmAXUBcAFi 
    173         AYUBbQFKAZoBdAFBAZ8BeAFEAdkBvwGeAesB2QHBAa8BhgFRAX0BagFOAWsBcAFuAWsBcAFuAWsBcAFu 
    174         AWsBcAFuAWsBcAFuAWsBcAFuEgABpAFlATQBpAFlATQBpAFlATQBpAFlATRdAAEGAZoBTgEGAZoBTgEG 
    175         AZoBTgwAAZIBcAFCAbsBlgFiAdEBrQGBAeYBzgGxAe8B3wHQAewB2wHFAd8BwgGbAaABiwFoAYgBbgFD 
    176         AVoBfwFqjQABBgGaAU4BBgGaAU4PAAF3AYUBbAGRAXkBTQGLAWcBOAGLAWcBOAGLAWcBOAGLAWcBOAGK 
    177         AWkBPQGAAXEBSgF6AXgBWKUAAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFu 
    178         AWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuUQABGAGm 
    179         AcMBGgGnAcQBAAGgAcQGAAOeJIEDngYAAWsBcAFuA90J3AbVFc8DygFrAXABbgGJAWABPgGkAWUBNAGk 
    180         AWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGk 
    181         AWUBNAGkAWUBNAGGAWABPyUAAaABxAFmAdsB6gERAaYBwgYAA4Ek/wOBBgABawFwAW4DzQPDAakCqgO0 
    182         A8IDxAPIA8sBqAGnAagD0QKnAagD0QK2AbcDygFrAXABbgFTAVcBVQGpAasBqQHXAa8BiQHNAZsBawHN 
    183         AZoBawHNAZoBagHNAZkBaQHNAZgBaAHMAZgBZgHNAZgBZQHMAZcBZQHMAZYBZAHMAZUBYwHeAboBmgGW 
    184         AXEBUwF5AV0BRSIAAaABxAFDAcQB2wFDAcUB2AEjAaYBwAMAA4ED/wbtA+4G7wbwA/EG8gP/A4EGAAFr 
    185         AXABbgPOA8UDnwOvA7wDxAPIA9ADqQPSA6kD0gO5A8oBawFwAW4BUwFXAVUBvwLAAZsBdgFYAd0BuwGb 
    186         Ac4BngFwAc8BnQFwAc4BnQFuAc4BnAFuAc4BnAFtAc4BmwFsAc0BmwFrAc4BmgFqAc0BmQFpAc0BmQFo 
    187         AdsBtgGUAaQBZQE0EwABoAHEDwABDgGqAcsBXQHaAekBIwGmAcADAAOBA/8G7QbuA+8G8AbxA/ID/wOB 
    188         BgABawFwAW4DzgzJA8UGyQ/FA9YBawFwAW4BUwFXAVUDyQGkAWUBNAHjAccBrQHXAbABiwHYAbEBjAHX 
    189         AbABiwHXAa8BigHWAa4BiAHVAawBhQHUAakBgQHSAaYBfAHQAaIBdgHPAZ8BcgHdAbsBnAGkAWUBNBAA 
    190         AaABxAEAAaABxA0AAZ4BwQECAawByAGIAecB8gERAaIBwgMAA4ED/wPsA+0G7gbvA/AJ8QP/A4EGAAFr 
    191         AXABbgP+Ff8G9AbrA+MD8AFrAXABbgFTAVcBVQG/AsABpAFlATQB4wHHAa4B2AGxAYwB2AGxAYwB2AGx 
    192         AYwB2AGxAYwB2AGxAYwB2AGxAYwB2AGxAYwB2AGxAYwB2AGxAYwB1gGuAYkB4AHCAaYBpAFlATQJAAEF 
    193         AXkBfQEAAaABxAF2Ae0B+wEAAaABxAcAAaABxAEAAZkBuQEAAaABxAFtAeYB9QF2AeIB7wEZAaMBwQMA 
    194         A4ED/wbsBu0G7gbvBvAD/wOBBgABawFwAW4D9wPjA+4G+gHIAdQBzgGOAWwBPwGLAWcBOAG0Aa4BmgP6 
    195         A/wD7gPjA/ABawFwAW4BUwFXAVUDyQGkAWUBNAHrAdgBxgHoAdIBvgHoAdIBvgHoAdIBvgHoAdIBvgHo 
    196         AdIBvgHoAdIBvgHoAdIBvgHoAdIBvgHoAdIBvgHoAdIBvgHrAdgBxgGkAWUBNAYAAQUBeQF9AQABoAHE 
    197         AXYB7QH7AXYB7QH7AQABoAHEAQABoAHEAQABoAHEAQABoAHEAQEBqQHEAW4B4QHuAQ8ByQHfAWkB5AHy 
    198         ARoBpAHAAwADgQP/BuwG7QbuCe8D8AP/A4EGAAFrAXABbgP5A+4D+gPkAb8BywHFAYsBZwE4AeMBywGs 
    199         AdwBvwGYAY8BawE7AawBpgGSA+QD+gPuA/EBawFwAW4BUwFXAVUBvwLAAZoBegFhAaQBZQE0AaQBZQE0 
    200         AaQBZQE0AaQBZQE0AaQBZQE0AaQBZQE0AaQBZQE0AaQBZQE0AaQBZQE0AaQBZQE0AaQBZQE0AaQBZQE0 
    201         AZ0BawFDAwABBQF5AX0BAAGgAcQBdgHtAfsBBAHDAdoBdgHtAfsBaQHqAfkBaQHqAfkBaQHqAfkBaQHq 
    202         AfkBBQHdAfcBCgHIAd8BBwHCAdgBbwHcAesBGwGjAb8DAAOBA/8D6wbsBu0G7gHiAu4BsQHwAfMBkgHw 
    203         AfUBmgHwAfUBdwKWBgABawFwAW4D+QP6A+QBvwHLAcUBiwFnATgB3AG/AZgBwAGfAXMBwAGfAXMB3wHI 
    204         AasBiwFnATgBrAGmAZID5AP0A/EBawFwAW4BVwFbAVkDyQamAaQBqQGnA/8B9AL1AcoCzAHKAswBygLM 
    205         AdcC2AH0AvUB9AL1A/8BpAGpAacDAAEFAXkBfgEAAaABxAF5Ae0B+wEyAeIB+AEsAd8B9AEEAcAB1gEE 
    206         AcAB1gEEAcAB1gEdAdIB6AEdAdIB6AEdAdIB6AELAcgB3wFqAeUB8wEbAasBxQEVAaABvAMAA4ED/wbr 
    207         BuwG7QHgAe4B7wGWAe8B9AFjAfEB+AFGAfMB+wFFAfMB+wFdAe8B9wE2Ad0B5gMAAWsBcAFuA/oB6gLp 
    208         AcQBzwHKAYsBZwE4AdwBvwGYAb8BnwFxAb8BnwFxAb8BnwFxAcABnwFzAdgBuwGWAYsBZwE4Aa8BqQGV 
    209         AeoB6QHqA/IBawFwAW4BWwFfAV0BvwLAAZUBlwGWAZUBlwGWAaQBqQGnA/8B9AL1AfQC9QH0AvUB9AL1 
    210         AfQC9QH0AvUB9AL1A/8BpAGpAacEAAGgAcQBrQHzAfsBLwHgAfYBMgHiAfgBMgHiAfcBMgHiAfcBLwHg 
    211         AfUBKQHbAfEBHQHSAegBHQHSAegBHQHSAegBNgHZAewBQAHNAeEBFgGhAb0BBQF5AX0DAAOBA/8G6wns 
    212         A+0BsQHuAfEBZwHxAfgBQAH0Af0BcQH3Af0BcgH3Af0BQwHzAfwBJAHsAfYBCgHzAf8BawFwAW4B/AH7 
    213         AfwC7AHrAYsBZwE4AYsBZwE4AYsBZwE4AYsBZwE4AcoBpwF5Ab0BkgFYAYsBZwE4AYsBZwE4AYsBZwE4 
    214         AYsBZwE4A+wD8wFrAXABbgFbAV8BXQPJBqYBpAGpAacD/wH0AvUBygLMAcoCzAHKAswBygLMAcoCzAH0 
    215         AvUD/wGkAakBpwMAAQUBeQF9AQABoAHEAa0B8wH7AS8B4AH2ATIB4gH3ASkB2wHxAS8B4AH1ASkB2wHx 
    216         ARYBzQHjATYB2QHsAWkB5wH2AUEBzgHjARMBowHBAQUBeQF9BgADgQP/A+oG6wnsAZsB7wHzAU4B8gH6 
    217         AWoB9gH9AbsB+gH+Ab8B+wH+AW4B9gH9ASIB8AH6AQ0B8wH/AWsBdQFyA/0D7gPtAd4B4gHfAbABmAF3 
    218         AYsBZwE4AcoBpwF5Ac4BswGPAY4BawE9AcMBvAGsAe4C7QLuAu0B7gHtAfMB9AHzAWsBcAFuAV8BYwFh 
    219         Ab8CwAGVAZcBlgGVAZcBlgGkAakBpwP/AfQC9QH0AvUB9AL1AfQC9QH0AvUB9AL1AfQC9QP/AaQBqQGn 
    220         BgABBQF5AX0BAAGgAcQBrQHzAfsBMQHhAfYBIAHjAfoBcwHsAfoBbwHrAfoBbgHoAfcBbAHoAfcBFAGh 
    221         AbwBFAGjAcEBBQF5AX0JAAOBA/8G6gbrBuwBnAHuAfIBTgHyAfoBZwH2Af0BtQH6Af4BuAH6Af4BawH1 
    222         Af0BIgHvAfoBDQHzAf8BbgFxAWsB3QHmAeID/wHWAeEC3QHWAckBtgGZAW4BiwFnATgB4gHLAasB0wG3 
    223         AZIBmwF9AVQB5QHfAdUJ/wP0AWsBcAFuAWUBaQFnA8kGpgGkAakBpxv/AaQBqQGnCQABBQF5AX0BAAGg 
    224         AcQBrQHzAfsBJQHkAfsBAAGgAcQBAAGgAcQBEwGhAb4BFQGfAbsBGwGhAbsBBgF6AXwMAAOBA/8D7Abq 
    225         CesBtAHtAfABagHwAfcBOgH0AfwBaAH2Af0BagH2Af0BPAHyAfsBHgHvAfkBCQHzAf8BiAF/AWsBcwFx 
    226         AWYBdQFwAWIBhQFtAUoBmgF0AUEBnwF4AUQB2QG/AZ4B6wHZAcEBrwGGAVEBfQFqAU4BawFwAW4BawFw 
    227         AW4BawFwAW4BawFwAW4BawFwAW4BawFwAW4BaAFsAWoBvwLAAZUBlwGWAZUBlwGWAZgBnAGaAaQBqQGn 
    228         AaQBqQGnAaQBqQGnAaQBqQGnAaQBqQGnAaQBqQGnAaQBqQGnAaQBqQGnAaQBqQGnAZIBmQGWDAABBQF5 
    229         AX0BAAGgAcQBrQHzAfsBAAGgAcQbAAOBGP8BmwHuAfIBaQHwAfcBTQHyAfoBRgHvAfcBKAHrAfQBDQHz 
    230         Af8DAAGSAXABQgG7AZYBYgHRAa0BgQHmAc4BsQHvAd8B0AHsAdsBxQHfAcIBmwGgAYsBaAGIAW4BQwFa 
    231         AX8BahIAAWsBbwFtEs4BxQLGAWEBZQFjAVMBVwFVHwABnQG/AQABoAHEAQABoAHEGwADnhiBAXwCjAFy 
    232         Ap8BagGuAa8BNgHkAe0BCQHzAf8BAgHzAf8DAAF3AYUBbAGRAXkBTQGLAWcBOAGLAWcBOAGLAWcBOAGL 
    233         AWcBOAGKAWkBPQGAAXEBSgF6AXgBWBUAAVMBVwFVAWsBbwFtAWsBbwFtAWsBbwFtAWsBbwFtAWsBbwFt 
    234         AWUBaQFnAWUBaQFnAV8BYgFhKAABoAHEGwABQgFNAT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEB 
    235         FgAD/wEAAcMB/wIAAv8CAAGDAf8CAAL/AgABhwH/AgAB/AE/AgABjwGfAgAB/AE/AgABhwGPAgAB/AE/ 
    236         AgABgQGHAgAB/AE/AgABgAEDAgABwAEDAgABgAEBAgABwAEDAgABgAMAAcABAwIAAYADAAHAAQMCAAHA 
    237         AwAB/AE/AgAB4AEBAgAB/AE/AgAB+AEDAgAB/AE/AgAB/wGHAgAB/AE/AgAB/wGPAQABPwL/AgAB/wGf 
    238         AQABfwL/AgAC/wIAA/8B4wEAAQMDAAEBAf8B4wEAAQMEAAH/AeEBAAEDBAAB/QHxAQABAwQAAfkB4QEA 
    239         AQMEAAHhAYEBAAEDBAABwAEBAQABAwQAAYABAQEAAQMDAAEBAQABAQEAAQEDAAEBAQABAQUAAQEBAAED 
    240         BQABAQGAAQcFAAEBAcABDwUAAQEB4QH/AQABAQEAAT8BAAE/AfEB/wEAAQEBAAF/AQABfwH9Af8L 
    241 </value> 
    242   </data> 
    243126  <metadata name="mainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
    244127    <value>334, 17</value> 

  • IBBoard.WarFoundry.GUI.WinForms/trunk/IBBoard.WarFoundry.GUI.WinForms.csproj

    r507 r512  
    101101      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 
    102102    </ProjectReference> 
    103     <ProjectReference Include="..\IBBoard.WarFoundry.API\IBBoard.WarFoundry.API.csproj"> 
    104       <Name>IBBoard.WarFoundry.API</Name> 
    105       <Project>{59EC117B-F955-44D5-8461-8F44F3A7481A}</Project> 
    106       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 
    107     </ProjectReference> 
    108103  </ItemGroup> 
    109104  <ItemGroup> 
    … …  
    229224    </None> 
    230225  </ItemGroup> 
     226  <ItemGroup> 
     227    <ProjectReference Include="..\IBBoard.WarFoundry.API\IBBoard.WarFoundry.API.csproj"> 
     228      <Project>{951E6C7A-7FBA-4F68-9D9E-F48618BB9626}</Project> 
     229      <Name>IBBoard.WarFoundry.API</Name> 
     230    </ProjectReference> 
     231  </ItemGroup> 
    231232  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 
    232233  <PropertyGroup>