Merge pull request #1073 from Ordisoftware/dev

Dev
Ordisoftware · Feb 8, 2022 · e2e416c · e2e416c
2 parents 618ffe3 + 570443f
commit e2e416c
Show file tree

Hide file tree

Showing 26 changed files with 1,687 additions and 80 deletions.
diff --git a/Documents/Parashot/Parashot-Lettriqs-EN.txt b/Documents/Parashot/Parashot-Lettriqs-EN.txt
@@ -19,7 +19,7 @@ Beshala'h = Will of the Evolutionary Force of the Creature
 Yitro = Energy of Matter Incarnated in the Reality
 Mishpatim = Service of the Force of the Speech that Protects the Peace of the Way
 Teroumah = Substance of the Mind which Communicates in the Matrix of the Breath
-Tetsave = Support of the Aid of the Light Communicating the Breath
+Tetsave = Support of the Aid Communicating the Breath
 Ki Tissa = Energetic Cover for the Shared Substance in the Space
 Vayaqhel = Binding through Love of the Truth of the Breath of the Existence
 Peqoudei = Revelation of the Truth of the Reality of the Thought of the Peace

diff --git a/Documents/Parashot/Parashot-Lettriqs-FR.txt b/Documents/Parashot/Parashot-Lettriqs-FR.txt
@@ -19,7 +19,7 @@ Beshala'h = Volonté de la Force Évolutive de la Créature
 Yitro = Énergie de la Matière Incarné dans la Réalité
 Mishpatim = Service de la Force de la Parole qui Protège la Paix du Chemin
 Teroumah = Substance du Mental qui Communique dans la Matrice du Souffle
-Tetsave = Soutien de l'Aide de la Lumière Communiquant le Souffle
+Tetsave = Soutien de l'Aide Communiquant le Souffle
 Ki Tissa = Couverture Énergétique pour la Substance Partagée dans l'Espace
 Vayaqhel = Liaison par l'Amour de la Vérité du Souffle de l'Existence
 Peqoudei = Révélation de la Vérité de la Réalité de la Pensée de la Paix

diff --git a/Documents/Parashot/ParashotFactory.txt b/Documents/Parashot/ParashotFactory.txt
@@ -18,7 +18,7 @@ Shemot : 4 - בשלח - Beshala'h - 13.17 - 17.16 - False
 Shemot : 5 - יתרו - Yitro - 18.1 - 20.23 - False
 Shemot : 6 - משפטים - Mishpatim - 21.1 - 24.18 - False
 Shemot : 7 - תרומה - Teroumah - 25.1 - 27.19 - False
-Shemot : 8 - תצווה - Tetsave - 27.20 - 30.10 - False
+Shemot : 8 - תצוה - Tetsave - 27.20 - 30.10 - False
 Shemot : 9 - כי תשא - Ki Tissa - 30.11 - 34.35 - False
 Shemot : 10 - ויקהל - Vayaqhel - 35.1 - 38.20 - True
 Shemot : 11 - פקודי - Peqoudei - 38.21 - 40.38 - False

diff --git a/Project/App.config b/Project/App.config
@@ -692,6 +692,9 @@
       <setting name="UseSodHaibour" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="ManageAcquaintanceEventsForm" serializeAs="String">
+        <value>584, 361</value>
+      </setting>
     </Ordisoftware.Hebrew.Calendar.Properties.Settings>
   </userSettings>
   <startup>

diff --git a/Project/Hebrew Calendar (vs2022).csproj b/Project/Hebrew Calendar (vs2022).csproj
@@ -524,6 +524,12 @@
     <Compile Include="Source\Forms\Boxes\Boards\ParashotForm.designer.cs">
       <DependentUpon>ParashotForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Source\Forms\Boxes\Tools\ManageAcquaintanceEventsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Source\Forms\Boxes\Tools\ManageAcquaintanceEventsForm.Designer.cs">
