diff --git a/.gitignore b/.gitignore index 2a35bf688..1e766fc09 100644 --- a/.gitignore +++ b/.gitignore @@ -216,3 +216,4 @@ ModelManifest.xml /tools/XmlGenerator/*.sqlite /Remote.txt /tools/XmlGenerator/sqlite-latest.sqlite.bz2 +*.diff diff --git a/src/EVEMon.Common/Controls/ControlExtensions.cs b/src/EVEMon.Common/Controls/ControlExtensions.cs index 8e69feed9..f51232beb 100644 --- a/src/EVEMon.Common/Controls/ControlExtensions.cs +++ b/src/EVEMon.Common/Controls/ControlExtensions.cs @@ -29,7 +29,7 @@ public static bool IsDesignModeHosted(this Control control) /// The parent. public static void SuspendDrawing(this Control parent) { - NativeMethods.SendMessage(parent.Handle, NativeMethods.WM_SETREDRAW, IntPtr.Zero, IntPtr.Zero); + //NativeMethods.SendMessage(parent.Handle, NativeMethods.WM_SETREDRAW, IntPtr.Zero, IntPtr.Zero); } /// @@ -38,8 +38,8 @@ public static void SuspendDrawing(this Control parent) /// The parent. public static void ResumeDrawing(this Control parent) { - NativeMethods.SendMessage(parent.Handle, NativeMethods.WM_SETREDRAW, (IntPtr)1, IntPtr.Zero); - parent.Refresh(); + //NativeMethods.SendMessage(parent.Handle, NativeMethods.WM_SETREDRAW, (IntPtr)1, IntPtr.Zero); + //parent.Refresh(); } } -} \ No newline at end of file +} diff --git a/src/EVEMon.Common/Controls/NoFlickerListBox.cs b/src/EVEMon.Common/Controls/NoFlickerListBox.cs index b5637a260..9fce082df 100644 --- a/src/EVEMon.Common/Controls/NoFlickerListBox.cs +++ b/src/EVEMon.Common/Controls/NoFlickerListBox.cs @@ -16,10 +16,6 @@ public class NoFlickerListBox : ListBox public NoFlickerListBox() : base() { pointerDown = DateTime.MinValue; - -#warning VEG EXPERIMENT set doublebuffered to true. - - DoubleBuffered = true; } /// diff --git a/src/EVEMon.Common/EveMonClient.Events.cs b/src/EVEMon.Common/EveMonClient.Events.cs index f6a36242b..a888082aa 100644 --- a/src/EVEMon.Common/EveMonClient.Events.cs +++ b/src/EVEMon.Common/EveMonClient.Events.cs @@ -58,7 +58,7 @@ public static partial class EveMonClient /// Occurs when the collection of a character implant set changed. /// public static event EventHandler CharacterImplantSetCollectionChanged; - + /// /// Occurs when an account status has been updated. /// @@ -128,7 +128,7 @@ public static partial class EveMonClient /// Occurs when a character info has been updated. /// public static event EventHandler CharacterInfoUpdated; - + /// /// Occurs when a character skill queue has been updated. /// @@ -263,7 +263,7 @@ public static partial class EveMonClient /// Occurs when the notifications of a character have been updated. /// public static event EventHandler CharacterEVENotificationsUpdated; - + /// /// Occurs when the text of a character contacts have been updated. /// @@ -566,7 +566,7 @@ internal static void OnCharacterListUpdated(ESIKey esiKey) Settings.Save(); CharacterListUpdated?.ThreadSafeInvoke(null, new ESIKeyInfoChangedEventArgs(esiKey)); } - + /// /// Called when the character implant set collection changed. /// @@ -932,7 +932,7 @@ internal static void OnCharacterEVENotificationsUpdated(Character character) Settings.Save(); CharacterEVENotificationsUpdated?.ThreadSafeInvoke(null, new CharacterChangedEventArgs(character)); } - + /// /// Called when the character contacts updated. /// diff --git a/src/EVEMon.Common/Extensions/EventHandlerExtensions.cs b/src/EVEMon.Common/Extensions/EventHandlerExtensions.cs index adc846d3c..70c1a6b4d 100644 --- a/src/EVEMon.Common/Extensions/EventHandlerExtensions.cs +++ b/src/EVEMon.Common/Extensions/EventHandlerExtensions.cs @@ -1,6 +1,9 @@ using System; +using System.Collections.Generic; using System.ComponentModel; +using System.Diagnostics; using System.Linq; +using System.Threading; namespace EVEMon.Common.Extensions { @@ -22,9 +25,18 @@ public static void ThreadSafeInvoke(this EventHandler eventHandler, object sende if (eventHandler == null) return; + Stopwatch sw = new Stopwatch(); + sw.Start(); + + Stopwatch time = new Stopwatch(); + List> timing = new List>(); + // Get each subscriber in turn foreach (EventHandler handler in eventHandler.GetInvocationList().Cast()) { + time.Reset(); + time.Start(); + // Get the object containing the subscribing method // If the target doesn't implement ISyncronizeInvoke, this will be null ISynchronizeInvoke sync = handler.Target as ISynchronizeInvoke; @@ -36,13 +48,31 @@ public static void ThreadSafeInvoke(this EventHandler eventHandler, object sende // This is preferable to using Invoke so that if an exception is thrown its presented // in the context of the handler, not the current thread IAsyncResult result = sync.BeginInvoke(handler, new[] { sender, e }); + //veg + //Thread.Sleep(1); sync.EndInvoke(result); continue; } // No it doesn't, so invoke the handler directly handler.Invoke(sender, e); + + timing.Add(new KeyValuePair(time.ElapsedTicks, $"{handler.Method.DeclaringType.FullName}.{handler.Method.Name}")); + + //System.Windows.Forms.Application.DoEvents(); + + //veg + //Thread.Sleep(1); } + + sw.Stop(); + + foreach (KeyValuePair kvp in timing.OrderBy(p => p.Key).Reverse().Take(5)) + { + EveMonClient.Trace($"{kvp.Key} - {kvp.Value}"); + } + + EveMonClient.Trace($"ThreadSafeInvoke: { sw.ElapsedMilliseconds} ms for {eventHandler.GetInvocationList().Length} delegates"); } /// diff --git a/src/EVEMon.Common/Resources/MD5Sums.txt b/src/EVEMon.Common/Resources/MD5Sums.txt index 845dbeb87..5adaf99ec 100644 --- a/src/EVEMon.Common/Resources/MD5Sums.txt +++ b/src/EVEMon.Common/Resources/MD5Sums.txt @@ -1,8 +1,8 @@ -c3e6655e8322fa6f3cf0632fe60786c9 *eve-blueprints-en-US.xml.gzip +1696c1353c8f093cc80e7fd8cb168802 *eve-blueprints-en-US.xml.gzip 540000f7c111354769a54fa31e57d411 *eve-certificates-en-US.xml.gzip -0d58b21ab445f316241589ef91fffc24 *eve-geography-en-US.xml.gzip -e4c1c54c78c0fa96ab5f794f910f9fec *eve-items-en-US.xml.gzip +f6d92ef6e5eff757d6243a2d7634e2ed *eve-geography-en-US.xml.gzip +60b547da64a2c8c8b25786e66de0bc19 *eve-items-en-US.xml.gzip 3668b50996fc40a0c0853fec427b5712 *eve-masteries-en-US.xml.gzip -1f6ae9f613fd26b08d5ec206d0958d79 *eve-properties-en-US.xml.gzip -adb83f4fc55f61a58548dcb924a91cfe *eve-reprocessing-en-US.xml.gzip -727a781211b138cf331afed346692962 *eve-skills-en-US.xml.gzip +d01964a405b26a8178c5bf6eb3d18024 *eve-properties-en-US.xml.gzip +f68c0ffcffb71e030264f3561d4ea711 *eve-reprocessing-en-US.xml.gzip +1d77a55aff0610b6200a18acb937dc12 *eve-skills-en-US.xml.gzip diff --git a/src/EVEMon.Common/Resources/eve-blueprints-en-US.xml.gzip b/src/EVEMon.Common/Resources/eve-blueprints-en-US.xml.gzip index 8ce90fd30..d9d14eb7a 100644 Binary files a/src/EVEMon.Common/Resources/eve-blueprints-en-US.xml.gzip and b/src/EVEMon.Common/Resources/eve-blueprints-en-US.xml.gzip differ diff --git a/src/EVEMon.Common/Resources/eve-geography-en-US.xml.gzip b/src/EVEMon.Common/Resources/eve-geography-en-US.xml.gzip index d70ef2329..14fec732c 100644 Binary files a/src/EVEMon.Common/Resources/eve-geography-en-US.xml.gzip and b/src/EVEMon.Common/Resources/eve-geography-en-US.xml.gzip differ diff --git a/src/EVEMon.Common/Resources/eve-items-en-US.xml.gzip b/src/EVEMon.Common/Resources/eve-items-en-US.xml.gzip index c37db06eb..5ed89f719 100644 Binary files a/src/EVEMon.Common/Resources/eve-items-en-US.xml.gzip and b/src/EVEMon.Common/Resources/eve-items-en-US.xml.gzip differ diff --git a/src/EVEMon.Common/Resources/eve-properties-en-US.xml.gzip b/src/EVEMon.Common/Resources/eve-properties-en-US.xml.gzip index d1ae47543..8ed0b4bba 100644 Binary files a/src/EVEMon.Common/Resources/eve-properties-en-US.xml.gzip and b/src/EVEMon.Common/Resources/eve-properties-en-US.xml.gzip differ diff --git a/src/EVEMon.Common/Resources/eve-reprocessing-en-US.xml.gzip b/src/EVEMon.Common/Resources/eve-reprocessing-en-US.xml.gzip index 9fb044e73..6c9175352 100644 Binary files a/src/EVEMon.Common/Resources/eve-reprocessing-en-US.xml.gzip and b/src/EVEMon.Common/Resources/eve-reprocessing-en-US.xml.gzip differ diff --git a/src/EVEMon.Common/Resources/eve-skills-en-US.xml.gzip b/src/EVEMon.Common/Resources/eve-skills-en-US.xml.gzip index 29d68f7e7..0fb72db84 100644 Binary files a/src/EVEMon.Common/Resources/eve-skills-en-US.xml.gzip and b/src/EVEMon.Common/Resources/eve-skills-en-US.xml.gzip differ diff --git a/src/EVEMon.Common/Serialization/Flags.xml b/src/EVEMon.Common/Serialization/Flags.xml index 917b2e41e..4c2dad40e 100644 --- a/src/EVEMon.Common/Serialization/Flags.xml +++ b/src/EVEMon.Common/Serialization/Flags.xml @@ -1,5 +1,5 @@ - + @@ -89,7 +89,7 @@ - + @@ -135,5 +135,9 @@ + + + + \ No newline at end of file diff --git a/src/EVEMon.Common/Service/EveIDToName.cs b/src/EVEMon.Common/Service/EveIDToName.cs index 9439bc721..1d4bf8c50 100644 --- a/src/EVEMon.Common/Service/EveIDToName.cs +++ b/src/EVEMon.Common/Service/EveIDToName.cs @@ -115,7 +115,7 @@ private static void Import(IEnumerable entiti private static Task UpdateOnOneSecondTickAsync() { // Is a save requested and is the last save older than 10s ? - if (s_savePending && DateTime.UtcNow > s_lastSaveTime.AddSeconds(10)) + if (s_savePending && DateTime.UtcNow > s_lastSaveTime.AddSeconds(30)) return SaveImmediateAsync(); return Task.CompletedTask; diff --git a/src/EVEMon.Common/Threading/Dispatcher.cs b/src/EVEMon.Common/Threading/Dispatcher.cs index 96e17eac9..2ba281e83 100644 --- a/src/EVEMon.Common/Threading/Dispatcher.cs +++ b/src/EVEMon.Common/Threading/Dispatcher.cs @@ -70,12 +70,32 @@ public static void Schedule(TimeSpan time, Action action) timer.Start(); } + private static object locker = new object(); + /// /// Occurs on every second, when the timer ticks. /// private static void OneSecondTickTimer_Tick(object sender, EventArgs e) { - EveMonClient.UpdateOnOneSecondTick(); + s_oneSecondTimer.Stop(); + + if (Monitor.TryEnter(locker)) + { + try + { + EveMonClient.UpdateOnOneSecondTick(); + } + finally + { + Monitor.Exit(locker); + } + } + else + { + EveMonClient.Trace($"Skipped OneSecondTickTimer_Tick()"); + } + + s_oneSecondTimer.Start(); } } } diff --git a/src/EVEMon/CharacterMonitoring/CharacterMonitorBody.cs b/src/EVEMon/CharacterMonitoring/CharacterMonitorBody.cs index 1e065d883..5c0e10813 100644 --- a/src/EVEMon/CharacterMonitoring/CharacterMonitorBody.cs +++ b/src/EVEMon/CharacterMonitoring/CharacterMonitorBody.cs @@ -161,7 +161,8 @@ private void OnDisposed(object sender, EventArgs e) /// private void UpdateFrequentControls() { - SuspendLayout(); + //veg + //SuspendLayout(); try { // Hides or shows the warning about a character with no API key @@ -169,7 +170,8 @@ private void UpdateFrequentControls() } finally { - ResumeLayout(false); + //veg + //ResumeLayout(false); Refresh(); } } @@ -183,7 +185,8 @@ private void UpdateInfrequentControls() if (!Visible) return; - SuspendLayout(); + //veg + //SuspendLayout(); try { // Reset the text filter @@ -227,8 +230,9 @@ private void UpdateInfrequentControls() } finally { - ResumeLayout(false); - Refresh(); + //veg + //ResumeLayout(false); + //Refresh(); } } diff --git a/src/EVEMon/CharacterMonitoring/CharacterMonitorFooter.cs b/src/EVEMon/CharacterMonitoring/CharacterMonitorFooter.cs index 02609af08..69e9b3177 100644 --- a/src/EVEMon/CharacterMonitoring/CharacterMonitorFooter.cs +++ b/src/EVEMon/CharacterMonitoring/CharacterMonitorFooter.cs @@ -101,7 +101,8 @@ private void OnDisposed(object sender, EventArgs e) /// private void UpdateFrequentControls() { - SuspendLayout(); + //veg + //SuspendLayout(); try { // Update the training controls @@ -109,7 +110,8 @@ private void UpdateFrequentControls() } finally { - ResumeLayout(false); + //veg + //ResumeLayout(false); } } @@ -241,7 +243,8 @@ private void UpdateInfrequentControls() if (!Visible) return; - SuspendLayout(); + //veg + //SuspendLayout(); try { // "Update Calendar" button @@ -249,7 +252,8 @@ private void UpdateInfrequentControls() } finally { - ResumeLayout(false); + //veg + //ResumeLayout(false); } } diff --git a/src/EVEMon/CharacterMonitoring/CharacterMonitorHeader.Designer.cs b/src/EVEMon/CharacterMonitoring/CharacterMonitorHeader.Designer.cs index 7e85158bc..6ba871421 100644 --- a/src/EVEMon/CharacterMonitoring/CharacterMonitorHeader.Designer.cs +++ b/src/EVEMon/CharacterMonitoring/CharacterMonitorHeader.Designer.cs @@ -28,625 +28,625 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.MainTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); - this.AccountStatusTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); - this.AccountStatusLabel = new System.Windows.Forms.Label(); - this.AccountActivityLabel = new System.Windows.Forms.Label(); - this.PaidUntilLabel = new System.Windows.Forms.Label(); - this.ThrobberFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); - this.UpdateThrobber = new EVEMon.Common.Controls.Throbber(); - this.ThrobberContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.ChangeAPIKeyInfoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.QueryEverythingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ThrobberSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.UpdateLabel = new System.Windows.Forms.Label(); - this.BioFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); - this.CharacterNameLabel = new System.Windows.Forms.Label(); - this.BioInfoLabel = new System.Windows.Forms.Label(); - this.BalanceLabel = new System.Windows.Forms.Label(); - this.BirthdayLabel = new System.Windows.Forms.Label(); - this.CorporationNameLabel = new System.Windows.Forms.Label(); - this.CorporationInfoFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); - this.AllianceNameLabel = new System.Windows.Forms.Label(); - this.SecurityStatusLabel = new System.Windows.Forms.Label(); - this.ActiveShipLabel = new System.Windows.Forms.Label(); - this.ActiveShipFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); - this.LocationInfoLabel = new System.Windows.Forms.Label(); - this.DockedInfoLabel = new System.Windows.Forms.Label(); - this.CharacterPortrait = new EVEMon.Common.Controls.CharacterPortrait(); - this.SkillSummaryPanel = new System.Windows.Forms.Panel(); - this.CustomLabelLink = new System.Windows.Forms.LinkLabel(); - this.RemapsCloneJumpSummaryLabel = new System.Windows.Forms.Label(); - this.tlpAttributes = new System.Windows.Forms.TableLayoutPanel(); - this.lblMEMAttribute = new System.Windows.Forms.Label(); - this.lblWILAttribute = new System.Windows.Forms.Label(); - this.lblCHAAttribute = new System.Windows.Forms.Label(); - this.lblPERAttribute = new System.Windows.Forms.Label(); - this.AttributeCharismaLabel = new System.Windows.Forms.Label(); - this.AttributePerceptionLabel = new System.Windows.Forms.Label(); - this.AttributeIntelligenceLabel = new System.Windows.Forms.Label(); - this.AttributeMemoryLabel = new System.Windows.Forms.Label(); - this.AttributeWillpowerLabel = new System.Windows.Forms.Label(); - this.lblINTAttribute = new System.Windows.Forms.Label(); - this.SkillSummaryLabel = new System.Windows.Forms.Label(); - this.CustomLabelComboBox = new System.Windows.Forms.ComboBox(); - this.CharacterLabel = new System.Windows.Forms.Label(); - this.AccountStatusModeComboBox = new System.Windows.Forms.ComboBox(); - this.ToolTip = new System.Windows.Forms.ToolTip(this.components); - this.MainTableLayoutPanel.SuspendLayout(); - this.AccountStatusTableLayoutPanel.SuspendLayout(); - this.ThrobberFlowLayoutPanel.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.UpdateThrobber)).BeginInit(); - this.ThrobberContextMenu.SuspendLayout(); - this.BioFlowLayoutPanel.SuspendLayout(); - this.SkillSummaryPanel.SuspendLayout(); - this.tlpAttributes.SuspendLayout(); - this.SuspendLayout(); - // - // MainTableLayoutPanel - // - this.MainTableLayoutPanel.AutoSize = true; - this.MainTableLayoutPanel.ColumnCount = 3; - this.MainTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.MainTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.MainTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.MainTableLayoutPanel.Controls.Add(this.AccountStatusTableLayoutPanel, 0, 1); - this.MainTableLayoutPanel.Controls.Add(this.ThrobberFlowLayoutPanel, 2, 0); - this.MainTableLayoutPanel.Controls.Add(this.BioFlowLayoutPanel, 1, 0); - this.MainTableLayoutPanel.Controls.Add(this.CharacterPortrait, 0, 0); - this.MainTableLayoutPanel.Controls.Add(this.SkillSummaryPanel, 1, 1); - this.MainTableLayoutPanel.Controls.Add(this.AccountStatusModeComboBox, 0, 2); - this.MainTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.MainTableLayoutPanel.Location = new System.Drawing.Point(0, 0); - this.MainTableLayoutPanel.Margin = new System.Windows.Forms.Padding(0); - this.MainTableLayoutPanel.Name = "MainTableLayoutPanel"; - this.MainTableLayoutPanel.RowCount = 3; - this.MainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.MainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.MainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 50F)); - this.MainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.MainTableLayoutPanel.Size = new System.Drawing.Size(525, 204); - this.MainTableLayoutPanel.TabIndex = 0; - // - // AccountStatusTableLayoutPanel - // - this.AccountStatusTableLayoutPanel.ColumnCount = 2; - this.AccountStatusTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.AccountStatusTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.AccountStatusTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.AccountStatusTableLayoutPanel.Controls.Add(this.AccountStatusLabel, 0, 0); - this.AccountStatusTableLayoutPanel.Controls.Add(this.AccountActivityLabel, 1, 0); - this.AccountStatusTableLayoutPanel.Controls.Add(this.PaidUntilLabel, 0, 1); - this.AccountStatusTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.AccountStatusTableLayoutPanel.Location = new System.Drawing.Point(0, 131); - this.AccountStatusTableLayoutPanel.Margin = new System.Windows.Forms.Padding(0); - this.AccountStatusTableLayoutPanel.Name = "AccountStatusTableLayoutPanel"; - this.AccountStatusTableLayoutPanel.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0); - this.AccountStatusTableLayoutPanel.RowCount = 2; - this.AccountStatusTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.AccountStatusTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.AccountStatusTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.AccountStatusTableLayoutPanel.Size = new System.Drawing.Size(136, 45); - this.AccountStatusTableLayoutPanel.TabIndex = 11; - // - // AccountStatusLabel - // - this.AccountStatusLabel.AutoSize = true; - this.AccountStatusLabel.Location = new System.Drawing.Point(0, 5); - this.AccountStatusLabel.Margin = new System.Windows.Forms.Padding(0); - this.AccountStatusLabel.Name = "AccountStatusLabel"; - this.AccountStatusLabel.Size = new System.Drawing.Size(83, 13); - this.AccountStatusLabel.TabIndex = 0; - this.AccountStatusLabel.Text = "Account Status:"; - // - // AccountActivityLabel - // - this.AccountActivityLabel.AutoSize = true; - this.AccountActivityLabel.Location = new System.Drawing.Point(83, 5); - this.AccountActivityLabel.Margin = new System.Windows.Forms.Padding(0); - this.AccountActivityLabel.Name = "AccountActivityLabel"; - this.AccountActivityLabel.Size = new System.Drawing.Size(25, 13); - this.AccountActivityLabel.TabIndex = 1; - this.AccountActivityLabel.Text = "???"; - // - // PaidUntilLabel - // - this.PaidUntilLabel.AutoSize = true; - this.AccountStatusTableLayoutPanel.SetColumnSpan(this.PaidUntilLabel, 2); - this.PaidUntilLabel.Location = new System.Drawing.Point(0, 18); - this.PaidUntilLabel.Margin = new System.Windows.Forms.Padding(0); - this.PaidUntilLabel.Name = "PaidUntilLabel"; - this.PaidUntilLabel.Size = new System.Drawing.Size(126, 13); - this.PaidUntilLabel.TabIndex = 2; - this.PaidUntilLabel.Text = "dd/MM/YYYY HH:mm:ss"; - // - // ThrobberFlowLayoutPanel - // - this.ThrobberFlowLayoutPanel.AutoSize = true; - this.ThrobberFlowLayoutPanel.Controls.Add(this.UpdateThrobber); - this.ThrobberFlowLayoutPanel.Controls.Add(this.UpdateLabel); - this.ThrobberFlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.ThrobberFlowLayoutPanel.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; - this.ThrobberFlowLayoutPanel.Location = new System.Drawing.Point(464, 0); - this.ThrobberFlowLayoutPanel.Margin = new System.Windows.Forms.Padding(0); - this.ThrobberFlowLayoutPanel.Name = "ThrobberFlowLayoutPanel"; - this.ThrobberFlowLayoutPanel.Size = new System.Drawing.Size(61, 131); - this.ThrobberFlowLayoutPanel.TabIndex = 10; - // - // UpdateThrobber - // - this.UpdateThrobber.ContextMenuStrip = this.ThrobberContextMenu; - this.UpdateThrobber.Dock = System.Windows.Forms.DockStyle.Right; - this.UpdateThrobber.Location = new System.Drawing.Point(34, 3); - this.UpdateThrobber.MaximumSize = new System.Drawing.Size(24, 24); - this.UpdateThrobber.MinimumSize = new System.Drawing.Size(24, 24); - this.UpdateThrobber.Name = "UpdateThrobber"; - this.UpdateThrobber.Size = new System.Drawing.Size(24, 24); - this.UpdateThrobber.State = EVEMon.Common.Enumerations.ThrobberState.Stopped; - this.UpdateThrobber.TabIndex = 4; - this.UpdateThrobber.TabStop = false; - this.UpdateThrobber.MouseDown += new System.Windows.Forms.MouseEventHandler(this.UpdateThrobber_MouseDown); - this.UpdateThrobber.MouseMove += new System.Windows.Forms.MouseEventHandler(this.UpdateThrobber_MouseMove); - // - // ThrobberContextMenu - // - this.ThrobberContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + this.MainTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); + this.AccountStatusTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); + this.AccountStatusLabel = new System.Windows.Forms.Label(); + this.AccountActivityLabel = new System.Windows.Forms.Label(); + this.PaidUntilLabel = new System.Windows.Forms.Label(); + this.ThrobberFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); + this.UpdateThrobber = new EVEMon.Common.Controls.Throbber(); + this.ThrobberContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.ChangeAPIKeyInfoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.QueryEverythingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ThrobberSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.UpdateLabel = new System.Windows.Forms.Label(); + this.BioFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); + this.CharacterNameLabel = new System.Windows.Forms.Label(); + this.BioInfoLabel = new System.Windows.Forms.Label(); + this.BalanceLabel = new System.Windows.Forms.Label(); + this.BirthdayLabel = new System.Windows.Forms.Label(); + this.CorporationNameLabel = new System.Windows.Forms.Label(); + this.CorporationInfoFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); + this.AllianceNameLabel = new System.Windows.Forms.Label(); + this.SecurityStatusLabel = new System.Windows.Forms.Label(); + this.ActiveShipLabel = new System.Windows.Forms.Label(); + this.ActiveShipFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); + this.LocationInfoLabel = new System.Windows.Forms.Label(); + this.DockedInfoLabel = new System.Windows.Forms.Label(); + this.CharacterPortrait = new EVEMon.Common.Controls.CharacterPortrait(); + this.SkillSummaryPanel = new System.Windows.Forms.Panel(); + this.CustomLabelLink = new System.Windows.Forms.LinkLabel(); + this.RemapsCloneJumpSummaryLabel = new System.Windows.Forms.Label(); + this.tlpAttributes = new System.Windows.Forms.TableLayoutPanel(); + this.lblMEMAttribute = new System.Windows.Forms.Label(); + this.lblWILAttribute = new System.Windows.Forms.Label(); + this.lblCHAAttribute = new System.Windows.Forms.Label(); + this.lblPERAttribute = new System.Windows.Forms.Label(); + this.AttributeCharismaLabel = new System.Windows.Forms.Label(); + this.AttributePerceptionLabel = new System.Windows.Forms.Label(); + this.AttributeIntelligenceLabel = new System.Windows.Forms.Label(); + this.AttributeMemoryLabel = new System.Windows.Forms.Label(); + this.AttributeWillpowerLabel = new System.Windows.Forms.Label(); + this.lblINTAttribute = new System.Windows.Forms.Label(); + this.SkillSummaryLabel = new System.Windows.Forms.Label(); + this.CustomLabelComboBox = new System.Windows.Forms.ComboBox(); + this.CharacterLabel = new System.Windows.Forms.Label(); + this.AccountStatusModeComboBox = new System.Windows.Forms.ComboBox(); + this.ToolTip = new System.Windows.Forms.ToolTip(this.components); + this.MainTableLayoutPanel.SuspendLayout(); + this.AccountStatusTableLayoutPanel.SuspendLayout(); + this.ThrobberFlowLayoutPanel.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.UpdateThrobber)).BeginInit(); + this.ThrobberContextMenu.SuspendLayout(); + this.BioFlowLayoutPanel.SuspendLayout(); + this.SkillSummaryPanel.SuspendLayout(); + this.tlpAttributes.SuspendLayout(); + this.SuspendLayout(); + // + // MainTableLayoutPanel + // + this.MainTableLayoutPanel.AutoSize = true; + this.MainTableLayoutPanel.ColumnCount = 3; + this.MainTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.MainTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.MainTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.MainTableLayoutPanel.Controls.Add(this.AccountStatusTableLayoutPanel, 0, 1); + this.MainTableLayoutPanel.Controls.Add(this.ThrobberFlowLayoutPanel, 2, 0); + this.MainTableLayoutPanel.Controls.Add(this.BioFlowLayoutPanel, 1, 0); + this.MainTableLayoutPanel.Controls.Add(this.CharacterPortrait, 0, 0); + this.MainTableLayoutPanel.Controls.Add(this.SkillSummaryPanel, 1, 1); + this.MainTableLayoutPanel.Controls.Add(this.AccountStatusModeComboBox, 0, 2); + this.MainTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.MainTableLayoutPanel.Location = new System.Drawing.Point(0, 0); + this.MainTableLayoutPanel.Margin = new System.Windows.Forms.Padding(0); + this.MainTableLayoutPanel.Name = "MainTableLayoutPanel"; + this.MainTableLayoutPanel.RowCount = 3; + this.MainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.MainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.MainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 50F)); + this.MainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.MainTableLayoutPanel.Size = new System.Drawing.Size(525, 204); + this.MainTableLayoutPanel.TabIndex = 0; + // + // AccountStatusTableLayoutPanel + // + this.AccountStatusTableLayoutPanel.ColumnCount = 2; + this.AccountStatusTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.AccountStatusTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.AccountStatusTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.AccountStatusTableLayoutPanel.Controls.Add(this.AccountStatusLabel, 0, 0); + this.AccountStatusTableLayoutPanel.Controls.Add(this.AccountActivityLabel, 1, 0); + this.AccountStatusTableLayoutPanel.Controls.Add(this.PaidUntilLabel, 0, 1); + this.AccountStatusTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.AccountStatusTableLayoutPanel.Location = new System.Drawing.Point(0, 131); + this.AccountStatusTableLayoutPanel.Margin = new System.Windows.Forms.Padding(0); + this.AccountStatusTableLayoutPanel.Name = "AccountStatusTableLayoutPanel"; + this.AccountStatusTableLayoutPanel.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0); + this.AccountStatusTableLayoutPanel.RowCount = 2; + this.AccountStatusTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.AccountStatusTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.AccountStatusTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.AccountStatusTableLayoutPanel.Size = new System.Drawing.Size(136, 45); + this.AccountStatusTableLayoutPanel.TabIndex = 11; + // + // AccountStatusLabel + // + this.AccountStatusLabel.AutoSize = true; + this.AccountStatusLabel.Location = new System.Drawing.Point(0, 5); + this.AccountStatusLabel.Margin = new System.Windows.Forms.Padding(0); + this.AccountStatusLabel.Name = "AccountStatusLabel"; + this.AccountStatusLabel.Size = new System.Drawing.Size(83, 13); + this.AccountStatusLabel.TabIndex = 0; + this.AccountStatusLabel.Text = "Account Status:"; + // + // AccountActivityLabel + // + this.AccountActivityLabel.AutoSize = true; + this.AccountActivityLabel.Location = new System.Drawing.Point(83, 5); + this.AccountActivityLabel.Margin = new System.Windows.Forms.Padding(0); + this.AccountActivityLabel.Name = "AccountActivityLabel"; + this.AccountActivityLabel.Size = new System.Drawing.Size(25, 13); + this.AccountActivityLabel.TabIndex = 1; + this.AccountActivityLabel.Text = "???"; + // + // PaidUntilLabel + // + this.PaidUntilLabel.AutoSize = true; + this.AccountStatusTableLayoutPanel.SetColumnSpan(this.PaidUntilLabel, 2); + this.PaidUntilLabel.Location = new System.Drawing.Point(0, 18); + this.PaidUntilLabel.Margin = new System.Windows.Forms.Padding(0); + this.PaidUntilLabel.Name = "PaidUntilLabel"; + this.PaidUntilLabel.Size = new System.Drawing.Size(126, 13); + this.PaidUntilLabel.TabIndex = 2; + this.PaidUntilLabel.Text = "dd/MM/YYYY HH:mm:ss"; + // + // ThrobberFlowLayoutPanel + // + this.ThrobberFlowLayoutPanel.AutoSize = true; + this.ThrobberFlowLayoutPanel.Controls.Add(this.UpdateThrobber); + this.ThrobberFlowLayoutPanel.Controls.Add(this.UpdateLabel); + this.ThrobberFlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.ThrobberFlowLayoutPanel.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.ThrobberFlowLayoutPanel.Location = new System.Drawing.Point(464, 0); + this.ThrobberFlowLayoutPanel.Margin = new System.Windows.Forms.Padding(0); + this.ThrobberFlowLayoutPanel.Name = "ThrobberFlowLayoutPanel"; + this.ThrobberFlowLayoutPanel.Size = new System.Drawing.Size(61, 131); + this.ThrobberFlowLayoutPanel.TabIndex = 10; + // + // UpdateThrobber + // + this.UpdateThrobber.ContextMenuStrip = this.ThrobberContextMenu; + this.UpdateThrobber.Dock = System.Windows.Forms.DockStyle.Right; + this.UpdateThrobber.Location = new System.Drawing.Point(34, 3); + this.UpdateThrobber.MaximumSize = new System.Drawing.Size(24, 24); + this.UpdateThrobber.MinimumSize = new System.Drawing.Size(24, 24); + this.UpdateThrobber.Name = "UpdateThrobber"; + this.UpdateThrobber.Size = new System.Drawing.Size(24, 24); + this.UpdateThrobber.State = EVEMon.Common.Enumerations.ThrobberState.Stopped; + this.UpdateThrobber.TabIndex = 4; + this.UpdateThrobber.TabStop = false; + this.UpdateThrobber.MouseDown += new System.Windows.Forms.MouseEventHandler(this.UpdateThrobber_MouseDown); + this.UpdateThrobber.MouseMove += new System.Windows.Forms.MouseEventHandler(this.UpdateThrobber_MouseMove); + // + // ThrobberContextMenu + // + this.ThrobberContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ChangeAPIKeyInfoMenuItem, this.QueryEverythingMenuItem, this.ThrobberSeparator}); - this.ThrobberContextMenu.Name = "cmsThrobberMenu"; - this.ThrobberContextMenu.Size = new System.Drawing.Size(234, 54); - this.ThrobberContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ThrobberContextMenu_Opening); - this.ThrobberContextMenu.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.ThrobberContextMenu_ItemClicked); - // - // ChangeAPIKeyInfoMenuItem - // - this.ChangeAPIKeyInfoMenuItem.Name = "ChangeAPIKeyInfoMenuItem"; - this.ChangeAPIKeyInfoMenuItem.Size = new System.Drawing.Size(233, 22); - this.ChangeAPIKeyInfoMenuItem.Text = "Change API Key Information..."; - this.ChangeAPIKeyInfoMenuItem.Click += new System.EventHandler(this.ChangeAPIKeyInfoMenuItem_Click); - // - // QueryEverythingMenuItem - // - this.QueryEverythingMenuItem.Name = "QueryEverythingMenuItem"; - this.QueryEverythingMenuItem.Size = new System.Drawing.Size(233, 22); - this.QueryEverythingMenuItem.Text = "Update Everything"; - // - // ThrobberSeparator - // - this.ThrobberSeparator.Name = "ThrobberSeparator"; - this.ThrobberSeparator.Size = new System.Drawing.Size(230, 6); - // - // UpdateLabel - // - this.UpdateLabel.AutoSize = true; - this.UpdateLabel.Dock = System.Windows.Forms.DockStyle.Right; - this.UpdateLabel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.UpdateLabel.Location = new System.Drawing.Point(0, 30); - this.UpdateLabel.Margin = new System.Windows.Forms.Padding(0); - this.UpdateLabel.Name = "UpdateLabel"; - this.UpdateLabel.Size = new System.Drawing.Size(61, 13); - this.UpdateLabel.TabIndex = 5; - this.UpdateLabel.Text = "0000:00:00"; - this.UpdateLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.UpdateLabel.MouseHover += new System.EventHandler(this.UpdateLabel_MouseHover); - // - // BioFlowLayoutPanel - // - this.BioFlowLayoutPanel.AutoSize = true; - this.BioFlowLayoutPanel.Controls.Add(this.CharacterNameLabel); - this.BioFlowLayoutPanel.Controls.Add(this.BioInfoLabel); - this.BioFlowLayoutPanel.Controls.Add(this.BalanceLabel); - this.BioFlowLayoutPanel.Controls.Add(this.BirthdayLabel); - this.BioFlowLayoutPanel.Controls.Add(this.CorporationNameLabel); - this.BioFlowLayoutPanel.Controls.Add(this.CorporationInfoFlowLayoutPanel); - this.BioFlowLayoutPanel.Controls.Add(this.AllianceNameLabel); - this.BioFlowLayoutPanel.Controls.Add(this.SecurityStatusLabel); - this.BioFlowLayoutPanel.Controls.Add(this.ActiveShipLabel); - this.BioFlowLayoutPanel.Controls.Add(this.ActiveShipFlowLayoutPanel); - this.BioFlowLayoutPanel.Controls.Add(this.LocationInfoLabel); - this.BioFlowLayoutPanel.Controls.Add(this.DockedInfoLabel); - this.BioFlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.BioFlowLayoutPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.BioFlowLayoutPanel.Location = new System.Drawing.Point(136, 0); - this.BioFlowLayoutPanel.Margin = new System.Windows.Forms.Padding(0); - this.BioFlowLayoutPanel.Name = "BioFlowLayoutPanel"; - this.BioFlowLayoutPanel.Size = new System.Drawing.Size(328, 131); - this.BioFlowLayoutPanel.TabIndex = 9; - // - // CharacterNameLabel - // - this.CharacterNameLabel.AutoSize = true; - this.CharacterNameLabel.Location = new System.Drawing.Point(0, 0); - this.CharacterNameLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); - this.CharacterNameLabel.Name = "CharacterNameLabel"; - this.CharacterNameLabel.Size = new System.Drawing.Size(84, 13); - this.CharacterNameLabel.TabIndex = 4; - this.CharacterNameLabel.Text = "Character Name"; - this.CharacterNameLabel.UseMnemonic = false; - // - // BioInfoLabel - // - this.BioInfoLabel.AutoSize = true; - this.BioInfoLabel.Location = new System.Drawing.Point(0, 13); - this.BioInfoLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); - this.BioInfoLabel.Name = "BioInfoLabel"; - this.BioInfoLabel.Size = new System.Drawing.Size(43, 13); - this.BioInfoLabel.TabIndex = 5; - this.BioInfoLabel.Text = "Bio Info"; - // - // BalanceLabel - // - this.BalanceLabel.AutoSize = true; - this.BalanceLabel.Location = new System.Drawing.Point(0, 26); - this.BalanceLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); - this.BalanceLabel.Name = "BalanceLabel"; - this.BalanceLabel.Size = new System.Drawing.Size(93, 13); - this.BalanceLabel.TabIndex = 7; - this.BalanceLabel.Text = "Balance: 0.00 ISK"; - // - // BirthdayLabel - // - this.BirthdayLabel.AutoSize = true; - this.BirthdayLabel.Location = new System.Drawing.Point(0, 39); - this.BirthdayLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); - this.BirthdayLabel.Name = "BirthdayLabel"; - this.BirthdayLabel.Size = new System.Drawing.Size(45, 13); - this.BirthdayLabel.TabIndex = 8; - this.BirthdayLabel.Text = "Birthday"; - // - // CorporationNameLabel - // - this.CorporationNameLabel.AutoSize = true; - this.CorporationNameLabel.Location = new System.Drawing.Point(0, 52); - this.CorporationNameLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); - this.CorporationNameLabel.Name = "CorporationNameLabel"; - this.CorporationNameLabel.Size = new System.Drawing.Size(82, 13); - this.CorporationNameLabel.TabIndex = 6; - this.CorporationNameLabel.Text = "Corporation Info"; - this.CorporationNameLabel.UseMnemonic = false; - // - // CorporationInfoFlowLayoutPanel - // - this.CorporationInfoFlowLayoutPanel.AutoSize = true; - this.CorporationInfoFlowLayoutPanel.Location = new System.Drawing.Point(0, 65); - this.CorporationInfoFlowLayoutPanel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); - this.CorporationInfoFlowLayoutPanel.Name = "CorporationInfoFlowLayoutPanel"; - this.CorporationInfoFlowLayoutPanel.Size = new System.Drawing.Size(0, 0); - this.CorporationInfoFlowLayoutPanel.TabIndex = 13; - // - // AllianceNameLabel - // - this.AllianceNameLabel.AutoSize = true; - this.AllianceNameLabel.Location = new System.Drawing.Point(0, 65); - this.AllianceNameLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); - this.AllianceNameLabel.Name = "AllianceNameLabel"; - this.AllianceNameLabel.Size = new System.Drawing.Size(65, 13); - this.AllianceNameLabel.TabIndex = 7; - this.AllianceNameLabel.Text = "Alliance Info"; - this.AllianceNameLabel.UseMnemonic = false; - // - // SecurityStatusLabel - // - this.SecurityStatusLabel.AutoSize = true; - this.SecurityStatusLabel.Location = new System.Drawing.Point(0, 78); - this.SecurityStatusLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); - this.SecurityStatusLabel.Name = "SecurityStatusLabel"; - this.SecurityStatusLabel.Size = new System.Drawing.Size(99, 13); - this.SecurityStatusLabel.TabIndex = 9; - this.SecurityStatusLabel.Text = "Security Status Info"; - // - // ActiveShipLabel - // - this.ActiveShipLabel.AutoSize = true; - this.ActiveShipLabel.Location = new System.Drawing.Point(0, 91); - this.ActiveShipLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); - this.ActiveShipLabel.Name = "ActiveShipLabel"; - this.ActiveShipLabel.Size = new System.Drawing.Size(82, 13); - this.ActiveShipLabel.TabIndex = 10; - this.ActiveShipLabel.Text = "Active Ship Info"; - this.ActiveShipLabel.UseMnemonic = false; - // - // ActiveShipFlowLayoutPanel - // - this.ActiveShipFlowLayoutPanel.AutoSize = true; - this.ActiveShipFlowLayoutPanel.Location = new System.Drawing.Point(0, 104); - this.ActiveShipFlowLayoutPanel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); - this.ActiveShipFlowLayoutPanel.Name = "ActiveShipFlowLayoutPanel"; - this.ActiveShipFlowLayoutPanel.Size = new System.Drawing.Size(0, 0); - this.ActiveShipFlowLayoutPanel.TabIndex = 12; - this.ActiveShipFlowLayoutPanel.WrapContents = false; - // - // LocationInfoLabel - // - this.LocationInfoLabel.AutoSize = true; - this.LocationInfoLabel.Location = new System.Drawing.Point(0, 104); - this.LocationInfoLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); - this.LocationInfoLabel.Name = "LocationInfoLabel"; - this.LocationInfoLabel.Size = new System.Drawing.Size(69, 13); - this.LocationInfoLabel.TabIndex = 12; - this.LocationInfoLabel.Text = "Location Info"; - this.LocationInfoLabel.UseMnemonic = false; - // - // DockedInfoLabel - // - this.DockedInfoLabel.AutoSize = true; - this.DockedInfoLabel.Location = new System.Drawing.Point(0, 117); - this.DockedInfoLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); - this.DockedInfoLabel.Name = "DockedInfoLabel"; - this.DockedInfoLabel.Size = new System.Drawing.Size(66, 13); - this.DockedInfoLabel.TabIndex = 14; - this.DockedInfoLabel.Text = "Docked Info"; - this.DockedInfoLabel.UseMnemonic = false; - // - // CharacterPortrait - // - this.CharacterPortrait.AutoSize = true; - this.CharacterPortrait.Character = null; - this.CharacterPortrait.Dock = System.Windows.Forms.DockStyle.Fill; - this.CharacterPortrait.Location = new System.Drawing.Point(3, 3); - this.CharacterPortrait.Margin = new System.Windows.Forms.Padding(3, 3, 5, 0); - this.CharacterPortrait.MinimumSize = new System.Drawing.Size(128, 128); - this.CharacterPortrait.Name = "CharacterPortrait"; - this.CharacterPortrait.Size = new System.Drawing.Size(128, 128); - this.CharacterPortrait.TabIndex = 2; - this.CharacterPortrait.TabStop = false; - // - // SkillSummaryPanel - // - this.SkillSummaryPanel.AutoSize = true; - this.MainTableLayoutPanel.SetColumnSpan(this.SkillSummaryPanel, 2); - this.SkillSummaryPanel.Controls.Add(this.CustomLabelLink); - this.SkillSummaryPanel.Controls.Add(this.RemapsCloneJumpSummaryLabel); - this.SkillSummaryPanel.Controls.Add(this.tlpAttributes); - this.SkillSummaryPanel.Controls.Add(this.SkillSummaryLabel); - this.SkillSummaryPanel.Controls.Add(this.CustomLabelComboBox); - this.SkillSummaryPanel.Controls.Add(this.CharacterLabel); - this.SkillSummaryPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.SkillSummaryPanel.Location = new System.Drawing.Point(136, 131); - this.SkillSummaryPanel.Margin = new System.Windows.Forms.Padding(0); - this.SkillSummaryPanel.Name = "SkillSummaryPanel"; - this.SkillSummaryPanel.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0); - this.MainTableLayoutPanel.SetRowSpan(this.SkillSummaryPanel, 2); - this.SkillSummaryPanel.Size = new System.Drawing.Size(389, 95); - this.SkillSummaryPanel.TabIndex = 4; - // - // CustomLabelLink - // - this.CustomLabelLink.AutoSize = true; - this.CustomLabelLink.Location = new System.Drawing.Point(138, 50); - this.CustomLabelLink.Name = "CustomLabelLink"; - this.CustomLabelLink.Size = new System.Drawing.Size(0, 13); - this.CustomLabelLink.TabIndex = 7; - this.ToolTip.SetToolTip(this.CustomLabelLink, "Character label - click to edit"); - this.CustomLabelLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.CustomLabelLink_LinkClicked); - // - // RemapsCloneJumpSummaryLabel - // - this.RemapsCloneJumpSummaryLabel.AutoSize = true; - this.RemapsCloneJumpSummaryLabel.BackColor = System.Drawing.Color.Transparent; - this.RemapsCloneJumpSummaryLabel.Dock = System.Windows.Forms.DockStyle.Left; - this.RemapsCloneJumpSummaryLabel.Location = new System.Drawing.Point(89, 5); - this.RemapsCloneJumpSummaryLabel.Margin = new System.Windows.Forms.Padding(0); - this.RemapsCloneJumpSummaryLabel.Name = "RemapsCloneJumpSummaryLabel"; - this.RemapsCloneJumpSummaryLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.RemapsCloneJumpSummaryLabel.Size = new System.Drawing.Size(138, 39); - this.RemapsCloneJumpSummaryLabel.TabIndex = 6; - this.RemapsCloneJumpSummaryLabel.Text = "Bonus Remaps: 0\r\nNext Neural Remap: Now\r\nNext Clone Jump: Now"; - // - // tlpAttributes - // - this.tlpAttributes.AutoSize = true; - this.tlpAttributes.ColumnCount = 2; - this.tlpAttributes.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tlpAttributes.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tlpAttributes.Controls.Add(this.lblMEMAttribute, 1, 4); - this.tlpAttributes.Controls.Add(this.lblWILAttribute, 1, 3); - this.tlpAttributes.Controls.Add(this.lblCHAAttribute, 1, 2); - this.tlpAttributes.Controls.Add(this.lblPERAttribute, 1, 1); - this.tlpAttributes.Controls.Add(this.AttributeCharismaLabel, 0, 2); - this.tlpAttributes.Controls.Add(this.AttributePerceptionLabel, 0, 1); - this.tlpAttributes.Controls.Add(this.AttributeIntelligenceLabel, 0, 0); - this.tlpAttributes.Controls.Add(this.AttributeMemoryLabel, 0, 4); - this.tlpAttributes.Controls.Add(this.AttributeWillpowerLabel, 0, 3); - this.tlpAttributes.Controls.Add(this.lblINTAttribute, 1, 0); - this.tlpAttributes.Dock = System.Windows.Forms.DockStyle.Left; - this.tlpAttributes.Location = new System.Drawing.Point(0, 5); - this.tlpAttributes.Name = "tlpAttributes"; - this.tlpAttributes.RowCount = 5; - this.tlpAttributes.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpAttributes.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpAttributes.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpAttributes.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpAttributes.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpAttributes.Size = new System.Drawing.Size(89, 90); - this.tlpAttributes.TabIndex = 5; - // - // lblMEMAttribute - // - this.lblMEMAttribute.AutoSize = true; - this.lblMEMAttribute.Location = new System.Drawing.Point(67, 52); - this.lblMEMAttribute.Name = "lblMEMAttribute"; - this.lblMEMAttribute.Size = new System.Drawing.Size(19, 13); - this.lblMEMAttribute.TabIndex = 9; - this.lblMEMAttribute.Text = "17"; - this.lblMEMAttribute.MouseHover += new System.EventHandler(this.AttributeLabel_MouseHover); - // - // lblWILAttribute - // - this.lblWILAttribute.AutoSize = true; - this.lblWILAttribute.Location = new System.Drawing.Point(67, 39); - this.lblWILAttribute.Name = "lblWILAttribute"; - this.lblWILAttribute.Size = new System.Drawing.Size(19, 13); - this.lblWILAttribute.TabIndex = 8; - this.lblWILAttribute.Text = "17"; - this.lblWILAttribute.MouseHover += new System.EventHandler(this.AttributeLabel_MouseHover); - // - // lblCHAAttribute - // - this.lblCHAAttribute.AutoSize = true; - this.lblCHAAttribute.Location = new System.Drawing.Point(67, 26); - this.lblCHAAttribute.Name = "lblCHAAttribute"; - this.lblCHAAttribute.Size = new System.Drawing.Size(19, 13); - this.lblCHAAttribute.TabIndex = 7; - this.lblCHAAttribute.Text = "17"; - this.lblCHAAttribute.MouseHover += new System.EventHandler(this.AttributeLabel_MouseHover); - // - // lblPERAttribute - // - this.lblPERAttribute.AutoSize = true; - this.lblPERAttribute.Location = new System.Drawing.Point(67, 13); - this.lblPERAttribute.Name = "lblPERAttribute"; - this.lblPERAttribute.Size = new System.Drawing.Size(19, 13); - this.lblPERAttribute.TabIndex = 6; - this.lblPERAttribute.Text = "17"; - this.lblPERAttribute.MouseHover += new System.EventHandler(this.AttributeLabel_MouseHover); - // - // AttributeCharismaLabel - // - this.AttributeCharismaLabel.AutoSize = true; - this.AttributeCharismaLabel.Location = new System.Drawing.Point(0, 26); - this.AttributeCharismaLabel.Margin = new System.Windows.Forms.Padding(0); - this.AttributeCharismaLabel.Name = "AttributeCharismaLabel"; - this.AttributeCharismaLabel.Size = new System.Drawing.Size(53, 13); - this.AttributeCharismaLabel.TabIndex = 2; - this.AttributeCharismaLabel.Text = "Charisma:"; - // - // AttributePerceptionLabel - // - this.AttributePerceptionLabel.AutoSize = true; - this.AttributePerceptionLabel.Location = new System.Drawing.Point(0, 13); - this.AttributePerceptionLabel.Margin = new System.Windows.Forms.Padding(0); - this.AttributePerceptionLabel.Name = "AttributePerceptionLabel"; - this.AttributePerceptionLabel.Size = new System.Drawing.Size(61, 13); - this.AttributePerceptionLabel.TabIndex = 1; - this.AttributePerceptionLabel.Text = "Perception:"; - // - // AttributeIntelligenceLabel - // - this.AttributeIntelligenceLabel.AutoSize = true; - this.AttributeIntelligenceLabel.Location = new System.Drawing.Point(0, 0); - this.AttributeIntelligenceLabel.Margin = new System.Windows.Forms.Padding(0); - this.AttributeIntelligenceLabel.Name = "AttributeIntelligenceLabel"; - this.AttributeIntelligenceLabel.Size = new System.Drawing.Size(64, 13); - this.AttributeIntelligenceLabel.TabIndex = 0; - this.AttributeIntelligenceLabel.Text = "Intelligence:"; - // - // AttributeMemoryLabel - // - this.AttributeMemoryLabel.AutoSize = true; - this.AttributeMemoryLabel.Location = new System.Drawing.Point(0, 52); - this.AttributeMemoryLabel.Margin = new System.Windows.Forms.Padding(0); - this.AttributeMemoryLabel.Name = "AttributeMemoryLabel"; - this.AttributeMemoryLabel.Size = new System.Drawing.Size(47, 13); - this.AttributeMemoryLabel.TabIndex = 4; - this.AttributeMemoryLabel.Text = "Memory:"; - // - // AttributeWillpowerLabel - // - this.AttributeWillpowerLabel.AutoSize = true; - this.AttributeWillpowerLabel.Location = new System.Drawing.Point(0, 39); - this.AttributeWillpowerLabel.Margin = new System.Windows.Forms.Padding(0); - this.AttributeWillpowerLabel.Name = "AttributeWillpowerLabel"; - this.AttributeWillpowerLabel.Size = new System.Drawing.Size(56, 13); - this.AttributeWillpowerLabel.TabIndex = 3; - this.AttributeWillpowerLabel.Text = "Willpower:"; - // - // lblINTAttribute - // - this.lblINTAttribute.AutoSize = true; - this.lblINTAttribute.Location = new System.Drawing.Point(67, 0); - this.lblINTAttribute.Name = "lblINTAttribute"; - this.lblINTAttribute.Size = new System.Drawing.Size(19, 13); - this.lblINTAttribute.TabIndex = 5; - this.lblINTAttribute.Text = "17"; - this.lblINTAttribute.MouseHover += new System.EventHandler(this.AttributeLabel_MouseHover); - // - // SkillSummaryLabel - // - this.SkillSummaryLabel.AutoSize = true; - this.SkillSummaryLabel.BackColor = System.Drawing.Color.Transparent; - this.SkillSummaryLabel.Dock = System.Windows.Forms.DockStyle.Right; - this.SkillSummaryLabel.Location = new System.Drawing.Point(295, 5); - this.SkillSummaryLabel.Margin = new System.Windows.Forms.Padding(0); - this.SkillSummaryLabel.Name = "SkillSummaryLabel"; - this.SkillSummaryLabel.Size = new System.Drawing.Size(94, 52); - this.SkillSummaryLabel.TabIndex = 1; - this.SkillSummaryLabel.Text = "Known Skills: 0\r\nSkills at Level V: 0\r\nTotal SP: 0\r\nFree SP: 0"; - this.SkillSummaryLabel.TextAlign = System.Drawing.ContentAlignment.TopRight; - this.SkillSummaryLabel.MouseHover += new System.EventHandler(this.SkillSummaryLabel_MouseHover); - // - // CustomLabelComboBox - // - this.CustomLabelComboBox.Location = new System.Drawing.Point(138, 47); - this.CustomLabelComboBox.MaxLength = 256; - this.CustomLabelComboBox.Name = "CustomLabelComboBox"; - this.CustomLabelComboBox.Size = new System.Drawing.Size(130, 21); - this.CustomLabelComboBox.TabIndex = 3; - this.ToolTip.SetToolTip(this.CustomLabelComboBox, "Character label"); - this.CustomLabelComboBox.Visible = false; - this.CustomLabelComboBox.SelectedIndexChanged += new System.EventHandler(this.CustomLabelComboBox_TextChanged); - this.CustomLabelComboBox.KeyUp += new System.Windows.Forms.KeyEventHandler(this.CustomLabelComboBox_KeyUp); - this.CustomLabelComboBox.Validated += new System.EventHandler(this.CustomLabelComboBox_TextChanged); - // - // CharacterLabel - // - this.CharacterLabel.AutoSize = true; - this.CharacterLabel.Location = new System.Drawing.Point(89, 50); - this.CharacterLabel.Margin = new System.Windows.Forms.Padding(0); - this.CharacterLabel.Name = "CharacterLabel"; - this.CharacterLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.CharacterLabel.Size = new System.Drawing.Size(46, 13); - this.CharacterLabel.TabIndex = 3; - this.CharacterLabel.Text = "Label:"; - // - // AccountStatusModeComboBox - // - this.AccountStatusModeComboBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.AccountStatusModeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.AccountStatusModeComboBox.Items.AddRange(new object[] { + this.ThrobberContextMenu.Name = "cmsThrobberMenu"; + this.ThrobberContextMenu.Size = new System.Drawing.Size(234, 54); + this.ThrobberContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ThrobberContextMenu_Opening); + this.ThrobberContextMenu.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.ThrobberContextMenu_ItemClicked); + // + // ChangeAPIKeyInfoMenuItem + // + this.ChangeAPIKeyInfoMenuItem.Name = "ChangeAPIKeyInfoMenuItem"; + this.ChangeAPIKeyInfoMenuItem.Size = new System.Drawing.Size(233, 22); + this.ChangeAPIKeyInfoMenuItem.Text = "Change API Key Information..."; + this.ChangeAPIKeyInfoMenuItem.Click += new System.EventHandler(this.ChangeAPIKeyInfoMenuItem_Click); + // + // QueryEverythingMenuItem + // + this.QueryEverythingMenuItem.Name = "QueryEverythingMenuItem"; + this.QueryEverythingMenuItem.Size = new System.Drawing.Size(233, 22); + this.QueryEverythingMenuItem.Text = "Update Everything"; + // + // ThrobberSeparator + // + this.ThrobberSeparator.Name = "ThrobberSeparator"; + this.ThrobberSeparator.Size = new System.Drawing.Size(230, 6); + // + // UpdateLabel + // + this.UpdateLabel.AutoSize = true; + this.UpdateLabel.Dock = System.Windows.Forms.DockStyle.Right; + this.UpdateLabel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.UpdateLabel.Location = new System.Drawing.Point(0, 30); + this.UpdateLabel.Margin = new System.Windows.Forms.Padding(0); + this.UpdateLabel.Name = "UpdateLabel"; + this.UpdateLabel.Size = new System.Drawing.Size(61, 13); + this.UpdateLabel.TabIndex = 5; + this.UpdateLabel.Text = "0000:00:00"; + this.UpdateLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.UpdateLabel.MouseHover += new System.EventHandler(this.UpdateLabel_MouseHover); + // + // BioFlowLayoutPanel + // + this.BioFlowLayoutPanel.AutoSize = true; + this.BioFlowLayoutPanel.Controls.Add(this.CharacterNameLabel); + this.BioFlowLayoutPanel.Controls.Add(this.BioInfoLabel); + this.BioFlowLayoutPanel.Controls.Add(this.BalanceLabel); + this.BioFlowLayoutPanel.Controls.Add(this.BirthdayLabel); + this.BioFlowLayoutPanel.Controls.Add(this.CorporationNameLabel); + this.BioFlowLayoutPanel.Controls.Add(this.CorporationInfoFlowLayoutPanel); + this.BioFlowLayoutPanel.Controls.Add(this.AllianceNameLabel); + this.BioFlowLayoutPanel.Controls.Add(this.SecurityStatusLabel); + this.BioFlowLayoutPanel.Controls.Add(this.ActiveShipLabel); + this.BioFlowLayoutPanel.Controls.Add(this.ActiveShipFlowLayoutPanel); + this.BioFlowLayoutPanel.Controls.Add(this.LocationInfoLabel); + this.BioFlowLayoutPanel.Controls.Add(this.DockedInfoLabel); + this.BioFlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.BioFlowLayoutPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; + this.BioFlowLayoutPanel.Location = new System.Drawing.Point(136, 0); + this.BioFlowLayoutPanel.Margin = new System.Windows.Forms.Padding(0); + this.BioFlowLayoutPanel.Name = "BioFlowLayoutPanel"; + this.BioFlowLayoutPanel.Size = new System.Drawing.Size(328, 131); + this.BioFlowLayoutPanel.TabIndex = 9; + // + // CharacterNameLabel + // + this.CharacterNameLabel.AutoSize = true; + this.CharacterNameLabel.Location = new System.Drawing.Point(0, 0); + this.CharacterNameLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.CharacterNameLabel.Name = "CharacterNameLabel"; + this.CharacterNameLabel.Size = new System.Drawing.Size(84, 13); + this.CharacterNameLabel.TabIndex = 4; + this.CharacterNameLabel.Text = "Character Name"; + this.CharacterNameLabel.UseMnemonic = false; + // + // BioInfoLabel + // + this.BioInfoLabel.AutoSize = true; + this.BioInfoLabel.Location = new System.Drawing.Point(0, 13); + this.BioInfoLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.BioInfoLabel.Name = "BioInfoLabel"; + this.BioInfoLabel.Size = new System.Drawing.Size(43, 13); + this.BioInfoLabel.TabIndex = 5; + this.BioInfoLabel.Text = "Bio Info"; + // + // BalanceLabel + // + this.BalanceLabel.AutoSize = true; + this.BalanceLabel.Location = new System.Drawing.Point(0, 26); + this.BalanceLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.BalanceLabel.Name = "BalanceLabel"; + this.BalanceLabel.Size = new System.Drawing.Size(93, 13); + this.BalanceLabel.TabIndex = 7; + this.BalanceLabel.Text = "Balance: 0.00 ISK"; + // + // BirthdayLabel + // + this.BirthdayLabel.AutoSize = true; + this.BirthdayLabel.Location = new System.Drawing.Point(0, 39); + this.BirthdayLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.BirthdayLabel.Name = "BirthdayLabel"; + this.BirthdayLabel.Size = new System.Drawing.Size(45, 13); + this.BirthdayLabel.TabIndex = 8; + this.BirthdayLabel.Text = "Birthday"; + // + // CorporationNameLabel + // + this.CorporationNameLabel.AutoSize = true; + this.CorporationNameLabel.Location = new System.Drawing.Point(0, 52); + this.CorporationNameLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.CorporationNameLabel.Name = "CorporationNameLabel"; + this.CorporationNameLabel.Size = new System.Drawing.Size(82, 13); + this.CorporationNameLabel.TabIndex = 6; + this.CorporationNameLabel.Text = "Corporation Info"; + this.CorporationNameLabel.UseMnemonic = false; + // + // CorporationInfoFlowLayoutPanel + // + this.CorporationInfoFlowLayoutPanel.AutoSize = true; + this.CorporationInfoFlowLayoutPanel.Location = new System.Drawing.Point(0, 65); + this.CorporationInfoFlowLayoutPanel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.CorporationInfoFlowLayoutPanel.Name = "CorporationInfoFlowLayoutPanel"; + this.CorporationInfoFlowLayoutPanel.Size = new System.Drawing.Size(0, 0); + this.CorporationInfoFlowLayoutPanel.TabIndex = 13; + // + // AllianceNameLabel + // + this.AllianceNameLabel.AutoSize = true; + this.AllianceNameLabel.Location = new System.Drawing.Point(0, 65); + this.AllianceNameLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.AllianceNameLabel.Name = "AllianceNameLabel"; + this.AllianceNameLabel.Size = new System.Drawing.Size(65, 13); + this.AllianceNameLabel.TabIndex = 7; + this.AllianceNameLabel.Text = "Alliance Info"; + this.AllianceNameLabel.UseMnemonic = false; + // + // SecurityStatusLabel + // + this.SecurityStatusLabel.AutoSize = true; + this.SecurityStatusLabel.Location = new System.Drawing.Point(0, 78); + this.SecurityStatusLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.SecurityStatusLabel.Name = "SecurityStatusLabel"; + this.SecurityStatusLabel.Size = new System.Drawing.Size(99, 13); + this.SecurityStatusLabel.TabIndex = 9; + this.SecurityStatusLabel.Text = "Security Status Info"; + // + // ActiveShipLabel + // + this.ActiveShipLabel.AutoSize = true; + this.ActiveShipLabel.Location = new System.Drawing.Point(0, 91); + this.ActiveShipLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.ActiveShipLabel.Name = "ActiveShipLabel"; + this.ActiveShipLabel.Size = new System.Drawing.Size(82, 13); + this.ActiveShipLabel.TabIndex = 10; + this.ActiveShipLabel.Text = "Active Ship Info"; + this.ActiveShipLabel.UseMnemonic = false; + // + // ActiveShipFlowLayoutPanel + // + this.ActiveShipFlowLayoutPanel.AutoSize = true; + this.ActiveShipFlowLayoutPanel.Location = new System.Drawing.Point(0, 104); + this.ActiveShipFlowLayoutPanel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.ActiveShipFlowLayoutPanel.Name = "ActiveShipFlowLayoutPanel"; + this.ActiveShipFlowLayoutPanel.Size = new System.Drawing.Size(0, 0); + this.ActiveShipFlowLayoutPanel.TabIndex = 12; + this.ActiveShipFlowLayoutPanel.WrapContents = false; + // + // LocationInfoLabel + // + this.LocationInfoLabel.AutoSize = true; + this.LocationInfoLabel.Location = new System.Drawing.Point(0, 104); + this.LocationInfoLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.LocationInfoLabel.Name = "LocationInfoLabel"; + this.LocationInfoLabel.Size = new System.Drawing.Size(69, 13); + this.LocationInfoLabel.TabIndex = 12; + this.LocationInfoLabel.Text = "Location Info"; + this.LocationInfoLabel.UseMnemonic = false; + // + // DockedInfoLabel + // + this.DockedInfoLabel.AutoSize = true; + this.DockedInfoLabel.Location = new System.Drawing.Point(0, 117); + this.DockedInfoLabel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.DockedInfoLabel.Name = "DockedInfoLabel"; + this.DockedInfoLabel.Size = new System.Drawing.Size(66, 13); + this.DockedInfoLabel.TabIndex = 14; + this.DockedInfoLabel.Text = "Docked Info"; + this.DockedInfoLabel.UseMnemonic = false; + // + // CharacterPortrait + // + this.CharacterPortrait.AutoSize = true; + this.CharacterPortrait.Character = null; + this.CharacterPortrait.Dock = System.Windows.Forms.DockStyle.Fill; + this.CharacterPortrait.Location = new System.Drawing.Point(3, 3); + this.CharacterPortrait.Margin = new System.Windows.Forms.Padding(3, 3, 5, 0); + this.CharacterPortrait.MinimumSize = new System.Drawing.Size(128, 128); + this.CharacterPortrait.Name = "CharacterPortrait"; + this.CharacterPortrait.Size = new System.Drawing.Size(128, 128); + this.CharacterPortrait.TabIndex = 2; + this.CharacterPortrait.TabStop = false; + // + // SkillSummaryPanel + // + this.SkillSummaryPanel.AutoSize = true; + this.MainTableLayoutPanel.SetColumnSpan(this.SkillSummaryPanel, 2); + this.SkillSummaryPanel.Controls.Add(this.CustomLabelLink); + this.SkillSummaryPanel.Controls.Add(this.RemapsCloneJumpSummaryLabel); + this.SkillSummaryPanel.Controls.Add(this.tlpAttributes); + this.SkillSummaryPanel.Controls.Add(this.SkillSummaryLabel); + this.SkillSummaryPanel.Controls.Add(this.CustomLabelComboBox); + this.SkillSummaryPanel.Controls.Add(this.CharacterLabel); + this.SkillSummaryPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.SkillSummaryPanel.Location = new System.Drawing.Point(136, 131); + this.SkillSummaryPanel.Margin = new System.Windows.Forms.Padding(0); + this.SkillSummaryPanel.Name = "SkillSummaryPanel"; + this.SkillSummaryPanel.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0); + this.MainTableLayoutPanel.SetRowSpan(this.SkillSummaryPanel, 2); + this.SkillSummaryPanel.Size = new System.Drawing.Size(389, 95); + this.SkillSummaryPanel.TabIndex = 4; + // + // CustomLabelLink + // + this.CustomLabelLink.AutoSize = true; + this.CustomLabelLink.Location = new System.Drawing.Point(138, 50); + this.CustomLabelLink.Name = "CustomLabelLink"; + this.CustomLabelLink.Size = new System.Drawing.Size(0, 13); + this.CustomLabelLink.TabIndex = 7; + this.ToolTip.SetToolTip(this.CustomLabelLink, "Character label - click to edit"); + this.CustomLabelLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.CustomLabelLink_LinkClicked); + // + // RemapsCloneJumpSummaryLabel + // + this.RemapsCloneJumpSummaryLabel.AutoSize = true; + this.RemapsCloneJumpSummaryLabel.BackColor = System.Drawing.Color.Transparent; + this.RemapsCloneJumpSummaryLabel.Dock = System.Windows.Forms.DockStyle.Left; + this.RemapsCloneJumpSummaryLabel.Location = new System.Drawing.Point(89, 5); + this.RemapsCloneJumpSummaryLabel.Margin = new System.Windows.Forms.Padding(0); + this.RemapsCloneJumpSummaryLabel.Name = "RemapsCloneJumpSummaryLabel"; + this.RemapsCloneJumpSummaryLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); + this.RemapsCloneJumpSummaryLabel.Size = new System.Drawing.Size(138, 39); + this.RemapsCloneJumpSummaryLabel.TabIndex = 6; + this.RemapsCloneJumpSummaryLabel.Text = "Bonus Remaps: 0\r\nNext Neural Remap: Now\r\nNext Clone Jump: Now"; + // + // tlpAttributes + // + this.tlpAttributes.AutoSize = true; + this.tlpAttributes.ColumnCount = 2; + this.tlpAttributes.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tlpAttributes.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tlpAttributes.Controls.Add(this.lblMEMAttribute, 1, 4); + this.tlpAttributes.Controls.Add(this.lblWILAttribute, 1, 3); + this.tlpAttributes.Controls.Add(this.lblCHAAttribute, 1, 2); + this.tlpAttributes.Controls.Add(this.lblPERAttribute, 1, 1); + this.tlpAttributes.Controls.Add(this.AttributeCharismaLabel, 0, 2); + this.tlpAttributes.Controls.Add(this.AttributePerceptionLabel, 0, 1); + this.tlpAttributes.Controls.Add(this.AttributeIntelligenceLabel, 0, 0); + this.tlpAttributes.Controls.Add(this.AttributeMemoryLabel, 0, 4); + this.tlpAttributes.Controls.Add(this.AttributeWillpowerLabel, 0, 3); + this.tlpAttributes.Controls.Add(this.lblINTAttribute, 1, 0); + this.tlpAttributes.Dock = System.Windows.Forms.DockStyle.Left; + this.tlpAttributes.Location = new System.Drawing.Point(0, 5); + this.tlpAttributes.Name = "tlpAttributes"; + this.tlpAttributes.RowCount = 5; + this.tlpAttributes.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpAttributes.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpAttributes.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpAttributes.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpAttributes.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpAttributes.Size = new System.Drawing.Size(89, 90); + this.tlpAttributes.TabIndex = 5; + // + // lblMEMAttribute + // + this.lblMEMAttribute.AutoSize = true; + this.lblMEMAttribute.Location = new System.Drawing.Point(67, 52); + this.lblMEMAttribute.Name = "lblMEMAttribute"; + this.lblMEMAttribute.Size = new System.Drawing.Size(19, 13); + this.lblMEMAttribute.TabIndex = 9; + this.lblMEMAttribute.Text = "17"; + this.lblMEMAttribute.MouseHover += new System.EventHandler(this.AttributeLabel_MouseHover); + // + // lblWILAttribute + // + this.lblWILAttribute.AutoSize = true; + this.lblWILAttribute.Location = new System.Drawing.Point(67, 39); + this.lblWILAttribute.Name = "lblWILAttribute"; + this.lblWILAttribute.Size = new System.Drawing.Size(19, 13); + this.lblWILAttribute.TabIndex = 8; + this.lblWILAttribute.Text = "17"; + this.lblWILAttribute.MouseHover += new System.EventHandler(this.AttributeLabel_MouseHover); + // + // lblCHAAttribute + // + this.lblCHAAttribute.AutoSize = true; + this.lblCHAAttribute.Location = new System.Drawing.Point(67, 26); + this.lblCHAAttribute.Name = "lblCHAAttribute"; + this.lblCHAAttribute.Size = new System.Drawing.Size(19, 13); + this.lblCHAAttribute.TabIndex = 7; + this.lblCHAAttribute.Text = "17"; + this.lblCHAAttribute.MouseHover += new System.EventHandler(this.AttributeLabel_MouseHover); + // + // lblPERAttribute + // + this.lblPERAttribute.AutoSize = true; + this.lblPERAttribute.Location = new System.Drawing.Point(67, 13); + this.lblPERAttribute.Name = "lblPERAttribute"; + this.lblPERAttribute.Size = new System.Drawing.Size(19, 13); + this.lblPERAttribute.TabIndex = 6; + this.lblPERAttribute.Text = "17"; + this.lblPERAttribute.MouseHover += new System.EventHandler(this.AttributeLabel_MouseHover); + // + // AttributeCharismaLabel + // + this.AttributeCharismaLabel.AutoSize = true; + this.AttributeCharismaLabel.Location = new System.Drawing.Point(0, 26); + this.AttributeCharismaLabel.Margin = new System.Windows.Forms.Padding(0); + this.AttributeCharismaLabel.Name = "AttributeCharismaLabel"; + this.AttributeCharismaLabel.Size = new System.Drawing.Size(53, 13); + this.AttributeCharismaLabel.TabIndex = 2; + this.AttributeCharismaLabel.Text = "Charisma:"; + // + // AttributePerceptionLabel + // + this.AttributePerceptionLabel.AutoSize = true; + this.AttributePerceptionLabel.Location = new System.Drawing.Point(0, 13); + this.AttributePerceptionLabel.Margin = new System.Windows.Forms.Padding(0); + this.AttributePerceptionLabel.Name = "AttributePerceptionLabel"; + this.AttributePerceptionLabel.Size = new System.Drawing.Size(61, 13); + this.AttributePerceptionLabel.TabIndex = 1; + this.AttributePerceptionLabel.Text = "Perception:"; + // + // AttributeIntelligenceLabel + // + this.AttributeIntelligenceLabel.AutoSize = true; + this.AttributeIntelligenceLabel.Location = new System.Drawing.Point(0, 0); + this.AttributeIntelligenceLabel.Margin = new System.Windows.Forms.Padding(0); + this.AttributeIntelligenceLabel.Name = "AttributeIntelligenceLabel"; + this.AttributeIntelligenceLabel.Size = new System.Drawing.Size(64, 13); + this.AttributeIntelligenceLabel.TabIndex = 0; + this.AttributeIntelligenceLabel.Text = "Intelligence:"; + // + // AttributeMemoryLabel + // + this.AttributeMemoryLabel.AutoSize = true; + this.AttributeMemoryLabel.Location = new System.Drawing.Point(0, 52); + this.AttributeMemoryLabel.Margin = new System.Windows.Forms.Padding(0); + this.AttributeMemoryLabel.Name = "AttributeMemoryLabel"; + this.AttributeMemoryLabel.Size = new System.Drawing.Size(47, 13); + this.AttributeMemoryLabel.TabIndex = 4; + this.AttributeMemoryLabel.Text = "Memory:"; + // + // AttributeWillpowerLabel + // + this.AttributeWillpowerLabel.AutoSize = true; + this.AttributeWillpowerLabel.Location = new System.Drawing.Point(0, 39); + this.AttributeWillpowerLabel.Margin = new System.Windows.Forms.Padding(0); + this.AttributeWillpowerLabel.Name = "AttributeWillpowerLabel"; + this.AttributeWillpowerLabel.Size = new System.Drawing.Size(56, 13); + this.AttributeWillpowerLabel.TabIndex = 3; + this.AttributeWillpowerLabel.Text = "Willpower:"; + // + // lblINTAttribute + // + this.lblINTAttribute.AutoSize = true; + this.lblINTAttribute.Location = new System.Drawing.Point(67, 0); + this.lblINTAttribute.Name = "lblINTAttribute"; + this.lblINTAttribute.Size = new System.Drawing.Size(19, 13); + this.lblINTAttribute.TabIndex = 5; + this.lblINTAttribute.Text = "17"; + this.lblINTAttribute.MouseHover += new System.EventHandler(this.AttributeLabel_MouseHover); + // + // SkillSummaryLabel + // + this.SkillSummaryLabel.AutoSize = true; + this.SkillSummaryLabel.BackColor = System.Drawing.Color.Transparent; + this.SkillSummaryLabel.Dock = System.Windows.Forms.DockStyle.Right; + this.SkillSummaryLabel.Location = new System.Drawing.Point(295, 5); + this.SkillSummaryLabel.Margin = new System.Windows.Forms.Padding(0); + this.SkillSummaryLabel.Name = "SkillSummaryLabel"; + this.SkillSummaryLabel.Size = new System.Drawing.Size(94, 52); + this.SkillSummaryLabel.TabIndex = 1; + this.SkillSummaryLabel.Text = "Known Skills: 0\r\nSkills at Level V: 0\r\nTotal SP: 0\r\nFree SP: 0"; + this.SkillSummaryLabel.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.SkillSummaryLabel.MouseHover += new System.EventHandler(this.SkillSummaryLabel_MouseHover); + // + // CustomLabelComboBox + // + this.CustomLabelComboBox.Location = new System.Drawing.Point(138, 47); + this.CustomLabelComboBox.MaxLength = 256; + this.CustomLabelComboBox.Name = "CustomLabelComboBox"; + this.CustomLabelComboBox.Size = new System.Drawing.Size(130, 21); + this.CustomLabelComboBox.TabIndex = 3; + this.ToolTip.SetToolTip(this.CustomLabelComboBox, "Character label"); + this.CustomLabelComboBox.Visible = false; + this.CustomLabelComboBox.SelectedIndexChanged += new System.EventHandler(this.CustomLabelComboBox_TextChanged); + this.CustomLabelComboBox.KeyUp += new System.Windows.Forms.KeyEventHandler(this.CustomLabelComboBox_KeyUp); + this.CustomLabelComboBox.Validated += new System.EventHandler(this.CustomLabelComboBox_TextChanged); + // + // CharacterLabel + // + this.CharacterLabel.AutoSize = true; + this.CharacterLabel.Location = new System.Drawing.Point(89, 50); + this.CharacterLabel.Margin = new System.Windows.Forms.Padding(0); + this.CharacterLabel.Name = "CharacterLabel"; + this.CharacterLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); + this.CharacterLabel.Size = new System.Drawing.Size(46, 13); + this.CharacterLabel.TabIndex = 3; + this.CharacterLabel.Text = "Label:"; + // + // AccountStatusModeComboBox + // + this.AccountStatusModeComboBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.AccountStatusModeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.AccountStatusModeComboBox.Items.AddRange(new object[] { "Auto Detect", "Force Alpha", "Force Omega"}); - this.AccountStatusModeComboBox.Location = new System.Drawing.Point(3, 179); - this.AccountStatusModeComboBox.Name = "AccountStatusModeComboBox"; - this.AccountStatusModeComboBox.Size = new System.Drawing.Size(130, 21); - this.AccountStatusModeComboBox.TabIndex = 12; - this.ToolTip.SetToolTip(this.AccountStatusModeComboBox, "Manually set this character as Alpha or Omega, or restore to auto detect"); - this.AccountStatusModeComboBox.SelectedIndexChanged += new System.EventHandler(this.AccountStatusModeComboBox_SelectedIndexChanged); - // - // ToolTip - // - this.ToolTip.AutoPopDelay = 5000000; - this.ToolTip.InitialDelay = 500; - this.ToolTip.IsBalloon = true; - this.ToolTip.ReshowDelay = 100; - // - // CharacterMonitorHeader - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.MainTableLayoutPanel); - this.Name = "CharacterMonitorHeader"; - this.Size = new System.Drawing.Size(525, 204); - this.Resize += new System.EventHandler(this.CharacterMonitorHeader_Resize); - this.MainTableLayoutPanel.ResumeLayout(false); - this.MainTableLayoutPanel.PerformLayout(); - this.AccountStatusTableLayoutPanel.ResumeLayout(false); - this.AccountStatusTableLayoutPanel.PerformLayout(); - this.ThrobberFlowLayoutPanel.ResumeLayout(false); - this.ThrobberFlowLayoutPanel.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.UpdateThrobber)).EndInit(); - this.ThrobberContextMenu.ResumeLayout(false); - this.BioFlowLayoutPanel.ResumeLayout(false); - this.BioFlowLayoutPanel.PerformLayout(); - this.SkillSummaryPanel.ResumeLayout(false); - this.SkillSummaryPanel.PerformLayout(); - this.tlpAttributes.ResumeLayout(false); - this.tlpAttributes.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.AccountStatusModeComboBox.Location = new System.Drawing.Point(3, 179); + this.AccountStatusModeComboBox.Name = "AccountStatusModeComboBox"; + this.AccountStatusModeComboBox.Size = new System.Drawing.Size(130, 21); + this.AccountStatusModeComboBox.TabIndex = 12; + this.ToolTip.SetToolTip(this.AccountStatusModeComboBox, "Manually set this character as Alpha or Omega, or restore to auto detect"); + this.AccountStatusModeComboBox.SelectedIndexChanged += new System.EventHandler(this.AccountStatusModeComboBox_SelectedIndexChanged); + // + // ToolTip + // + this.ToolTip.AutoPopDelay = 5000000; + this.ToolTip.InitialDelay = 500; + this.ToolTip.IsBalloon = true; + this.ToolTip.ReshowDelay = 100; + // + // CharacterMonitorHeader + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.MainTableLayoutPanel); + this.Name = "CharacterMonitorHeader"; + this.Size = new System.Drawing.Size(525, 204); + this.Resize += new System.EventHandler(this.CharacterMonitorHeader_Resize); + this.MainTableLayoutPanel.ResumeLayout(false); + this.MainTableLayoutPanel.PerformLayout(); + this.AccountStatusTableLayoutPanel.ResumeLayout(false); + this.AccountStatusTableLayoutPanel.PerformLayout(); + this.ThrobberFlowLayoutPanel.ResumeLayout(false); + this.ThrobberFlowLayoutPanel.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.UpdateThrobber)).EndInit(); + this.ThrobberContextMenu.ResumeLayout(false); + this.BioFlowLayoutPanel.ResumeLayout(false); + this.BioFlowLayoutPanel.PerformLayout(); + this.SkillSummaryPanel.ResumeLayout(false); + this.SkillSummaryPanel.PerformLayout(); + this.tlpAttributes.ResumeLayout(false); + this.tlpAttributes.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/src/EVEMon/CharacterMonitoring/CharacterMonitorHeader.cs b/src/EVEMon/CharacterMonitoring/CharacterMonitorHeader.cs index badff8251..cf6354807 100644 --- a/src/EVEMon/CharacterMonitoring/CharacterMonitorHeader.cs +++ b/src/EVEMon/CharacterMonitoring/CharacterMonitorHeader.cs @@ -127,7 +127,8 @@ private void UpdateFrequentControls() if (m_character == null) return; - SuspendLayout(); + //veg + //SuspendLayout(); try { RefreshThrobber(); @@ -148,7 +149,8 @@ private void UpdateFrequentControls() } finally { - ResumeLayout(false); + //veg + //ResumeLayout(false); } } @@ -191,7 +193,8 @@ private void UpdateInfrequentControls() if (m_character == null) return; - SuspendLayout(); + //veg + //SuspendLayout(); try { // Safe for work implementation @@ -219,7 +222,8 @@ private void UpdateInfrequentControls() } finally { - ResumeLayout(false); + //veg + //ResumeLayout(false); } } @@ -231,7 +235,8 @@ private void UpdateInfoControls() if (m_character == null) return; - SuspendLayout(); + //veg + //SuspendLayout(); try { SecurityStatusLabel.Text = $"Security Status: {m_character.SecurityStatus:N2}"; @@ -246,7 +251,7 @@ private void UpdateInfoControls() } finally { - ResumeLayout(false); + //ResumeLayout(false); } } @@ -290,7 +295,8 @@ private void UpdateAccountStatusInfo() return; } - SuspendLayout(); + //veg + //SuspendLayout(); m_updatingStatus = true; try { @@ -332,7 +338,8 @@ private void UpdateAccountStatusInfo() finally { m_updatingStatus = false; - ResumeLayout(false); + //veg + //ResumeLayout(false); } } diff --git a/src/EVEMon/CharacterMonitoring/CharacterMonitorHeader.resx b/src/EVEMon/CharacterMonitoring/CharacterMonitorHeader.resx index 55f1fd4d3..a83ecaa69 100644 --- a/src/EVEMon/CharacterMonitoring/CharacterMonitorHeader.resx +++ b/src/EVEMon/CharacterMonitoring/CharacterMonitorHeader.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 193, 17 - 17, 17 diff --git a/src/EVEMon/MainWindow.Designer.cs b/src/EVEMon/MainWindow.Designer.cs index 658d62d9c..9eda0477d 100644 --- a/src/EVEMon/MainWindow.Designer.cs +++ b/src/EVEMon/MainWindow.Designer.cs @@ -250,7 +250,7 @@ private void InitializeComponent() // lblStatus // this.lblStatus.Name = "lblStatus"; - this.lblStatus.Size = new System.Drawing.Size(59, 17); + this.lblStatus.Size = new System.Drawing.Size(58, 17); this.lblStatus.Text = "EVE Time:"; // // lblServerStatus @@ -262,7 +262,7 @@ private void InitializeComponent() // toolStripStatusSpacerLabel // this.toolStripStatusSpacerLabel.Name = "toolStripStatusSpacerLabel"; - this.toolStripStatusSpacerLabel.Size = new System.Drawing.Size(287, 17); + this.toolStripStatusSpacerLabel.Size = new System.Drawing.Size(288, 17); this.toolStripStatusSpacerLabel.Spring = true; // // lblCSSProviderStatus @@ -542,7 +542,7 @@ private void InitializeComponent() this.secondSeparator, this.optionsToolStripMenuItem}); this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - this.toolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20); + this.toolsToolStripMenuItem.Size = new System.Drawing.Size(46, 20); this.toolsToolStripMenuItem.Text = "&Tools"; // // charactersComparisonMenuItem @@ -711,7 +711,7 @@ private void InitializeComponent() this.testTimeoutOneSecToolStripMenuItem, this.restartToolStripMenuItem}); this.testsToolStripMenuItem.Name = "testsToolStripMenuItem"; - this.testsToolStripMenuItem.Size = new System.Drawing.Size(40, 20); + this.testsToolStripMenuItem.Size = new System.Drawing.Size(39, 20); this.testsToolStripMenuItem.Text = "Te&st"; this.testsToolStripMenuItem.Visible = false; this.testsToolStripMenuItem.DropDownOpening += new System.EventHandler(this.testToolStripMenuItem_DropDownOpening); @@ -719,42 +719,42 @@ private void InitializeComponent() // exceptionWindowToolStripMenuItem // this.exceptionWindowToolStripMenuItem.Name = "exceptionWindowToolStripMenuItem"; - this.exceptionWindowToolStripMenuItem.Size = new System.Drawing.Size(287, 22); + this.exceptionWindowToolStripMenuItem.Size = new System.Drawing.Size(289, 22); this.exceptionWindowToolStripMenuItem.Text = "Exception Window"; this.exceptionWindowToolStripMenuItem.Click += new System.EventHandler(this.ExceptionWindowToolStripMenuItem_Click); // // exceptionWindowRecursiveExceptionToolStripMenuItem // this.exceptionWindowRecursiveExceptionToolStripMenuItem.Name = "exceptionWindowRecursiveExceptionToolStripMenuItem"; - this.exceptionWindowRecursiveExceptionToolStripMenuItem.Size = new System.Drawing.Size(287, 22); + this.exceptionWindowRecursiveExceptionToolStripMenuItem.Size = new System.Drawing.Size(289, 22); this.exceptionWindowRecursiveExceptionToolStripMenuItem.Text = "Exception Window (Recursive Exception)"; this.exceptionWindowRecursiveExceptionToolStripMenuItem.Click += new System.EventHandler(this.exceptionWindowRecursiveExceptionToolStripMenuItem_Click); // // testNotificationToolStripMenuItem // this.testNotificationToolStripMenuItem.Name = "testNotificationToolStripMenuItem"; - this.testNotificationToolStripMenuItem.Size = new System.Drawing.Size(287, 22); + this.testNotificationToolStripMenuItem.Size = new System.Drawing.Size(289, 22); this.testNotificationToolStripMenuItem.Text = "Notification"; this.testNotificationToolStripMenuItem.Click += new System.EventHandler(this.testNotificationToolstripMenuItem_Click); // // testCharacterNotificationToolStripMenuItem // this.testCharacterNotificationToolStripMenuItem.Name = "testCharacterNotificationToolStripMenuItem"; - this.testCharacterNotificationToolStripMenuItem.Size = new System.Drawing.Size(287, 22); + this.testCharacterNotificationToolStripMenuItem.Size = new System.Drawing.Size(289, 22); this.testCharacterNotificationToolStripMenuItem.Text = "Character Notification"; this.testCharacterNotificationToolStripMenuItem.Click += new System.EventHandler(this.testCharacterNotificationToolStripMenuItem_Click); // // testTimeoutOneSecToolStripMenuItem // this.testTimeoutOneSecToolStripMenuItem.Name = "testTimeoutOneSecToolStripMenuItem"; - this.testTimeoutOneSecToolStripMenuItem.Size = new System.Drawing.Size(287, 22); + this.testTimeoutOneSecToolStripMenuItem.Size = new System.Drawing.Size(289, 22); this.testTimeoutOneSecToolStripMenuItem.Text = "Set Timeout to 1 Second"; this.testTimeoutOneSecToolStripMenuItem.Click += new System.EventHandler(this.testTimeoutOneSecToolStripMenuItem_Click); // // restartToolStripMenuItem // this.restartToolStripMenuItem.Name = "restartToolStripMenuItem"; - this.restartToolStripMenuItem.Size = new System.Drawing.Size(287, 22); + this.restartToolStripMenuItem.Size = new System.Drawing.Size(289, 22); this.restartToolStripMenuItem.Text = "Restart"; this.restartToolStripMenuItem.Click += new System.EventHandler(this.restartToolStripMenuItem_Click); // @@ -790,7 +790,7 @@ private void InitializeComponent() this.tsbAbout}); this.mainToolBar.Location = new System.Drawing.Point(0, 24); this.mainToolBar.Name = "mainToolBar"; - this.mainToolBar.Size = new System.Drawing.Size(600, 25); + this.mainToolBar.Size = new System.Drawing.Size(600, 31); this.mainToolBar.TabIndex = 5; this.mainToolBar.Text = "toolStrip1"; this.mainToolBar.MouseDown += new System.Windows.Forms.MouseEventHandler(this.mainToolBar_MouseDown); @@ -802,7 +802,7 @@ private void InitializeComponent() this.addAPIKeyTbMenu.Image = ((System.Drawing.Image)(resources.GetObject("addAPIKeyTbMenu.Image"))); this.addAPIKeyTbMenu.ImageTransparentColor = System.Drawing.Color.Magenta; this.addAPIKeyTbMenu.Name = "addAPIKeyTbMenu"; - this.addAPIKeyTbMenu.Size = new System.Drawing.Size(23, 22); + this.addAPIKeyTbMenu.Size = new System.Drawing.Size(28, 28); this.addAPIKeyTbMenu.ToolTipText = "Add API key"; this.addAPIKeyTbMenu.Click += new System.EventHandler(this.addAPIKeyMenu_Click); // @@ -811,14 +811,14 @@ private void InitializeComponent() this.apiKeysManagementTbMenu.Image = ((System.Drawing.Image)(resources.GetObject("apiKeysManagementTbMenu.Image"))); this.apiKeysManagementTbMenu.ImageTransparentColor = System.Drawing.Color.Magenta; this.apiKeysManagementTbMenu.Name = "apiKeysManagementTbMenu"; - this.apiKeysManagementTbMenu.Size = new System.Drawing.Size(23, 22); + this.apiKeysManagementTbMenu.Size = new System.Drawing.Size(28, 28); this.apiKeysManagementTbMenu.ToolTipText = "Manage accounts"; this.apiKeysManagementTbMenu.Click += new System.EventHandler(this.manageAPIKeysMenuItem_Click); // // apiKeysSettingsToolStripSeparator // this.apiKeysSettingsToolStripSeparator.Name = "apiKeysSettingsToolStripSeparator"; - this.apiKeysSettingsToolStripSeparator.Size = new System.Drawing.Size(6, 25); + this.apiKeysSettingsToolStripSeparator.Size = new System.Drawing.Size(6, 31); // // manageCharacterTbMenu // @@ -830,7 +830,7 @@ private void InitializeComponent() this.manageCharacterTbMenu.Image = ((System.Drawing.Image)(resources.GetObject("manageCharacterTbMenu.Image"))); this.manageCharacterTbMenu.ImageTransparentColor = System.Drawing.Color.Magenta; this.manageCharacterTbMenu.Name = "manageCharacterTbMenu"; - this.manageCharacterTbMenu.Size = new System.Drawing.Size(29, 22); + this.manageCharacterTbMenu.Size = new System.Drawing.Size(37, 28); this.manageCharacterTbMenu.Text = "Manage Character"; this.manageCharacterTbMenu.ToolTipText = "Manage Character"; // @@ -838,7 +838,7 @@ private void InitializeComponent() // this.toolStripMenuItem1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem1.Image"))); this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(170, 22); + this.toolStripMenuItem1.Size = new System.Drawing.Size(171, 22); this.toolStripMenuItem1.Text = "&Delete Character..."; this.toolStripMenuItem1.Click += new System.EventHandler(this.deleteCharacterMenu_Click); // @@ -846,7 +846,7 @@ private void InitializeComponent() // this.toolStripMenuItem2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem2.Image"))); this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(170, 22); + this.toolStripMenuItem2.Size = new System.Drawing.Size(171, 22); this.toolStripMenuItem2.Text = "&Export Character..."; this.toolStripMenuItem2.Click += new System.EventHandler(this.saveCharacterInfosMenuItem_Click); // @@ -854,14 +854,14 @@ private void InitializeComponent() // this.toolStripMenuItem3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem3.Image"))); this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(170, 22); + this.toolStripMenuItem3.Size = new System.Drawing.Size(171, 22); this.toolStripMenuItem3.Text = "&Hide Character"; this.toolStripMenuItem3.Click += new System.EventHandler(this.hideCharacterMenu_Click); // // manageCharacterToolStripSeparator // this.manageCharacterToolStripSeparator.Name = "manageCharacterToolStripSeparator"; - this.manageCharacterToolStripSeparator.Size = new System.Drawing.Size(6, 25); + this.manageCharacterToolStripSeparator.Size = new System.Drawing.Size(6, 31); // // tsdbSettings // @@ -872,7 +872,7 @@ private void InitializeComponent() this.tsdbSettings.Image = ((System.Drawing.Image)(resources.GetObject("tsdbSettings.Image"))); this.tsdbSettings.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsdbSettings.Name = "tsdbSettings"; - this.tsdbSettings.Size = new System.Drawing.Size(29, 22); + this.tsdbSettings.Size = new System.Drawing.Size(37, 28); this.tsdbSettings.Text = "tsddbSettings"; this.tsdbSettings.ToolTipText = "Save/Restore Settings"; // @@ -895,7 +895,7 @@ private void InitializeComponent() // settingsToolStripSeparator // this.settingsToolStripSeparator.Name = "settingsToolStripSeparator"; - this.settingsToolStripSeparator.Size = new System.Drawing.Size(6, 25); + this.settingsToolStripSeparator.Size = new System.Drawing.Size(6, 31); // // clearCacheToolStripButton // @@ -903,7 +903,7 @@ private void InitializeComponent() this.clearCacheToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("clearCacheToolStripButton.Image"))); this.clearCacheToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.clearCacheToolStripButton.Name = "clearCacheToolStripButton"; - this.clearCacheToolStripButton.Size = new System.Drawing.Size(23, 22); + this.clearCacheToolStripButton.Size = new System.Drawing.Size(28, 28); this.clearCacheToolStripButton.Text = "Clear Cache"; this.clearCacheToolStripButton.Click += new System.EventHandler(this.clearCacheToolStripMenuItem_Click); // @@ -913,14 +913,14 @@ private void InitializeComponent() this.resetSettingsToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("resetSettingsToolStripButton.Image"))); this.resetSettingsToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.resetSettingsToolStripButton.Name = "resetSettingsToolStripButton"; - this.resetSettingsToolStripButton.Size = new System.Drawing.Size(23, 22); + this.resetSettingsToolStripButton.Size = new System.Drawing.Size(28, 28); this.resetSettingsToolStripButton.Text = "Reset Settings"; this.resetSettingsToolStripButton.Click += new System.EventHandler(this.resetSettingsToolStripMenuItem_Click); // // cacheResetToolStripSeparator // this.cacheResetToolStripSeparator.Name = "cacheResetToolStripSeparator"; - this.cacheResetToolStripSeparator.Size = new System.Drawing.Size(6, 25); + this.cacheResetToolStripSeparator.Size = new System.Drawing.Size(6, 31); // // exitToolStripButton // @@ -928,14 +928,14 @@ private void InitializeComponent() this.exitToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("exitToolStripButton.Image"))); this.exitToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.exitToolStripButton.Name = "exitToolStripButton"; - this.exitToolStripButton.Size = new System.Drawing.Size(23, 22); + this.exitToolStripButton.Size = new System.Drawing.Size(28, 28); this.exitToolStripButton.Text = "Exit"; this.exitToolStripButton.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // // exitToolStripSeparator // this.exitToolStripSeparator.Name = "exitToolStripSeparator"; - this.exitToolStripSeparator.Size = new System.Drawing.Size(6, 25); + this.exitToolStripSeparator.Size = new System.Drawing.Size(6, 31); // // tsbManagePlans // @@ -943,7 +943,7 @@ private void InitializeComponent() this.tsbManagePlans.Image = ((System.Drawing.Image)(resources.GetObject("tsbManagePlans.Image"))); this.tsbManagePlans.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbManagePlans.Name = "tsbManagePlans"; - this.tsbManagePlans.Size = new System.Drawing.Size(23, 22); + this.tsbManagePlans.Size = new System.Drawing.Size(28, 28); this.tsbManagePlans.Text = "Manage Plans"; this.tsbManagePlans.Click += new System.EventHandler(this.manageToolStripMenuItem_Click); // @@ -953,14 +953,14 @@ private void InitializeComponent() this.plansTbMenu.Image = ((System.Drawing.Image)(resources.GetObject("plansTbMenu.Image"))); this.plansTbMenu.ImageTransparentColor = System.Drawing.Color.Magenta; this.plansTbMenu.Name = "plansTbMenu"; - this.plansTbMenu.Size = new System.Drawing.Size(57, 22); + this.plansTbMenu.Size = new System.Drawing.Size(57, 28); this.plansTbMenu.Text = "Plans..."; this.plansTbMenu.DropDownOpening += new System.EventHandler(this.tsdbPlans_DropDownOpening); // // plansToolStripSeparator // this.plansToolStripSeparator.Name = "plansToolStripSeparator"; - this.plansToolStripSeparator.Size = new System.Drawing.Size(6, 25); + this.plansToolStripSeparator.Size = new System.Drawing.Size(6, 31); // // characterComparisonToolStripButton // @@ -968,14 +968,14 @@ private void InitializeComponent() this.characterComparisonToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("characterComparisonToolStripButton.Image"))); this.characterComparisonToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.characterComparisonToolStripButton.Name = "characterComparisonToolStripButton"; - this.characterComparisonToolStripButton.Size = new System.Drawing.Size(23, 22); + this.characterComparisonToolStripButton.Size = new System.Drawing.Size(28, 28); this.characterComparisonToolStripButton.Text = "Character Comparison..."; this.characterComparisonToolStripButton.Click += new System.EventHandler(this.charactersComparisonToolStripMenuItem_Click); // // tsbMineralSheet // this.tsbMineralSheet.Name = "tsbMineralSheet"; - this.tsbMineralSheet.Size = new System.Drawing.Size(23, 22); + this.tsbMineralSheet.Size = new System.Drawing.Size(23, 28); // // skillsPieChartTbMenu // @@ -983,14 +983,14 @@ private void InitializeComponent() this.skillsPieChartTbMenu.Image = ((System.Drawing.Image)(resources.GetObject("skillsPieChartTbMenu.Image"))); this.skillsPieChartTbMenu.ImageTransparentColor = System.Drawing.Color.Magenta; this.skillsPieChartTbMenu.Name = "skillsPieChartTbMenu"; - this.skillsPieChartTbMenu.Size = new System.Drawing.Size(23, 22); + this.skillsPieChartTbMenu.Size = new System.Drawing.Size(28, 28); this.skillsPieChartTbMenu.Text = "Skill Group Pie Chart..."; this.skillsPieChartTbMenu.Click += new System.EventHandler(this.tsSkillsPieChartTool_Click); // // tsbSchedule // this.tsbSchedule.Name = "tsbSchedule"; - this.tsbSchedule.Size = new System.Drawing.Size(23, 22); + this.tsbSchedule.Size = new System.Drawing.Size(23, 28); // // tsbImplantGroups // @@ -998,7 +998,7 @@ private void InitializeComponent() this.tsbImplantGroups.Image = ((System.Drawing.Image)(resources.GetObject("tsbImplantGroups.Image"))); this.tsbImplantGroups.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbImplantGroups.Name = "tsbImplantGroups"; - this.tsbImplantGroups.Size = new System.Drawing.Size(23, 22); + this.tsbImplantGroups.Size = new System.Drawing.Size(28, 28); this.tsbImplantGroups.Text = "Implant AllGroups..."; this.tsbImplantGroups.Click += new System.EventHandler(this.manualImplantGroupsToolStripMenuItem_Click); // @@ -1008,14 +1008,14 @@ private void InitializeComponent() this.tsbShowOwned.Image = ((System.Drawing.Image)(resources.GetObject("tsbShowOwned.Image"))); this.tsbShowOwned.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbShowOwned.Name = "tsbShowOwned"; - this.tsbShowOwned.Size = new System.Drawing.Size(23, 22); + this.tsbShowOwned.Size = new System.Drawing.Size(28, 28); this.tsbShowOwned.Text = "Show Owned Skillbooks..."; this.tsbShowOwned.Click += new System.EventHandler(this.tsShowOwnedSkillbooks_Click); // // toolsToolStripSeparator // this.toolsToolStripSeparator.Name = "toolsToolStripSeparator"; - this.toolsToolStripSeparator.Size = new System.Drawing.Size(6, 25); + this.toolsToolStripSeparator.Size = new System.Drawing.Size(6, 31); // // tsbOptions // @@ -1023,7 +1023,7 @@ private void InitializeComponent() this.tsbOptions.Image = ((System.Drawing.Image)(resources.GetObject("tsbOptions.Image"))); this.tsbOptions.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbOptions.Name = "tsbOptions"; - this.tsbOptions.Size = new System.Drawing.Size(23, 22); + this.tsbOptions.Size = new System.Drawing.Size(28, 28); this.tsbOptions.Text = "Options..."; this.tsbOptions.Click += new System.EventHandler(this.optionsMenuItem_Click); // @@ -1033,7 +1033,7 @@ private void InitializeComponent() this.tsbAbout.Image = ((System.Drawing.Image)(resources.GetObject("tsbAbout.Image"))); this.tsbAbout.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbAbout.Name = "tsbAbout"; - this.tsbAbout.Size = new System.Drawing.Size(23, 22); + this.tsbAbout.Size = new System.Drawing.Size(28, 28); this.tsbAbout.Text = "About..."; this.tsbAbout.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // @@ -1055,13 +1055,13 @@ private void InitializeComponent() this.tcCharacterTabs.AllowDrop = true; this.tcCharacterTabs.Controls.Add(this.tpOverview); this.tcCharacterTabs.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcCharacterTabs.Location = new System.Drawing.Point(0, 49); + this.tcCharacterTabs.Location = new System.Drawing.Point(0, 55); this.tcCharacterTabs.Multiline = true; this.tcCharacterTabs.Name = "tcCharacterTabs"; this.tcCharacterTabs.Padding = new System.Drawing.Point(0, 0); this.tcCharacterTabs.SelectedIndex = 0; this.tcCharacterTabs.ShowToolTips = true; - this.tcCharacterTabs.Size = new System.Drawing.Size(600, 503); + this.tcCharacterTabs.Size = new System.Drawing.Size(600, 497); this.tcCharacterTabs.SizeMode = System.Windows.Forms.TabSizeMode.FillToRight; this.tcCharacterTabs.TabIndex = 0; this.tcCharacterTabs.SelectedIndexChanged += new System.EventHandler(this.tcCharacterTabs_SelectedIndexChanged); @@ -1072,7 +1072,7 @@ private void InitializeComponent() this.tpOverview.Controls.Add(this.overview); this.tpOverview.Location = new System.Drawing.Point(4, 22); this.tpOverview.Name = "tpOverview"; - this.tpOverview.Size = new System.Drawing.Size(592, 477); + this.tpOverview.Size = new System.Drawing.Size(592, 471); this.tpOverview.TabIndex = 0; this.tpOverview.Text = "Overview"; this.tpOverview.UseVisualStyleBackColor = true; @@ -1086,7 +1086,7 @@ private void InitializeComponent() this.overview.Location = new System.Drawing.Point(0, 0); this.overview.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.overview.Name = "overview"; - this.overview.Size = new System.Drawing.Size(592, 477); + this.overview.Size = new System.Drawing.Size(592, 471); this.overview.TabIndex = 0; this.overview.CharacterClicked += new System.EventHandler(this.overview_CharacterClicked); // @@ -1105,9 +1105,9 @@ private void InitializeComponent() this.tabLoadingLabel.BackColor = System.Drawing.Color.WhiteSmoke; this.tabLoadingLabel.Dock = System.Windows.Forms.DockStyle.Fill; this.tabLoadingLabel.ForeColor = System.Drawing.SystemColors.GrayText; - this.tabLoadingLabel.Location = new System.Drawing.Point(0, 49); + this.tabLoadingLabel.Location = new System.Drawing.Point(0, 55); this.tabLoadingLabel.Name = "tabLoadingLabel"; - this.tabLoadingLabel.Size = new System.Drawing.Size(600, 503); + this.tabLoadingLabel.Size = new System.Drawing.Size(600, 497); this.tabLoadingLabel.TabIndex = 7; this.tabLoadingLabel.Text = "Loading...\r\n\r\nPlease Wait."; this.tabLoadingLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1117,9 +1117,9 @@ private void InitializeComponent() this.noCharactersLabel.BackColor = System.Drawing.Color.WhiteSmoke; this.noCharactersLabel.Dock = System.Windows.Forms.DockStyle.Fill; this.noCharactersLabel.ForeColor = System.Drawing.SystemColors.GrayText; - this.noCharactersLabel.Location = new System.Drawing.Point(0, 49); + this.noCharactersLabel.Location = new System.Drawing.Point(0, 55); this.noCharactersLabel.Name = "noCharactersLabel"; - this.noCharactersLabel.Size = new System.Drawing.Size(600, 503); + this.noCharactersLabel.Size = new System.Drawing.Size(600, 497); this.noCharactersLabel.TabIndex = 8; this.noCharactersLabel.Text = "No character loaded or monitored\r\n\r\nTo add characters, click the File > Add API k" + "ey... menu option\r\nTo monitor characters, click the File > Manage API Keys... me" + diff --git a/src/EVEMon/MainWindow.cs b/src/EVEMon/MainWindow.cs index 2859abb9e..4df3c2273 100644 --- a/src/EVEMon/MainWindow.cs +++ b/src/EVEMon/MainWindow.cs @@ -992,7 +992,7 @@ private void EveMonClient_TimerTick(object sender, EventArgs e) { UpdateStatusLabel(); UpdateWindowTitle(); - + // Checks whether the tooltip must be displayed if (m_popupNotifications.Count != 0 && DateTime.UtcNow > m_nextPopupUpdate) DisplayTooltipNotifications(); @@ -1123,7 +1123,10 @@ private void UpdateWindowTitle() builder.Append(appSuffix); // Set the window title - Text = builder.ToString(); + if (Text != builder.ToString()) + { + Text = builder.ToString(); + } } /// diff --git a/tools/XmlGenerator/Datafiles/Geography.cs b/tools/XmlGenerator/Datafiles/Geography.cs index 06c3541d9..81fa72041 100644 --- a/tools/XmlGenerator/Datafiles/Geography.cs +++ b/tools/XmlGenerator/Datafiles/Geography.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using System.Reflection; using EVEMon.Common.Collections; using EVEMon.Common.Serialization.Datafiles; using EVEMon.XmlGenerator.Interfaces; @@ -170,9 +171,15 @@ private static IEnumerable ExportAgents(IHasLongID srcStation ID = agent.ID, Level = agent.Level, Quality = agent.Quality, - Name = Database.InvNamesTable[agent.ID].Name, - DivisionName = Database.CrpNPCDivisionsTable[agent.DivisionID].DivisionName, - AgentType = Database.AgtAgentTypesTable[agent.AgentTypeID].AgentType, + Name = Database.InvNamesTable.HasValue(agent.ID) + ? Database.InvNamesTable[agent.ID].Name + : "Missing", + DivisionName = Database.CrpNPCDivisionsTable.HasValue(agent.DivisionID) + ? Database.CrpNPCDivisionsTable[agent.DivisionID].DivisionName + : "Missing", + AgentType = Database.AgtAgentTypesTable.HasValue(agent.AgentTypeID) + ? Database.AgtAgentTypesTable[agent.AgentTypeID].AgentType + : "Missing", ResearchSkillID = Database.AgtResearchAgentsTable.Any(x => x.ID == agent.ID) ? Database.AgtResearchAgentsTable[agent.ID].ResearchSkillID : 0, diff --git a/tools/XmlGenerator/Datafiles/Properties.cs b/tools/XmlGenerator/Datafiles/Properties.cs index 5f480e8d8..fe701f62a 100644 --- a/tools/XmlGenerator/Datafiles/Properties.cs +++ b/tools/XmlGenerator/Datafiles/Properties.cs @@ -93,6 +93,16 @@ private static void ConfigureNullCategoryProperties() Description = "Used to describe the consumption rate." }; s_injectedUnits.Add(perHourUnit); + + // TODO: New unit added in 20.02, remove when SDE conversion is updated + EveUnits modifierRealPercentUnit = new EveUnits + { + ID = 205, + Name = "modifier realPercent", + DisplayName = "%", + Description = "Used for multipliers displayed as % 10 is +10% -10 is -10% 3.6 is +3.6%" + }; + s_injectedUnits.Add(modifierRealPercentUnit); // Create EVEMon custom properties int newPropID = Database.DgmAttributeTypesTable.Last().ID; @@ -307,8 +317,12 @@ private static IEnumerable ExportAttributeCategori // Unit prop.UnitID = srcProp.UnitID.GetValueOrDefault(); - prop.Unit = srcProp.UnitID.HasValue - ? Database.EveUnitsTable.Concat(s_injectedUnits).First( + + Database.EveUnitsTable.Concat(s_injectedUnits); + + prop.Unit = srcProp.UnitID.HasValue && Database.EveUnitsTable.Any( + x => x.ID == srcProp.UnitID.Value) + ? Database.EveUnitsTable.FirstOrDefault( x => x.ID == srcProp.UnitID.Value).DisplayName : string.Empty; diff --git a/tools/XmlGenerator/XmlGenerator.csproj b/tools/XmlGenerator/XmlGenerator.csproj index 64baa3cdf..8f25411f4 100644 --- a/tools/XmlGenerator/XmlGenerator.csproj +++ b/tools/XmlGenerator/XmlGenerator.csproj @@ -258,7 +258,6 @@ -