Merge pull request #55 from Ordisoftware/dev

Dev
Ordisoftware · Aug 25, 2019 · a9e1524 · a9e1524
2 parents 53b12d6 + 0b757c9
commit a9e1524
Show file tree

Hide file tree

Showing 22 changed files with 1,350 additions and 431 deletions.
diff --git a/Project/App.config b/Project/App.config
@@ -128,6 +128,24 @@
       <setting name="UpgradeRequired" serializeAs="String">
         <value>True</value>
       </setting>
+      <setting name="CurrentDayColor" serializeAs="String">
+        <value>Red</value>
+      </setting>
+      <setting name="TorahEventColor" serializeAs="String">
+        <value>DarkRed</value>
+      </setting>
+      <setting name="SeasonEventColor" serializeAs="String">
+        <value>DarkGreen</value>
+      </setting>
+      <setting name="MoonEventColor" serializeAs="String">
+        <value>DarkBlue</value>
+      </setting>
+      <setting name="FullMoonColor" serializeAs="String">
+        <value>DarkGoldenrod</value>
+      </setting>
+      <setting name="Paramètre" serializeAs="String">
+        <value />
+      </setting>
     </Ordisoftware.HebrewCalendar.Properties.Settings>
   </userSettings>
   <startup>

diff --git a/Project/Dependencies/Calendar.NET/Calendar.cs b/Project/Dependencies/Calendar.NET/Calendar.cs
@@ -71,6 +71,10 @@ public class Calendar : UserControl
     private const int MarginSize = 10;
     // ORDISOFTWARE MODIF END
 
+    // ORDISOFTWARE MODIF BEGIN
+    public Color CurrentDayColor = Color.Red;
+    // ORDISOFTWARE MODIF END
+
     /// <summary>
     /// Indicates the font for the times on the day view
     /// </summary>
@@ -979,7 +983,7 @@ private void RenderMonthCalendar(PaintEventArgs e)
               {
                 //ORDISOFTWARE MODIF BEGIN
                 //g.DrawString(counter.ToString(CultureInfo.InvariantCulture), _todayFont, Brushes.Black, xStart + 5, yStart + 2);
-                g.DrawString(counter.ToString(CultureInfo.InvariantCulture), _todayFont, Brushes.DarkRed, xStart + 5, yStart + 2);
+                g.DrawString(counter.ToString(CultureInfo.InvariantCulture), _todayFont, new SolidBrush(CurrentDayColor), xStart + 5, yStart + 2);
                 //ORDISOFTWARE MODIF END
               }
               else

diff --git a/Project/Hebrew Calendar (vs2017).csproj b/Project/Hebrew Calendar (vs2017).csproj
@@ -275,6 +275,9 @@
     <EmbeddedResource Include="Source\Forms\MainForm.fr.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Source\Forms\PreferencesForm.fr-FR.resx">
+      <DependentUpon>PreferencesForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Source\Forms\PreferencesForm.fr.resx">
       <DependentUpon>PreferencesForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -292,6 +295,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Source\Forms\MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Source\Forms\PreferencesForm.resx">
       <DependentUpon>PreferencesForm.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("1.9.0.0")]
-[assembly: AssemblyFileVersion("1.9.0.0")]
+[assembly: AssemblyVersion("1.10.0.0")]
+[assembly: AssemblyFileVersion("1.10.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
@@ -127,5 +127,23 @@
     <Setting Name="UpgradeRequired" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="CurrentDayColor" Type="System.Drawing.Color" Scope="User">
+      <Value Profile="(Default)">Red</Value>
+    </Setting>
+    <Setting Name="TorahEventColor" Type="System.Drawing.Color" Scope="User">
+      <Value Profile="(Default)">DarkRed</Value>
+    </Setting>
+    <Setting Name="SeasonEventColor" Type="System.Drawing.Color" Scope="User">
+      <Value Profile="(Default)">DarkGreen</Value>
+    </Setting>
+    <Setting Name="MoonEventColor" Type="System.Drawing.Color" Scope="User">
+      <Value Profile="(Default)">DarkBlue</Value>
+    </Setting>
+    <Setting Name="FullMoonColor" Type="System.Drawing.Color" Scope="User">
+      <Value Profile="(Default)">DarkGoldenrod</Value>
+    </Setting>
+    <Setting Name="Paramètre" Type="System.Drawing.Color" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/Project/Source/Classes/Localizer.cs b/Project/Source/Classes/Localizer.cs
@@ -258,6 +258,13 @@ static public readonly Dictionary<string, string> ReplaceCalendarText
                 "Voulez-vous continuer ?" }
       };
 
