From 646a7f85419ca837997632035deeab3714648011 Mon Sep 17 00:00:00 2001 From: FenPhoenix Date: Mon, 8 Jul 2019 08:09:22 -0700 Subject: [PATCH] Lazy-load choose-readme panel and subcontrols --- AngelLoader/AngelLoader.csproj | 1 + .../Static_LazyLoaded/ChooseReadmeLLPanel.cs | 88 +++++++++++++++++++ AngelLoader/Forms/MainForm.Designer.cs | 61 ------------- AngelLoader/Forms/MainForm.cs | 45 +++++----- AngelLoader/Forms/MainForm.resx | 65 -------------- AngelLoader/Forms/MainForm_InitManual.cs | 48 ---------- 6 files changed, 111 insertions(+), 197 deletions(-) create mode 100644 AngelLoader/CustomControls/Static_LazyLoaded/ChooseReadmeLLPanel.cs diff --git a/AngelLoader/AngelLoader.csproj b/AngelLoader/AngelLoader.csproj index c4d43caad..c77129609 100644 --- a/AngelLoader/AngelLoader.csproj +++ b/AngelLoader/AngelLoader.csproj @@ -236,6 +236,7 @@ + diff --git a/AngelLoader/CustomControls/Static_LazyLoaded/ChooseReadmeLLPanel.cs b/AngelLoader/CustomControls/Static_LazyLoaded/ChooseReadmeLLPanel.cs new file mode 100644 index 000000000..d2ea7b2a2 --- /dev/null +++ b/AngelLoader/CustomControls/Static_LazyLoaded/ChooseReadmeLLPanel.cs @@ -0,0 +1,88 @@ +using System.Drawing; +using System.Windows.Forms; +using AngelLoader.Common.DataClasses; +using AngelLoader.Common.Utility; +using AngelLoader.Forms; + +namespace AngelLoader.CustomControls.Static_LazyLoaded +{ + internal static class ChooseReadmeLLPanel + { + private static bool _constructed; + + internal static Panel Panel; + internal static Button OKButton; + internal static ListBoxCustom ListBox; + internal static FlowLayoutPanel OKButtonFLP; + + internal static void Construct(MainForm form, Control container) + { + if (_constructed) return; + + OKButton = new Button + { + Anchor = AnchorStyles.Top | AnchorStyles.Right, + AutoSize = true, + Margin = new Padding(0), + Padding = new Padding(6, 0, 6, 0), + Height = 23, + TabIndex = 48, + UseVisualStyleBackColor = true + }; + OKButton.Click += form.ChooseReadmeButton_Click; + + OKButtonFLP = new FlowLayoutPanel + { + FlowDirection = FlowDirection.RightToLeft, + Location = new Point(1, 134), + Size = new Size(320, 24), + TabIndex = 3 + }; + OKButtonFLP.Controls.Add(OKButton); + + ListBox = new ListBoxCustom + { + FormattingEnabled = true, + Size = new Size(320, 134), + TabIndex = 47 + }; + + Panel = new Panel + { + Anchor = AnchorStyles.None, + TabIndex = 46, + Visible = false, + Size = new Size(324, 161) + }; + Panel.Controls.Add(ListBox); + Panel.Controls.Add(OKButtonFLP); + + Panel.CenterHV(container); + container.Controls.Add(Panel); + + _constructed = true; + + Localize(); + } + + internal static void Localize() + { + if (_constructed) OKButton.SetTextAutoSize(LText.Global.OK, 75); + } + + internal static void SuspendPanelLayout() + { + if (_constructed) Panel.SuspendLayout(); + } + + internal static void ResumePanelLayout() + { + if (_constructed) Panel.ResumeLayout(); + } + + internal static void ShowPanel(bool value) + { + if (_constructed) Panel.Visible = value; + } + } +} diff --git a/AngelLoader/Forms/MainForm.Designer.cs b/AngelLoader/Forms/MainForm.Designer.cs index 289941181..59915b522 100644 --- a/AngelLoader/Forms/MainForm.Designer.cs +++ b/AngelLoader/Forms/MainForm.Designer.cs @@ -179,10 +179,6 @@ private void InitializeComponent() this.ZoomOutButton = new System.Windows.Forms.Button(); this.ResetZoomButton = new System.Windows.Forms.Button(); this.ChooseReadmeComboBox = new AngelLoader.CustomControls.ComboBoxCustom(); - this.ChooseReadmePanel = new System.Windows.Forms.Panel(); - this.ChooseReadmeOKFLP = new System.Windows.Forms.FlowLayoutPanel(); - this.ChooseReadmeButton = new System.Windows.Forms.Button(); - this.ChooseReadmeListBox = new AngelLoader.CustomControls.ListBoxCustom(); this.ReadmeRichTextBox = new AngelLoader.CustomControls.RichTextBoxCustom(); this.MainToolTip = new System.Windows.Forms.ToolTip(this.components); @@ -218,8 +214,6 @@ private void InitializeComponent() this.PatchTabPage.SuspendLayout(); this.PatchMainPanel.SuspendLayout(); this.PatchDMLsPanel.SuspendLayout(); - this.ChooseReadmePanel.SuspendLayout(); - this.ChooseReadmeOKFLP.SuspendLayout(); this.SuspendLayout(); // // GameTabsImageList @@ -503,7 +497,6 @@ private void InitializeComponent() this.MainSplitContainer.Panel2.Controls.Add(this.ZoomOutButton); this.MainSplitContainer.Panel2.Controls.Add(this.ResetZoomButton); this.MainSplitContainer.Panel2.Controls.Add(this.ChooseReadmeComboBox); - this.MainSplitContainer.Panel2.Controls.Add(this.ChooseReadmePanel); this.MainSplitContainer.Panel2.Controls.Add(this.ReadmeRichTextBox); this.MainSplitContainer.Panel2MinSize = 38; this.MainSplitContainer.Size = new System.Drawing.Size(1671, 672); @@ -2044,53 +2037,6 @@ private void InitializeComponent() this.ChooseReadmeComboBox.Visible = false; this.ChooseReadmeComboBox.SelectedIndexChanged += new System.EventHandler(this.ChooseReadmeComboBox_SelectedIndexChanged); this.ChooseReadmeComboBox.DropDownClosed += new System.EventHandler(this.ChooseReadmeComboBox_DropDownClosed); - // - // ChooseReadmePanel - // - this.ChooseReadmePanel.Anchor = System.Windows.Forms.AnchorStyles.None; - this.ChooseReadmePanel.AutoSize = true; - this.ChooseReadmePanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.ChooseReadmePanel.Controls.Add(this.ChooseReadmeOKFLP); - this.ChooseReadmePanel.Controls.Add(this.ChooseReadmeListBox); - this.ChooseReadmePanel.Location = new System.Drawing.Point(2, 2); - this.ChooseReadmePanel.Name = "ChooseReadmePanel"; - this.ChooseReadmePanel.Size = new System.Drawing.Size(324, 161); - this.ChooseReadmePanel.TabIndex = 46; - this.ChooseReadmePanel.Visible = false; - // - // ChooseReadmeOKFLP - // - this.ChooseReadmeOKFLP.Controls.Add(this.ChooseReadmeButton); - this.ChooseReadmeOKFLP.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; - this.ChooseReadmeOKFLP.Location = new System.Drawing.Point(1, 134); - this.ChooseReadmeOKFLP.Name = "ChooseReadmeOKFLP"; - this.ChooseReadmeOKFLP.Size = new System.Drawing.Size(320, 24); - this.ChooseReadmeOKFLP.TabIndex = 3; - // - // ChooseReadmeButton - // - this.ChooseReadmeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.ChooseReadmeButton.AutoSize = true; - this.ChooseReadmeButton.Location = new System.Drawing.Point(245, 0); - this.ChooseReadmeButton.Margin = new System.Windows.Forms.Padding(0); - this.ChooseReadmeButton.Name = "ChooseReadmeButton"; - this.ChooseReadmeButton.Padding = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.ChooseReadmeButton.Size = new System.Drawing.Size(75, 23); - this.ChooseReadmeButton.TabIndex = 48; - this.ChooseReadmeButton.Text = "OK"; - this.ChooseReadmeButton.UseVisualStyleBackColor = true; - this.ChooseReadmeButton.Click += new System.EventHandler(this.ChooseReadmeButton_Click); - // - // ChooseReadmeListBox - // - this.ChooseReadmeListBox.FormattingEnabled = true; - this.ChooseReadmeListBox.Location = new System.Drawing.Point(0, 0); - this.ChooseReadmeListBox.Name = "ChooseReadmeListBox"; - this.ChooseReadmeListBox.Size = new System.Drawing.Size(320, 134); - this.ChooseReadmeListBox.TabIndex = 47; - // - // ReadmeRichTextBox - // this.ReadmeRichTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); @@ -2177,9 +2123,6 @@ private void InitializeComponent() this.PatchMainPanel.PerformLayout(); this.PatchDMLsPanel.ResumeLayout(false); this.PatchDMLsPanel.PerformLayout(); - this.ChooseReadmePanel.ResumeLayout(false); - this.ChooseReadmeOKFLP.ResumeLayout(false); - this.ChooseReadmeOKFLP.PerformLayout(); this.ResumeLayout(false); } @@ -2195,9 +2138,6 @@ private void InitializeComponent() private System.Windows.Forms.Button PlayFMButton; private AngelLoader.CustomControls.RichTextBoxCustom ReadmeRichTextBox; private System.Windows.Forms.Button ScanAllFMsButton; - private System.Windows.Forms.Panel ChooseReadmePanel; - private System.Windows.Forms.Button ChooseReadmeButton; - private AngelLoader.CustomControls.ListBoxCustom ChooseReadmeListBox; private System.Windows.Forms.Label DebugLabel; private AngelLoader.CustomControls.SplitContainerCustom TopSplitContainer; private System.Windows.Forms.Panel EverythingPanel; @@ -2301,7 +2241,6 @@ private void InitializeComponent() private System.Windows.Forms.Button EditFMScanReleaseDateButton; private System.Windows.Forms.Button EditFMScanAuthorButton; private System.Windows.Forms.Button EditFMScanTitleButton; - private System.Windows.Forms.FlowLayoutPanel ChooseReadmeOKFLP; private System.Windows.Forms.Button EditFMScanForReadmesButton; private System.Windows.Forms.Button StatsScanCustomResourcesButton; private System.Windows.Forms.TabPage PatchTabPage; diff --git a/AngelLoader/Forms/MainForm.cs b/AngelLoader/Forms/MainForm.cs index 9312a7519..2fe0174f9 100644 --- a/AngelLoader/Forms/MainForm.cs +++ b/AngelLoader/Forms/MainForm.cs @@ -528,7 +528,6 @@ public void InitThreadable() // Cheap 'n cheesy storage of initial size for minimum-width setting later EditFMFinishedOnButton.Tag = new Size(138, 23); - ChooseReadmeButton.Tag = new Size(75, 23); PatchOpenFMFolderButton.Tag = new Size(162, 23); // EnsureValidity() guarantees selected tab will not be invisible @@ -554,7 +553,6 @@ public void InitThreadable() // Set these here because they depend on the splitter positions SetUITextToLocalized(suspendResume: false); - ChooseReadmePanel.CenterHV(MainSplitContainer.Panel2); if (Math.Abs(Config.FMsListFontSizeInPoints - FMsDGV.DefaultCellStyle.Font.SizeInPoints) >= 0.001) { @@ -792,7 +790,7 @@ public void SetUITextToLocalized(bool suspendResume = true) AddRemoveTagFLP.SuspendLayout(); PatchMainPanel.SuspendLayout(); MainSplitContainer.Panel2.SuspendLayout(); - ChooseReadmePanel.SuspendLayout(); + ChooseReadmeLLPanel.SuspendPanelLayout(); #endif } try @@ -975,7 +973,7 @@ public void SetUITextToLocalized(bool suspendResume = true) ViewHTMLReadmeButton.SetTextAutoSize(LText.ReadmeArea.ViewHTMLReadme); - ChooseReadmeButton.SetTextAutoSize(LText.Global.OK, ((Size)ChooseReadmeButton.Tag).Width); + ChooseReadmeLLPanel.Localize(); #endregion @@ -1037,7 +1035,7 @@ public void SetUITextToLocalized(bool suspendResume = true) AddRemoveTagFLP.ResumeLayout(); PatchMainPanel.ResumeLayout(); MainSplitContainer.Panel2.ResumeLayout(); - ChooseReadmePanel.ResumeLayout(); + ChooseReadmeLLPanel.ResumePanelLayout(); } // We can't do this while the layout is suspended, because then it won't have the right dimensions @@ -2507,7 +2505,7 @@ private void ClearShownData() // Hide instead of clear to avoid zoom factor pain ShowReadme(false); - ChooseReadmePanel.Hide(); + ChooseReadmeLLPanel.ShowPanel(false); ViewHTMLReadmeButton.Hide(); WebSearchButton.Enabled = false; @@ -2777,9 +2775,6 @@ private async Task DisplaySelectedFM(bool refreshReadme = false) using (new DisableEvents(this)) ChooseReadmeComboBox.ClearFullItems(); - // Debug - fm.SelectedReadme = ""; - if (!fm.SelectedReadme.IsEmpty()) { if (readmeFiles.Count > 1) @@ -2797,7 +2792,7 @@ private async Task DisplaySelectedFM(bool refreshReadme = false) { ReadmeRichTextBox.SetText(LText.ReadmeArea.NoReadmeFound); - ChooseReadmePanel.Hide(); + ChooseReadmeLLPanel.ShowPanel(false); ChooseReadmeComboBox.Hide(); ViewHTMLReadmeButton.Hide(); ShowReadme(true); @@ -2808,9 +2803,6 @@ private async Task DisplaySelectedFM(bool refreshReadme = false) { var safeReadme = Core.DetectSafeReadme(readmeFiles, fm.Title); - // Debug - safeReadme = ""; - if (!safeReadme.IsEmpty()) { fm.SelectedReadme = safeReadme; @@ -2821,12 +2813,14 @@ private async Task DisplaySelectedFM(bool refreshReadme = false) ShowReadme(false); ViewHTMLReadmeButton.Hide(); - ChooseReadmeListBox.ClearFullItems(); - foreach (var f in readmeFiles) ChooseReadmeListBox.AddFullItem(f, f.GetFileNameFastBothDSC()); + ChooseReadmeLLPanel.Construct(this, MainSplitContainer.Panel2); + + ChooseReadmeLLPanel.ListBox.ClearFullItems(); + foreach (var f in readmeFiles) ChooseReadmeLLPanel.ListBox.AddFullItem(f, f.GetFileNameFastBothDSC()); ShowReadmeControls(false); - ChooseReadmePanel.Show(); + ChooseReadmeLLPanel.ShowPanel(true); return; } @@ -2839,7 +2833,7 @@ private async Task DisplaySelectedFM(bool refreshReadme = false) } } - ChooseReadmePanel.Hide(); + ChooseReadmeLLPanel.ShowPanel(false); LoadReadme(fm); @@ -3305,13 +3299,18 @@ internal void AddTagMenu_Closed(object sender, ToolStripDropDownClosedEventArgs #region Choose readme - private void ChooseReadmeButton_Click(object sender, EventArgs e) + internal void ChooseReadmeButton_Click(object sender, EventArgs e) { - if (ChooseReadmeListBox.Items.Count == 0 || ChooseReadmeListBox.SelectedIndex == -1) return; + // This is only hooked up after construction, so no Construct() call needed + + if (ChooseReadmeLLPanel.ListBox.Items.Count == 0 || ChooseReadmeLLPanel.ListBox.SelectedIndex == -1) + { + return; + } var fm = FMsDGV.GetSelectedFM(); - fm.SelectedReadme = ChooseReadmeListBox.SelectedBackingItem(); - ChooseReadmePanel.Hide(); + fm.SelectedReadme = ChooseReadmeLLPanel.ListBox.SelectedBackingItem(); + ChooseReadmeLLPanel.ShowPanel(false); if (fm.SelectedReadme.ExtIsHtml()) { @@ -3322,9 +3321,9 @@ private void ChooseReadmeButton_Click(object sender, EventArgs e) ShowReadme(true); } - if (ChooseReadmeListBox.Items.Count > 1) + if (ChooseReadmeLLPanel.ListBox.Items.Count > 1) { - ReadmeCB_FillAndSelect(ChooseReadmeListBox.BackingItems, fm.SelectedReadme); + ReadmeCB_FillAndSelect(ChooseReadmeLLPanel.ListBox.BackingItems, fm.SelectedReadme); ShowReadmeControls(CursorOverReadmeArea()); } else diff --git a/AngelLoader/Forms/MainForm.resx b/AngelLoader/Forms/MainForm.resx index 584d24eda..20d477146 100644 --- a/AngelLoader/Forms/MainForm.resx +++ b/AngelLoader/Forms/MainForm.resx @@ -120,71 +120,6 @@ 672, 56 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABg - DQAAAk1TRnQBSQFMAgEBAwEAAVgBFQFYARUBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA - AwABEAMAAQEBAAEgBgABEB4AAwQBBgNCAXQDTgGZA1UBsQNaAcoDVQG1A0wBkQNGAYADHAEnKAADDQER - A0oBiwNQAZoDHgErGAADAwEEA1MBrQNXAb0DTQGWA18B4ANQAZ9wAAMjATMDVwHoAwAB/wMAAf8DAAH/ - AwAB/wMAAf8DAAH/AwAB/wMAAf8DPQFqGAADDAEQAwQBBgQAAyoBQQIAAZcB/wMAAf8DQAFwDAADAwQE - AQUEAAMEAQYBhgGLAQAB/wHJAc0BAAH/AZABlgEAAf8BqgG6AQAB/wNZAccDLQFGAxgBIgMnATsDOAFe - A0IBdAM/AW4DOAFeAwcBCkwAAxcBIAETAS8BRgH+AwAB/wNZAcQBIwFVASEB+wMAAf8CAAGcAf8DAAH/ - AwAB/wNaAeQDQQH5AwAB/wNDAXcMAAMJAQwDUAGfA1kByQM8AWgDRgGBA1kBzwEAAZUBygH/AwAB/wNZ - AdcDQgF2AzIBUQNTAbADRQF+AxIBGQgAAysBQwNhAeIC/wEAAf8DWwHZAT4BQwENAf4DWwHQA1oB2ANe - AdoDAAH/AwAB/wMAAf8DVwHfAxUBHUwAA1gB0QMAAf8DSgGMA1kBzAMAAf8DAAH/AgABmAH/AgABlgH/ - A0AB/QE+AUEBPgH4A1ABpANRAfcDAAH/AyEBMQgAAx8BLAEAAY4BpwH/AgABmgH/AwAB/wEAAZQBvQH/ - AQABzgL/AQABsQHeAf8BAAGYAdIB/wEAAYUBygH/AwAB/wMrAfwBAAGnAcgB/wNYAe8DHgErDAADRQF9 - AbwBwQEAAf8DVQG0A00BlgNIAYUDWgHbA1YBswNCAXUDTQGVAcYBzQEAAf8DVQHqAxkBI0gAAzMBUwMA - Af8DXwHgAy4BSAFVAVwBVQHqAwAB/wMAAf8DAAH/AwAB/wMpAfoDAAH/A0YBgQNOAZcDAAH/A1MBsAwA - A0QBewEAAbIB2AH/AQABtwH1Af8BAAHRAfkB/wEAAZkBngH/AQABswHPAf8BAAGOAa0B/wEAAbIBxwH/ - AQAB1wL/AQAB6wL/AQABnQGhAf8DTwGbAw0BEgwAA0YBgAHFAckBAAH/A1ABngMkATUDVQG6A1kB7ANe - AdoDPAFoAzUBVgHBAccBAAH/A1gB4wMYASJIAANXAb0DAAH/A1wB1AMdASoDWQHDAwAB/wNAAf0CAAG8 - Af8DAAH/AwAB/wMAAf8DJwE7AzUBVgMAAf8CIQEjAfsDEwEaCAADUAGdAQABrQHrAf8BAAGhAcoB/wMA - Af8DAAH/AQABlAG3Af8CAAGCAf8DAAH/AQABmQGfAf8BAAHoAv8DAAH/A0sBjgMEAQYMAANIAYQBugG/ - AQAB/wNcAdwBZQFtAVEB9wHYAegBAAH/AbcBugEAAf8B3AHhAQAB/wMAAf8DWQHDAcEBxgEAAf8DVwHf - AxgBIUgAA10B7QMAAf8DKwH8A0QBfAM9AWkCTQEyAfoBKQIyAfsBTQEpAU0B+gEbASABTAH+AysB/ANS - AaYEAAM+AWsDAAH/AwAB/wM3AVsDAQECAzkBXwEAAYEBpAH/AQABtAHuAf8DAAH/AwAB/wMAAf8BAAGM - AbgB/wMAAf8BggIAAf8DAAH/AQABuAHOAf8BAAGFAcQB/wNYAd0DOQFgAxQBHAgAA0cBgwGVAZsBAAH/ - AwAB/wHbAesBAAH/A1QBrwMQARUCUwFPAaUBwwHKAQAB/wNcAecBqAGwAQAB/wNbAeEDGgElSAADSAH2 - AgABmgH/AwAB/wMAAf8DVAGrA1oB1QMAAf8DSAH2ASIBTwEWAf4DVwHoA1kB1wM7AWUDSgGKAgABiAH/ - AgABnwH/Az4BbANeAdoDAAH/AQABsgHjAf8BAAGOAakB/wMAAf8DAAH/AwAB/wEAAZEBwwH/AwAB/wMA - Af8DAAH/AwAB/wEAAbAB7gH/AwAB/wMAAf8DTQGWCAADRwGDAQABhgEAAf8B1wHcAQAB/wMAAf8DUAGd - AxoBJQNTAawBwgHOAQAB/wNbAdkBoAGqAQAB/wNYAekDHQEqSAADUQH3AwAB/wI+AVwB+ANeAeUBPgFc - AT4B+AMAAf8DSAH2AykB+gMrAfwBIQEyASEB+wNXAb0DKAE9A1kB1wIAAZIB/wMAAf8DPQFqAgABhgH/ - AQABqAHSAf8BAAHSAv8CAAGEAf8DAAH/AwAB/wMAAf8BAAGKAcEB/wMAAf8DAAH/AwAB/wMAAf8BAAG8 - AfYB/wEAAaoB3gH/AgABmQH/A1IBqAgAA0IBdgGHAZMBAAH/AVgBWQFBAfkB3gHhAQAB/wMAAf8DAAH/ - Ac4B4AEAAf8CXgFbAdkDQQFzAasBtAEAAf8DXQHtAxUBHUgAA1kB7AIAAZIB/wEAAYkBuAH/A18B4ANI - AYQDKQE/A04BmAJHAWoB+QMAAf8DRQF9BAADTAGSAgABiQH/AgABnAH/AwAB/wM0AVQDGAEhA0cBggEA - AcAB6AH/AgABhAH/AwAB/wMAAf8DAAH/AQABpAHIAf8DAAH/AwAB/wMAAf8DAAH/AQABugH5Af8DVAHu - A0EBcwMXASAIAANQAZ0BoAGrAQAB/wNaAc0DWQHEAm0BUQH3AYMBiwEAAf8DXgHlAzwBaAM5AV8BqwGx - AQAB/wNMAfMDOgFhAxgBIgMJAQxAAANWAbYCAAGYAf8DAAH/AgABiAH/A1gB3QM0BFQBrgGXAakB3QH/ - AlkBXwH7A0cBgwNPAaUDAAH/AwAB/wMAAf8CKQFNAfoDDwEUBwABAQFZAmQB7AEAAaEB5gH/AwAB/wGC - AgAB/wMAAf8BAAGMAbgB/wMAAf8DAAH/AwAB/wIAAb0B/wEAAZYBwAH/A1UBsgMDAQQEAAMZASMDWgHT - AYQBhgEAAf8B0QHXAQAB/wJcAT4B+ANXAd8DVAHuA1EB9wNeAeUDWAHjAV4BXwEpAf4B0QHXAQAB/wF0 - AXgBJgH+AVABUwEQAf4DVAHuAyoBQEAAAy8BSgMAAf8DAAH/AgABnwH/AQABgQG2Af8DAAH/A0wB8wMA - Af8CPgFcAfgDTQH6AQABhAGyAf8DAAH/AwAB/wMAAf8DUgGmDAADQgF1AQAB4wL/AQABlAHMAf8DAAH/ - AwAB/wEAAYABsQH/AwAB/wMAAf8CAAGOAf8BAAG5AfsB/wMAAf8DSwGOAxEBFwQAAyUBNwMAAf8B2wHc - AY4B/wH4AfsBnQH/AaUBqAEAAf8CXwEyAfsBlwGaAQAB/wJZAUIB9QGQAZIBAAH/AaQBpwEAAf8CYgFY - Ae8B7QHyAY4B/wHJAc0BAAH/AaABpQEAAf8DWgHYAxQBG0QAA1cBxQMAAf8DAAH/AwAB/wIAAYUB/wIA - AaoB/wMAAf8BAAGAAZsB/wEAAY4BuAH/AwAB/wMAAf8CAAG0Af8BKQJNAfoDEgEZCAADGAEhAVoCXQHK - AQAB5QH6Af8BAAP/AQABxAH3Af8CAAGUAf8BAAGNAboB/wIAAZcB/wIAAcIB/wEAAdEC/wEAAcoB7gH/ - AgABhwH/A1oB5AMgAS8IAAMCAQMDTAGTAbwBxgEAAf8DUwGwA10B4gMAAf8DUwHxAwAB/wM4AV4DUQGg - Av8BAAH/AwAB/wNXAb8DFgEeSAADDQESA1UB6gMAAf8DAAH/AgABnAH/AwAB/wIAAY8B/wMAAf8DAAH/ - AwAB/wIAAaQB/wIAAYYB/wMtAUUMAAMfAS0BAAGVAawB/wEAAYABkgH/A1EBoQNcAeoBAAHiAfgB/wEA - Ad4B8wH/AQABygHzAf8BAAGmAcgB/wNWAbsDVgG7AQABrwHQAf8DVgG8AwoBDgwAAyYBOQNZAcwDJQE3 - A1IBqQNRAaADUwGsA1QBrwNCAXYCfwFsAf4BtAG4AQAB/wG7AccBAAH/A1MB8QMxAU9MAAMVAR0DWQHH - AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AgABkQH/Al0BYQHiAy0BRRQAAyYBOAMyAVEEAAMLAQ8DRAF7 - AQAB7AL/AQABggGUAf8DSQGJAwQBBQMDAQQDNAFUAw0BESwAAlwBWAHRAckB0gEAAf8DSwGPAm0BUQH3 - AZsBqAEAAf8DPQFqVAADOwFjA1YBvgNOAfADUwHxAlMBZAHxA1oBzQNDAXcDBgEIKAADEAEVAVMCZAHx - A18B4EAAA0QBeQNPAaUEAANGAYEDVgHBAw8BFEQAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEB - BQABgBcAA/8BAAHgAQ8B/AE/AQMB/wIAAcABBwHkATkBAAEDAgABgAEDAYABAQGAAQMCAAGAAQEBgAEB - AcABAwMAAQEBwAEBAcABAwQAAcABAQHAAQMDAAEQAgABwAEDBgABwAEDBgABwAEDAwABIAIAAcAFAAGA - AQEFAAEBAcABAQQAAYABAQGAAQEBgAEBAgABgAEDAYABAQHAAQECAAHAAQcByAEDAf8BgQIAAfABDwH8 - AX8B/wGRAgAL - - 17, 17 diff --git a/AngelLoader/Forms/MainForm_InitManual.cs b/AngelLoader/Forms/MainForm_InitManual.cs index 83e6137c0..7dc5296ff 100644 --- a/AngelLoader/Forms/MainForm_InitManual.cs +++ b/AngelLoader/Forms/MainForm_InitManual.cs @@ -180,10 +180,6 @@ private void InitComponentManual() ZoomOutButton = new Button(); ResetZoomButton = new Button(); ChooseReadmeComboBox = new ComboBoxCustom(); - ChooseReadmePanel = new Panel(); - ChooseReadmeOKFLP = new FlowLayoutPanel(); - ChooseReadmeButton = new Button(); - ChooseReadmeListBox = new ListBoxCustom(); ReadmeRichTextBox = new RichTextBoxCustom(); MainToolTip = new ToolTip(components); @@ -225,8 +221,6 @@ private void InitComponentManual() PatchTabPage.SuspendLayout(); PatchMainPanel.SuspendLayout(); PatchDMLsPanel.SuspendLayout(); - ChooseReadmePanel.SuspendLayout(); - ChooseReadmeOKFLP.SuspendLayout(); SuspendLayout(); #endregion @@ -437,8 +431,6 @@ private void InitComponentManual() MainSplitContainer.Panel2.Controls.Add(ZoomInButton); MainSplitContainer.Panel2.Controls.Add(ZoomOutButton); MainSplitContainer.Panel2.Controls.Add(ResetZoomButton); - MainSplitContainer.Panel2.Controls.Add(ChooseReadmeComboBox); - MainSplitContainer.Panel2.Controls.Add(ChooseReadmePanel); MainSplitContainer.Panel2.Controls.Add(ReadmeRichTextBox); MainSplitContainer.Panel2MinSize = 38; MainSplitContainer.Size = new Size(1671, 672); @@ -1672,41 +1664,6 @@ private void InitComponentManual() ChooseReadmeComboBox.SelectedIndexChanged += ChooseReadmeComboBox_SelectedIndexChanged; ChooseReadmeComboBox.DropDownClosed += ChooseReadmeComboBox_DropDownClosed; // - // ChooseReadmePanel - // - ChooseReadmePanel.Anchor = AnchorStyles.None; - ChooseReadmePanel.Controls.Add(ChooseReadmeOKFLP); - ChooseReadmePanel.Controls.Add(ChooseReadmeListBox); - // This gets centered later so no location is specified here - ChooseReadmePanel.Size = new Size(324, 161); - ChooseReadmePanel.TabIndex = 46; - ChooseReadmePanel.Visible = false; - // - // ChooseReadmeOKFLP - // - ChooseReadmeOKFLP.Controls.Add(ChooseReadmeButton); - ChooseReadmeOKFLP.FlowDirection = FlowDirection.RightToLeft; - ChooseReadmeOKFLP.Location = new Point(1, 134); - ChooseReadmeOKFLP.Size = new Size(320, 24); - ChooseReadmeOKFLP.TabIndex = 3; - // - // ChooseReadmeButton - // - ChooseReadmeButton.Anchor = AnchorStyles.Top | AnchorStyles.Right; - ChooseReadmeButton.AutoSize = true; - ChooseReadmeButton.Margin = new Padding(0); - ChooseReadmeButton.Padding = new Padding(6, 0, 6, 0); - ChooseReadmeButton.Height = 23; - ChooseReadmeButton.TabIndex = 48; - ChooseReadmeButton.UseVisualStyleBackColor = true; - ChooseReadmeButton.Click += ChooseReadmeButton_Click; - // - // ChooseReadmeListBox - // - ChooseReadmeListBox.FormattingEnabled = true; - ChooseReadmeListBox.Size = new Size(320, 134); - ChooseReadmeListBox.TabIndex = 47; - // // ReadmeRichTextBox // ReadmeRichTextBox.BackColor = SystemColors.Window; @@ -1787,11 +1744,6 @@ private void InitComponentManual() PatchDMLsPanel.ResumeLayout(); - /* Deferred - ChooseReadmePanel.ResumeLayout(); - */ - - ChooseReadmeOKFLP.ResumeLayout(); ResumeLayout(); } }