From a1753176d30d331c105c1dbb63fdee95d105533a Mon Sep 17 00:00:00 2001 From: Nikolia558 <38259407+Nikolai558@users.noreply.github.com> Date: Wed, 1 Dec 2021 17:28:25 -0700 Subject: [PATCH 01/15] Publication Changed Links Modified A or D changes will not print the compair link. But will display a message stating why the link is not there. --- .../DataAccess/PublicationParser.cs | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/FeBuddyLibrary/DataAccess/PublicationParser.cs b/FeBuddyLibrary/DataAccess/PublicationParser.cs index 5618642..189fdf6 100644 --- a/FeBuddyLibrary/DataAccess/PublicationParser.cs +++ b/FeBuddyLibrary/DataAccess/PublicationParser.cs @@ -74,7 +74,19 @@ public void WriteAirportInfoTxt(string responsibleArtcc) { if (recordModel1.UserAction != "" && recordModel1.UserAction != " ") { - airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | https://aeronav.faa.gov/d-tpp/{AiracDateCycleModel.AllCycleDates[GlobalConfig.airacEffectiveDate]}/compare_pdf/{recordModel1.PdfName.Substring(0, recordModel1.PdfName.Length - 4)}_cmp.pdf"); + if (recordModel1.UserAction == "A") + { + airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | This procedure is new and has no previous version to compare."); + } + else if (recordModel1.UserAction == "D") + { + airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | This procedure has been deleted this AIRAC."); + } + else + { + // TODO - Check link here. + airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | https://aeronav.faa.gov/d-tpp/{AiracDateCycleModel.AllCycleDates[GlobalConfig.airacEffectiveDate]}/compare_pdf/{recordModel1.PdfName.Substring(0, recordModel1.PdfName.Length - 4)}_cmp.pdf"); + } } } } @@ -134,7 +146,19 @@ public void WriteAirportInfoTxt(string responsibleArtcc) { if (recordModel1.UserAction != "" && recordModel1.UserAction != " ") { - airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | https://aeronav.faa.gov/d-tpp/{AiracDateCycleModel.AllCycleDates[GlobalConfig.airacEffectiveDate]}/compare_pdf/{recordModel1.PdfName.Substring(0, recordModel1.PdfName.Length - 4)}_cmp.pdf"); + if (recordModel1.UserAction == "A") + { + airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | This procedure is new and has no previous version to compare."); + } + else if (recordModel1.UserAction == "D") + { + airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | This procedure has been deleted this AIRAC."); + } + else + { + // TODO - Check link here. + airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | https://aeronav.faa.gov/d-tpp/{AiracDateCycleModel.AllCycleDates[GlobalConfig.airacEffectiveDate]}/compare_pdf/{recordModel1.PdfName.Substring(0, recordModel1.PdfName.Length - 4)}_cmp.pdf"); + } } } } From 17126827fc019fe687196a31c5acd70ec794d8f6 Mon Sep 17 00:00:00 2001 From: Nikolia558 <38259407+Nikolai558@users.noreply.github.com> Date: Wed, 1 Dec 2021 17:51:06 -0700 Subject: [PATCH 02/15] ADDED LINK 404 CHECKER ADDED THE CODE TO CHECK IF A LINK IS A 404 OR NOT. RIGHT NOW THIS IS PRETTY SLOW FOR THE MOST PART SO IT IS COMMENTED OUT. --- .../DataAccess/PublicationParser.cs | 29 ++++++++++++++++--- FeBuddyLibrary/Helpers/WebHelpers.cs | 23 ++++++++++++++- 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/FeBuddyLibrary/DataAccess/PublicationParser.cs b/FeBuddyLibrary/DataAccess/PublicationParser.cs index 189fdf6..cc2f13a 100644 --- a/FeBuddyLibrary/DataAccess/PublicationParser.cs +++ b/FeBuddyLibrary/DataAccess/PublicationParser.cs @@ -84,8 +84,18 @@ public void WriteAirportInfoTxt(string responsibleArtcc) } else { - // TODO - Check link here. - airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | https://aeronav.faa.gov/d-tpp/{AiracDateCycleModel.AllCycleDates[GlobalConfig.airacEffectiveDate]}/compare_pdf/{recordModel1.PdfName.Substring(0, recordModel1.PdfName.Length - 4)}_cmp.pdf"); + string link = $"https://aeronav.faa.gov/d-tpp/{AiracDateCycleModel.AllCycleDates[GlobalConfig.airacEffectiveDate]}/compare_pdf/{recordModel1.PdfName.Substring(0, recordModel1.PdfName.Length - 4)}_cmp.pdf"; + //// TODO - Check link here, if this takes to long comment it out. + //if (Helpers.WebHelpers.is404WebsiteLink(link)) + //{ + // airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | This procedure has changed but the FAA does not seem to have a comparative document. This is common with DOD facilities such as KHIF and KMUO."); + //} + //else + //{ + // airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | {link}"); + //} + airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | {link}"); + } } } @@ -156,8 +166,19 @@ public void WriteAirportInfoTxt(string responsibleArtcc) } else { - // TODO - Check link here. - airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | https://aeronav.faa.gov/d-tpp/{AiracDateCycleModel.AllCycleDates[GlobalConfig.airacEffectiveDate]}/compare_pdf/{recordModel1.PdfName.Substring(0, recordModel1.PdfName.Length - 4)}_cmp.pdf"); + string link = $"https://aeronav.faa.gov/d-tpp/{AiracDateCycleModel.AllCycleDates[GlobalConfig.airacEffectiveDate]}/compare_pdf/{recordModel1.PdfName.Substring(0, recordModel1.PdfName.Length - 4)}_cmp.pdf"; + //// TODO - Check link here, if this takes to long comment it out. + //// This works however it does add some time to it. Maybe use setting option for this? Or just forget it all together and just do a message at the top of the file. + //if (Helpers.WebHelpers.is404WebsiteLink(link)) + //{ + // airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | This procedure has changed but the FAA does not seem to have a comparative document. This is common with DOD facilities such as KHIF and KMUO."); + //} + //else + //{ + // airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | {link}"); + //} + airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | {link}"); + } } } diff --git a/FeBuddyLibrary/Helpers/WebHelpers.cs b/FeBuddyLibrary/Helpers/WebHelpers.cs index f963cd5..72adaef 100644 --- a/FeBuddyLibrary/Helpers/WebHelpers.cs +++ b/FeBuddyLibrary/Helpers/WebHelpers.cs @@ -43,7 +43,28 @@ public static bool GetMetaUrlResponse() } } - public static void UpdateCheck() + public static bool is404WebsiteLink(string link) + { + try + { + var request = HttpWebRequest.Create(link); + request.Method = "GET"; + if (request.GetResponse() is HttpWebResponse response) + { + response.Close(); + } + + return false; + } + catch (WebException) + { + Logger.LogMessage("DEBUG", $"NOT VALID LINK: {link}"); + return true; + } + } + + + public static void UpdateCheck() { Logger.LogMessage("DEBUG", "PREFORMING UPDATE CHECK"); From 992e423624f33d0ed8ee54866f73521ac26c4c08 Mon Sep 17 00:00:00 2001 From: Nikolia558 <38259407+Nikolai558@users.noreply.github.com> Date: Wed, 1 Dec 2021 17:58:48 -0700 Subject: [PATCH 03/15] Logging Messages Added --- .../DataAccess/GetFaaMetaFileData.cs | 8 +++++++- .../DataAccess/PublicationParser.cs | 19 ++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/FeBuddyLibrary/DataAccess/GetFaaMetaFileData.cs b/FeBuddyLibrary/DataAccess/GetFaaMetaFileData.cs index 4d41e30..15ac72d 100644 --- a/FeBuddyLibrary/DataAccess/GetFaaMetaFileData.cs +++ b/FeBuddyLibrary/DataAccess/GetFaaMetaFileData.cs @@ -1,4 +1,5 @@ -using FeBuddyLibrary.Models.MetaFileModels; +using FeBuddyLibrary.Helpers; +using FeBuddyLibrary.Models.MetaFileModels; using System.Collections.Generic; using System.IO; using System.Text; @@ -12,7 +13,12 @@ public class GetFaaMetaFileData public void QuarterbackFunc() { + Logger.LogMessage("DEBUG", $"STARTING META FILE PARSING"); + ParseMetaFile(); + + Logger.LogMessage("DEBUG", $"COMPLETED META FILE PARSING"); + } private void ParseMetaFile() diff --git a/FeBuddyLibrary/DataAccess/PublicationParser.cs b/FeBuddyLibrary/DataAccess/PublicationParser.cs index cc2f13a..03ccc82 100644 --- a/FeBuddyLibrary/DataAccess/PublicationParser.cs +++ b/FeBuddyLibrary/DataAccess/PublicationParser.cs @@ -1,4 +1,5 @@ -using FeBuddyLibrary.Models; +using FeBuddyLibrary.Helpers; +using FeBuddyLibrary.Models; using FeBuddyLibrary.Models.MetaFileModels; using System; using System.Collections.Generic; @@ -15,12 +16,16 @@ public class PublicationParser public void WriteAirportInfoTxt(string responsibleArtcc) { + Logger.LogMessage("INFO", "STARTING PUBLICATION PARSER"); + StringBuilder airportInArtccInfo = new StringBuilder(); StringBuilder airportProcedureChanges = new StringBuilder(); StringBuilder airportProcedures = new StringBuilder(); if (responsibleArtcc == "FAA") { + Logger.LogMessage("DEBUG", "RESPONSIBLE ARTCC IS FAA"); + foreach (string artcc in allArtcc) { if (artcc == "FAA") @@ -114,6 +119,8 @@ public void WriteAirportInfoTxt(string responsibleArtcc) } else if (allArtcc.Contains(responsibleArtcc)) { + Logger.LogMessage("DEBUG", $"RESPONSIBLE ARTCC IS {responsibleArtcc}"); + foreach (AptModel airport in GlobalConfig.allAptModelsForCheck) { if (airport.ResArtcc == responsibleArtcc) @@ -197,8 +204,12 @@ public void WriteAirportInfoTxt(string responsibleArtcc) } else { + Logger.LogMessage("ERROR", $"RESPONSIBLE ARTCC IS NOT VALID! NEW EXCEPTION THROWN, THIS CAUSED CRASH."); + throw new NotImplementedException(); } + Logger.LogMessage("INFO", "COMPLETED PUBLICATION PARSER"); + } /// @@ -207,13 +218,19 @@ public void WriteAirportInfoTxt(string responsibleArtcc) /// Full File Path private void CreateDirAndFile(string fullFilePath) { + Logger.LogMessage("DEBUG", $"TRYING TO CREATE {fullFilePath}"); + if (!Directory.Exists(fullFilePath.Substring(0, fullFilePath.LastIndexOf('\\')))) { + Logger.LogMessage("DEBUG", $"DIRECTORY DOES NOT EXIST, CREATING DIRECTORY FOR {fullFilePath}"); + Directory.CreateDirectory(fullFilePath.Substring(0, fullFilePath.LastIndexOf('\\'))); } if (!File.Exists(fullFilePath)) { + Logger.LogMessage("WARNING", $"FILE ALREADY EXITS FOR {fullFilePath}"); + //File.Create(fullFilePath); } } From 2824414b9794dc7cc9e149e5dfd41fe30b6874f2 Mon Sep 17 00:00:00 2001 From: Nikolia558 <38259407+Nikolai558@users.noreply.github.com> Date: Wed, 1 Dec 2021 20:17:52 -0700 Subject: [PATCH 04/15] Checking each link not worth it Removed code to check each link for a 404 --- FeBuddyLibrary/Helpers/WebHelpers.cs | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/FeBuddyLibrary/Helpers/WebHelpers.cs b/FeBuddyLibrary/Helpers/WebHelpers.cs index 72adaef..1234492 100644 --- a/FeBuddyLibrary/Helpers/WebHelpers.cs +++ b/FeBuddyLibrary/Helpers/WebHelpers.cs @@ -43,27 +43,6 @@ public static bool GetMetaUrlResponse() } } - public static bool is404WebsiteLink(string link) - { - try - { - var request = HttpWebRequest.Create(link); - request.Method = "GET"; - if (request.GetResponse() is HttpWebResponse response) - { - response.Close(); - } - - return false; - } - catch (WebException) - { - Logger.LogMessage("DEBUG", $"NOT VALID LINK: {link}"); - return true; - } - } - - public static void UpdateCheck() { Logger.LogMessage("DEBUG", "PREFORMING UPDATE CHECK"); From 275b31c2b3d8d6151998f75c9d2462ef2cdfa594 Mon Sep 17 00:00:00 2001 From: Nikolia558 <38259407+Nikolai558@users.noreply.github.com> Date: Wed, 1 Dec 2021 20:18:22 -0700 Subject: [PATCH 05/15] Proccess Exit Code --- FeBuddyLibrary/Helpers/BatchFileHelpers.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/FeBuddyLibrary/Helpers/BatchFileHelpers.cs b/FeBuddyLibrary/Helpers/BatchFileHelpers.cs index 426a34b..6b18c93 100644 --- a/FeBuddyLibrary/Helpers/BatchFileHelpers.cs +++ b/FeBuddyLibrary/Helpers/BatchFileHelpers.cs @@ -27,9 +27,10 @@ public static void ExecuteCurlBatchFile(string batchFileName) CreateNoWindow = true, UseShellExecute = false }; - + Process = Process.Start(ProcessInfo); Process.WaitForExit(); + _ = Process.ExitCode; Process.Close(); } From 54d03ac79422e73ca7ce63510e67531edda51914 Mon Sep 17 00:00:00 2001 From: Nikolia558 <38259407+Nikolai558@users.noreply.github.com> Date: Wed, 1 Dec 2021 20:19:26 -0700 Subject: [PATCH 06/15] Changed Procedure Change File Content Added Info Message into Procedure changes --- .../DataAccess/PublicationParser.cs | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/FeBuddyLibrary/DataAccess/PublicationParser.cs b/FeBuddyLibrary/DataAccess/PublicationParser.cs index 03ccc82..2ca3d13 100644 --- a/FeBuddyLibrary/DataAccess/PublicationParser.cs +++ b/FeBuddyLibrary/DataAccess/PublicationParser.cs @@ -90,15 +90,6 @@ public void WriteAirportInfoTxt(string responsibleArtcc) else { string link = $"https://aeronav.faa.gov/d-tpp/{AiracDateCycleModel.AllCycleDates[GlobalConfig.airacEffectiveDate]}/compare_pdf/{recordModel1.PdfName.Substring(0, recordModel1.PdfName.Length - 4)}_cmp.pdf"; - //// TODO - Check link here, if this takes to long comment it out. - //if (Helpers.WebHelpers.is404WebsiteLink(link)) - //{ - // airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | This procedure has changed but the FAA does not seem to have a comparative document. This is common with DOD facilities such as KHIF and KMUO."); - //} - //else - //{ - // airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | {link}"); - //} airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | {link}"); } @@ -114,6 +105,16 @@ public void WriteAirportInfoTxt(string responsibleArtcc) string ProcedureChangefilePath = $"{outputDirectory}\\{artcc}_{AiracDateCycleModel.AllCycleDates[GlobalConfig.airacEffectiveDate]}\\Procedure_Changes.txt"; CreateDirAndFile(ProcedureChangefilePath); + + if (airportProcedureChanges.Length > 1) + { + airportProcedureChanges.Insert(0, "\n\n\nIn some cases, the link will return a 404 Error. This is because the FAA does not have a comparative document. This is common with DOD facilities.\n\n\n"); + } + else + { + airportProcedureChanges.AppendLine("\n\n\nNo Changes this AIRAC\n\n\n"); + } + File.WriteAllText(ProcedureChangefilePath, airportProcedureChanges.ToString()); } } @@ -174,16 +175,6 @@ public void WriteAirportInfoTxt(string responsibleArtcc) else { string link = $"https://aeronav.faa.gov/d-tpp/{AiracDateCycleModel.AllCycleDates[GlobalConfig.airacEffectiveDate]}/compare_pdf/{recordModel1.PdfName.Substring(0, recordModel1.PdfName.Length - 4)}_cmp.pdf"; - //// TODO - Check link here, if this takes to long comment it out. - //// This works however it does add some time to it. Maybe use setting option for this? Or just forget it all together and just do a message at the top of the file. - //if (Helpers.WebHelpers.is404WebsiteLink(link)) - //{ - // airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | This procedure has changed but the FAA does not seem to have a comparative document. This is common with DOD facilities such as KHIF and KMUO."); - //} - //else - //{ - // airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | {link}"); - //} airportProcedureChanges.AppendLine($"\t({recordModel1.UserAction}) {recordModel1.ChartName} | {link}"); } @@ -200,6 +191,15 @@ public void WriteAirportInfoTxt(string responsibleArtcc) string ProcedureChangefilePath = $"{outputDirectory}\\{responsibleArtcc}_{AiracDateCycleModel.AllCycleDates[GlobalConfig.airacEffectiveDate]}\\Procedure_Changes.txt"; CreateDirAndFile(ProcedureChangefilePath); + + if (airportProcedureChanges.Length > 1) + { + airportProcedureChanges.Insert(0, "\n\n\nIn some cases, the link will return a 404 Error. This is because the FAA does not have a comparative document. This is common with DOD facilities.\n\n\n"); + } + else + { + airportProcedureChanges.AppendLine("\n\n\nNo Changes this AIRAC\n\n\n"); + } File.WriteAllText(ProcedureChangefilePath, airportProcedureChanges.ToString()); } else From c66ad1019d83aeecd112e5045142dc9f413e0ea8 Mon Sep 17 00:00:00 2001 From: Nikolia558 <38259407+Nikolai558@users.noreply.github.com> Date: Wed, 1 Dec 2021 20:27:36 -0700 Subject: [PATCH 07/15] changed FAC ID Style Changed from Dropdown box to dropdown list so that people can not "type" in that field --- FeBuddyWinFormUI/WinForms/MainForm.Designer.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs b/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs index 33be235..eb612af 100644 --- a/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs +++ b/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs @@ -259,6 +259,7 @@ private void InitializeComponent() // facilityIdCombobox // this.facilityIdCombobox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); + this.facilityIdCombobox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.facilityIdCombobox.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.facilityIdCombobox.ForeColor = System.Drawing.SystemColors.AppWorkspace; this.facilityIdCombobox.FormattingEnabled = true; @@ -435,9 +436,9 @@ private void InitializeComponent() this.Name = "MainForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FE-BUDDY"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_Closing); this.Load += new System.EventHandler(this.MainForm_Load); this.Shown += new System.EventHandler(this.MainForm_Shown); - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_Closing); this.airacCycleGroupBox.ResumeLayout(false); this.airacCycleGroupBox.PerformLayout(); this.convertGroupBox.ResumeLayout(false); From 164bd769687216f4e765644c682fdeac713673ff Mon Sep 17 00:00:00 2001 From: Nikolas <38259407+Nikolai558@users.noreply.github.com> Date: Fri, 17 Dec 2021 11:58:12 -0700 Subject: [PATCH 08/15] Update SECURITY.md --- SECURITY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/SECURITY.md b/SECURITY.md index 4368457..2a776f8 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,6 +4,7 @@ | Version | Supported | | ------- | ------------------ | +| 1.0.1 | :white_check_mark: | | 1.0.0 | :white_check_mark: | | < 1.0.0 | :x: | From 8dead0a26a0325820acbeb6bb091f6b648791cb8 Mon Sep 17 00:00:00 2001 From: Nikolia558 <38259407+Nikolai558@users.noreply.github.com> Date: Mon, 20 Dec 2021 17:10:32 -0700 Subject: [PATCH 09/15] Modified Menu Items Added Two Main Categories for the menu items Information - Holds all website link buttons Settings - Holds uninstall option --- .../WinForms/MainForm.Designer.cs | 161 ++++++++++-------- FeBuddyWinFormUI/WinForms/MainForm.cs | 72 ++++---- 2 files changed, 124 insertions(+), 109 deletions(-) diff --git a/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs b/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs index eb612af..468def9 100644 --- a/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs +++ b/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs @@ -50,12 +50,14 @@ private void InitializeComponent() this.outputLocationLabel = new System.Windows.Forms.Label(); this.exitButton = new System.Windows.Forms.Button(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.instructionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.roadmapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.fAQToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.creditsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.changeLogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.uninstallToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.informationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); + this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.airacCycleGroupBox.SuspendLayout(); this.convertGroupBox.SuspendLayout(); this.startGroupBox.SuspendLayout(); @@ -344,72 +346,83 @@ private void InitializeComponent() this.menuStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.menuStrip1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.instructionsToolStripMenuItem, - this.roadmapToolStripMenuItem, - this.fAQToolStripMenuItem, - this.creditsToolStripMenuItem, - this.changeLogToolStripMenuItem, - this.uninstallToolStripMenuItem}); + this.informationToolStripMenuItem, + this.settingsToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(785, 24); + this.menuStrip1.Size = new System.Drawing.Size(785, 26); this.menuStrip1.TabIndex = 15; this.menuStrip1.Text = "menuStrip1"; // - // instructionsToolStripMenuItem - // - this.instructionsToolStripMenuItem.Font = new System.Drawing.Font("Romantic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); - this.instructionsToolStripMenuItem.ForeColor = System.Drawing.SystemColors.AppWorkspace; - this.instructionsToolStripMenuItem.Name = "instructionsToolStripMenuItem"; - this.instructionsToolStripMenuItem.Size = new System.Drawing.Size(93, 20); - this.instructionsToolStripMenuItem.Text = "Instructions"; - this.instructionsToolStripMenuItem.Click += new System.EventHandler(this.InstructionsToolStripMenuItem_Click); - // - // roadmapToolStripMenuItem - // - this.roadmapToolStripMenuItem.Font = new System.Drawing.Font("Romantic", 11.25F); - this.roadmapToolStripMenuItem.ForeColor = System.Drawing.SystemColors.AppWorkspace; - this.roadmapToolStripMenuItem.Name = "roadmapToolStripMenuItem"; - this.roadmapToolStripMenuItem.Size = new System.Drawing.Size(80, 20); - this.roadmapToolStripMenuItem.Text = "Roadmap"; - this.roadmapToolStripMenuItem.Click += new System.EventHandler(this.RoadmapToolStripMenuItem_Click); - // - // fAQToolStripMenuItem - // - this.fAQToolStripMenuItem.Font = new System.Drawing.Font("Romantic", 11.25F); - this.fAQToolStripMenuItem.ForeColor = System.Drawing.SystemColors.AppWorkspace; - this.fAQToolStripMenuItem.Name = "fAQToolStripMenuItem"; - this.fAQToolStripMenuItem.Size = new System.Drawing.Size(50, 20); - this.fAQToolStripMenuItem.Text = "FAQ"; - this.fAQToolStripMenuItem.Click += new System.EventHandler(this.FAQToolStripMenuItem_Click); - // - // creditsToolStripMenuItem - // - this.creditsToolStripMenuItem.Font = new System.Drawing.Font("Romantic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); - this.creditsToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ActiveBorder; - this.creditsToolStripMenuItem.Name = "creditsToolStripMenuItem"; - this.creditsToolStripMenuItem.Size = new System.Drawing.Size(64, 20); - this.creditsToolStripMenuItem.Text = "Credits"; - this.creditsToolStripMenuItem.Click += new System.EventHandler(this.CreditsToolStripMenuItem_Click); - // - // changeLogToolStripMenuItem - // - this.changeLogToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.changeLogToolStripMenuItem.Font = new System.Drawing.Font("Romantic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); - this.changeLogToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ActiveBorder; - this.changeLogToolStripMenuItem.Name = "changeLogToolStripMenuItem"; - this.changeLogToolStripMenuItem.Size = new System.Drawing.Size(97, 20); - this.changeLogToolStripMenuItem.Text = "Change Log"; - this.changeLogToolStripMenuItem.Click += new System.EventHandler(this.ChangeLogToolStripMenuItem_Click); - // - // uninstallToolStripMenuItem - // - this.uninstallToolStripMenuItem.Font = new System.Drawing.Font("Romantic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); - this.uninstallToolStripMenuItem.ForeColor = System.Drawing.SystemColors.AppWorkspace; - this.uninstallToolStripMenuItem.Name = "uninstallToolStripMenuItem"; - this.uninstallToolStripMenuItem.Size = new System.Drawing.Size(76, 20); - this.uninstallToolStripMenuItem.Text = "Uninstall"; - this.uninstallToolStripMenuItem.Click += new System.EventHandler(this.UninstallToolStripMenuItem_Click); + // informationToolStripMenuItem + // + this.informationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripMenuItem2, + this.toolStripMenuItem3, + this.toolStripMenuItem4, + this.toolStripMenuItem5, + this.toolStripMenuItem6}); + this.informationToolStripMenuItem.Font = new System.Drawing.Font("Romantic", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); + this.informationToolStripMenuItem.ForeColor = System.Drawing.SystemColors.AppWorkspace; + this.informationToolStripMenuItem.Name = "informationToolStripMenuItem"; + this.informationToolStripMenuItem.Size = new System.Drawing.Size(94, 22); + this.informationToolStripMenuItem.Text = "Information"; + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 22); + this.toolStripMenuItem2.Text = "Instructions"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); + // + // toolStripMenuItem3 + // + this.toolStripMenuItem3.Name = "toolStripMenuItem3"; + this.toolStripMenuItem3.Size = new System.Drawing.Size(180, 22); + this.toolStripMenuItem3.Text = "Roadmap"; + this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click); + // + // toolStripMenuItem4 + // + this.toolStripMenuItem4.Name = "toolStripMenuItem4"; + this.toolStripMenuItem4.Size = new System.Drawing.Size(180, 22); + this.toolStripMenuItem4.Text = "FAQ"; + this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click); + // + // toolStripMenuItem5 + // + this.toolStripMenuItem5.Name = "toolStripMenuItem5"; + this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 22); + this.toolStripMenuItem5.Text = "Change Log"; + this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click); + // + // toolStripMenuItem6 + // + this.toolStripMenuItem6.Name = "toolStripMenuItem6"; + this.toolStripMenuItem6.Size = new System.Drawing.Size(180, 22); + this.toolStripMenuItem6.Text = "Credits"; + this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click); + // + // settingsToolStripMenuItem + // + this.settingsToolStripMenuItem.BackColor = System.Drawing.Color.Transparent; + this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripMenuItem1}); + this.settingsToolStripMenuItem.Font = new System.Drawing.Font("Romantic", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); + this.settingsToolStripMenuItem.ForeColor = System.Drawing.SystemColors.AppWorkspace; + this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(70, 22); + this.settingsToolStripMenuItem.Text = "Settings"; + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.BackColor = System.Drawing.Color.Black; + this.toolStripMenuItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripMenuItem1.ForeColor = System.Drawing.SystemColors.AppWorkspace; + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.toolStripMenuItem1.Text = "Uninstall"; + this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); // // MainForm // @@ -474,15 +487,17 @@ private void InitializeComponent() private System.Windows.Forms.GroupBox processingGroupBox; private System.Windows.Forms.Button exitButton; private System.Windows.Forms.MenuStrip menuStrip1; - private System.Windows.Forms.ToolStripMenuItem instructionsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem creditsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem changeLogToolStripMenuItem; private System.Windows.Forms.Label outputDirectoryLabel; private System.Windows.Forms.Label outputLocationLabel; - private System.Windows.Forms.ToolStripMenuItem uninstallToolStripMenuItem; private System.Windows.Forms.ComboBox facilityIdCombobox; - private System.Windows.Forms.ToolStripMenuItem fAQToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem roadmapToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem informationToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem4; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem5; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem6; } } diff --git a/FeBuddyWinFormUI/WinForms/MainForm.cs b/FeBuddyWinFormUI/WinForms/MainForm.cs index 862132a..5e402fd 100644 --- a/FeBuddyWinFormUI/WinForms/MainForm.cs +++ b/FeBuddyWinFormUI/WinForms/MainForm.cs @@ -485,40 +485,19 @@ private void Worker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArg Logger.LogMessage("DEBUG", "AIRAC DATE WORKER COMPLETED"); } - private void InstructionsToolStripMenuItem_Click(object sender, EventArgs e) - { - Logger.LogMessage("DEBUG", "INSTRUCTIONS MENU ITEM CLICKED"); - - Process.Start("https://docs.google.com/presentation/d/e/2PACX-1vRMd6PIRrj0lPb4sAi9KB7iM3u5zn0dyUVLqEcD9m2e71nf0UPyEmkOs4ZwYsQdl7smopjdvw_iWEyP/embed"); - - } - - private void CreditsToolStripMenuItem_Click(object sender, EventArgs e) - { - Logger.LogMessage("DEBUG", "CREDITS MENU ITEM CLICKED"); - Process.Start("https://github.com/Nikolai558/FE-BUDDY/blob/releases/Credits.md"); - // CreditsForm frm = new CreditsForm(); - // frm.ShowDialog(); - } - private void MainForm_Load(object sender, EventArgs e) { Logger.LogMessage("DEBUG", "LOADING MAIN FORM"); var pfc = new PrivateFontCollection(); pfc.AddFontFile("Properties\\romantic.ttf"); - instructionsToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); - creditsToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); - changeLogToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); - uninstallToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); - fAQToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); - roadmapToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); - } - - private void ChangeLogToolStripMenuItem_Click(object sender, EventArgs e) - { - Logger.LogMessage("DEBUG", "CHANGELOG MENU ITEM CLICKED"); - Process.Start("https://github.com/Nikolai558/FE-BUDDY/blob/releases/ChangeLog.md"); + // TODO - Add fonts to buttons. + //instructionsToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); + //creditsToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); + //changeLogToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); + //uninstallToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); + //fAQToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); + //roadmapToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); } private void NextAiracSelection_Click(object sender, EventArgs e) @@ -532,7 +511,13 @@ private void NextAiracSelection_Click(object sender, EventArgs e) } } - private void UninstallToolStripMenuItem_Click(object sender, EventArgs e) + private void FacilityIdCombobox_SelectedIndexChanged(object sender, EventArgs e) + { + Logger.LogMessage("DEBUG", "FACILITY COMBOBOX CLICKED"); + GlobalConfig.facilityID = facilityIdCombobox.SelectedItem.ToString(); + } + + private void toolStripMenuItem1_Click(object sender, EventArgs e) { Logger.LogMessage("WARNING", "UNINSTALL MENU ITEM CLICKED"); @@ -652,22 +637,37 @@ private void UninstallToolStripMenuItem_Click(object sender, EventArgs e) } } - private void FacilityIdCombobox_SelectedIndexChanged(object sender, EventArgs e) + private void toolStripMenuItem2_Click(object sender, EventArgs e) { - Logger.LogMessage("DEBUG", "FACILITY COMBOBOX CLICKED"); - GlobalConfig.facilityID = facilityIdCombobox.SelectedItem.ToString(); + Logger.LogMessage("DEBUG", "INSTRUCTIONS MENU ITEM CLICKED"); + + Process.Start("https://docs.google.com/presentation/d/e/2PACX-1vRMd6PIRrj0lPb4sAi9KB7iM3u5zn0dyUVLqEcD9m2e71nf0UPyEmkOs4ZwYsQdl7smopjdvw_iWEyP/embed"); + } + + private void toolStripMenuItem3_Click(object sender, EventArgs e) + { + Logger.LogMessage("DEBUG", "ROADMAP MENU ITEM CLICKED"); + Process.Start("https://github.com/Nikolai558/FE-BUDDY/blob/releases/ROADMAP.md"); } - private void FAQToolStripMenuItem_Click(object sender, EventArgs e) + private void toolStripMenuItem4_Click(object sender, EventArgs e) { Logger.LogMessage("DEBUG", "FAQ MENU ITEM CLICKED"); Process.Start("https://docs.google.com/presentation/d/e/2PACX-1vSlhz1DhDwZ-43BY4Q2vg-ff0QBGssxpmv4-nhZlz9LpGJvWjqLsHVaQwwsV1AGMWFFF_x_j_b3wTBO/embed"); } - private void RoadmapToolStripMenuItem_Click(object sender, EventArgs e) + private void toolStripMenuItem5_Click(object sender, EventArgs e) { - Logger.LogMessage("DEBUG", "ROADMAP MENU ITEM CLICKED"); - Process.Start("https://github.com/Nikolai558/FE-BUDDY/blob/releases/ROADMAP.md"); + Logger.LogMessage("DEBUG", "CHANGELOG MENU ITEM CLICKED"); + Process.Start("https://github.com/Nikolai558/FE-BUDDY/blob/releases/ChangeLog.md"); + } + + private void toolStripMenuItem6_Click(object sender, EventArgs e) + { + Logger.LogMessage("DEBUG", "CREDITS MENU ITEM CLICKED"); + Process.Start("https://github.com/Nikolai558/FE-BUDDY/blob/releases/Credits.md"); + // CreditsForm frm = new CreditsForm(); + // frm.ShowDialog(); } } } From b6be0218a76b217d5bc89b6d8717fc581d3aae3a Mon Sep 17 00:00:00 2001 From: Nikolia558 <38259407+Nikolai558@users.noreply.github.com> Date: Mon, 20 Dec 2021 17:22:31 -0700 Subject: [PATCH 10/15] Changed Menu Item Colors --- .../WinForms/MainForm.Designer.cs | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs b/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs index 468def9..8ecced1 100644 --- a/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs +++ b/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs @@ -356,6 +356,7 @@ private void InitializeComponent() // // informationToolStripMenuItem // + this.informationToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.informationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripMenuItem2, this.toolStripMenuItem3, @@ -370,6 +371,10 @@ private void InitializeComponent() // // toolStripMenuItem2 // + this.toolStripMenuItem2.BackColor = System.Drawing.Color.Black; + this.toolStripMenuItem2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.toolStripMenuItem2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripMenuItem2.ForeColor = System.Drawing.SystemColors.AppWorkspace; this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 22); this.toolStripMenuItem2.Text = "Instructions"; @@ -377,6 +382,10 @@ private void InitializeComponent() // // toolStripMenuItem3 // + this.toolStripMenuItem3.BackColor = System.Drawing.Color.Black; + this.toolStripMenuItem3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.toolStripMenuItem3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripMenuItem3.ForeColor = System.Drawing.SystemColors.AppWorkspace; this.toolStripMenuItem3.Name = "toolStripMenuItem3"; this.toolStripMenuItem3.Size = new System.Drawing.Size(180, 22); this.toolStripMenuItem3.Text = "Roadmap"; @@ -384,6 +393,10 @@ private void InitializeComponent() // // toolStripMenuItem4 // + this.toolStripMenuItem4.BackColor = System.Drawing.Color.Black; + this.toolStripMenuItem4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.toolStripMenuItem4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripMenuItem4.ForeColor = System.Drawing.SystemColors.AppWorkspace; this.toolStripMenuItem4.Name = "toolStripMenuItem4"; this.toolStripMenuItem4.Size = new System.Drawing.Size(180, 22); this.toolStripMenuItem4.Text = "FAQ"; @@ -391,6 +404,10 @@ private void InitializeComponent() // // toolStripMenuItem5 // + this.toolStripMenuItem5.BackColor = System.Drawing.Color.Black; + this.toolStripMenuItem5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.toolStripMenuItem5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripMenuItem5.ForeColor = System.Drawing.SystemColors.AppWorkspace; this.toolStripMenuItem5.Name = "toolStripMenuItem5"; this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 22); this.toolStripMenuItem5.Text = "Change Log"; @@ -398,6 +415,10 @@ private void InitializeComponent() // // toolStripMenuItem6 // + this.toolStripMenuItem6.BackColor = System.Drawing.Color.Black; + this.toolStripMenuItem6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripMenuItem6.ForeColor = System.Drawing.SystemColors.AppWorkspace; this.toolStripMenuItem6.Name = "toolStripMenuItem6"; this.toolStripMenuItem6.Size = new System.Drawing.Size(180, 22); this.toolStripMenuItem6.Text = "Credits"; @@ -405,7 +426,7 @@ private void InitializeComponent() // // settingsToolStripMenuItem // - this.settingsToolStripMenuItem.BackColor = System.Drawing.Color.Transparent; + this.settingsToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripMenuItem1}); this.settingsToolStripMenuItem.Font = new System.Drawing.Font("Romantic", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); From d1009dc139dcd4a11baf90fff6a3a4c6e310df83 Mon Sep 17 00:00:00 2001 From: Nikolia558 <38259407+Nikolai558@users.noreply.github.com> Date: Mon, 20 Dec 2021 17:33:25 -0700 Subject: [PATCH 11/15] Renamed Backend Menu Items --- .../WinForms/MainForm.Designer.cs | 192 +++++++++--------- FeBuddyWinFormUI/WinForms/MainForm.cs | 32 +-- FeBuddyWinFormUI/WinForms/MainForm.resx | 2 +- 3 files changed, 114 insertions(+), 112 deletions(-) diff --git a/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs b/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs index 8ecced1..913caae 100644 --- a/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs +++ b/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs @@ -49,20 +49,20 @@ private void InitializeComponent() this.outputDirectoryLabel = new System.Windows.Forms.Label(); this.outputLocationLabel = new System.Windows.Forms.Label(); this.exitButton = new System.Windows.Forms.Button(); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.menuStrip = new System.Windows.Forms.MenuStrip(); this.informationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); + this.InstructionsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RoadmapMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.FAQMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ChangeLogMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CreditsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.UninstallMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.airacCycleGroupBox.SuspendLayout(); this.convertGroupBox.SuspendLayout(); this.startGroupBox.SuspendLayout(); this.processingGroupBox.SuspendLayout(); - this.menuStrip1.SuspendLayout(); + this.menuStrip.SuspendLayout(); this.SuspendLayout(); // // currentAiracSelection @@ -341,109 +341,109 @@ private void InitializeComponent() this.exitButton.Visible = false; this.exitButton.Click += new System.EventHandler(this.ExitButton_Click); // - // menuStrip1 + // menuStrip // - this.menuStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.menuStrip1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.menuStrip.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.informationToolStripMenuItem, this.settingsToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(785, 26); - this.menuStrip1.TabIndex = 15; - this.menuStrip1.Text = "menuStrip1"; + this.menuStrip.Location = new System.Drawing.Point(0, 0); + this.menuStrip.Name = "menuStrip"; + this.menuStrip.Size = new System.Drawing.Size(785, 26); + this.menuStrip.TabIndex = 15; + this.menuStrip.Text = "menuStrip1"; // // informationToolStripMenuItem // this.informationToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.informationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripMenuItem2, - this.toolStripMenuItem3, - this.toolStripMenuItem4, - this.toolStripMenuItem5, - this.toolStripMenuItem6}); + this.InstructionsMenuItem, + this.RoadmapMenuItem, + this.FAQMenuItem, + this.ChangeLogMenuItem, + this.CreditsMenuItem}); this.informationToolStripMenuItem.Font = new System.Drawing.Font("Romantic", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); this.informationToolStripMenuItem.ForeColor = System.Drawing.SystemColors.AppWorkspace; this.informationToolStripMenuItem.Name = "informationToolStripMenuItem"; this.informationToolStripMenuItem.Size = new System.Drawing.Size(94, 22); this.informationToolStripMenuItem.Text = "Information"; // - // toolStripMenuItem2 - // - this.toolStripMenuItem2.BackColor = System.Drawing.Color.Black; - this.toolStripMenuItem2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.toolStripMenuItem2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripMenuItem2.ForeColor = System.Drawing.SystemColors.AppWorkspace; - this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 22); - this.toolStripMenuItem2.Text = "Instructions"; - this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); - // - // toolStripMenuItem3 - // - this.toolStripMenuItem3.BackColor = System.Drawing.Color.Black; - this.toolStripMenuItem3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.toolStripMenuItem3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripMenuItem3.ForeColor = System.Drawing.SystemColors.AppWorkspace; - this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(180, 22); - this.toolStripMenuItem3.Text = "Roadmap"; - this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click); - // - // toolStripMenuItem4 - // - this.toolStripMenuItem4.BackColor = System.Drawing.Color.Black; - this.toolStripMenuItem4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.toolStripMenuItem4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripMenuItem4.ForeColor = System.Drawing.SystemColors.AppWorkspace; - this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(180, 22); - this.toolStripMenuItem4.Text = "FAQ"; - this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click); - // - // toolStripMenuItem5 - // - this.toolStripMenuItem5.BackColor = System.Drawing.Color.Black; - this.toolStripMenuItem5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.toolStripMenuItem5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripMenuItem5.ForeColor = System.Drawing.SystemColors.AppWorkspace; - this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 22); - this.toolStripMenuItem5.Text = "Change Log"; - this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click); - // - // toolStripMenuItem6 - // - this.toolStripMenuItem6.BackColor = System.Drawing.Color.Black; - this.toolStripMenuItem6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripMenuItem6.ForeColor = System.Drawing.SystemColors.AppWorkspace; - this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(180, 22); - this.toolStripMenuItem6.Text = "Credits"; - this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click); + // InstructionsMenuItem + // + this.InstructionsMenuItem.BackColor = System.Drawing.Color.Black; + this.InstructionsMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.InstructionsMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.InstructionsMenuItem.ForeColor = System.Drawing.SystemColors.AppWorkspace; + this.InstructionsMenuItem.Name = "InstructionsMenuItem"; + this.InstructionsMenuItem.Size = new System.Drawing.Size(180, 22); + this.InstructionsMenuItem.Text = "Instructions"; + this.InstructionsMenuItem.Click += new System.EventHandler(this.InstructionsMenuItem_Click); + // + // RoadmapMenuItem + // + this.RoadmapMenuItem.BackColor = System.Drawing.Color.Black; + this.RoadmapMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.RoadmapMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.RoadmapMenuItem.ForeColor = System.Drawing.SystemColors.AppWorkspace; + this.RoadmapMenuItem.Name = "RoadmapMenuItem"; + this.RoadmapMenuItem.Size = new System.Drawing.Size(180, 22); + this.RoadmapMenuItem.Text = "Roadmap"; + this.RoadmapMenuItem.Click += new System.EventHandler(this.RoadmapMenuItem_Click); + // + // FAQMenuItem + // + this.FAQMenuItem.BackColor = System.Drawing.Color.Black; + this.FAQMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.FAQMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.FAQMenuItem.ForeColor = System.Drawing.SystemColors.AppWorkspace; + this.FAQMenuItem.Name = "FAQMenuItem"; + this.FAQMenuItem.Size = new System.Drawing.Size(180, 22); + this.FAQMenuItem.Text = "FAQ"; + this.FAQMenuItem.Click += new System.EventHandler(this.FAQMenuItem_Click); + // + // ChangeLogMenuItem + // + this.ChangeLogMenuItem.BackColor = System.Drawing.Color.Black; + this.ChangeLogMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.ChangeLogMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.ChangeLogMenuItem.ForeColor = System.Drawing.SystemColors.AppWorkspace; + this.ChangeLogMenuItem.Name = "ChangeLogMenuItem"; + this.ChangeLogMenuItem.Size = new System.Drawing.Size(180, 22); + this.ChangeLogMenuItem.Text = "Change Log"; + this.ChangeLogMenuItem.Click += new System.EventHandler(this.ChangeLogMenuItem_Click); + // + // CreditsMenuItem + // + this.CreditsMenuItem.BackColor = System.Drawing.Color.Black; + this.CreditsMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.CreditsMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.CreditsMenuItem.ForeColor = System.Drawing.SystemColors.AppWorkspace; + this.CreditsMenuItem.Name = "CreditsMenuItem"; + this.CreditsMenuItem.Size = new System.Drawing.Size(180, 22); + this.CreditsMenuItem.Text = "Credits"; + this.CreditsMenuItem.Click += new System.EventHandler(this.CreditsMenuItem_Click); // // settingsToolStripMenuItem // this.settingsToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripMenuItem1}); + this.UninstallMenuItem}); this.settingsToolStripMenuItem.Font = new System.Drawing.Font("Romantic", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); this.settingsToolStripMenuItem.ForeColor = System.Drawing.SystemColors.AppWorkspace; this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; this.settingsToolStripMenuItem.Size = new System.Drawing.Size(70, 22); this.settingsToolStripMenuItem.Text = "Settings"; // - // toolStripMenuItem1 + // UninstallMenuItem // - this.toolStripMenuItem1.BackColor = System.Drawing.Color.Black; - this.toolStripMenuItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripMenuItem1.ForeColor = System.Drawing.SystemColors.AppWorkspace; - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(180, 22); - this.toolStripMenuItem1.Text = "Uninstall"; - this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); + this.UninstallMenuItem.BackColor = System.Drawing.Color.Black; + this.UninstallMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.UninstallMenuItem.ForeColor = System.Drawing.SystemColors.AppWorkspace; + this.UninstallMenuItem.Name = "UninstallMenuItem"; + this.UninstallMenuItem.Size = new System.Drawing.Size(133, 22); + this.UninstallMenuItem.Text = "Uninstall"; + this.UninstallMenuItem.Click += new System.EventHandler(this.UninstallMenuItem_Click); // // MainForm // @@ -458,13 +458,13 @@ private void InitializeComponent() this.Controls.Add(this.startGroupBox); this.Controls.Add(this.convertGroupBox); this.Controls.Add(this.airacCycleGroupBox); - this.Controls.Add(this.menuStrip1); + this.Controls.Add(this.menuStrip); this.Font = new System.Drawing.Font("Segoe UI", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ForeColor = System.Drawing.SystemColors.Control; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.HelpButton = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.menuStrip1; + this.MainMenuStrip = this.menuStrip; this.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7); this.MaximizeBox = false; this.Name = "MainForm"; @@ -481,8 +481,8 @@ private void InitializeComponent() this.startGroupBox.PerformLayout(); this.processingGroupBox.ResumeLayout(false); this.processingGroupBox.PerformLayout(); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); + this.menuStrip.ResumeLayout(false); + this.menuStrip.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -507,18 +507,18 @@ private void InitializeComponent() private System.Windows.Forms.Label processingDataLabel; private System.Windows.Forms.GroupBox processingGroupBox; private System.Windows.Forms.Button exitButton; - private System.Windows.Forms.MenuStrip menuStrip1; + private System.Windows.Forms.MenuStrip menuStrip; private System.Windows.Forms.Label outputDirectoryLabel; private System.Windows.Forms.Label outputLocationLabel; private System.Windows.Forms.ComboBox facilityIdCombobox; private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem UninstallMenuItem; private System.Windows.Forms.ToolStripMenuItem informationToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; - private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3; - private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem4; - private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem5; - private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem6; + private System.Windows.Forms.ToolStripMenuItem InstructionsMenuItem; + private System.Windows.Forms.ToolStripMenuItem RoadmapMenuItem; + private System.Windows.Forms.ToolStripMenuItem FAQMenuItem; + private System.Windows.Forms.ToolStripMenuItem ChangeLogMenuItem; + private System.Windows.Forms.ToolStripMenuItem CreditsMenuItem; } } diff --git a/FeBuddyWinFormUI/WinForms/MainForm.cs b/FeBuddyWinFormUI/WinForms/MainForm.cs index 5e402fd..fb392a7 100644 --- a/FeBuddyWinFormUI/WinForms/MainForm.cs +++ b/FeBuddyWinFormUI/WinForms/MainForm.cs @@ -23,7 +23,7 @@ public MainForm() Logger.LogMessage("DEBUG", "INITIALIZING COMPONENT"); InitializeComponent(); - menuStrip1.Renderer = new MyRenderer(); + menuStrip.Renderer = new MyRenderer(); // It should grab from the assembily info. @@ -174,7 +174,7 @@ private void StartButton_Click(object sender, EventArgs e) FileHelpers.WriteTestSctFile(); - menuStrip1.Visible = false; + menuStrip.Visible = false; chooseDirButton.Enabled = false; //startButton.Enabled = false; @@ -418,7 +418,7 @@ private void Worker_StartParsingCompleted(object sender, RunWorkerCompletedEvent processingGroupBox.Visible = true; processingGroupBox.Enabled = true; - menuStrip1.Visible = true; + menuStrip.Visible = true; exitButton.Visible = true; exitButton.Enabled = true; @@ -492,12 +492,14 @@ private void MainForm_Load(object sender, EventArgs e) var pfc = new PrivateFontCollection(); pfc.AddFontFile("Properties\\romantic.ttf"); // TODO - Add fonts to buttons. - //instructionsToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); - //creditsToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); - //changeLogToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); - //uninstallToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); - //fAQToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); - //roadmapToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); + InstructionsMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); + CreditsMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); + ChangeLogMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); + UninstallMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); + FAQMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); + RoadmapMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); + informationToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); + settingsToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); } private void NextAiracSelection_Click(object sender, EventArgs e) @@ -517,7 +519,7 @@ private void FacilityIdCombobox_SelectedIndexChanged(object sender, EventArgs e) GlobalConfig.facilityID = facilityIdCombobox.SelectedItem.ToString(); } - private void toolStripMenuItem1_Click(object sender, EventArgs e) + private void UninstallMenuItem_Click(object sender, EventArgs e) { Logger.LogMessage("WARNING", "UNINSTALL MENU ITEM CLICKED"); @@ -637,32 +639,32 @@ private void toolStripMenuItem1_Click(object sender, EventArgs e) } } - private void toolStripMenuItem2_Click(object sender, EventArgs e) + private void InstructionsMenuItem_Click(object sender, EventArgs e) { Logger.LogMessage("DEBUG", "INSTRUCTIONS MENU ITEM CLICKED"); Process.Start("https://docs.google.com/presentation/d/e/2PACX-1vRMd6PIRrj0lPb4sAi9KB7iM3u5zn0dyUVLqEcD9m2e71nf0UPyEmkOs4ZwYsQdl7smopjdvw_iWEyP/embed"); } - private void toolStripMenuItem3_Click(object sender, EventArgs e) + private void RoadmapMenuItem_Click(object sender, EventArgs e) { Logger.LogMessage("DEBUG", "ROADMAP MENU ITEM CLICKED"); Process.Start("https://github.com/Nikolai558/FE-BUDDY/blob/releases/ROADMAP.md"); } - private void toolStripMenuItem4_Click(object sender, EventArgs e) + private void FAQMenuItem_Click(object sender, EventArgs e) { Logger.LogMessage("DEBUG", "FAQ MENU ITEM CLICKED"); Process.Start("https://docs.google.com/presentation/d/e/2PACX-1vSlhz1DhDwZ-43BY4Q2vg-ff0QBGssxpmv4-nhZlz9LpGJvWjqLsHVaQwwsV1AGMWFFF_x_j_b3wTBO/embed"); } - private void toolStripMenuItem5_Click(object sender, EventArgs e) + private void ChangeLogMenuItem_Click(object sender, EventArgs e) { Logger.LogMessage("DEBUG", "CHANGELOG MENU ITEM CLICKED"); Process.Start("https://github.com/Nikolai558/FE-BUDDY/blob/releases/ChangeLog.md"); } - private void toolStripMenuItem6_Click(object sender, EventArgs e) + private void CreditsMenuItem_Click(object sender, EventArgs e) { Logger.LogMessage("DEBUG", "CREDITS MENU ITEM CLICKED"); Process.Start("https://github.com/Nikolai558/FE-BUDDY/blob/releases/Credits.md"); diff --git a/FeBuddyWinFormUI/WinForms/MainForm.resx b/FeBuddyWinFormUI/WinForms/MainForm.resx index 456e36b..d424045 100644 --- a/FeBuddyWinFormUI/WinForms/MainForm.resx +++ b/FeBuddyWinFormUI/WinForms/MainForm.resx @@ -125,7 +125,7 @@ This is to trick the radar client into displaying them properly. Converted: AAMYY N051.30.18.800 W188.50.48.300 - + 17, 17 From 4c29cacf48efbfdad486935b105e905b8f96be1c Mon Sep 17 00:00:00 2001 From: Nikolia558 <38259407+Nikolai558@users.noreply.github.com> Date: Mon, 20 Dec 2021 17:36:49 -0700 Subject: [PATCH 12/15] Added Menu Item Added Report Issues button that links to github issues. --- FeBuddyWinFormUI/WinForms/MainForm.Designer.cs | 12 ++++++++++++ FeBuddyWinFormUI/WinForms/MainForm.cs | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs b/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs index 913caae..a7f6612 100644 --- a/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs +++ b/FeBuddyWinFormUI/WinForms/MainForm.Designer.cs @@ -58,6 +58,7 @@ private void InitializeComponent() this.CreditsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.UninstallMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.reportIssuesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.airacCycleGroupBox.SuspendLayout(); this.convertGroupBox.SuspendLayout(); this.startGroupBox.SuspendLayout(); @@ -347,6 +348,7 @@ private void InitializeComponent() this.menuStrip.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.informationToolStripMenuItem, + this.reportIssuesToolStripMenuItem, this.settingsToolStripMenuItem}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; @@ -445,6 +447,15 @@ private void InitializeComponent() this.UninstallMenuItem.Text = "Uninstall"; this.UninstallMenuItem.Click += new System.EventHandler(this.UninstallMenuItem_Click); // + // reportIssuesToolStripMenuItem + // + this.reportIssuesToolStripMenuItem.Font = new System.Drawing.Font("Romantic", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); + this.reportIssuesToolStripMenuItem.ForeColor = System.Drawing.SystemColors.AppWorkspace; + this.reportIssuesToolStripMenuItem.Name = "reportIssuesToolStripMenuItem"; + this.reportIssuesToolStripMenuItem.Size = new System.Drawing.Size(105, 22); + this.reportIssuesToolStripMenuItem.Text = "Report Issues"; + this.reportIssuesToolStripMenuItem.Click += new System.EventHandler(this.reportIssuesToolStripMenuItem_Click); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 25F); @@ -519,6 +530,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem FAQMenuItem; private System.Windows.Forms.ToolStripMenuItem ChangeLogMenuItem; private System.Windows.Forms.ToolStripMenuItem CreditsMenuItem; + private System.Windows.Forms.ToolStripMenuItem reportIssuesToolStripMenuItem; } } diff --git a/FeBuddyWinFormUI/WinForms/MainForm.cs b/FeBuddyWinFormUI/WinForms/MainForm.cs index fb392a7..6792eb6 100644 --- a/FeBuddyWinFormUI/WinForms/MainForm.cs +++ b/FeBuddyWinFormUI/WinForms/MainForm.cs @@ -671,5 +671,11 @@ private void CreditsMenuItem_Click(object sender, EventArgs e) // CreditsForm frm = new CreditsForm(); // frm.ShowDialog(); } + + private void reportIssuesToolStripMenuItem_Click(object sender, EventArgs e) + { + Logger.LogMessage("DEBUG", "REPORT ISSUES MENU ITEM CLICKED"); + Process.Start("https://github.com/Nikolai558/FE-BUDDY/issues"); + } } } From 5d23086ae999a303541b0cf4b2c2dafe75269a57 Mon Sep 17 00:00:00 2001 From: Nikolia558 <38259407+Nikolai558@users.noreply.github.com> Date: Mon, 20 Dec 2021 17:41:03 -0700 Subject: [PATCH 13/15] Changed Menu Item Colors Changed the Pressed gradient funtion for the menu items. --- FeBuddyWinFormUI/WinForms/MainForm.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/FeBuddyWinFormUI/WinForms/MainForm.cs b/FeBuddyWinFormUI/WinForms/MainForm.cs index 6792eb6..f66f4a5 100644 --- a/FeBuddyWinFormUI/WinForms/MainForm.cs +++ b/FeBuddyWinFormUI/WinForms/MainForm.cs @@ -72,6 +72,15 @@ public override Color MenuItemSelectedGradientEnd { get { return Color.Black; } } + public override Color MenuItemPressedGradientBegin + { + get { return Color.Black; } + } + + public override Color MenuItemPressedGradientEnd + { + get { return Color.Black; } + } } private void MainForm_Closing(object sender, EventArgs e) @@ -500,6 +509,7 @@ private void MainForm_Load(object sender, EventArgs e) RoadmapMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); informationToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); settingsToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); + reportIssuesToolStripMenuItem.Font = new Font(pfc.Families[0], 12, FontStyle.Regular); } private void NextAiracSelection_Click(object sender, EventArgs e) From 585f9a960ce8a1dd083bb214f74ebd00f55be22d Mon Sep 17 00:00:00 2001 From: Nikolia558 <38259407+Nikolai558@users.noreply.github.com> Date: Mon, 20 Dec 2021 17:57:33 -0700 Subject: [PATCH 14/15] Addressed Bug #21 Hopefully this fixes the issue of not opening the browser when it should. --- FeBuddyWinFormUI/WinForms/MainForm.cs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/FeBuddyWinFormUI/WinForms/MainForm.cs b/FeBuddyWinFormUI/WinForms/MainForm.cs index f66f4a5..11eee6b 100644 --- a/FeBuddyWinFormUI/WinForms/MainForm.cs +++ b/FeBuddyWinFormUI/WinForms/MainForm.cs @@ -652,32 +652,36 @@ private void UninstallMenuItem_Click(object sender, EventArgs e) private void InstructionsMenuItem_Click(object sender, EventArgs e) { Logger.LogMessage("DEBUG", "INSTRUCTIONS MENU ITEM CLICKED"); - - Process.Start("https://docs.google.com/presentation/d/e/2PACX-1vRMd6PIRrj0lPb4sAi9KB7iM3u5zn0dyUVLqEcD9m2e71nf0UPyEmkOs4ZwYsQdl7smopjdvw_iWEyP/embed"); + Process.Start(new ProcessStartInfo("https://docs.google.com/presentation/d/e/2PACX-1vRMd6PIRrj0lPb4sAi9KB7iM3u5zn0dyUVLqEcD9m2e71nf0UPyEmkOs4ZwYsQdl7smopjdvw_iWEyP/embed") { UseShellExecute = true }); + //Process.Start("https://docs.google.com/presentation/d/e/2PACX-1vRMd6PIRrj0lPb4sAi9KB7iM3u5zn0dyUVLqEcD9m2e71nf0UPyEmkOs4ZwYsQdl7smopjdvw_iWEyP/embed"); } private void RoadmapMenuItem_Click(object sender, EventArgs e) { Logger.LogMessage("DEBUG", "ROADMAP MENU ITEM CLICKED"); - Process.Start("https://github.com/Nikolai558/FE-BUDDY/blob/releases/ROADMAP.md"); + Process.Start(new ProcessStartInfo("https://github.com/Nikolai558/FE-BUDDY/blob/releases/ROADMAP.md") { UseShellExecute = true }); + //Process.Start("https://github.com/Nikolai558/FE-BUDDY/blob/releases/ROADMAP.md"); } private void FAQMenuItem_Click(object sender, EventArgs e) { Logger.LogMessage("DEBUG", "FAQ MENU ITEM CLICKED"); - Process.Start("https://docs.google.com/presentation/d/e/2PACX-1vSlhz1DhDwZ-43BY4Q2vg-ff0QBGssxpmv4-nhZlz9LpGJvWjqLsHVaQwwsV1AGMWFFF_x_j_b3wTBO/embed"); + Process.Start(new ProcessStartInfo("https://docs.google.com/presentation/d/e/2PACX-1vSlhz1DhDwZ-43BY4Q2vg-ff0QBGssxpmv4-nhZlz9LpGJvWjqLsHVaQwwsV1AGMWFFF_x_j_b3wTBO/embed") { UseShellExecute = true }); + //Process.Start("https://docs.google.com/presentation/d/e/2PACX-1vSlhz1DhDwZ-43BY4Q2vg-ff0QBGssxpmv4-nhZlz9LpGJvWjqLsHVaQwwsV1AGMWFFF_x_j_b3wTBO/embed"); } private void ChangeLogMenuItem_Click(object sender, EventArgs e) { Logger.LogMessage("DEBUG", "CHANGELOG MENU ITEM CLICKED"); - Process.Start("https://github.com/Nikolai558/FE-BUDDY/blob/releases/ChangeLog.md"); + Process.Start(new ProcessStartInfo("https://github.com/Nikolai558/FE-BUDDY/blob/releases/ChangeLog.md") { UseShellExecute = true }); + //Process.Start("https://github.com/Nikolai558/FE-BUDDY/blob/releases/ChangeLog.md"); } private void CreditsMenuItem_Click(object sender, EventArgs e) { Logger.LogMessage("DEBUG", "CREDITS MENU ITEM CLICKED"); - Process.Start("https://github.com/Nikolai558/FE-BUDDY/blob/releases/Credits.md"); + Process.Start(new ProcessStartInfo("https://github.com/Nikolai558/FE-BUDDY/blob/releases/Credits.md") { UseShellExecute = true }); + //Process.Start("https://github.com/Nikolai558/FE-BUDDY/blob/releases/Credits.md"); // CreditsForm frm = new CreditsForm(); // frm.ShowDialog(); } @@ -685,7 +689,8 @@ private void CreditsMenuItem_Click(object sender, EventArgs e) private void reportIssuesToolStripMenuItem_Click(object sender, EventArgs e) { Logger.LogMessage("DEBUG", "REPORT ISSUES MENU ITEM CLICKED"); - Process.Start("https://github.com/Nikolai558/FE-BUDDY/issues"); + Process.Start(new ProcessStartInfo("https://github.com/Nikolai558/FE-BUDDY/issues") { UseShellExecute = true }); + //Process.Start("https://github.com/Nikolai558/FE-BUDDY/issues"); } } } From eeb433f07ae117c648c2ab3ff0f8ea69138d75dc Mon Sep 17 00:00:00 2001 From: Nikolia558 <38259407+Nikolai558@users.noreply.github.com> Date: Mon, 20 Dec 2021 18:35:32 -0700 Subject: [PATCH 15/15] Ready for Release 1.0.2 --- ChangeLog.md | 8 ++++++++ FeBuddyLibrary/GlobalConfig.cs | 2 +- FeBuddyWinFormUI/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 2a3fbb1..208467c 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,4 +1,12 @@ --- +- ## Version 1.0.2 + - In the Publications Output, if a procedure is Added (A) or Deleted (D), the link is NOT generated and instead will display a quick explanation. #20 + - Restructured Menu Buttons + - New Menu button for "Reporting Issues" #23 + - Fixed Bug #22 - Menu Fonts Changing Randomly + - Fixed Bug #19 - Clearing the FAC ID field + - Fixed Bug #21 - Browser not opening on Menu Button click + - ## Version 1.0.1 - The Main Window has a background image instead of a solid color. - Changed the Update view background colors to match new main window colors. diff --git a/FeBuddyLibrary/GlobalConfig.cs b/FeBuddyLibrary/GlobalConfig.cs index 1ea33cc..76f5661 100644 --- a/FeBuddyLibrary/GlobalConfig.cs +++ b/FeBuddyLibrary/GlobalConfig.cs @@ -10,7 +10,7 @@ namespace FeBuddyLibrary { public class GlobalConfig { - public static readonly string ProgramVersion = "1.0.1"; + public static readonly string ProgramVersion = "1.0.2"; public static string GithubVersion = ""; diff --git a/FeBuddyWinFormUI/Properties/AssemblyInfo.cs b/FeBuddyWinFormUI/Properties/AssemblyInfo.cs index 49f46de..44c143a 100644 --- a/FeBuddyWinFormUI/Properties/AssemblyInfo.cs +++ b/FeBuddyWinFormUI/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1")] -[assembly: AssemblyFileVersion("1.0.1")] +[assembly: AssemblyVersion("1.0.2")] +[assembly: AssemblyFileVersion("1.0.2")]