+    static public readonly Dictionary<string, string> NavigationDayText
+      = new Dictionary<string, string>()
+      {
+        { "en", "Day #" },
+        { "fr", "Jour #" }
+      };
+
     static public readonly Dictionary<MoonPhaseType, Dictionary<string, string>> MoonPhaseText
       = new Dictionary<MoonPhaseType, Dictionary<string, string>>()
       {

diff --git a/Project/Source/Classes/SettingsHelper.cs b/Project/Source/Classes/SettingsHelper.cs
@@ -11,7 +11,7 @@
 /// You may add additional accurate notices of copyright ownership.
 /// </license>
 /// <created> 2016-04 </created>
-/// <edited> 2016-04 </edited>
+/// <edited> 2019-08 </edited>
 using System;
 using System.Windows.Forms;
 using Ordisoftware.HebrewCalendar.Properties;
@@ -82,8 +82,13 @@ static internal void Retrieve(this Settings settings)
       PreferencesForm.Instance.PanelTopColor.BackColor = settings.NavigateTopColor;
       PreferencesForm.Instance.PanelMiddleColor.BackColor = settings.NavigateMiddleColor;
       PreferencesForm.Instance.PanelBottomColor.BackColor = settings.NavigateBottomColor;
-      PreferencesForm.Instance.PanelTextColor.BackColor = settings.TextColor;
-      PreferencesForm.Instance.PanelBackColor.BackColor = settings.TextBackground;
+      PreferencesForm.Instance.PanelTextColor2.BackColor = settings.TextColor;
+      PreferencesForm.Instance.PanelBackColor2.BackColor = settings.TextBackground;
+      PreferencesForm.Instance.PanelCurrentDayColor.BackColor = settings.CurrentDayColor;
+      PreferencesForm.Instance.PanelTorahEventColor.BackColor = settings.TorahEventColor;
+      PreferencesForm.Instance.PanelSeasonEventColor.BackColor = settings.SeasonEventColor;
+      PreferencesForm.Instance.PanelMoonEventColor.BackColor = settings.MoonEventColor;
+      PreferencesForm.Instance.PanelFullMoonColor.BackColor = settings.FullMoonColor;
     }
 
     /// <summary>
@@ -113,8 +118,13 @@ static internal void Store(this Settings settings)
       settings.NavigateTopColor = PreferencesForm.Instance.PanelTopColor.BackColor;
       settings.NavigateMiddleColor = PreferencesForm.Instance.PanelMiddleColor.BackColor;
       settings.NavigateBottomColor = PreferencesForm.Instance.PanelBottomColor.BackColor;
-      settings.TextColor = PreferencesForm.Instance.PanelTextColor.BackColor;
-      settings.TextBackground = PreferencesForm.Instance.PanelBackColor.BackColor;
+      settings.TextColor = PreferencesForm.Instance.PanelTextColor2.BackColor;
+      settings.TextBackground = PreferencesForm.Instance.PanelBackColor2.BackColor;
+      settings.CurrentDayColor = PreferencesForm.Instance.PanelCurrentDayColor.BackColor;
+      settings.TorahEventColor = PreferencesForm.Instance.PanelTorahEventColor.BackColor;
+      settings.SeasonEventColor = PreferencesForm.Instance.PanelSeasonEventColor.BackColor;
+      settings.MoonEventColor = PreferencesForm.Instance.PanelMoonEventColor.BackColor;
+      settings.FullMoonColor = PreferencesForm.Instance.PanelFullMoonColor.BackColor;
       settings.Save();
     }
 

diff --git a/Project/Source/Forms/MainForm.Designer.cs b/Project/Source/Forms/MainForm.Designer.cs
diff --git a/Project/Source/Forms/MainForm.FillMonths.cs b/Project/Source/Forms/MainForm.FillMonths.cs
@@ -11,7 +11,7 @@
 /// You may add additional accurate notices of copyright ownership.
 /// </license>
 /// <created> 2019-01 </created>
-/// <edited> 2019-01 </edited>
+/// <edited> 2019-08 </edited>
 using System;
 using System.Drawing;
 using Calendar.NET;