+      <DependentUpon>ManageAcquaintanceEventsForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="Source\Forms\Config\PreferencesForm.Initialize.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -594,11 +600,11 @@
     <Compile Include="Source\Forms\Boxes\Tools\DatesDiffCalculatorForm.Designer.cs">
       <DependentUpon>DatesDiffCalculatorForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\Forms\Boxes\Tools\EditDateBookmarksForm.cs">
+    <Compile Include="Source\Forms\Boxes\Tools\ManageBookmarksForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Source\Forms\Boxes\Tools\EditDateBookmarksForm.Designer.cs">
-      <DependentUpon>EditDateBookmarksForm.cs</DependentUpon>
+    <Compile Include="Source\Forms\Boxes\Tools\ManageBookmarksForm.Designer.cs">
+      <DependentUpon>ManageBookmarksForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Source\Forms\Config\StatisticsForm.cs">
       <SubType>Form</SubType>
@@ -957,11 +963,18 @@
     <EmbeddedResource Include="Source\Forms\Boxes\Boards\ParashotForm.resx">
       <DependentUpon>ParashotForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Source\Forms\Boxes\Tools\EditDateBookmarksForm.fr.resx">
-      <DependentUpon>EditDateBookmarksForm.cs</DependentUpon>
+    <EmbeddedResource Include="Source\Forms\Boxes\Tools\ManageAcquaintanceEventsForm.fr.resx">
+      <DependentUpon>ManageAcquaintanceEventsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Source\Forms\Boxes\Tools\EditDateBookmarksForm.resx">
-      <DependentUpon>EditDateBookmarksForm.cs</DependentUpon>
+    <EmbeddedResource Include="Source\Forms\Boxes\Tools\ManageAcquaintanceEventsForm.resx">
+      <DependentUpon>ManageAcquaintanceEventsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Source\Forms\Boxes\Tools\ManageBookmarksForm.fr.resx">
+      <DependentUpon>ManageBookmarksForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Source\Forms\Boxes\Tools\ManageBookmarksForm.resx">
+      <DependentUpon>ManageBookmarksForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Source\Forms\Boxes\Select\SelectExportTargetForm.fr.resx">
       <DependentUpon>SelectExportTargetForm.cs</DependentUpon>

diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut 
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("9.23.0.0")]
-[assembly: AssemblyFileVersion("9.23.0.0")]
+[assembly: AssemblyVersion("9.24.0.0")]
+[assembly: AssemblyFileVersion("9.24.0.0")]
diff --git a/Project/Properties/Settings.Designer.cs b/Project/Properties/Settings.Designer.cs
diff --git a/Project/Properties/Settings.settings b/Project/Properties/Settings.settings
@@ -686,5 +686,8 @@
     <Setting Name="UseSodHaibour" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="ManageAcquaintanceEventsForm" Type="System.Drawing.Size" Scope="User">
+      <Value Profile="(Default)">584, 361</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/Project/Source/Common/Core/Classes/WebCheckUpdate.cs b/Project/Source/Common/Core/Classes/WebCheckUpdate.cs
@@ -97,12 +97,11 @@ static public bool Run(bool checkAtStartup, ref DateTime lastdone, int interval,
     }
     catch ( WebException ex )
     {
+      // TODO create advanced box to retry-cancel
       CleanTemp();
       string msg = ex.Message;
-      // TODO manage domain name resolution failed and create advanced box to retry-cancel instead of OK
       if ( ex.Status == WebExceptionStatus.Timeout )
       {
-        doFinally();
         if ( auto )
           if ( useGitHub )
             return false;

diff --git a/Project/Source/Common/Hebrew/WinControls/LettersControl.Designer.cs b/Project/Source/Common/Hebrew/WinControls/LettersControl.Designer.cs
diff --git a/Project/Source/Common/Hebrew/WinControls/LettersControl.cs b/Project/Source/Common/Hebrew/WinControls/LettersControl.cs
@@ -229,13 +229,16 @@ public int MarginY
   /// </summary>
   public bool ContextMenuDetailsVisible
   {
-    get => ActionLetterViewDetails.Visible;
+    get => _ContextMenuDetailsVisible;
     set
     {
+      if ( !Globals.IsReady ) return;
+      _ContextMenuDetailsVisible = value;
       ActionLetterViewDetails.Visible = value;
       MenuItemSeparator.Visible = value;
     }
   }
+  private bool _ContextMenuDetailsVisible;
 
   /// <summary>
   /// Indicates if an input key is processed.
@@ -262,6 +265,7 @@ public LettersControl()
   /// <param name="e"></param>
   private void LettersControl_Load(object sender, EventArgs e)
   {
+    ActionLetterViewDetails_VisibleChanged(null, null);
     Redraw();
   }
 
@@ -449,6 +453,11 @@ private void ContextMenuLetter_Opened(object sender, EventArgs e)
     MenuItemSeparator.Enabled = ActionLetterViewDetails.Enabled;
   }
 
+  private void ActionLetterViewDetails_VisibleChanged(object sender, EventArgs e)
+  {
+    ContextMenuDetailsVisible = ActionLetterViewDetails.Visible;
+  }
+
 }
 
 /// <summary>

