Merge pull request #1199 from Ordisoftware/dev

Dev

Author: Ordisoftware

Project/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: NeutralResourcesLanguage("en")]
-[assembly: AssemblyVersion("9.30.0.0")]
-[assembly: AssemblyFileVersion("9.30.0.0")]
+[assembly: AssemblyVersion("9.31.0.0")]
+[assembly: AssemblyFileVersion("9.31.0.0")]

Project/Source/Common/Core/Classes/StackMethods.cs

@@ -221,7 +221,7 @@ static public bool IsVisibleOnTop(this Control control, int requiredPercent = 10
   /// From https://stackoverflow.com/questions/26587843/prevent-toolstripmenuitems-from-jumping-to-second-screen
   static public void SetDropDownOpening(this ToolStrip toolstrip, EventHandler action = null)
   {
-    if ( action is null ) action = MenuItemDropDownOpening;
+    action ??= MenuItemDropDownOpening;
     var items1 = toolstrip.Items.OfType<ToolStripDropDownButton>();
     var items2 = items1.SelectMany(item => item.DropDownItems.OfType<ToolStripMenuItem>());
     var items3 = items2.SelectMany(item => item.DropDownItems.OfType<ToolStripMenuItem>());
@@ -230,14 +230,13 @@ static public void SetDropDownOpening(this ToolStrip toolstrip, EventHandler act
     items3.ForEach(item => { if ( item.HasDropDownItems ) item.DropDownOpening += action; });
   }
 
-
   /// <summary>
   /// Ensure drop down menu items are displayed on the same screen.
   /// </summary>
   /// From https://stackoverflow.com/questions/26587843/prevent-toolstripmenuitems-from-jumping-to-second-screen
   static public void SetDropDownOpening(this ContextMenuStrip menu, EventHandler action = null)
   {
-    if ( action is null ) action = MenuItemDropDownOpening;
+    action ??= MenuItemDropDownOpening;
     var items1 = menu.Items.OfType<ToolStripMenuItem>();
     var items2 = items1.SelectMany(item => item.DropDownItems.OfType<ToolStripMenuItem>());
     var items3 = items2.SelectMany(item => item.DropDownItems.OfType<ToolStripMenuItem>());

Project/Source/Common/Core/System/MediaMixer.cs

@@ -58,7 +58,7 @@ static public void StopPlaying()
 
   static public void MuteVolume(IntPtr? handle = null)
   {
-    if ( handle is null ) handle = Globals.MainForm?.Handle;
+    handle ??= Globals.MainForm?.Handle;
     if ( handle is null ) return;
     SendMessageW(handle.Value, WM_APPCOMMAND, handle.Value, (IntPtr)APPCOMMAND_VOLUME_MUTE);
   }

Project/Source/Common/Core/System/SystemManager.Power.cs

@@ -85,7 +85,7 @@ static public bool IsScreensaverRunning
 
   static public bool IsForegroundFullScreen(Screen screen = null)
   {
-    if ( screen is null ) screen = Screen.PrimaryScreen;
+    screen ??= Screen.PrimaryScreen;
     var rect = new NativeMethods.RECT();
     NativeMethods.GetWindowRect(new HandleRef(null, NativeMethods.GetForegroundWindow()), ref rect);
     var rectangle = new Rectangle(rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top);

Project/Source/Common/Core/WinControls/TextBoxEx.cs

@@ -83,7 +83,7 @@ public override string Text
     set
     {
       InsertingText?.Invoke(this, TextUpdating.Text, ref value);
-      if ( value is null ) value = string.Empty;
+      value ??= string.Empty;
       if ( value == Text ) return;
       if ( value.Length > MaxLength ) return;
       base.Text = value;
@@ -112,7 +112,7 @@ public override string SelectedText
     set
     {
       InsertingText?.Invoke(this, TextUpdating.Selected, ref value);
-      if ( value is null ) value = string.Empty;
+      value ??= string.Empty;
       if ( value == base.SelectedText ) return;
       if ( Text.Length + value.Length - SelectionLength > MaxLength ) return;
       base.SelectedText = value;

Project/Source/Forms/MainForm/Data/MainForm.FillMonths.cs

@@ -158,8 +158,7 @@ public void FillMonths()
           if ( color3 is not null )
             color1 = color3;
           else
-          if ( color1 is null )
-            color1 = Settings.MonthViewBackColor;
+            color1 ??= Settings.MonthViewBackColor;
           DayBrushes[YearLast - date.Year, date.Month, date.Day] = SolidBrushesPool.Get(color1.Value);
           if ( isCelebrationWeekEnd )
             isCelebrationWeekStart = false;

README.md

@@ -395,8 +395,12 @@ It is therefore possible to use [AutoHotKey](https://www.autohotkey.com) to defi
 - Add comments to bookmarks.
 - Add lunar months board with Hebrew names, meanings, lettriqs and tools.
 - Add command-line option `--lunarmonths` to show the lunar months board.
+
+#### 2022.08.10 - Version 9.31
+
 - Fix auto-generate years interval.
 - Use a dedicated folder in application's document folder for exports and imports settings, themes and bookmarks.
+- Update web links with Elamite language.
 
 #### 2022.08.05 - Version 9.30
 

Setup/OrdisoftwareHebrewCalendarSetup.iss

@@ -1,4 +1,4 @@
-#define MyAppVersion "9.30"
+#define MyAppVersion "9.31"
 #define MyAppName "Hebrew Calendar"
 #define MyAppNameNoSpace "HebrewCalendar"
 #define MyAppExeName "Ordisoftware.Hebrew.Calendar.exe"