@@ -22,7 +22,7 @@ namespace Ordisoftware.HebrewCalendar
   public partial class MainForm
   {
 
-    private void FillMonths()
+    internal void FillMonths()
     {
       string strToolTip = "Error on getting sun rise and set";
       int progress = 0;
@@ -51,8 +51,8 @@ void add(Color color, string text)
                         ? " " + Localizer.BabylonianHebrewMonthText[row.LunarMonth]
                         : "";
         colorMoon = row.IsNewMoon == 1
-                  ? Color.DarkRed
-                  : ( row.IsFullMoon == 1 ? Color.DarkGoldenrod : Color.DarkBlue );
+                  ? Program.Settings.TorahEventColor
+                  : ( row.IsFullMoon == 1 ? Program.Settings.FullMoonColor : Program.Settings.MoonEventColor );
         if ( (MoonriseType)row.MoonriseType == MoonriseType.AfterSet )
         {
           if ( row.Moonset != "" ) add(Color.Black, Localizer.EphemerisText.GetLang(EphemerisType.Set) + row.Moonset);
@@ -66,9 +66,9 @@ void add(Color color, string text)
           if ( row.Moonset != "" ) add(Color.Black, Localizer.EphemerisText.GetLang(EphemerisType.Set) + row.Moonset);
         }
         if ( row.SeasonChange != 0 )
-          add(Color.DarkGreen, Localizer.SeasonEventText.GetLang((SeasonChangeType)row.SeasonChange));
+          add(Program.Settings.SeasonEventColor, Localizer.SeasonEventText.GetLang((SeasonChangeType)row.SeasonChange));
         if ( row.TorahEvents != 0 )
-          add(Color.DarkRed, Localizer.TorahEventText.GetLang((TorahEventType)row.TorahEvents));
+          add(Program.Settings.TorahEventColor, Localizer.TorahEventText.GetLang((TorahEventType)row.TorahEvents));
       }
     }
 

diff --git a/Project/Source/Forms/MainForm.LoadData.cs b/Project/Source/Forms/MainForm.LoadData.cs
@@ -27,14 +27,14 @@ public partial class MainForm
 
     private void LoadData()
     {
-
       int progress = 0;
       void update(object tableSender, DataRowChangeEventArgs tableEvent)
       {
         if ( !IsGenerating ) UpdateProgress(progress++, Count, Localizer.LoadingDataText.GetLang());
       };
       LunisolarCalendar.LunisolarDays.RowChanged += update;
       Cursor = Cursors.WaitCursor;
+      Enabled = false;
       try
       {
         SQLiteUtility.CreateDatabaseIfNotExists();
@@ -79,6 +79,7 @@ void update(object tableSender, DataRowChangeEventArgs tableEvent)
       }
       finally
       {
+        Enabled = true;
         Cursor = Cursors.Default;
         LunisolarCalendar.LunisolarDays.RowChanged -= update;
         SetView(Program.Settings.CurrentView, true);

diff --git a/Project/Source/Forms/MainForm.Update.cs b/Project/Source/Forms/MainForm.Update.cs
@@ -11,7 +11,7 @@
 /// You may add additional accurate notices of copyright ownership.
 /// </license>
 /// <created> 2016-04 </created>
-/// <edited> 2016-04 </edited>
+/// <edited> 2019-08 </edited>
 using System;
 using System.Drawing;
 using System.Windows.Forms;
@@ -43,7 +43,7 @@ private bool UpdateProgress(int index, int count, string text)
     /// <summary>
     /// Update the buttons.
     /// </summary>
-    private void UpdateButtons()
+    internal void UpdateButtons()
     {
       try
       {

diff --git a/Project/Source/Forms/MainForm.cs b/Project/Source/Forms/MainForm.cs
@@ -50,7 +50,7 @@ static MainForm()
     /// <summary>
     /// Indicate if generation is in progress.
     /// </summary>
-    private bool IsGenerating = false;
+    internal bool IsGenerating = false;
 
     /// <summary>
     /// Indicate if application can be closed.
@@ -77,6 +77,7 @@ private MainForm()
       SystemEvents.SessionEnding += SessionEnding;
       CalendarText.ForeColor = Program.Settings.TextColor;
       CalendarText.BackColor = Program.Settings.TextBackground;
+      CalendarMonth.CurrentDayColor = Program.Settings.CurrentDayColor;
       CalendarMonth.CalendarDateChanged += (date) =>
       {
         NavigationForm.Instance.Date = date;