diff --git a/Project/Source/Common/Hebrew/WinControls/LettersControl.resx b/Project/Source/Common/Hebrew/WinControls/LettersControl.resx
@@ -188,7 +188,7 @@
   <data name="ActionLetterAddAtEnd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAAOBJREFUOE9jGAXYwabNWza3tHX+h3LBoL6+7n99ff0HKBc/WLdh0//6xha4AVVV
+        wAAADsABataJCQAAAOBJREFUOE9jGAXYwabNWza3tHX+h3LBoL6+7n99ff0HKBc/WLdh0//6xha4AVVV
         Vf8fPX7yv66uDsVQnGD12vX/q2vqwYorKyv+P3v+/P/CxUv/19bWEmfAitVr/5dV1Pyvqa7+/+Hjp/+r
         gAZu2LSFeAOWrVj1v7ik/H9NTc3/t+/e/t+5Z+//vQcPgflQJfjB4qXL/+cXFIMUG4O88ODR4//nL14i
         3oAFS5b+z84thCk2BgXi0WPHiQ/ECZOnHMrIzEFWbAyMQlAYfIbyCQIVIDaGMOEAxDeAMIcRYGAAAHbg
@@ -204,7 +204,7 @@
   <data name="ActionLetterAddAtStart.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAAOBJREFUOE9jGAXYQX19/Qcg/g/lgkFLW+f/TZu3bIZy8YO6urr/9+8/+F9VVQU3
+        wAAADsABataJCQAAAOBJREFUOE9jGAXYQX19/Qcg/g/lgkFLW+f/TZu3bIZy8YO6urr/9+8/+F9VVQU3
         pL6x5f+6DZtQDMUJamtr/y9cvPT/o8dP/ldWVoA1VdfU/1+9dj3xBmzYtAWs4e279/9rqqv/l1XU/F+x
         ei1xBtTU1Pzfd/DQ/5179/1/9fr1fxC/uKT8/7IVq4g34PzFS//v3rsP9EIlSJNxfkHx/8VLlxNnACgQ
         Dxw69L8aEojGILHs3ML/C5YsJc6A0tLSg9BoBGsGgYzMnP8TJk85BOUSBCpADNcMBSA+SHx4AQYGABFB
@@ -274,7 +274,7 @@
     <value>TextBox</value>
   </data>
   <data name="&gt;&gt;TextBox.Type" xml:space="preserve">
-    <value>Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Words, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Letters, Version=6.9.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;TextBox.Parent" xml:space="preserve">
     <value>$this</value>

diff --git a/Project/Source/Forms/Boxes/Tools/DatesDiffCalculatorForm.cs b/Project/Source/Forms/Boxes/Tools/DatesDiffCalculatorForm.cs
@@ -202,7 +202,7 @@ private void ActionManageBookmarks_Click(object sender, EventArgs e)
     Enabled = false;
     try
     {
-      if ( EditDateBookmarksForm.Run() )
+      if ( ManageBookmarksForm.Run() )
         LoadMenuBookmarks(this);
     }
     finally