From a911defa29959bf2e2fd607191816045bc122680 Mon Sep 17 00:00:00 2001
From: Lukasz Baldyga <c3ypt1c@gmail.com>
Date: Tue, 6 Oct 2020 13:02:56 +0100
Subject: [PATCH] Menu reopens when all windows are closed

---
 .../Advanced Software Engineering.csproj      | 33 ++++++++++++++++++-
 .../Advanced Software Engineering/Console.cs  |  4 +--
 .../Advanced Software Engineering/Menu.cs     |  5 ---
 .../Advanced Software Engineering/Program.cs  |  6 +++-
 .../SettingsAndHelperFunctions.cs             | 20 +++++++----
 5 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj
index cca31bb..a1327ac 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj	
@@ -12,6 +12,21 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,6 +47,10 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -52,7 +71,7 @@
     <Compile Include="Console.Designer.cs">
       <DependentUpon>Console.cs</DependentUpon>
     </Compile>
-    <Compile Include="Settings.cs" />
+    <Compile Include="SettingsAndHelperFunctions.cs" />
     <Compile Include="Menu.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -89,5 +108,17 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Console.cs b/Advanced Software Engineering/Advanced Software Engineering/Console.cs
index b32f29a..bbae546 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Console.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Console.cs	
@@ -19,8 +19,8 @@ namespace Advanced_Software_Engineering
 
         private void Console_FormClosed(object sender, FormClosedEventArgs e)
         {
-            SettingsAndHelperFunctions.NumberOfWindows--;
-            
+            SettingsAndHelperFunctions.WindowClosed();
         }
+
     }
 }
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Menu.cs b/Advanced Software Engineering/Advanced Software Engineering/Menu.cs
index 596930d..be9379a 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Menu.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Menu.cs	
@@ -41,11 +41,6 @@ namespace Advanced_Software_Engineering
             this.Close();
         }
 
-        public static void CheckWindows()
-        {
-            if (SettingsAndHelperFunctions.NumberOfWindows == 0) Menu.Show();
-        }
-
         private void Menu_Load(object sender, EventArgs e)
         {
             //Do things on load
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Program.cs b/Advanced Software Engineering/Advanced Software Engineering/Program.cs
index b6f6ba3..bcac0b0 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Program.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Program.cs	
@@ -8,6 +8,8 @@ namespace Advanced_Software_Engineering
 {
     static class Program
     {
+        public static Form MainMenu;
+
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
@@ -16,7 +18,9 @@ namespace Advanced_Software_Engineering
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new Menu());
+
+            MainMenu = new Menu();
+            Application.Run(MainMenu);
         }
     }
 }
diff --git a/Advanced Software Engineering/Advanced Software Engineering/SettingsAndHelperFunctions.cs b/Advanced Software Engineering/Advanced Software Engineering/SettingsAndHelperFunctions.cs
index c5a2b31..d70eb8e 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/SettingsAndHelperFunctions.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/SettingsAndHelperFunctions.cs	
@@ -1,14 +1,20 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+using System.Windows.Forms;
 
 namespace Advanced_Software_Engineering
 {
-    class SettingsAndHelperFunctions
+    public class SettingsAndHelperFunctions
     {
         public static int NumberOfWindows = 0;
+
+        public static void WindowClosed()
+        {
+            NumberOfWindows--;
+            if (NumberOfWindows == 0)
+            {
+                System.Console.WriteLine("Showing MainMenu");
+                Program.MainMenu.Show();
+            }
+                
+        }
     }
 }