Merge pull request #973 from Ordisoftware/dev

Dev

Author: Ordisoftware

.gitignore

@@ -27,10 +27,10 @@ Project/[Pp]ackages/
 *.userprefs
 
 # Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
+[Bb]in/[Dd]ebug/
+[Bb]in/[Dd]ebugPublic/
+[Bb]in/[Rr]elease/
+[Bb]in/[Rr]eleases/
 x64/
 x86/
 bld/

Project/Hebrew Calendar (vs2022).csproj

@@ -171,7 +171,7 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Dependencies\Windows Global Hotkey\HotkeyManager.cs" />
-    <Compile Include="Source\Common\Core\Diagnostics\Chronometer.cs" />
+    <Compile Include="Source\Common\Core\Debug\Chronometer.cs" />
     <Compile Include="Source\Common\Core\Classes\EnumHelper.cs" />
     <Compile Include="Source\Common\Core\Classes\ExportHelper.cs" />
     <Compile Include="Source\Common\Core\Classes\ObjectHelper.cs" />
@@ -194,9 +194,9 @@
     <Compile Include="Source\Common\Core\Data\SQLiteDate.cs" />
     <Compile Include="Source\Common\Core\Data\SQLiteNetHelper.cs" />
     <Compile Include="Source\Common\Core\Data\SQLiteOdbcHelper.cs" />
-    <Compile Include="Source\Common\Core\Diagnostics\DebugManager.cs" />
-    <Compile Include="Source\Common\Core\Diagnostics\DebugManager.Delegates.cs" />
-    <Compile Include="Source\Common\Core\Diagnostics\DebugManager.Trace.cs" />
+    <Compile Include="Source\Common\Core\Debug\DebugManager.cs" />
+    <Compile Include="Source\Common\Core\Debug\DebugManager.Delegates.cs" />
+    <Compile Include="Source\Common\Core\Debug\DebugManager.Trace.cs" />
     <Compile Include="Source\Common\Core\Display\AutoMenu.cs" />
     <Compile Include="Source\Common\Core\Display\AutoMenu.Test.cs" />
     <Compile Include="Source\Common\Core\Display\DisplayManager.cs" />

…e/Common/Core/Diagnostics/Chronometer.cs …/Source/Common/Core/Debug/Chronometer.csProject/Source/Common/Core/Diagnostics/Chronometer.cs renamed to Project/Source/Common/Core/Debug/Chronometer.cs Project/Source/Common/Core/Diagnostics/Chronometer.cs renamed to Project/Source/Common/Core/Debug/Chronometer.cs

@@ -238,13 +238,15 @@ private void LoadEvents()
     /// </summary>
     private void LoadFonts()
     {
-      foreach ( var value in new InstalledFontCollection().Families.OrderBy(f => f.Name) )
-        if ( MonoSpacedFonts.Contains(value.Name.ToLower()) )
-        {
-          int index = EditTextReportFontName.Items.Add(value.Name);
-          if ( value.Name == Settings.FontName )
-            EditTextReportFontName.SelectedIndex = index;
-        }
+      var fonts = new InstalledFontCollection().Families
+                                               .Where(value => MonoSpacedFonts.Contains(value.Name.ToLower()))
+                                               .OrderBy(f => f.Name);
+      foreach ( var value in fonts )
+      {
+        int index = EditTextReportFontName.Items.Add(value.Name);
+        if ( value.Name == Settings.FontName )
+          EditTextReportFontName.SelectedIndex = index;
+      }
     }
 
     /// <summary>

…re/Diagnostics/DebugManager.Delegates.cs …mon/Core/Debug/DebugManager.Delegates.csProject/Source/Common/Core/Diagnostics/DebugManager.Delegates.cs renamed to Project/Source/Common/Core/Debug/DebugManager.Delegates.cs Project/Source/Common/Core/Diagnostics/DebugManager.Delegates.cs renamed to Project/Source/Common/Core/Debug/DebugManager.Delegates.cs

@@ -11,7 +11,7 @@
 /// You may add additional accurate notices of copyright ownership.
 /// </license>
 /// <created> 2016-04 </created>
-/// <edited> 2021-09 </edited>
+/// <edited> 2021-11 </edited>
 using System;
 using System.Windows.Forms;
 using Ordisoftware.Core;
@@ -72,7 +72,7 @@ public void DoMenuShowHide_Click(object sender, EventArgs e)
     {
       SystemManager.TryCatchManage(() =>
       {
-        if ( Visible && WindowState == FormWindowState.Minimized )
+        if ( Visible && WindowState == FormWindowState.Minimized && ( sender is null or NotifyIcon ) )
         {
           WindowState = Settings.MainFormState;
           UpdateTitles(true);
@@ -110,6 +110,11 @@ public void DoMenuShowHide_Click(object sender, EventArgs e)
                 GoToDate(CalendarMonth.CalendarDate.Date);
         }
         else
+        if ( Visible && !this.IsVisibleOnTop(80) )
+        {
+          this.Popup();
+        }
+        else
         {
           Settings.MainFormState = WindowState;
           WindowState = FormWindowState.Minimized;