# HG changeset patch # User IBBoard # Date 1323007609 0 # Node ID 8021cc097ec88825255073b8a0164f17a34ea777 # Parent 5b8f0a6bf0b20b227718d6047b9efd88f7d5032a Re #382: WinForms builds from Linux/Mono fail on Windows/.Net * Remove unnecessary ImageList from FrmNewUnit and replace with common resource diff -r 5b8f0a6bf0b2 -r 8021cc097ec8 FrmNewUnit.cs --- a/FrmNewUnit.cs Sat Dec 03 15:03:12 2011 +0000 +++ b/FrmNewUnit.cs Sun Dec 04 14:06:49 2011 +0000 @@ -1,238 +1,212 @@ -// This file (FrmNewUnit.cs) is a part of the IBBoard.WarFoundry.GUI.WinForms project and is copyright 2007, 2008, 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. - +// This file (FrmNewUnit.cs) is a part of the IBBoard.WarFoundry.GUI.WinForms project and is copyright 2007, 2008, 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.Collections.Generic; -using System.Drawing; -using System.ComponentModel; -using System.Windows.Forms; -using IBBoard; -using IBBoard.Lang; -using IBBoard.Windows.Forms; -using IBBoard.WarFoundry.API; +using System.Collections.Generic; +using System.Drawing; +using System.ComponentModel; +using System.Windows.Forms; +using IBBoard; +using IBBoard.Lang; +using IBBoard.Windows.Forms; +using IBBoard.WarFoundry.API; using IBBoard.WarFoundry.API.Objects; -using IBBoard.WarFoundry.API.Objects.Requirement; -using IBBoard.Windows.Forms.I18N; - -namespace IBBoard.WarFoundry -{ - /// - /// Summary description for FrmNewUnit. - /// - public class FrmNewUnit : IBBForm - { - private System.ComponentModel.IContainer components; - private IBBoard.Windows.Forms.IBBButton bttnCancel; - private IBBoard.Windows.Forms.IBBLabel lblUnitList; - private IBBoard.Windows.Forms.IBBButton bttnSelectUnit; - private System.Windows.Forms.ListBox lstUnits; - private UnitType[] units; - private Army army; - private System.Windows.Forms.ImageList imageList; - private System.Windows.Forms.Label lblNewUnitWarning; - private System.Windows.Forms.Label lblWarningIcon; - - public FrmNewUnit(Race race, Category cat, Army army) - { - InitializeComponent(); - - ControlTranslator.TranslateControl(this, cat.Name); - units = race.GetUnitTypes(cat); - this.army = army; - - for (int i = 0; i - /// Clean up any resources being used. - /// - protected override void Dispose( bool disposing ) - { - if( disposing ) - { - if(components != null) - { - components.Dispose(); - } - } - base.Dispose( disposing ); - } - - #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() +using IBBoard.WarFoundry.API.Objects.Requirement; +using IBBoard.Windows.Forms.I18N; + +namespace IBBoard.WarFoundry +{ + /// + /// Summary description for FrmNewUnit. + /// + public class FrmNewUnit : IBBForm + { + private IBBoard.Windows.Forms.IBBButton bttnCancel; + private IBBoard.Windows.Forms.IBBLabel lblUnitList; + private IBBoard.Windows.Forms.IBBButton bttnSelectUnit; + private System.Windows.Forms.ListBox lstUnits; + private UnitType[] units; + private Army army; + private System.Windows.Forms.Label lblNewUnitWarning; + private System.Windows.Forms.Label lblWarningIcon; + + public FrmNewUnit(Race race, Category cat, Army army) + { + InitializeComponent(); + + ControlTranslator.TranslateControl(this, cat.Name); + units = race.GetUnitTypes(cat); + this.army = army; + + for (int i = 0; i + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmNewUnit)); - this.lstUnits = new System.Windows.Forms.ListBox(); - this.bttnCancel = new IBBoard.Windows.Forms.IBBButton(); - this.lblUnitList = new IBBoard.Windows.Forms.IBBLabel(); - this.bttnSelectUnit = new IBBoard.Windows.Forms.IBBButton(); - this.lblNewUnitWarning = new System.Windows.Forms.Label(); - this.imageList = new System.Windows.Forms.ImageList(this.components); - this.lblWarningIcon = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // lstUnits - // - this.lstUnits.Location = new System.Drawing.Point(88, 8); - this.lstUnits.Name = "lstUnits"; - this.lstUnits.Size = new System.Drawing.Size(272, 121); - this.lstUnits.TabIndex = 7; - this.lstUnits.SelectedIndexChanged += new System.EventHandler(this.lstUnits_SelectedIndexChanged); - this.lstUnits.DoubleClick += new System.EventHandler(this.lstUnits_DoubleClick); - this.lstUnits.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lstUnits_MouseDown); - // - // bttnCancel - // - this.bttnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.bttnCancel.FlatStyle = System.Windows.Forms.FlatStyle.System; - this.bttnCancel.Location = new System.Drawing.Point(8, 168); - this.bttnCancel.Name = "bttnCancel"; - this.bttnCancel.Size = new System.Drawing.Size(80, 24); - this.bttnCancel.TabIndex = 6; - this.bttnCancel.Text = "Cancel"; - this.bttnCancel.Click += new System.EventHandler(this.bttnCancel_Click); - // - // lblUnitList - // - this.lblUnitList.Location = new System.Drawing.Point(0, 8); - this.lblUnitList.Name = "lblUnitList"; - this.lblUnitList.Size = new System.Drawing.Size(88, 80); - this.lblUnitList.TabIndex = 5; - this.lblUnitList.Text = "unit list"; - this.lblUnitList.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // bttnSelectUnit - // - this.bttnSelectUnit.Enabled = false; - this.bttnSelectUnit.FlatStyle = System.Windows.Forms.FlatStyle.System; - this.bttnSelectUnit.Location = new System.Drawing.Point(256, 168); - this.bttnSelectUnit.Name = "bttnSelectUnit"; - this.bttnSelectUnit.Size = new System.Drawing.Size(104, 24); - this.bttnSelectUnit.TabIndex = 4; - this.bttnSelectUnit.Text = "create unit"; - this.bttnSelectUnit.Click += new System.EventHandler(this.bttnSelectUnit_Click); - // - // lblNewUnitWarning - // - this.lblNewUnitWarning.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.lblNewUnitWarning.ImageList = this.imageList; - this.lblNewUnitWarning.Location = new System.Drawing.Point(48, 136); - this.lblNewUnitWarning.Name = "lblNewUnitWarning"; - this.lblNewUnitWarning.Size = new System.Drawing.Size(312, 32); - this.lblNewUnitWarning.TabIndex = 9; - this.lblNewUnitWarning.Text = "One or more unit requirements are not satisfied."; - this.lblNewUnitWarning.TextAlign = System.Drawing.ContentAlignment.TopRight; - this.lblNewUnitWarning.Visible = false; - // - // imageList - // - this.imageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList.ImageStream"))); - this.imageList.TransparentColor = System.Drawing.Color.Transparent; - this.imageList.Images.SetKeyName(0, ""); - // - // lblWarningIcon - // - this.lblWarningIcon.Image = ((System.Drawing.Image)(resources.GetObject("lblWarningIcon.Image"))); - this.lblWarningIcon.Location = new System.Drawing.Point(8, 136); - this.lblWarningIcon.Name = "lblWarningIcon"; - this.lblWarningIcon.Size = new System.Drawing.Size(40, 32); - this.lblWarningIcon.TabIndex = 10; - this.lblWarningIcon.Visible = false; - // - // FrmNewUnit - // - this.AcceptButton = this.bttnSelectUnit; - this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); - this.CancelButton = this.bttnCancel; - this.ClientSize = new System.Drawing.Size(370, 196); - this.Controls.Add(this.lblWarningIcon); - this.Controls.Add(this.lblNewUnitWarning); - this.Controls.Add(this.bttnCancel); - this.Controls.Add(this.lblUnitList); - this.Controls.Add(this.bttnSelectUnit); - this.Controls.Add(this.lstUnits); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "FrmNewUnit"; - this.ShowInTaskbar = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "FrmNewUni"; - this.ResumeLayout(false); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmNewUnit)); + this.lstUnits = new System.Windows.Forms.ListBox(); + this.bttnCancel = new IBBoard.Windows.Forms.IBBButton(); + this.lblUnitList = new IBBoard.Windows.Forms.IBBLabel(); + this.bttnSelectUnit = new IBBoard.Windows.Forms.IBBButton(); + this.lblNewUnitWarning = new System.Windows.Forms.Label(); + this.lblWarningIcon = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // lstUnits + // + this.lstUnits.Location = new System.Drawing.Point(88, 8); + this.lstUnits.Name = "lstUnits"; + this.lstUnits.Size = new System.Drawing.Size(272, 121); + this.lstUnits.TabIndex = 7; + this.lstUnits.SelectedIndexChanged += new System.EventHandler(this.lstUnits_SelectedIndexChanged); + this.lstUnits.DoubleClick += new System.EventHandler(this.lstUnits_DoubleClick); + this.lstUnits.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lstUnits_MouseDown); + // + // bttnCancel + // + this.bttnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.bttnCancel.FlatStyle = System.Windows.Forms.FlatStyle.System; + this.bttnCancel.Location = new System.Drawing.Point(8, 168); + this.bttnCancel.Name = "bttnCancel"; + this.bttnCancel.Size = new System.Drawing.Size(80, 24); + this.bttnCancel.TabIndex = 6; + this.bttnCancel.Text = "Cancel"; + this.bttnCancel.Click += new System.EventHandler(this.bttnCancel_Click); + // + // lblUnitList + // + this.lblUnitList.Location = new System.Drawing.Point(0, 8); + this.lblUnitList.Name = "lblUnitList"; + this.lblUnitList.Size = new System.Drawing.Size(88, 80); + this.lblUnitList.TabIndex = 5; + this.lblUnitList.Text = "unit list"; + this.lblUnitList.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // bttnSelectUnit + // + this.bttnSelectUnit.Enabled = false; + this.bttnSelectUnit.FlatStyle = System.Windows.Forms.FlatStyle.System; + this.bttnSelectUnit.Location = new System.Drawing.Point(256, 168); + this.bttnSelectUnit.Name = "bttnSelectUnit"; + this.bttnSelectUnit.Size = new System.Drawing.Size(104, 24); + this.bttnSelectUnit.TabIndex = 4; + this.bttnSelectUnit.Text = "create unit"; + this.bttnSelectUnit.Click += new System.EventHandler(this.bttnSelectUnit_Click); + // + // lblNewUnitWarning + // + this.lblNewUnitWarning.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.lblNewUnitWarning.Location = new System.Drawing.Point(48, 136); + this.lblNewUnitWarning.Name = "lblNewUnitWarning"; + this.lblNewUnitWarning.Size = new System.Drawing.Size(312, 32); + this.lblNewUnitWarning.TabIndex = 9; + this.lblNewUnitWarning.Text = "One or more unit requirements are not satisfied."; + this.lblNewUnitWarning.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.lblNewUnitWarning.Visible = false; + // + // lblWarningIcon + // + this.lblWarningIcon.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.dialog_warning; + this.lblWarningIcon.Location = new System.Drawing.Point(8, 136); + this.lblWarningIcon.Name = "lblWarningIcon"; + this.lblWarningIcon.Size = new System.Drawing.Size(40, 32); + this.lblWarningIcon.TabIndex = 10; + this.lblWarningIcon.Visible = false; + // + // FrmNewUnit + // + this.AcceptButton = this.bttnSelectUnit; + this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); + this.CancelButton = this.bttnCancel; + this.ClientSize = new System.Drawing.Size(370, 196); + this.Controls.Add(this.lblWarningIcon); + this.Controls.Add(this.lblNewUnitWarning); + this.Controls.Add(this.bttnCancel); + this.Controls.Add(this.lblUnitList); + this.Controls.Add(this.bttnSelectUnit); + this.Controls.Add(this.lstUnits); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "FrmNewUnit"; + this.ShowInTaskbar = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "FrmNewUni"; + this.ResumeLayout(false); - } - #endregion - - public UnitType SelectedUnit - { - get { return units[lstUnits.SelectedIndex]; } - } - - private void bttnCancel_Click(object sender, System.EventArgs e) - { - DialogResult = DialogResult.Cancel; - this.Close(); - } - - private void bttnSelectUnit_Click(object sender, System.EventArgs e) - { - selectUnit(); - } - - private void selectUnit() - { - DialogResult = DialogResult.OK; - this.Close(); - } - - private void setSelectUnitEnabledVal() - { - if (lstUnits.SelectedIndex>-1) - { + } + #endregion + + public UnitType SelectedUnit + { + get { return units[lstUnits.SelectedIndex]; } + } + + private void bttnCancel_Click(object sender, System.EventArgs e) + { + DialogResult = DialogResult.Cancel; + this.Close(); + } + + private void bttnSelectUnit_Click(object sender, System.EventArgs e) + { + selectUnit(); + } + + private void selectUnit() + { + DialogResult = DialogResult.OK; + this.Close(); + } + + private void setSelectUnitEnabledVal() + { + if (lstUnits.SelectedIndex>-1) + { bttnSelectUnit.Enabled = true; - ICollection failureMessages; - lblNewUnitWarning.Visible = !Validates.AsOkay(RequirementHandler.AllowsAdding(SelectedUnit, army, out failureMessages)); - lblWarningIcon.Visible = lblNewUnitWarning.Visible; - - if (lblNewUnitWarning.Visible) - { - lblNewUnitWarning.Text = String.Join("\n", new List(failureMessages).ToArray()); - } - } - else - { - bttnSelectUnit.Enabled = false; - } - } - - private void lstUnits_SelectedIndexChanged(object sender, System.EventArgs e) - { - setSelectUnitEnabledVal(); - } - - private void lstUnits_DoubleClick(object sender, EventArgs e) - { - if (lstUnits.SelectedIndex>-1) - { - selectUnit(); - } - } - - private void lstUnits_MouseDown(object sender, MouseEventArgs e) - { - //make sure no item is selected when a click is made outside a unit - int index = lstUnits.IndexFromPoint(e.X, e.Y); - lstUnits.SelectedIndex = index; - } - } -} + ICollection failureMessages; + lblNewUnitWarning.Visible = !Validates.AsOkay(RequirementHandler.AllowsAdding(SelectedUnit, army, out failureMessages)); + lblWarningIcon.Visible = lblNewUnitWarning.Visible; + + if (lblNewUnitWarning.Visible) + { + lblNewUnitWarning.Text = String.Join("\n", new List(failureMessages).ToArray()); + } + } + else + { + bttnSelectUnit.Enabled = false; + } + } + + private void lstUnits_SelectedIndexChanged(object sender, System.EventArgs e) + { + setSelectUnitEnabledVal(); + } + + private void lstUnits_DoubleClick(object sender, EventArgs e) + { + if (lstUnits.SelectedIndex>-1) + { + selectUnit(); + } + } + + private void lstUnits_MouseDown(object sender, MouseEventArgs e) + { + //make sure no item is selected when a click is made outside a unit + int index = lstUnits.IndexFromPoint(e.X, e.Y); + lstUnits.SelectedIndex = index; + } + } +} diff -r 5b8f0a6bf0b2 -r 8021cc097ec8 FrmNewUnit.resx --- a/FrmNewUnit.resx Sat Dec 03 15:03:12 2011 +0000 +++ b/FrmNewUnit.resx Sun Dec 04 14:06:49 2011 +0000 @@ -117,101 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC4 - DAAAAk1TRnQBSQFMAwEBAAEEAQABBAEAASABAAEgAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABgAMA - ASADAAEBAQABIAYAAUD/AP8AJAADAgH/AwIB/wMCAf8DAgH/AwIB/wMCAf8DAgH/AwIB/wMCAf8DAgH/ - AwIB/wMCAf8DAgH/AwIB/wMCAf8DAgH/AwIB/wMCAf8DAgH/AwIB/wMCAf8DAgH/AwIB//8AnQADAgH/ - AwIB/wICASoB/wICAS0B/wICASsB/wICASsB/wICASsB/wICASsB/wICASsB/wICASsB/wICASsB/wIC - ASsB/wICASsB/wICASsB/wICASsB/wICASsB/wICASsB/wICASsB/wICASsB/wICASsB/wICASsB/wIC - ASsB/wICASsB/wICAS0B/wICAS0B/wICASoB/wMCAf//AJEAAwIB/wICAWwB/wICAZ0B/wICAZ8B/wIC - AZ8B/wICAZ8B/wICAZ8B/wICAZ8B/wICAZ8B/wICAZ8B/wICAZ8B/wICAZ8B/wICAZ8B/wICAZ8B/wIC - AZ8B/wICAZ8B/wICAZ8B/wICAZ8B/wICAZ8B/wICAZ8B/wICAZ8B/wICAZ8B/wICAZ8B/wICAZ8B/wIC - AZ8B/wICAZ8B/wICAZ8B/wICAZ0B/wICAXIB//8AjQADAgH/AgIBnAH/Aj0BxAH/AnIB4AH/AncB4gH/ - AnYB4gH/AnMB4QH/AnEB4QH/Am4B4AH/AmsB3wH/AmgB3wH/AmYB3gH/AmMB3gH/AmAB3QH/Al4B3AH/ - AlsB3AH/AlgB2wH/AlUB2wH/AlMB2gH/AlAB2gH/Ak0B2QH/AkoB2AH/AkcB2AH/AkUB1wH/AkIB1wH/ - AkAB1gH/AjgB1AH/Ah0BvAH/AgIBngH//wCRAAICAaAB/wJ7Ad0B/wIWAdAB/wICAcwB/wICAcwB/wIC - AcwB/wICAcwB/wICAcwB/wICAcwB/wICAcwB/wICAcwB/wICAcwB/wICAcwB/wICAcwB/wICAcwB/wIC - AcwB/wICAcwB/wICAcwB/wICAcwB/wICAcwB/wICAcwB/wICAcwB/wICAcwB/wICAcwB/wICAcwB/wIM - Ac4B/wI6Ac8B/wICAZ8B//8AkQACAgGhAf8CWAHHAf8CPAHYAf8CAgHMAf8CowHbAf8C0gHgAf8C0gHg - Af8C0wHhAf8C1AHiAf8C1AHiAf8C1QHjAf8C1gHkAf8C1wHlAf8C2AHmAf8C2AHmAf8C2QHnAf8C2QHn - Af8C2gHoAf8C2gHoAf8C2wHpAf8C3AHqAf8C3QHrAf8C3gHsAf8CwQHnAf8CAgHMAf8CHQHRAf8CKwG/ - Af8CAgGiAf//AJEAAgIBngH/AhgBpwH/AncB3QH/AgoBzgH/AlIB0wH/A+AB/wPhAf8D4QH/A+IB/wPj - Af8D4wH/A+QB/wPlAf8D5gH/A+YB/wPnAf8D6AH/A+kB/wPqAf8D6gH/A+sB/wPsAf8D7QH/AmsB2wH/ - AgUBzQH/Aj0B0wH/Ag4BpQH/AgIBoAH//wCVAAICAaEB/wJUAcQB/wJGAdoB/wIEAcwB/wKzAdsB/wPg - Af8D4QH/A+EB/wPiAf8D4wH/A+MB/wPkAf8DPgH/AzkB/wPmAf8D5wH/A+gB/wPpAf8D6gH/A+oB/wPr - Af8CzQHnAf8CCQHNAf8CJgHTAf8CLgG7Af8CAgGgAf//AJkAAgIBngH/AhEBpgH/AnsB3AH/AhABzwH/ - Aj0B0QH/A98B/wPgAf8D4AH/A+EB/wPiAf8D4gH/A+MB/wM5Af8DNwH/A+YB/wPmAf8D5wH/A+gB/wPp - Af8D6gH/A+oB/wJUAdcB/wIKAc4B/wJFAdIB/wIKAaIB/wICAaAB//8AnQACAgGgAf8CSAG9Af8CUwHc - Af8CAgHMAf8CogHaAf8D3wH/A+AB/wPgAf8D4QH/A+IB/wPiAf8D1wH/A9cB/wPlAf8D5gH/A+YB/wPn - Af8D6AH/A+kB/wK6AeMB/wIDAcwB/wIxAdUB/wIrAbcB/wICAaAB//8AoQACAgGiAf8CCgGiAf8CewHa - Af8CGQHRAf8CLAHQAf8C3QHfAf8D3wH/A+AB/wPgAf8D4QH/A+IB/wMnAf8DJwH/A+QB/wPlAf8D5QH/ - A+YB/wPnAf8D6AH/Aj0B0wH/AhABzwH/AksB0QH/AgcBogH/AgIBoQH//wClAAICAZ8B/wI9AbgB/wJg - Ad4B/wICAcwB/wKNAdcB/wPfAf8D3wH/A+AB/wPgAf8D4QH/Ax0B/wMdAf8D4wH/A+QB/wPlAf8D5QH/ - A+YB/wKkAd8B/wICAcwB/wI+AdcB/wImAbEB/wICAaEB//8ArQACBQGiAf8CdQHXAf8CJAHTAf8CHQHO - Af8C1wHdAf8D3wH/A98B/wPgAf8D4AH/Aw8B/wMPAf8D4gH/A+MB/wPkAf8D5QH/AuIB5AH/AioB0QH/ - AhoB0QH/Ak0BzgH/AgQBogH/AgIBpAH//wCtAAICAaAB/wIxAbEB/wJsAd8B/wIDAcwB/wJ7AdUB/wPe - Af8D3gH/A98B/wPgAf8DBQH/AwUB/wPhAf8D4gH/A+MB/wPkAf8CjAHaAf8CAwHMAf8CTQHaAf8CIAGs - Af8CAgGfAf//ALUAAgMBoQH/Am4B0wH/AjEB1QH/AhIBzgH/As4B3AH/A94B/wPeAf8D1wH/AwIB/wMC - Af8D2QH/A+EB/wPiAf8C2gHiAf8CGwHPAf8CJgHTAf8CSwHLAf8CAgGhAf//ALkAAgIBoAH/AiQBrAH/ - AncB4AH/AgYBzQH/AmgB1AH/A90B/wPeAf8DzAH/AwIB/wMCAf8DzgH/A+EB/wPhAf8CeAHYAf8CBgHN - Af8CWQHbAf8CGAGoAf8CAgGfAf//AL0AAgIBoAH/AmQBzAH/Aj0B2AH/AgkBzQH/AsMB2wH/A90B/wPB - Af8DAgH/AwIB/wPDAf8D4AH/As4B3wH/Ag4BzQH/AjMB1gH/AkcBxwH/AgIBogH//wDBAAICAZwB/wIZ - AakB/wJ+AeAB/wIKAc4B/wJUAdIB/wPdAf8D2gH/A88B/wPPAf8D3AH/A98B/wJjAdUB/wILAc4B/wJk - AdsB/wIRAaUB/wICAZ4B//8AxQACAgGgAf8CWAHGAf8CSgHaAf8CBAHMAf8CtAHZAf8D3QH/A90B/wPe - Af8D3gH/AsAB3AH/AgYBzAH/AkIB2QH/AkABwQH/AgIBoQH//wDJAAICAZ4B/wIRAaYB/wKBAeAB/wIR - Ac8B/wJBAdEB/wPcAf8D3QH/A90B/wPeAf8CTAHSAf8CEwHPAf8CagHbAf8CCwGiAf8CAgGfAf//AM0A - AgIBnwH/Ak0BwAH/AlcB3AH/AgIBzAH/AqIB1wH/A9wB/wPcAf8CrQHZAf8CAwHMAf8CUgHcAf8COQG8 - Af8CAgGgAf//ANEAAgIBpQH/AgoBowH/AoEB3gH/AhsB0QH/Ai4BzwH/AtoB2wH/A9wB/wI3AdAB/wIe - AdIB/wJsAdkB/wIGAaIB/wICAZ4B//8A1QACAgGgAf8CQQG6Af8CZQHfAf8CAgHMAf8CjwHWAf8CmAHW - Af8CAwHMAf8CYwHfAf8CMAG2Af8CAgGgAf//AN0AAgUBoQH/AnwB2gH/AiYB0wH/AhcBzgH/AhkBzQH/ - AiwB1AH/AmoB1wH/AgMBoAH/AgIBnwH//wDdAAICAZ4B/wI0AbQB/wJzAeEB/wIDAcwB/wIFAc0B/wJz - AeEB/wImAa8B/wICAZ4B//8A5QACAwGhAf8CcAHVAf8CRAHZAf8CSAHaAf8CYQHSAf8CAgGhAf//AOkA - AgIBoAH/AhUBpwH/Am8B2gH/AmwB2gH/AhEBpwH/AgIBnwH//wDtAAICAZ0B/wICAaEB/wICAaAB/wIC - AaAB//8A/wD/AP8A/wD/AP8AvwABQgFNAT4HAAE+AwABKAMAAYADAAEgAwABAQEAAQEGAAECFgAD/wEA - BP8MAAHwAgABHwwAAcACAAEHDAABgAIAAQMMAAGAAgABAwwAAcACAAEDDAABwAIAAQMMAAHAAgABAwwA - AeACAAEHDAAB4AIAAQcMAAHwAgABDwwAAfACAAEPDAAB+AIAAR8MAAH8AgABHwwAAfwCAAE/DAAB/gIA - AX8MAAH+AgABfwwAAf8CAAH/DAAB/wIAAf8MAAH/AYABAQH/DAAB/wGAAQEB/wwAAf8BwAEDAf8MAAH/ - AcABAwH/DAAB/wHgAQcB/wwAAf8B8AEHAf8MAAH/AfABDwH/DAAB/wH4AR8B/wwAAf8B+AEfAf8MAAH/ - AfwBPwH/DAAE/wwABP8MAAT/DAAL - - - - - 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 diff -r 5b8f0a6bf0b2 -r 8021cc097ec8 FrmUnit.resources Binary file FrmUnit.resources has changed diff -r 5b8f0a6bf0b2 -r 8021cc097ec8 Properties/Resources.Designer.cs --- a/Properties/Resources.Designer.cs Sat Dec 03 15:03:12 2011 +0000 +++ b/Properties/Resources.Designer.cs Sun Dec 04 14:06:49 2011 +0000 @@ -60,6 +60,13 @@ } } + internal static System.Drawing.Bitmap dialog_warning { + get { + object obj = ResourceManager.GetObject("dialog-warning", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap document_new { get { object obj = ResourceManager.GetObject("document-new", resourceCulture); diff -r 5b8f0a6bf0b2 -r 8021cc097ec8 Properties/Resources.resx --- a/Properties/Resources.resx Sat Dec 03 15:03:12 2011 +0000 +++ b/Properties/Resources.resx Sun Dec 04 14:06:49 2011 +0000 @@ -121,9 +121,15 @@ ..\icons\document-open.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\icons\warning-sml.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\icons\list-add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\icons\edit-delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\icons\edit-undo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -139,11 +145,8 @@ ..\icons\document-save.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\icons\warning-sml.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\icons\edit-delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\icons\dialog-warning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file