From 30bb2295068f67d51d610a4e73c82fea31692b6f Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 01:09:29 +0200 Subject: [PATCH 01/19] Fix code --- Project/Source/Database/LunisolarDay.Helper.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Project/Source/Database/LunisolarDay.Helper.cs b/Project/Source/Database/LunisolarDay.Helper.cs index d2b023741..5b95f5629 100644 --- a/Project/Source/Database/LunisolarDay.Helper.cs +++ b/Project/Source/Database/LunisolarDay.Helper.cs @@ -11,7 +11,7 @@ /// You may add additional accurate notices of copyright ownership. /// /// 2020-12 -/// 2021-05 +/// 2021-09 using System; using Ordisoftware.Core; @@ -30,7 +30,7 @@ public string GetWeekLongCelebrationIntermediateDay() int day = LunarDay >= TorahCelebrationSettings.PessahStartDay + deltaPessah ? LunarDay - TorahCelebrationSettings.PessahStartDay + 1 + deltaPessah : -1; - if ( day > 0 && day < TorahCelebrationSettings.PessahLenght ) + if ( day > 0 && day <= TorahCelebrationSettings.PessahLenght ) return AppTranslations.PessahDay.GetLang(day); } else @@ -39,7 +39,7 @@ public string GetWeekLongCelebrationIntermediateDay() int day = LunarDay >= TorahCelebrationSettings.SoukotStartDay ? LunarDay - TorahCelebrationSettings.SoukotStartDay + 1 : -1; - if ( day > 0 && day < TorahCelebrationSettings.SoukotLenght ) + if ( day > 0 && day <= TorahCelebrationSettings.SoukotLenght ) return AppTranslations.SoukotDay.GetLang(day); } else From 8c275f2187261be3d124f3d623175fbe85e47006 Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 01:10:38 +0200 Subject: [PATCH 02/19] Improve context menu --- .../Forms/MainForm/UI/MainForm.UpdateUI.cs | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Project/Source/Forms/MainForm/UI/MainForm.UpdateUI.cs b/Project/Source/Forms/MainForm/UI/MainForm.UpdateUI.cs index 3384397dd..5840b6651 100644 --- a/Project/Source/Forms/MainForm/UI/MainForm.UpdateUI.cs +++ b/Project/Source/Forms/MainForm/UI/MainForm.UpdateUI.cs @@ -210,23 +210,31 @@ public void UpdateCalendarMonth(bool doFill) private void UpdateContextMenuStripDay() { + // Day var date = Program.Settings.TorahEventsCountAsMoon ? ContextMenuDayCurrentEvent.Moonrise ?? ContextMenuDayCurrentEvent.Date : ContextMenuDayCurrentEvent.Sunrise ?? ContextMenuDayCurrentEvent.Date; var rowDay = ApplicationDatabase.Instance.GetDay(date); ContextMenuDayDate.Text = rowDay?.DayAndMonthWithYearText ?? SysTranslations.NullSlot.GetLang(); ContextMenuDayParashah.Enabled = false; + // Celebration + string weeklong = ContextMenuDayCurrentEvent.GetWeekLongCelebrationIntermediateDay(); + bool b1 = weeklong.IsNullOrEmpty(); + bool b2 = ContextMenuDayCurrentEvent.TorahEvent == TorahCelebrationDay.SoukotD8 && !Settings.UseSimhatTorahOutside; + if ( !b1 || b2 ) + ContextMenuDayDate.Text += " - " + weeklong; + // Parashah if ( Settings.CalendarShowParashah ) - if ( ContextMenuDayCurrentEvent.TorahEvent == TorahCelebrationDay.None ) - if ( ContextMenuDayCurrentEvent.GetWeekLongCelebrationIntermediateDay().IsNullOrEmpty() ) + if ( b1 || b2 ) + { + var parashah = ParashotFactory.Instance.Get(rowDay?.GetParashahReadingDay()?.ParashahID); + if ( parashah != null ) { - var parashah = ParashotFactory.Instance.Get(rowDay?.GetParashahReadingDay()?.ParashahID); - if ( parashah != null ) - { - ContextMenuDayDate.Text += " - " + parashah.ToStringShort(false, rowDay.HasLinkedParashah); - ContextMenuDayParashah.Enabled = true; - } + ContextMenuDayDate.Text += " - " + parashah.ToStringShort(false, rowDay.HasLinkedParashah); + ContextMenuDayParashah.Enabled = true; } + } + // Times ContextMenuDaySetAsActive.Enabled = ContextMenuDayCurrentEvent.Date != CalendarMonth.CalendarDate.Date; ContextMenuDayClearSelection.Enabled = DateSelected.HasValue && DateSelected != DateTime.Today; ContextMenuDaySelectDate.Enabled = ( !DateSelected.HasValue && DateTime.Today != ContextMenuDayCurrentEvent.Date ) From c349dae4d969a762e4fa932ca00ab557361e48c9 Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 01:15:35 +0200 Subject: [PATCH 03/19] Refactor --- Project/Hebrew Calendar (vs2017).csproj | 3 + Project/Source/Forms/MainForm/MainForm.cs | 48 +----- .../Forms/MainForm/UI/MainForm.ContextMenu.cs | 144 ++++++++++++++++++ .../Forms/MainForm/UI/MainForm.UpdateUI.cs | 77 ---------- 4 files changed, 150 insertions(+), 122 deletions(-) create mode 100644 Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs diff --git a/Project/Hebrew Calendar (vs2017).csproj b/Project/Hebrew Calendar (vs2017).csproj index e5d598291..0f4282d45 100644 --- a/Project/Hebrew Calendar (vs2017).csproj +++ b/Project/Hebrew Calendar (vs2017).csproj @@ -540,6 +540,9 @@ Form + + Form + Form diff --git a/Project/Source/Forms/MainForm/MainForm.cs b/Project/Source/Forms/MainForm/MainForm.cs index e225f182e..50515c77d 100644 --- a/Project/Source/Forms/MainForm/MainForm.cs +++ b/Project/Source/Forms/MainForm/MainForm.cs @@ -1055,46 +1055,16 @@ private void TimerKillProcesses_Tick(object sender, EventArgs e) #endregion - #region Context Menu Management + #region Context Menu private void CalendarMonth_MouseClick(object sender, MouseEventArgs e) { - var dayEvent = CalendarMonth.CalendarEvents.FirstOrDefault(item => item.EventArea.Contains(e.X, e.Y)); - if ( dayEvent == null ) return; - var dayRow = ApplicationDatabase.Instance.LunisolarDays.FirstOrDefault(day => day.Date == dayEvent.Date); - if ( dayRow == null ) return; - bool showContextMenu = CalendarMonth.CalendarDate.Month == dayRow.Date.Month; - if ( e.Button == MouseButtons.Left ) - { - if ( e.Clicks > 1 && showContextMenu ) - switch ( Settings.CalendarDoubleClickAction ) - { - case CalendarDoubleClickAction.SetActive: - GoToDate(dayRow.Date); - break; - case CalendarDoubleClickAction.Select: - DateSelected = dayRow.Date; - break; - } - else - if ( e.Clicks == 1 ) - if ( Settings.MonthViewChangeDayOnClick || ModifierKeys.HasFlag(Keys.Shift) ) - GoToDate(dayRow.Date); - else - if ( ModifierKeys.HasFlag(Keys.Control) ) - DateSelected = dayRow.Date; - } - else - if ( showContextMenu && e.Button == MouseButtons.Right ) - { - ContextMenuDayCurrentEvent = dayRow; - ContextMenuStripDay.Show(Cursor.Position); - } + DoCalendarMonth_MouseClick(sender, e); } private void ContextMenuStripDay_Opened(object sender, EventArgs e) { - UpdateContextMenuStripDay(); + DoContextMenuStripDay_Opened(sender, e); } private void ContextMenuDayNavigation_Click(object sender, EventArgs e) @@ -1120,10 +1090,6 @@ private void ContextMenuDayParashah_Click(object sender, EventArgs e) ParashotForm.Run(parashah); } - #endregion - - #region Context Menu Days - private void CalendarMonth_MouseMove(object sender, MouseEventArgs e) { CalendarMonth.Refresh(); @@ -1154,10 +1120,6 @@ private void ContextMenuDayClearSelection_Click(object sender, EventArgs e) DateSelected = null; } - #endregion - - #region Context Menu Dates Diff - private void ContextMenuDayDatesDiffToToday_Click(object sender, EventArgs e) { ContextMenuDayDatesDiffTo(DateTime.Today); @@ -1174,10 +1136,6 @@ private void ContextMenuDayDatesDiffTo(DateTime date) DatesDiffCalculatorForm.Run(tuple, ensureOrder: true); } - #endregion - - #region Context Menu Bookmarks - private ToolStripMenuItem CurrentBookmarkMenu; internal void LoadMenuBookmarks(Form caller) diff --git a/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs b/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs new file mode 100644 index 000000000..1056fa37c --- /dev/null +++ b/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs @@ -0,0 +1,144 @@ +/// +/// This file is part of Ordisoftware Hebrew Calendar. +/// Copyright 2016-2021 Olivier Rogier. +/// See www.ordisoftware.com for more information. +/// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +/// If a copy of the MPL was not distributed with this file, You can obtain one at +/// https://mozilla.org/MPL/2.0/. +/// If it is not possible or desirable to put the notice in a particular file, +/// then You may include the notice in a location(such as a LICENSE file in a +/// relevant directory) where a recipient would be likely to look for such a notice. +/// You may add additional accurate notices of copyright ownership. +/// +/// 2021-09 +/// 2021-09 +using System; +using System.Linq; +using System.Windows.Forms; +using Ordisoftware.Core; + +namespace Ordisoftware.Hebrew.Calendar +{ + + /// + /// The application's main form. + /// + /// + public partial class MainForm + { + + private void DoCalendarMonth_MouseClick(object sender, MouseEventArgs e) + { + var dayEvent = CalendarMonth.CalendarEvents.FirstOrDefault(item => item.EventArea.Contains(e.X, e.Y)); + if ( dayEvent == null ) return; + var dayRow = ApplicationDatabase.Instance.LunisolarDays.FirstOrDefault(day => day.Date == dayEvent.Date); + if ( dayRow == null ) return; + bool showContextMenu = CalendarMonth.CalendarDate.Month == dayRow.Date.Month; + if ( e.Button == MouseButtons.Left ) + { + if ( e.Clicks > 1 && showContextMenu ) + switch ( Settings.CalendarDoubleClickAction ) + { + case CalendarDoubleClickAction.SetActive: + GoToDate(dayRow.Date); + break; + case CalendarDoubleClickAction.Select: + DateSelected = dayRow.Date; + break; + } + else + if ( e.Clicks == 1 ) + if ( Settings.MonthViewChangeDayOnClick || ModifierKeys.HasFlag(Keys.Shift) ) + GoToDate(dayRow.Date); + else + if ( ModifierKeys.HasFlag(Keys.Control) ) + DateSelected = dayRow.Date; + } + else + if ( showContextMenu && e.Button == MouseButtons.Right ) + { + ContextMenuDayCurrentEvent = dayRow; + ContextMenuStripDay.Show(Cursor.Position); + } + } + + private void DoContextMenuStripDay_Opened(object sender, EventArgs e) + { + // Day + var date = Program.Settings.TorahEventsCountAsMoon + ? ContextMenuDayCurrentEvent.Moonrise ?? ContextMenuDayCurrentEvent.Date + : ContextMenuDayCurrentEvent.Sunrise ?? ContextMenuDayCurrentEvent.Date; + var rowDay = ApplicationDatabase.Instance.GetDay(date); + ContextMenuDayDate.Text = rowDay?.DayAndMonthWithYearText ?? SysTranslations.NullSlot.GetLang(); + ContextMenuDayParashah.Enabled = false; + // Celebration + string weeklong = ContextMenuDayCurrentEvent.GetWeekLongCelebrationIntermediateDay(); + bool b1 = weeklong.IsNullOrEmpty(); + bool b2 = ContextMenuDayCurrentEvent.TorahEvent == TorahCelebrationDay.SoukotD8 && !Settings.UseSimhatTorahOutside; + if ( !b1 || b2 ) + ContextMenuDayDate.Text += " - " + weeklong; + // Parashah + if ( Settings.CalendarShowParashah ) + if ( b1 || b2 ) + { + var parashah = ParashotFactory.Instance.Get(rowDay?.GetParashahReadingDay()?.ParashahID); + if ( parashah != null ) + { + ContextMenuDayDate.Text += " - " + parashah.ToStringShort(false, rowDay.HasLinkedParashah); + ContextMenuDayParashah.Enabled = true; + } + } + // Times + ContextMenuDaySetAsActive.Enabled = ContextMenuDayCurrentEvent.Date != CalendarMonth.CalendarDate.Date; + ContextMenuDayClearSelection.Enabled = DateSelected.HasValue && DateSelected != DateTime.Today; + ContextMenuDaySelectDate.Enabled = ( !DateSelected.HasValue && DateTime.Today != ContextMenuDayCurrentEvent.Date ) + || ( DateSelected.HasValue && DateSelected != ContextMenuDayCurrentEvent.Date ); + ContextMenuDayGoToToday.Enabled = CalendarMonth.CalendarDate.Date != DateTime.Today; + ContextMenuDayGoToSelected.Enabled = DateSelected.HasValue + && DateSelected.Value != ContextMenuDayCurrentEvent.Date; + ContextMenuDayDatesDiffToToday.Enabled = ContextMenuDayCurrentEvent.Date != DateTime.Today; + ContextMenuDayDatesDiffToSelected.Enabled = DateSelected.HasValue + && ContextMenuDaySelectDate.Enabled && DateSelected != DateTime.Today; + if ( Settings.TorahEventsCountAsMoon ) + { + ContextMenuDayMoonrise.Visible = false; + ContextMenuDayMoonset.Visible = false; + ContextMenuDaySunrise.Visible = !ContextMenuDayCurrentEvent?.SunriseAsString.IsNullOrEmpty() ?? false; + ContextMenuDaySunset.Visible = !ContextMenuDayCurrentEvent?.SunsetAsString.IsNullOrEmpty() ?? false; + ContextMenuDaySunrise.Text = AppTranslations.Sunrise.GetLang(ContextMenuDayCurrentEvent?.SunriseAsString ?? "-"); + ContextMenuDaySunset.Text = AppTranslations.Sunset.GetLang(ContextMenuDayCurrentEvent?.SunsetAsString ?? "-"); + } + else + { + ContextMenuDaySunrise.Visible = false; + ContextMenuDaySunset.Visible = false; + if ( ContextMenuDayCurrentEvent.MoonriseOccuring == MoonriseOccuring.AfterSet ) + { + ContextMenuDayMoonrise.Visible = ContextMenuDayCurrentEvent.Moonset != null; + if ( ContextMenuDayMoonrise.Visible ) + ContextMenuDayMoonrise.Text = AppTranslations.Moonset.GetLang(ContextMenuDayCurrentEvent?.MoonsetAsString ?? "-"); + ContextMenuDayMoonset.Visible = ContextMenuDayCurrentEvent.MoonriseOccuring != MoonriseOccuring.NextDay; + if ( ContextMenuDayMoonset.Visible ) + ContextMenuDayMoonset.Text = AppTranslations.Moonrise.GetLang(ContextMenuDayCurrentEvent?.MoonriseAsString ?? "-"); + ContextMenuDayMoonrise.ImageIndex = 3; + ContextMenuDayMoonset.ImageIndex = 2; + } + else + { + ContextMenuDayMoonrise.Visible = ContextMenuDayCurrentEvent.MoonriseOccuring != MoonriseOccuring.NextDay; + if ( ContextMenuDayMoonrise.Visible ) + ContextMenuDayMoonrise.Text = AppTranslations.Moonrise.GetLang(ContextMenuDayCurrentEvent?.MoonriseAsString ?? "-"); + ContextMenuDayMoonset.Visible = ContextMenuDayCurrentEvent.Moonset != null; + if ( ContextMenuDayMoonset.Visible ) + ContextMenuDayMoonset.Text = AppTranslations.Moonset.GetLang(ContextMenuDayCurrentEvent?.MoonsetAsString ?? "-"); + ContextMenuDayMoonrise.ImageIndex = 2; + ContextMenuDayMoonset.ImageIndex = 3; + } + } + ContextMenuDayTimesSeparator.Visible = ContextMenuDaySunrise.Visible || ContextMenuDaySunset.Visible + || ContextMenuDayMoonrise.Visible || ContextMenuDayMoonset.Visible; + } + + } + +} diff --git a/Project/Source/Forms/MainForm/UI/MainForm.UpdateUI.cs b/Project/Source/Forms/MainForm/UI/MainForm.UpdateUI.cs index 5840b6651..8eaed0845 100644 --- a/Project/Source/Forms/MainForm/UI/MainForm.UpdateUI.cs +++ b/Project/Source/Forms/MainForm/UI/MainForm.UpdateUI.cs @@ -208,83 +208,6 @@ public void UpdateCalendarMonth(bool doFill) } } - private void UpdateContextMenuStripDay() - { - // Day - var date = Program.Settings.TorahEventsCountAsMoon - ? ContextMenuDayCurrentEvent.Moonrise ?? ContextMenuDayCurrentEvent.Date - : ContextMenuDayCurrentEvent.Sunrise ?? ContextMenuDayCurrentEvent.Date; - var rowDay = ApplicationDatabase.Instance.GetDay(date); - ContextMenuDayDate.Text = rowDay?.DayAndMonthWithYearText ?? SysTranslations.NullSlot.GetLang(); - ContextMenuDayParashah.Enabled = false; - // Celebration - string weeklong = ContextMenuDayCurrentEvent.GetWeekLongCelebrationIntermediateDay(); - bool b1 = weeklong.IsNullOrEmpty(); - bool b2 = ContextMenuDayCurrentEvent.TorahEvent == TorahCelebrationDay.SoukotD8 && !Settings.UseSimhatTorahOutside; - if ( !b1 || b2 ) - ContextMenuDayDate.Text += " - " + weeklong; - // Parashah - if ( Settings.CalendarShowParashah ) - if ( b1 || b2 ) - { - var parashah = ParashotFactory.Instance.Get(rowDay?.GetParashahReadingDay()?.ParashahID); - if ( parashah != null ) - { - ContextMenuDayDate.Text += " - " + parashah.ToStringShort(false, rowDay.HasLinkedParashah); - ContextMenuDayParashah.Enabled = true; - } - } - // Times - ContextMenuDaySetAsActive.Enabled = ContextMenuDayCurrentEvent.Date != CalendarMonth.CalendarDate.Date; - ContextMenuDayClearSelection.Enabled = DateSelected.HasValue && DateSelected != DateTime.Today; - ContextMenuDaySelectDate.Enabled = ( !DateSelected.HasValue && DateTime.Today != ContextMenuDayCurrentEvent.Date ) - || ( DateSelected.HasValue && DateSelected != ContextMenuDayCurrentEvent.Date ); - ContextMenuDayGoToToday.Enabled = CalendarMonth.CalendarDate.Date != DateTime.Today; - ContextMenuDayGoToSelected.Enabled = DateSelected.HasValue - && DateSelected.Value != ContextMenuDayCurrentEvent.Date; - ContextMenuDayDatesDiffToToday.Enabled = ContextMenuDayCurrentEvent.Date != DateTime.Today; - ContextMenuDayDatesDiffToSelected.Enabled = DateSelected.HasValue - && ContextMenuDaySelectDate.Enabled && DateSelected != DateTime.Today; - if ( Settings.TorahEventsCountAsMoon ) - { - ContextMenuDayMoonrise.Visible = false; - ContextMenuDayMoonset.Visible = false; - ContextMenuDaySunrise.Visible = !ContextMenuDayCurrentEvent?.SunriseAsString.IsNullOrEmpty() ?? false; - ContextMenuDaySunset.Visible = !ContextMenuDayCurrentEvent?.SunsetAsString.IsNullOrEmpty() ?? false; - ContextMenuDaySunrise.Text = AppTranslations.Sunrise.GetLang(ContextMenuDayCurrentEvent?.SunriseAsString ?? "-"); - ContextMenuDaySunset.Text = AppTranslations.Sunset.GetLang(ContextMenuDayCurrentEvent?.SunsetAsString ?? "-"); - } - else - { - ContextMenuDaySunrise.Visible = false; - ContextMenuDaySunset.Visible = false; - if ( ContextMenuDayCurrentEvent.MoonriseOccuring == MoonriseOccuring.AfterSet ) - { - ContextMenuDayMoonrise.Visible = ContextMenuDayCurrentEvent.Moonset != null; - if ( ContextMenuDayMoonrise.Visible ) - ContextMenuDayMoonrise.Text = AppTranslations.Moonset.GetLang(ContextMenuDayCurrentEvent?.MoonsetAsString ?? "-"); - ContextMenuDayMoonset.Visible = ContextMenuDayCurrentEvent.MoonriseOccuring != MoonriseOccuring.NextDay; - if ( ContextMenuDayMoonset.Visible ) - ContextMenuDayMoonset.Text = AppTranslations.Moonrise.GetLang(ContextMenuDayCurrentEvent?.MoonriseAsString ?? "-"); - ContextMenuDayMoonrise.ImageIndex = 3; - ContextMenuDayMoonset.ImageIndex = 2; - } - else - { - ContextMenuDayMoonrise.Visible = ContextMenuDayCurrentEvent.MoonriseOccuring != MoonriseOccuring.NextDay; - if ( ContextMenuDayMoonrise.Visible ) - ContextMenuDayMoonrise.Text = AppTranslations.Moonrise.GetLang(ContextMenuDayCurrentEvent?.MoonriseAsString ?? "-"); - ContextMenuDayMoonset.Visible = ContextMenuDayCurrentEvent.Moonset != null; - if ( ContextMenuDayMoonset.Visible ) - ContextMenuDayMoonset.Text = AppTranslations.Moonset.GetLang(ContextMenuDayCurrentEvent?.MoonsetAsString ?? "-"); - ContextMenuDayMoonrise.ImageIndex = 2; - ContextMenuDayMoonset.ImageIndex = 3; - } - } - ContextMenuDayTimesSeparator.Visible = ContextMenuDaySunrise.Visible || ContextMenuDaySunset.Visible - || ContextMenuDayMoonrise.Visible || ContextMenuDayMoonset.Visible; - } - } } From 40b468fd45779418ce9e439a246543e4c203e2ea Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 01:15:39 +0200 Subject: [PATCH 04/19] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 2a9adda7b..8450e88dd 100644 --- a/README.md +++ b/README.md @@ -321,6 +321,10 @@ The generation of parashot relating to Shabatot is not guaranteed to be traditio ## Changelog +#### In progress - Version 9.5 + +- Improve day context menu to indicate the celebration. + #### 2021.09.24 - Version 9.4 - Add search next parashah from today in parashot board. From 36283721de751b47b7b8d428020355943d874931 Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 01:16:37 +0200 Subject: [PATCH 05/19] Update version number --- Project/Properties/AssemblyInfo.cs | 4 ++-- Setup/OrdisoftwareHebrewCalendarSetup.iss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 223e3ec22..7c21bd241 100644 --- 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.4.0.0")] -[assembly: AssemblyFileVersion("9.4.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("9.5.0.0")] +[assembly: AssemblyFileVersion("9.5.0.0")] \ No newline at end of file diff --git a/Setup/OrdisoftwareHebrewCalendarSetup.iss b/Setup/OrdisoftwareHebrewCalendarSetup.iss index 8759f751f..2787505d3 100644 --- a/Setup/OrdisoftwareHebrewCalendarSetup.iss +++ b/Setup/OrdisoftwareHebrewCalendarSetup.iss @@ -1,4 +1,4 @@ -#define MyAppVersion "9.4" +#define MyAppVersion "9.5" #define MyAppName "Hebrew Calendar" #define MyAppNameNoSpace "HebrewCalendar" #define MyAppExeName "Ordisoftware.Hebrew.Calendar.exe" From e967c030c24c2049a84b943c2479ed01d3a2abf8 Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 02:01:54 +0200 Subject: [PATCH 06/19] Add online provider --- .../WebLinks/WebLinks-02-JewishCalendars.txt | 3 + .../WebProviders/WebProviders-Celebration.txt | 3 + .../WebProviders/WebProviders-Parashah.txt | 6 ++ Project/Hebrew Calendar (vs2017).csproj | 2 + .../Common/Hebrew/Classes/HebrewTools.cs | 3 + .../Hebrew/Entities/OnlineCelebrations.cs | 10 ++ .../Entities/OnlineParashot.TheYeshivaNet.cs | 100 ++++++++++++++++++ .../Entities/OnlineParashot.YeshivaCo.cs | 100 ++++++++++++++++++ 8 files changed, 227 insertions(+) create mode 100644 Project/Source/Common/Hebrew/Entities/OnlineParashot.TheYeshivaNet.cs create mode 100644 Project/Source/Common/Hebrew/Entities/OnlineParashot.YeshivaCo.cs diff --git a/Documents/WebLinks/WebLinks-02-JewishCalendars.txt b/Documents/WebLinks/WebLinks-02-JewishCalendars.txt index bace8c156..c93f97ee8 100644 --- a/Documents/WebLinks/WebLinks-02-JewishCalendars.txt +++ b/Documents/WebLinks/WebLinks-02-JewishCalendars.txt @@ -27,6 +27,9 @@ URL = https://www.aish.com/jewish-calendar/Jewish_Calendar.html Name = (EN) Chabad.org URL = https://www.chabad.org/calendar/view/month.htm +Name = (EN) Yeshiva.co +URL = https://www.yeshiva.co/calendar + Name = (EN) Hebcal.com URL = https://www.hebcal.com diff --git a/Documents/WebProviders/WebProviders-Celebration.txt b/Documents/WebProviders/WebProviders-Celebration.txt index 2c2bb1782..0e26d0392 100644 --- a/Documents/WebProviders/WebProviders-Celebration.txt +++ b/Documents/WebProviders/WebProviders-Celebration.txt @@ -24,6 +24,9 @@ URL = https://www.chabad.org/%CHABAD-EN% Name = (EN) Torah.org URL = https://torah.org/%TORAHORG%/ +Name = (EN) Yeshiva.co +URL = https://www.yeshiva.co/midrash/category/%YESHIVACO% + Name = (EN) TheYeshiva.net URL = https://www.theyeshiva.net/jewish/%THEYESHIVA% diff --git a/Documents/WebProviders/WebProviders-Parashah.txt b/Documents/WebProviders/WebProviders-Parashah.txt index 3a1d1e108..8b112551f 100644 --- a/Documents/WebProviders/WebProviders-Parashah.txt +++ b/Documents/WebProviders/WebProviders-Parashah.txt @@ -24,6 +24,12 @@ URL = https://www.chabad.org/article.aspx?aid=%CHABAD-EN% Name = (EN) Torah.org URL = https://torah.org/parsha/%TORAHORG%/ +Name = (EN) Yeshiva.co +URL = https://www.yeshiva.co/midrash/category/%YESHIVACO% + +Name = (EN) TheYeshiva.net +URL = https://www.theyeshiva.net/jewish/%THEYESHIVA% + Name = (EN) TrueTorahJews.org URL = https://www.truetorahjews.org/parsha-pearls/%TORAHJEWS% diff --git a/Project/Hebrew Calendar (vs2017).csproj b/Project/Hebrew Calendar (vs2017).csproj index 0f4282d45..f729b36e2 100644 --- a/Project/Hebrew Calendar (vs2017).csproj +++ b/Project/Hebrew Calendar (vs2017).csproj @@ -250,6 +250,8 @@ + + diff --git a/Project/Source/Common/Hebrew/Classes/HebrewTools.cs b/Project/Source/Common/Hebrew/Classes/HebrewTools.cs index d46401469..21ea359a8 100644 --- a/Project/Source/Common/Hebrew/Classes/HebrewTools.cs +++ b/Project/Source/Common/Hebrew/Classes/HebrewTools.cs @@ -186,6 +186,8 @@ void open(Parashah item) string link = url.Replace("%TORAHBOX%", OnlineParashot.TorahBox[item.Book][item.Number - 1]) .Replace("%TORAHORG%", OnlineParashot.TorahOrg[item.Book][item.Number - 1]) .Replace("%TORAHJEWS%", OnlineParashot.TorahJews[item.Book][item.Number - 1]) + .Replace("%YESHIVACO%", OnlineParashot.YeshivaCo[item.Book][item.Number - 1]) + .Replace("%THEYESHIVA%", OnlineParashot.TheYeshivaNet[item.Book][item.Number - 1]) .Replace("%CHABAD-EN%", OnlineParashot.ChabadEN[item.Book][item.Number - 1]) .Replace("%CHABAD-FR%", OnlineParashot.ChabadFR[item.Book][item.Number - 1]) .Replace("%WIKIPEDIA-EN%", OnlineParashot.WikipediaEN[item.Book][item.Number - 1]) @@ -209,6 +211,7 @@ static public void OpenCelebrationProvider(string url, TorahCelebration celebrat .Replace("%TORAHJEWS%", OnlineCelebration.TrueTorahJews[celebration]) .Replace("%LOUBAVITCH%", OnlineCelebration.Loubavitch[celebration]) .Replace("%THEYESHIVA%", OnlineCelebration.TheYeshiva[celebration]) + .Replace("%YESHIVACO%", OnlineCelebration.YeshivaCo[celebration]) .Replace("%CHABAD-EN%", OnlineCelebration.ChabadEN[celebration]) .Replace("%CHABAD-FR%", OnlineCelebration.ChabadFR[celebration]) .Replace("%AISH-EN%", OnlineCelebration.AishEN[celebration]) diff --git a/Project/Source/Common/Hebrew/Entities/OnlineCelebrations.cs b/Project/Source/Common/Hebrew/Entities/OnlineCelebrations.cs index 612d51717..c524856d2 100644 --- a/Project/Source/Common/Hebrew/Entities/OnlineCelebrations.cs +++ b/Project/Source/Common/Hebrew/Entities/OnlineCelebrations.cs @@ -101,6 +101,16 @@ static public readonly Dictionary ChabadEN { TorahCelebration.Soukot, "library/article_cdo/aid/4126/jewish/Sukkot.htm" } }; + static public readonly Dictionary YeshivaCo + = new Dictionary + { + { TorahCelebration.Pessah, "103" }, + { TorahCelebration.Chavouot, "90" }, + { TorahCelebration.YomTerouah, "492" }, + { TorahCelebration.YomHaKipourim, "73" }, + { TorahCelebration.Soukot, "74" } + }; + static public readonly Dictionary TheYeshiva = new Dictionary { diff --git a/Project/Source/Common/Hebrew/Entities/OnlineParashot.TheYeshivaNet.cs b/Project/Source/Common/Hebrew/Entities/OnlineParashot.TheYeshivaNet.cs new file mode 100644 index 000000000..46c7ed15c --- /dev/null +++ b/Project/Source/Common/Hebrew/Entities/OnlineParashot.TheYeshivaNet.cs @@ -0,0 +1,100 @@ +/// +/// This file is part of Ordisoftware Hebrew Calendar/Letters/Words. +/// Copyright 2012-2021 Olivier Rogier. +/// See www.ordisoftware.com for more information. +/// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +/// If a copy of the MPL was not distributed with this file, You can obtain one at +/// https://mozilla.org/MPL/2.0/. +/// If it is not possible or desirable to put the notice in a particular file, +/// then You may include the notice in a location(such as a LICENSE file in a +/// relevant directory) where a recipient would be likely to look for such a notice. +/// You may add additional accurate notices of copyright ownership. +/// +/// 2021-03 +/// 2021-03 +using System; +using Ordisoftware.Core; + +namespace Ordisoftware.Hebrew +{ + + static partial class OnlineParashot + { + + static public readonly NullSafeDictionary> TheYeshivaNet + = new NullSafeDictionary> + { + [TorahBook.Bereshit] = new NullSafeList + { + "c7/torah/parsha/bereshit/bereshit", + "c8/torah/parsha/bereshit/noach", + "c9/torah/parsha/bereshit/lech-lecha", + "c10/torah/parsha/bereshit/vayera", + "c11/torah/parsha/bereshit/chayei-sarah", + "c13/torah/parsha/bereshit/toldot", + "c16/torah/parsha/bereshit/vayetzei", + "c18/torah/parsha/bereshit/vayishlach", + "c15/torah/parsha/bereshit/vayeshev", + "c12/torah/parsha/bereshit/miketz", + "c17/torah/parsha/bereshit/vayigash", + "c14/torah/parsha/bereshit/vayechi", + }, + [TorahBook.Shemot] = new NullSafeList + { + "c25/torah/parsha/shemot/shemot", + "c28/torah/parsha/shemot/vaera", + "c21/torah/parsha/shemot/bo", + "c20/torah/parsha/shemot/beshalach", + "c30/torah/parsha/shemot/yisro", + "c23/torah/parsha/shemot/mishpatim", + "c26/torah/parsha/shemot/terumah", + "c27/torah/parsha/shemot/tetzaveh", + "c22/torah/parsha/shemot/ki-tisa", + "c29/torah/parsha/shemot/vayakhel", + "c24/torah/parsha/shemot/pekudei", + }, + [TorahBook.Vayiqra] = new NullSafeList + { + "c41/torah/parsha/vayikra/vayikra", + "c40/torah/parsha/vayikra/tzav", + "c38/torah/parsha/vayikra/shmini", + "c39/torah/parsha/vayikra/tazria", + "c37/torah/parsha/vayikra/metzora", + "c32/torah/parsha/vayikra/acharei-mos", + "c36/torah/parsha/vayikra/kedoshim", + "c35/torah/parsha/vayikra/emor", + "c34/torah/parsha/vayikra/behar", + "c33/torah/parsha/vayikra/bechukotai", + }, + [TorahBook.Bamidbar] = new NullSafeList + { + "c44/torah/parsha/bamidbar/bamidbar", + "c50/torah/parsha/bamidbar/nasso", + "c45/torah/parsha/bamidbar/behaalotcha", + "c52/torah/parsha/bamidbar/shlach", + "c47/torah/parsha/bamidbar/korach", + "c46/torah/parsha/bamidbar/chukat", + "c43/torah/parsha/bamidbar/balak", + "c51/torah/parsha/bamidbar/pinchas", + "c49/torah/parsha/bamidbar/matot", + "c48/torah/parsha/bamidbar/maasei", + }, + [TorahBook.Devarim] = new NullSafeList + { + "c55/torah/parsha/devarim/devarim", + "c63/torah/parsha/devarim/vaetchanan", + "c56/torah/parsha/devarim/eikev", + "c61/torah/parsha/devarim/reeh", + "c62/torah/parsha/devarim/shoftim", + "c59/torah/parsha/devarim/ki-teitzei", + "c58/torah/parsha/devarim/ki-tavo", + "c60/torah/parsha/devarim/nitzavim", + "c64/torah/parsha/devarim/vayeilech", + "c57/torah/parsha/devarim/haazinu", + "c65/torah/parsha/devarim/vezot-haberakhah", + } + }; + + } + +} diff --git a/Project/Source/Common/Hebrew/Entities/OnlineParashot.YeshivaCo.cs b/Project/Source/Common/Hebrew/Entities/OnlineParashot.YeshivaCo.cs new file mode 100644 index 000000000..335ce9451 --- /dev/null +++ b/Project/Source/Common/Hebrew/Entities/OnlineParashot.YeshivaCo.cs @@ -0,0 +1,100 @@ +/// +/// This file is part of Ordisoftware Hebrew Calendar/Letters/Words. +/// Copyright 2012-2021 Olivier Rogier. +/// See www.ordisoftware.com for more information. +/// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +/// If a copy of the MPL was not distributed with this file, You can obtain one at +/// https://mozilla.org/MPL/2.0/. +/// If it is not possible or desirable to put the notice in a particular file, +/// then You may include the notice in a location(such as a LICENSE file in a +/// relevant directory) where a recipient would be likely to look for such a notice. +/// You may add additional accurate notices of copyright ownership. +/// +/// 2021-03 +/// 2021-03 +using System; +using Ordisoftware.Core; + +namespace Ordisoftware.Hebrew +{ + + static partial class OnlineParashot + { + + static public readonly NullSafeDictionary> YeshivaCo + = new NullSafeDictionary> + { + [TorahBook.Bereshit] = new NullSafeList + { + "15", + "16", + "17", + "18", + "19", + "20", + "21", + "22", + "23", + "24", + "25", + "70" + }, + [TorahBook.Shemot] = new NullSafeList + { + "26", + "27", + "28", + "29", + "30", + "31", + "32", + "33", + "34", + "35", + "36" + }, + [TorahBook.Vayiqra] = new NullSafeList + { + "37", + "38", + "39", + "40", + "41", + "42", + "43", + "44", + "45", + "46" + }, + [TorahBook.Bamidbar] = new NullSafeList + { + "47", + "48", + "49", + "50", + "51", + "52", + "53", + "54", + "55", + "56" + }, + [TorahBook.Devarim] = new NullSafeList + { + "57", + "58", + "59", + "60", + "61", + "62", + "63", + "64", + "65", + "66", + "67" + } + }; + + } + +} From 0c2620e1846e891f3257b2195a578d13aeb231b9 Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 02:02:55 +0200 Subject: [PATCH 07/19] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8450e88dd..18097bedc 100644 --- a/README.md +++ b/README.md @@ -321,9 +321,11 @@ The generation of parashot relating to Shabatot is not guaranteed to be traditio ## Changelog -#### In progress - Version 9.5 +#### 2021.09.26 - Version 9.5 - Improve day context menu to indicate the celebration. +- Add some parashah and celebrations online providers for the study. +- Update web links. #### 2021.09.24 - Version 9.4 From dc781de1fe61a1c85f9b246bef2691403c1716ec Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 02:12:08 +0200 Subject: [PATCH 08/19] Refactor --- .../Forms/MainForm/UI/MainForm.ContextMenu.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs b/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs index 1056fa37c..0eca7e9b9 100644 --- a/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs +++ b/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs @@ -72,14 +72,20 @@ private void DoContextMenuStripDay_Opened(object sender, EventArgs e) ContextMenuDayDate.Text = rowDay?.DayAndMonthWithYearText ?? SysTranslations.NullSlot.GetLang(); ContextMenuDayParashah.Enabled = false; // Celebration + string celebration = AppTranslations.TorahCelebrationDays[ContextMenuDayCurrentEvent.TorahEvent].GetLang(); string weeklong = ContextMenuDayCurrentEvent.GetWeekLongCelebrationIntermediateDay(); - bool b1 = weeklong.IsNullOrEmpty(); - bool b2 = ContextMenuDayCurrentEvent.TorahEvent == TorahCelebrationDay.SoukotD8 && !Settings.UseSimhatTorahOutside; - if ( !b1 || b2 ) - ContextMenuDayDate.Text += " - " + weeklong; + bool isNoCelebration = celebration.IsNullOrEmpty(); + bool isNoWeekLong = weeklong.IsNullOrEmpty(); + bool isNoEvent = isNoCelebration && isNoWeekLong; + bool isSimhatTorah = ContextMenuDayCurrentEvent.TorahEvent == TorahCelebrationDay.SoukotD8 && !Settings.UseSimhatTorahOutside; + if ( !isNoEvent || isSimhatTorah ) + if (!isNoWeekLong) + ContextMenuDayDate.Text += " - " + weeklong; + else + ContextMenuDayDate.Text += " - " + celebration; // Parashah if ( Settings.CalendarShowParashah ) - if ( b1 || b2 ) + if ( isNoEvent || isSimhatTorah ) { var parashah = ParashotFactory.Instance.Get(rowDay?.GetParashahReadingDay()?.ParashahID); if ( parashah != null ) From 2edb4d7fcbf6a5b7507e04d8a19947f9e6abbbbd Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 03:27:52 +0200 Subject: [PATCH 09/19] Improve UX --- Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs b/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs index 0eca7e9b9..feb6fdc3e 100644 --- a/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs +++ b/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs @@ -51,7 +51,7 @@ private void DoCalendarMonth_MouseClick(object sender, MouseEventArgs e) if ( Settings.MonthViewChangeDayOnClick || ModifierKeys.HasFlag(Keys.Shift) ) GoToDate(dayRow.Date); else - if ( ModifierKeys.HasFlag(Keys.Control) ) + if ( showContextMenu && ModifierKeys.HasFlag(Keys.Control) ) DateSelected = dayRow.Date; } else From 4b02737f341668cfd2fc10679682a86baf1848ac Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 10:37:34 +0200 Subject: [PATCH 10/19] Improve visual month interaction --- Project/Source/Forms/MainForm/MainForm.cs | 2 ++ .../Forms/MainForm/UI/MainForm.ContextMenu.cs | 23 +++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Project/Source/Forms/MainForm/MainForm.cs b/Project/Source/Forms/MainForm/MainForm.cs index 50515c77d..c82486f29 100644 --- a/Project/Source/Forms/MainForm/MainForm.cs +++ b/Project/Source/Forms/MainForm/MainForm.cs @@ -1113,6 +1113,8 @@ private void ContextMenuDayGoToSelected_Click(object sender, EventArgs e) private void ContextMenuDaySelect_Click(object sender, EventArgs e) { DateSelected = ContextMenuDayCurrentEvent.Date; + if ( CalendarMonth.CalendarDate.Month != DateSelected.Value.Month ) + GoToDate(DateSelected.Value); } private void ContextMenuDayClearSelection_Click(object sender, EventArgs e) diff --git a/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs b/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs index feb6fdc3e..9a3ed6387 100644 --- a/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs +++ b/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs @@ -33,26 +33,41 @@ private void DoCalendarMonth_MouseClick(object sender, MouseEventArgs e) if ( dayEvent == null ) return; var dayRow = ApplicationDatabase.Instance.LunisolarDays.FirstOrDefault(day => day.Date == dayEvent.Date); if ( dayRow == null ) return; - bool showContextMenu = CalendarMonth.CalendarDate.Month == dayRow.Date.Month; + bool showContextMenu = true;// CalendarMonth.CalendarDate.Month == dayRow.Date.Month; if ( e.Button == MouseButtons.Left ) { - if ( e.Clicks > 1 && showContextMenu ) + if ( e.Clicks > 1 ) switch ( Settings.CalendarDoubleClickAction ) { case CalendarDoubleClickAction.SetActive: GoToDate(dayRow.Date); break; case CalendarDoubleClickAction.Select: - DateSelected = dayRow.Date; + if ( showContextMenu ) DateSelected = dayRow.Date; break; } else if ( e.Clicks == 1 ) + { + bool valid = false; if ( Settings.MonthViewChangeDayOnClick || ModifierKeys.HasFlag(Keys.Shift) ) + { GoToDate(dayRow.Date); + valid = true; + } + if ( ( showContextMenu || valid ) && ModifierKeys.HasFlag(Keys.Control) ) + { + DateSelected = dayRow.Date; + if ( CalendarMonth.CalendarDate.Month != dayRow.Date.Month ) + GoToDate(dayRow.Date); + } else - if ( showContextMenu && ModifierKeys.HasFlag(Keys.Control) ) + if ( !showContextMenu && ModifierKeys.HasFlag(Keys.Control) ) + { + GoToDate(dayRow.Date); DateSelected = dayRow.Date; + } + } } else if ( showContextMenu && e.Button == MouseButtons.Right ) From 53f215a168648e6fcdf78b5ff1a173c40713da7f Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 10:37:41 +0200 Subject: [PATCH 11/19] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 18097bedc..a20b4833e 100644 --- a/README.md +++ b/README.md @@ -323,6 +323,7 @@ The generation of parashot relating to Shabatot is not guaranteed to be traditio #### 2021.09.26 - Version 9.5 +- Improve interaction with monthly view. - Improve day context menu to indicate the celebration. - Add some parashah and celebrations online providers for the study. - Update web links. From ea0d60f2b62278bd78131bc75371287b2253025b Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 13:35:33 +0200 Subject: [PATCH 12/19] Improve online providers --- .../WebLinks/WebLinks-07-OnlineLessons.txt | 8 ++ .../WebLinks/WebLinks-08-VideoChannels.txt | 3 + .../WebProviders/WebProviders-Celebration.txt | 3 + .../WebProviders/WebProviders-Parashah.txt | 3 + Project/Hebrew Calendar (vs2017).csproj | 1 + .../Common/Hebrew/Classes/HebrewTools.cs | 14 +-- .../Hebrew/Entities/OnlineCelebrations.cs | 10 ++ .../OnlineParashot.MyJewishLearning.cs | 100 ++++++++++++++++++ .../Entities/OnlineParashot.TheYeshivaNet.cs | 4 +- .../Entities/OnlineParashot.YeshivaCo.cs | 4 +- .../Forms/MainForm/UI/MainForm.ContextMenu.cs | 20 ++-- 11 files changed, 146 insertions(+), 24 deletions(-) create mode 100644 Project/Source/Common/Hebrew/Entities/OnlineParashot.MyJewishLearning.cs diff --git a/Documents/WebLinks/WebLinks-07-OnlineLessons.txt b/Documents/WebLinks/WebLinks-07-OnlineLessons.txt index d85bf1da5..4b3a4e266 100644 --- a/Documents/WebLinks/WebLinks-07-OnlineLessons.txt +++ b/Documents/WebLinks/WebLinks-07-OnlineLessons.txt @@ -107,6 +107,14 @@ URL = https://www.truetorahjews.org - +Name = (EN) My Jewish Learning +URL = https://www.myjewishlearning.com + +Name = (EN) The Rabbinical Assembly +URL = https://www.rabbinicalassembly.org + +- + Name = (FR) Aish URL = https://www.aish.fr diff --git a/Documents/WebLinks/WebLinks-08-VideoChannels.txt b/Documents/WebLinks/WebLinks-08-VideoChannels.txt index 3daa1c4bf..488aa1669 100644 --- a/Documents/WebLinks/WebLinks-08-VideoChannels.txt +++ b/Documents/WebLinks/WebLinks-08-VideoChannels.txt @@ -107,6 +107,9 @@ URL = https://www.youtube.com/user/AishIvrit - +Name = (EN) My Jewish Learning +URL = https://www.youtube.com/user/myjewishlearning + Name = (EN) The Yeshiva URL = https://www.youtube.com/user/TheYeshivaNet diff --git a/Documents/WebProviders/WebProviders-Celebration.txt b/Documents/WebProviders/WebProviders-Celebration.txt index 0e26d0392..2b14ca827 100644 --- a/Documents/WebProviders/WebProviders-Celebration.txt +++ b/Documents/WebProviders/WebProviders-Celebration.txt @@ -33,6 +33,9 @@ URL = https://www.theyeshiva.net/jewish/%THEYESHIVA% Name = (EN) TrueTorahJews.org URL = https://www.truetorahjews.org/parsha-pearls/%TORAHJEWS% +Name = (EN) MyJewishLearning.com +URL = https://www.myjewishlearning.com/category/celebrate/%MYJEWISHLEARNING%/ + - Name = (FR) Torah-Box.com diff --git a/Documents/WebProviders/WebProviders-Parashah.txt b/Documents/WebProviders/WebProviders-Parashah.txt index 8b112551f..f38b95de3 100644 --- a/Documents/WebProviders/WebProviders-Parashah.txt +++ b/Documents/WebProviders/WebProviders-Parashah.txt @@ -33,6 +33,9 @@ URL = https://www.theyeshiva.net/jewish/%THEYESHIVA% Name = (EN) TrueTorahJews.org URL = https://www.truetorahjews.org/parsha-pearls/%TORAHJEWS% +Name = (EN) MyJewishLearning.com +URL = https://www.myjewishlearning.com/torah-portions/%MYJEWISHLEARNING%/ + - Name = (FR) Torah-Box.com diff --git a/Project/Hebrew Calendar (vs2017).csproj b/Project/Hebrew Calendar (vs2017).csproj index f729b36e2..36ef88473 100644 --- a/Project/Hebrew Calendar (vs2017).csproj +++ b/Project/Hebrew Calendar (vs2017).csproj @@ -250,6 +250,7 @@ + diff --git a/Project/Source/Common/Hebrew/Classes/HebrewTools.cs b/Project/Source/Common/Hebrew/Classes/HebrewTools.cs index 21ea359a8..6afa57d4e 100644 --- a/Project/Source/Common/Hebrew/Classes/HebrewTools.cs +++ b/Project/Source/Common/Hebrew/Classes/HebrewTools.cs @@ -183,15 +183,16 @@ static public void OpenParashahProvider(string url, Parashah parashah, bool open // void open(Parashah item) { - string link = url.Replace("%TORAHBOX%", OnlineParashot.TorahBox[item.Book][item.Number - 1]) + string link = url.Replace("%WIKIPEDIA-EN%", OnlineParashot.WikipediaEN[item.Book][item.Number - 1]) + .Replace("%WIKIPEDIA-FR%", OnlineParashot.WikipediaFR[item.Book][item.Number - 1]) + .Replace("%TORAHBOX%", OnlineParashot.TorahBox[item.Book][item.Number - 1]) .Replace("%TORAHORG%", OnlineParashot.TorahOrg[item.Book][item.Number - 1]) .Replace("%TORAHJEWS%", OnlineParashot.TorahJews[item.Book][item.Number - 1]) .Replace("%YESHIVACO%", OnlineParashot.YeshivaCo[item.Book][item.Number - 1]) .Replace("%THEYESHIVA%", OnlineParashot.TheYeshivaNet[item.Book][item.Number - 1]) + .Replace("%MYJEWISHLEARNING%", OnlineParashot.MyJewishLearning[item.Book][item.Number - 1]) .Replace("%CHABAD-EN%", OnlineParashot.ChabadEN[item.Book][item.Number - 1]) .Replace("%CHABAD-FR%", OnlineParashot.ChabadFR[item.Book][item.Number - 1]) - .Replace("%WIKIPEDIA-EN%", OnlineParashot.WikipediaEN[item.Book][item.Number - 1]) - .Replace("%WIKIPEDIA-FR%", OnlineParashot.WikipediaFR[item.Book][item.Number - 1]) .Replace("%AISH-EN%", OnlineParashot.AishEN[item.Book][item.Number - 1]) .Replace("%AISH-FR%", OnlineParashot.AishFR[item.Book][item.Number - 1]) .Replace("%AISH-IW%", OnlineParashot.AishIW[item.Book][item.Number - 1]); @@ -206,12 +207,13 @@ static public void OpenCelebrationProvider(string url, TorahCelebration celebrat { string link = url.Replace("%WIKIPEDIA-EN%", OnlineCelebration.WikipediaEN[celebration]) .Replace("%WIKIPEDIA-FR%", OnlineCelebration.WikipediaFR[celebration]) - .Replace("%TORAHORG%", OnlineCelebration.TorahOrg[celebration]) .Replace("%TORAHBOX%", OnlineCelebration.TorahBox[celebration]) + .Replace("%TORAHORG%", OnlineCelebration.TorahOrg[celebration]) .Replace("%TORAHJEWS%", OnlineCelebration.TrueTorahJews[celebration]) - .Replace("%LOUBAVITCH%", OnlineCelebration.Loubavitch[celebration]) - .Replace("%THEYESHIVA%", OnlineCelebration.TheYeshiva[celebration]) .Replace("%YESHIVACO%", OnlineCelebration.YeshivaCo[celebration]) + .Replace("%THEYESHIVA%", OnlineCelebration.TheYeshiva[celebration]) + .Replace("%MYJEWISHLEARNING%", OnlineCelebration.MyJewishLearning[celebration]) + .Replace("%LOUBAVITCH%", OnlineCelebration.Loubavitch[celebration]) .Replace("%CHABAD-EN%", OnlineCelebration.ChabadEN[celebration]) .Replace("%CHABAD-FR%", OnlineCelebration.ChabadFR[celebration]) .Replace("%AISH-EN%", OnlineCelebration.AishEN[celebration]) diff --git a/Project/Source/Common/Hebrew/Entities/OnlineCelebrations.cs b/Project/Source/Common/Hebrew/Entities/OnlineCelebrations.cs index c524856d2..865dffd9d 100644 --- a/Project/Source/Common/Hebrew/Entities/OnlineCelebrations.cs +++ b/Project/Source/Common/Hebrew/Entities/OnlineCelebrations.cs @@ -61,6 +61,16 @@ static public readonly Dictionary TrueTorahJews { TorahCelebration.Soukot, "succos" } }; + static public readonly Dictionary MyJewishLearning + = new Dictionary + { + { TorahCelebration.Pessah, "passover" }, + { TorahCelebration.Chavouot, "shavuot" }, + { TorahCelebration.YomTerouah, "rosh-hashanah" }, + { TorahCelebration.YomHaKipourim, "yom-kippur" }, + { TorahCelebration.Soukot, "sukkot" } + }; + static public readonly Dictionary TorahBox = new Dictionary { diff --git a/Project/Source/Common/Hebrew/Entities/OnlineParashot.MyJewishLearning.cs b/Project/Source/Common/Hebrew/Entities/OnlineParashot.MyJewishLearning.cs new file mode 100644 index 000000000..25a2557fb --- /dev/null +++ b/Project/Source/Common/Hebrew/Entities/OnlineParashot.MyJewishLearning.cs @@ -0,0 +1,100 @@ +/// +/// This file is part of Ordisoftware Hebrew Calendar/Letters/Words. +/// Copyright 2012-2021 Olivier Rogier. +/// See www.ordisoftware.com for more information. +/// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +/// If a copy of the MPL was not distributed with this file, You can obtain one at +/// https://mozilla.org/MPL/2.0/. +/// If it is not possible or desirable to put the notice in a particular file, +/// then You may include the notice in a location(such as a LICENSE file in a +/// relevant directory) where a recipient would be likely to look for such a notice. +/// You may add additional accurate notices of copyright ownership. +/// +/// 2021-09 +/// 2021-09 +using System; +using Ordisoftware.Core; + +namespace Ordisoftware.Hebrew +{ + + static partial class OnlineParashot + { + + static public readonly NullSafeDictionary> MyJewishLearning + = new NullSafeDictionary> + { + [TorahBook.Bereshit] = new NullSafeList + { + "parashat-bereshit", + "parashat-noach", + "parashat-lech-lecha", + "parashat-vayera", + "parashat-chayei-sara", + "parashat-toldot", + "parashat-vayetzei", + "parashat-vayishlach", + "parashat-vayeshev", + "parashat-miketz", + "parashat-vayigash", + "parashat-vayechi", + }, + [TorahBook.Shemot] = new NullSafeList + { + "parashat-shemot", + "parashat-vaera", + "parashat-bo", + "parashat-beshalach", + "parashat-yitro", + "parashat-mishpatim", + "parashat-terumah", + "parashat-tetzaveh", + "parashat-ki-tisa", + "parashat-vayakhel", + "parashat-pekudei", + }, + [TorahBook.Vayiqra] = new NullSafeList + { + "parashat-vayikra", + "parashat-tzav", + "parashat-shmini", + "parashat-tazria", + "parashat-metzora", + "parashat-achrei-mot", + "parashat-kedoshim", + "parashat-emor", + "parashat-behar", + "parashat-bechukotai", + }, + [TorahBook.Bamidbar] = new NullSafeList + { + "parashat-bamidbar", + "parashat-nasso", + "parashat-behaalotcha", + "parashat-shlach", + "parashat-korach", + "parashat-chukat", + "parashat-balak", + "parashat-pinchas", + "parashat-matot", + "parashat-masei", + }, + [TorahBook.Devarim] = new NullSafeList + { + "parashat-devarim", + "parashat-vaetchanan", + "parashat-eikev", + "parashat-reeh", + "parashat-shoftim", + "parashat-ki-teitzei", + "parashat-ki-tavo", + "parashat-nitzavim", + "parashat-vayeilech", + "parashat-haazinu", + "parashat-vezot-haberakhah", + } + }; + + } + +} diff --git a/Project/Source/Common/Hebrew/Entities/OnlineParashot.TheYeshivaNet.cs b/Project/Source/Common/Hebrew/Entities/OnlineParashot.TheYeshivaNet.cs index 46c7ed15c..baccaef33 100644 --- a/Project/Source/Common/Hebrew/Entities/OnlineParashot.TheYeshivaNet.cs +++ b/Project/Source/Common/Hebrew/Entities/OnlineParashot.TheYeshivaNet.cs @@ -10,8 +10,8 @@ /// relevant directory) where a recipient would be likely to look for such a notice. /// You may add additional accurate notices of copyright ownership. /// -/// 2021-03 -/// 2021-03 +/// 2021-09 +/// 2021-09 using System; using Ordisoftware.Core; diff --git a/Project/Source/Common/Hebrew/Entities/OnlineParashot.YeshivaCo.cs b/Project/Source/Common/Hebrew/Entities/OnlineParashot.YeshivaCo.cs index 335ce9451..aa32e45a7 100644 --- a/Project/Source/Common/Hebrew/Entities/OnlineParashot.YeshivaCo.cs +++ b/Project/Source/Common/Hebrew/Entities/OnlineParashot.YeshivaCo.cs @@ -10,8 +10,8 @@ /// relevant directory) where a recipient would be likely to look for such a notice. /// You may add additional accurate notices of copyright ownership. /// -/// 2021-03 -/// 2021-03 +/// 2021-09 +/// 2021-09 using System; using Ordisoftware.Core; diff --git a/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs b/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs index 9a3ed6387..55a01a39b 100644 --- a/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs +++ b/Project/Source/Forms/MainForm/UI/MainForm.ContextMenu.cs @@ -33,7 +33,6 @@ private void DoCalendarMonth_MouseClick(object sender, MouseEventArgs e) if ( dayEvent == null ) return; var dayRow = ApplicationDatabase.Instance.LunisolarDays.FirstOrDefault(day => day.Date == dayEvent.Date); if ( dayRow == null ) return; - bool showContextMenu = true;// CalendarMonth.CalendarDate.Month == dayRow.Date.Month; if ( e.Button == MouseButtons.Left ) { if ( e.Clicks > 1 ) @@ -43,34 +42,27 @@ private void DoCalendarMonth_MouseClick(object sender, MouseEventArgs e) GoToDate(dayRow.Date); break; case CalendarDoubleClickAction.Select: - if ( showContextMenu ) DateSelected = dayRow.Date; + DateSelected = dayRow.Date; + if ( CalendarMonth.CalendarDate.Month != dayRow.Date.Month ) + GoToDate(dayRow.Date); break; } else if ( e.Clicks == 1 ) { - bool valid = false; - if ( Settings.MonthViewChangeDayOnClick || ModifierKeys.HasFlag(Keys.Shift) ) - { - GoToDate(dayRow.Date); - valid = true; - } - if ( ( showContextMenu || valid ) && ModifierKeys.HasFlag(Keys.Control) ) + if ( ModifierKeys.HasFlag(Keys.Control) ) { DateSelected = dayRow.Date; if ( CalendarMonth.CalendarDate.Month != dayRow.Date.Month ) GoToDate(dayRow.Date); } else - if ( !showContextMenu && ModifierKeys.HasFlag(Keys.Control) ) - { + if ( Settings.MonthViewChangeDayOnClick || ModifierKeys.HasFlag(Keys.Shift) ) GoToDate(dayRow.Date); - DateSelected = dayRow.Date; - } } } else - if ( showContextMenu && e.Button == MouseButtons.Right ) + if ( e.Button == MouseButtons.Right ) { ContextMenuDayCurrentEvent = dayRow; ContextMenuStripDay.Show(Cursor.Position); From 155391f40f4b61f7b0fbd1d9f77699dd79f8d085 Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 13:35:45 +0200 Subject: [PATCH 13/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a20b4833e..ba6d7e056 100644 --- a/README.md +++ b/README.md @@ -325,7 +325,7 @@ The generation of parashot relating to Shabatot is not guaranteed to be traditio - Improve interaction with monthly view. - Improve day context menu to indicate the celebration. -- Add some parashah and celebrations online providers for the study. +- Add some parashah and celebrations online providers for the study in english and french. - Update web links. #### 2021.09.24 - Version 9.4 From a2585ca9c5166bc345e4fc228dbe9eefad32c0a4 Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 17:25:15 +0200 Subject: [PATCH 14/19] Update text --- .../Translations/AppTranslations.News.cs | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/Project/Source/Program/Translations/AppTranslations.News.cs b/Project/Source/Program/Translations/AppTranslations.News.cs index a933180c3..da12ef002 100644 --- a/Project/Source/Program/Translations/AppTranslations.News.cs +++ b/Project/Source/Program/Translations/AppTranslations.News.cs @@ -39,19 +39,17 @@ static public readonly NullSafeDictionary Notice "• Quelques améliorations et corrections." },*/ - ["9.4"] = new TranslationsDictionary + ["9.5"] = new TranslationsDictionary { - [Language.EN] = "• Added search next parashah from today in parashot board." + Globals.NL + - "• Improved export filenames for celebrations and new moons boards." + Globals.NL + - "• Fixed export to remove all active and selected day marks in the monthly view." + Globals.NL + - "• Fixed some check boxes in celebrations and new moons boards." + Globals.NL + - "• few fixes and improvements.", + [Language.EN] = "• Improved interaction with monthly view." + Globals.NL + + "• Improved day context menu to indicate the celebration." + Globals.NL + + "• Addd some parashah and celebrations online providers for the study in english and french." + Globals.NL + + "• Updated web links.", - [Language.FR] = "• Ajout de la recherche de la prochaine parashah depuis aujourd'hui dans le tableau des parashot." + Globals.NL + - "• Amélioration des noms de fichiers exportés par les tableaux des célébrations et des nouvelles lunes." + Globals.NL + - "• Correction de l'export pour enlever toutes les marques de jour actif et séléctionné dans la vue mensuelle." + Globals.NL + - "• Correction de cases à cocher dans les tableaux des célébrations et des nouvelles lunes." + Globals.NL + - "• Quelques corrections et améliorations." + [Language.FR] = "• Amélioration de l'interaction avec la vue mensuelle." + Globals.NL + + "• Amélioration du menu contextuel du jour pour indiquer la célébration." + Globals.NL + + "• Ajout quelques fournisseurs en ligne de parashah et de célébrations pour l'étude en anglais et en français." + Globals.NL + + "• Mettre à jour les liens Web." }, ["9.x"] = new TranslationsDictionary @@ -64,9 +62,12 @@ static public readonly NullSafeDictionary Notice "• Added option for double-click in visual month to set active or select." + Globals.NL + "• Added some keyboard shortcuts to change and select day in monthly view." + Globals.NL + "• Added celebration verses board and its command-line option." + Globals.NL + + "• Added search next parashah from today in parashot board." + Globals.NL + "• Moved day of shabat selection to the generation tab in the preferences." + Globals.NL + + "• Improved export filenames for celebrations and new moons boards." + Globals.NL + "• Improved web links menus to display those in the current language to the top." + Globals.NL + "• The monthly view displays solar hours in case of sun omer." + Globals.NL + + "• Fixed some check boxes in celebrations and new moons boards." + Globals.NL + "• Some fixes and improvements." + Globals.NL + "• Optimized code." + Globals.NL + "• Updated web links.", @@ -79,9 +80,12 @@ static public readonly NullSafeDictionary Notice "• Ajout d'une option pour choisir l'action pour le double-clic dans la vue mensuelle." + Globals.NL + "• Ajout de raccourcis clavier pour changer et sélectionner un jour dans la vue mensuelle." + Globals.NL + "• Ajout d'un tableau des versets des célébrations et de son option de ligne de commande." + Globals.NL + + "• Ajout de la recherche de la prochaine parashah depuis aujourd'hui dans le tableau des parashot." + Globals.NL + "• Déplacement du choix du jour du shabat vers l'onglet de génération dans les préférences." + Globals.NL + + "• Amélioration des noms de fichiers exportés par les tableaux des célébrations et des nouvelles lunes." + Globals.NL + "• Amélioration des menus de liens web pour affichager ceux dans la langue actuelle vers le haut." + Globals.NL + "• La vue mensuelle affiche les heures solaires en cas de omer du soleil." + Globals.NL + + "• Correction de cases à cocher dans les tableaux des célébrations et des nouvelles lunes." + Globals.NL + "• Quelques corrections et améliorations." + Globals.NL + "• Code optimisé." + Globals.NL + "• Mise à jour les liens web." From d2ffd3f4693308b93921455cba3f9b39d52d3992 Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 18:10:27 +0200 Subject: [PATCH 15/19] Improve UI --- .../Source/Forms/Config/PreferencesForm.cs | 1 + .../Forms/Config/PreferencesForm.designer.cs | 319 +-- .../Forms/Config/PreferencesForm.fr.resx | 3 + .../Source/Forms/Config/PreferencesForm.resx | 2043 +++++++++-------- 4 files changed, 1196 insertions(+), 1170 deletions(-) diff --git a/Project/Source/Forms/Config/PreferencesForm.cs b/Project/Source/Forms/Config/PreferencesForm.cs index 3c1884e91..a05797ea0 100644 --- a/Project/Source/Forms/Config/PreferencesForm.cs +++ b/Project/Source/Forms/Config/PreferencesForm.cs @@ -542,6 +542,7 @@ private void EditUseColors_CheckedChanged(object sender, EventArgs e) { if ( IsReady ) MustRefreshMonthView = true; PanelCalendarColors.Enabled = EditUseColors.Checked; + EditSelectedDayBoxColorOnlyCurrent.Enabled = EditUseColors.Checked; } private void EditCalendarColor_Click(object sender, EventArgs e) diff --git a/Project/Source/Forms/Config/PreferencesForm.designer.cs b/Project/Source/Forms/Config/PreferencesForm.designer.cs index c0b80bad2..9597b31b6 100644 --- a/Project/Source/Forms/Config/PreferencesForm.designer.cs +++ b/Project/Source/Forms/Config/PreferencesForm.designer.cs @@ -165,6 +165,10 @@ private void InitializeComponent() this.EditAskRegenerateIfIntervalGreater = new System.Windows.Forms.CheckBox(); this.EditAutoRegenerate = new System.Windows.Forms.CheckBox(); this.ActionAutoGenerateHelp = new System.Windows.Forms.Button(); + this.EditGPSLatitude = new Ordisoftware.Core.TextBoxEx(); + this.EditTimeZone = new Ordisoftware.Core.TextBoxEx(); + this.EditGPSLongitude = new Ordisoftware.Core.TextBoxEx(); + this.EditAutoGenerateYearsInterval = new Ordisoftware.Core.TextBoxEx(); this.TabPageReminder = new System.Windows.Forms.TabPage(); this.LabelDefaultLockoutAction = new System.Windows.Forms.Label(); this.LabelReminderBoxDesktopLocation = new System.Windows.Forms.Label(); @@ -219,6 +223,19 @@ private void InitializeComponent() this.LabelMoonDayTextFormat = new System.Windows.Forms.Label(); this.ActionMoonDayTextFormatReset = new System.Windows.Forms.Button(); this.LabelCalendarLineSpacingInfo = new System.Windows.Forms.Label(); + this.ActionMoonDayTextFormatHelp = new System.Windows.Forms.Button(); + this.EditCalendarShowParashah = new System.Windows.Forms.CheckBox(); + this.EditCalendarShowSelectedBox = new System.Windows.Forms.CheckBox(); + this.EditCalendarUseHoverEffect = new System.Windows.Forms.CheckBox(); + this.EditMonthViewChangeDayOnClick = new System.Windows.Forms.CheckBox(); + this.LabelMonthViewFontSize = new System.Windows.Forms.Label(); + this.EditCalendarLineSpacing = new System.Windows.Forms.NumericUpDown(); + this.EditMonthViewFontSize = new System.Windows.Forms.NumericUpDown(); + this.LabelCalendarLineSpacing = new System.Windows.Forms.Label(); + this.EditMoonDayTextFormat = new Ordisoftware.Core.TextBoxEx(); + this.TabPageColors = new System.Windows.Forms.TabPage(); + this.EditUseColors = new System.Windows.Forms.CheckBox(); + this.EditSelectedDayBoxColorOnlyCurrent = new System.Windows.Forms.CheckBox(); this.PanelCalendarColors = new System.Windows.Forms.Panel(); this.ActionOpenTheme = new System.Windows.Forms.Button(); this.ActionSaveTheme = new System.Windows.Forms.Button(); @@ -260,17 +277,6 @@ private void InitializeComponent() this.LabelColorTodayBack = new System.Windows.Forms.Label(); this.EditSelectedDayBoxColor = new System.Windows.Forms.Panel(); this.EditCalendarColorTorahEvent = new System.Windows.Forms.Panel(); - this.EditUseColors = new System.Windows.Forms.CheckBox(); - this.ActionMoonDayTextFormatHelp = new System.Windows.Forms.Button(); - this.EditCalendarShowParashah = new System.Windows.Forms.CheckBox(); - this.EditSelectedDayBoxColorOnlyCurrent = new System.Windows.Forms.CheckBox(); - this.EditCalendarShowSelectedBox = new System.Windows.Forms.CheckBox(); - this.EditCalendarUseHoverEffect = new System.Windows.Forms.CheckBox(); - this.EditMonthViewChangeDayOnClick = new System.Windows.Forms.CheckBox(); - this.LabelMonthViewFontSize = new System.Windows.Forms.Label(); - this.EditCalendarLineSpacing = new System.Windows.Forms.NumericUpDown(); - this.EditMonthViewFontSize = new System.Windows.Forms.NumericUpDown(); - this.LabelCalendarLineSpacing = new System.Windows.Forms.Label(); this.TabPageTextReport = new System.Windows.Forms.TabPage(); this.LabelTextReportFontSizeInterval = new System.Windows.Forms.Label(); this.LabelFontName = new System.Windows.Forms.Label(); @@ -323,11 +329,6 @@ private void InitializeComponent() this.ActionSelectCalculatorPath = new System.Windows.Forms.Button(); this.LabelHebrewLettersPath = new System.Windows.Forms.Label(); this.ActionSelectHebrewLettersPath = new System.Windows.Forms.Button(); - this.EditGPSLatitude = new Ordisoftware.Core.TextBoxEx(); - this.EditTimeZone = new Ordisoftware.Core.TextBoxEx(); - this.EditGPSLongitude = new Ordisoftware.Core.TextBoxEx(); - this.EditAutoGenerateYearsInterval = new Ordisoftware.Core.TextBoxEx(); - this.EditMoonDayTextFormat = new Ordisoftware.Core.TextBoxEx(); this.EditHebrewWordsPath = new Ordisoftware.Core.TextBoxEx(); this.EditWeatherAppPath = new Ordisoftware.Core.TextBoxEx(); this.EditExportFolder = new Ordisoftware.Core.TextBoxEx(); @@ -359,9 +360,10 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.EditRemindCelebrationHoursBefore)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.EditRemindCelebrationsDaysBefore)).BeginInit(); this.TabPageMonthView.SuspendLayout(); - this.PanelCalendarColors.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.EditCalendarLineSpacing)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.EditMonthViewFontSize)).BeginInit(); + this.TabPageColors.SuspendLayout(); + this.PanelCalendarColors.SuspendLayout(); this.TabPageTextReport.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.EditTextReportFontSize)).BeginInit(); this.TabPagePrint.SuspendLayout(); @@ -647,6 +649,7 @@ private void InitializeComponent() this.TabControl.Controls.Add(this.TabPageShabat); this.TabControl.Controls.Add(this.TabPageCelebrations); this.TabControl.Controls.Add(this.TabPageMonthView); + this.TabControl.Controls.Add(this.TabPageColors); this.TabControl.Controls.Add(this.TabPageTextReport); this.TabControl.Controls.Add(this.TabPagePrint); this.TabControl.Controls.Add(this.TabPagePaths); @@ -1477,6 +1480,38 @@ private void InitializeComponent() this.ActionAutoGenerateHelp.UseVisualStyleBackColor = true; this.ActionAutoGenerateHelp.Click += new System.EventHandler(this.ActionAutoGenerateHelp_Click); // + // EditGPSLatitude + // + this.EditGPSLatitude.CaretAfterPaste = Ordisoftware.Core.CaretPositionAfterPaste.Ending; + resources.ApplyResources(this.EditGPSLatitude, "EditGPSLatitude"); + this.EditGPSLatitude.Name = "EditGPSLatitude"; + this.EditGPSLatitude.ReadOnly = true; + this.EditGPSLatitude.TabStop = false; + // + // EditTimeZone + // + this.EditTimeZone.CaretAfterPaste = Ordisoftware.Core.CaretPositionAfterPaste.Ending; + resources.ApplyResources(this.EditTimeZone, "EditTimeZone"); + this.EditTimeZone.Name = "EditTimeZone"; + this.EditTimeZone.ReadOnly = true; + this.EditTimeZone.TabStop = false; + // + // EditGPSLongitude + // + this.EditGPSLongitude.CaretAfterPaste = Ordisoftware.Core.CaretPositionAfterPaste.Ending; + resources.ApplyResources(this.EditGPSLongitude, "EditGPSLongitude"); + this.EditGPSLongitude.Name = "EditGPSLongitude"; + this.EditGPSLongitude.ReadOnly = true; + this.EditGPSLongitude.TabStop = false; + // + // EditAutoGenerateYearsInterval + // + this.EditAutoGenerateYearsInterval.CaretAfterPaste = Ordisoftware.Core.CaretPositionAfterPaste.Ending; + resources.ApplyResources(this.EditAutoGenerateYearsInterval, "EditAutoGenerateYearsInterval"); + this.EditAutoGenerateYearsInterval.Name = "EditAutoGenerateYearsInterval"; + this.EditAutoGenerateYearsInterval.ReadOnly = true; + this.EditAutoGenerateYearsInterval.TabStop = false; + // // TabPageReminder // this.TabPageReminder.BackColor = System.Drawing.SystemColors.Window; @@ -1858,11 +1893,8 @@ private void InitializeComponent() this.TabPageMonthView.Controls.Add(this.LabelMoonDayTextFormat); this.TabPageMonthView.Controls.Add(this.ActionMoonDayTextFormatReset); this.TabPageMonthView.Controls.Add(this.LabelCalendarLineSpacingInfo); - this.TabPageMonthView.Controls.Add(this.PanelCalendarColors); - this.TabPageMonthView.Controls.Add(this.EditUseColors); this.TabPageMonthView.Controls.Add(this.ActionMoonDayTextFormatHelp); this.TabPageMonthView.Controls.Add(this.EditCalendarShowParashah); - this.TabPageMonthView.Controls.Add(this.EditSelectedDayBoxColorOnlyCurrent); this.TabPageMonthView.Controls.Add(this.EditCalendarShowSelectedBox); this.TabPageMonthView.Controls.Add(this.EditCalendarUseHoverEffect); this.TabPageMonthView.Controls.Add(this.EditMonthViewChangeDayOnClick); @@ -1925,6 +1957,115 @@ private void InitializeComponent() this.LabelCalendarLineSpacingInfo.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.LabelCalendarLineSpacingInfo.Name = "LabelCalendarLineSpacingInfo"; // + // ActionMoonDayTextFormatHelp + // + this.ActionMoonDayTextFormatHelp.FlatAppearance.BorderSize = 0; + resources.ApplyResources(this.ActionMoonDayTextFormatHelp, "ActionMoonDayTextFormatHelp"); + this.ActionMoonDayTextFormatHelp.Name = "ActionMoonDayTextFormatHelp"; + this.ActionMoonDayTextFormatHelp.UseVisualStyleBackColor = true; + this.ActionMoonDayTextFormatHelp.Click += new System.EventHandler(this.ActionMoonDayTextFormatHelp_Click); + // + // EditCalendarShowParashah + // + resources.ApplyResources(this.EditCalendarShowParashah, "EditCalendarShowParashah"); + this.EditCalendarShowParashah.Name = "EditCalendarShowParashah"; + this.EditCalendarShowParashah.UseVisualStyleBackColor = true; + this.EditCalendarShowParashah.CheckedChanged += new System.EventHandler(this.EditMonthViewOptionChanged); + // + // EditCalendarShowSelectedBox + // + resources.ApplyResources(this.EditCalendarShowSelectedBox, "EditCalendarShowSelectedBox"); + this.EditCalendarShowSelectedBox.Name = "EditCalendarShowSelectedBox"; + this.EditCalendarShowSelectedBox.UseVisualStyleBackColor = true; + this.EditCalendarShowSelectedBox.CheckedChanged += new System.EventHandler(this.EditMonthViewOptionChanged); + // + // EditCalendarUseHoverEffect + // + resources.ApplyResources(this.EditCalendarUseHoverEffect, "EditCalendarUseHoverEffect"); + this.EditCalendarUseHoverEffect.Name = "EditCalendarUseHoverEffect"; + this.EditCalendarUseHoverEffect.UseVisualStyleBackColor = true; + this.EditCalendarUseHoverEffect.CheckedChanged += new System.EventHandler(this.EditMonthViewOptionChanged); + // + // EditMonthViewChangeDayOnClick + // + resources.ApplyResources(this.EditMonthViewChangeDayOnClick, "EditMonthViewChangeDayOnClick"); + this.EditMonthViewChangeDayOnClick.Name = "EditMonthViewChangeDayOnClick"; + this.EditMonthViewChangeDayOnClick.UseVisualStyleBackColor = true; + this.EditMonthViewChangeDayOnClick.CheckedChanged += new System.EventHandler(this.EditMonthViewOptionChanged); + // + // LabelMonthViewFontSize + // + resources.ApplyResources(this.LabelMonthViewFontSize, "LabelMonthViewFontSize"); + this.LabelMonthViewFontSize.Name = "LabelMonthViewFontSize"; + // + // EditCalendarLineSpacing + // + this.EditCalendarLineSpacing.BackColor = System.Drawing.SystemColors.Window; + resources.ApplyResources(this.EditCalendarLineSpacing, "EditCalendarLineSpacing"); + this.EditCalendarLineSpacing.Name = "EditCalendarLineSpacing"; + this.EditCalendarLineSpacing.ReadOnly = true; + this.EditCalendarLineSpacing.ValueChanged += new System.EventHandler(this.EditMonthViewOptionChanged); + // + // EditMonthViewFontSize + // + this.EditMonthViewFontSize.BackColor = System.Drawing.SystemColors.Window; + resources.ApplyResources(this.EditMonthViewFontSize, "EditMonthViewFontSize"); + this.EditMonthViewFontSize.Maximum = new decimal(new int[] { + 30, + 0, + 0, + 0}); + this.EditMonthViewFontSize.Minimum = new decimal(new int[] { + 6, + 0, + 0, + 0}); + this.EditMonthViewFontSize.Name = "EditMonthViewFontSize"; + this.EditMonthViewFontSize.ReadOnly = true; + this.EditMonthViewFontSize.Value = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.EditMonthViewFontSize.ValueChanged += new System.EventHandler(this.EditMonthViewFontSize_ValueChanged); + // + // LabelCalendarLineSpacing + // + resources.ApplyResources(this.LabelCalendarLineSpacing, "LabelCalendarLineSpacing"); + this.LabelCalendarLineSpacing.Name = "LabelCalendarLineSpacing"; + // + // EditMoonDayTextFormat + // + this.EditMoonDayTextFormat.BackColor = System.Drawing.SystemColors.Window; + this.EditMoonDayTextFormat.CaretAfterPaste = Ordisoftware.Core.CaretPositionAfterPaste.Ending; + resources.ApplyResources(this.EditMoonDayTextFormat, "EditMoonDayTextFormat"); + this.EditMoonDayTextFormat.Name = "EditMoonDayTextFormat"; + this.EditMoonDayTextFormat.TextChanged += new System.EventHandler(this.EditMoonDayTextFormat_TextChanged); + // + // TabPageColors + // + this.TabPageColors.BackColor = System.Drawing.SystemColors.Window; + this.TabPageColors.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TabPageColors.Controls.Add(this.EditUseColors); + this.TabPageColors.Controls.Add(this.EditSelectedDayBoxColorOnlyCurrent); + this.TabPageColors.Controls.Add(this.PanelCalendarColors); + resources.ApplyResources(this.TabPageColors, "TabPageColors"); + this.TabPageColors.Name = "TabPageColors"; + // + // EditUseColors + // + resources.ApplyResources(this.EditUseColors, "EditUseColors"); + this.EditUseColors.Name = "EditUseColors"; + this.EditUseColors.UseVisualStyleBackColor = true; + this.EditUseColors.CheckedChanged += new System.EventHandler(this.EditUseColors_CheckedChanged); + // + // EditSelectedDayBoxColorOnlyCurrent + // + resources.ApplyResources(this.EditSelectedDayBoxColorOnlyCurrent, "EditSelectedDayBoxColorOnlyCurrent"); + this.EditSelectedDayBoxColorOnlyCurrent.Name = "EditSelectedDayBoxColorOnlyCurrent"; + this.EditSelectedDayBoxColorOnlyCurrent.UseVisualStyleBackColor = true; + this.EditSelectedDayBoxColorOnlyCurrent.CheckedChanged += new System.EventHandler(this.EditMonthViewOptionChanged); + // // PanelCalendarColors // this.PanelCalendarColors.Controls.Add(this.ActionOpenTheme); @@ -2241,97 +2382,6 @@ private void InitializeComponent() this.EditCalendarColorTorahEvent.Name = "EditCalendarColorTorahEvent"; this.EditCalendarColorTorahEvent.Click += new System.EventHandler(this.EditCalendarColor_Click); // - // EditUseColors - // - resources.ApplyResources(this.EditUseColors, "EditUseColors"); - this.EditUseColors.Name = "EditUseColors"; - this.EditUseColors.UseVisualStyleBackColor = true; - this.EditUseColors.CheckedChanged += new System.EventHandler(this.EditUseColors_CheckedChanged); - // - // ActionMoonDayTextFormatHelp - // - this.ActionMoonDayTextFormatHelp.FlatAppearance.BorderSize = 0; - resources.ApplyResources(this.ActionMoonDayTextFormatHelp, "ActionMoonDayTextFormatHelp"); - this.ActionMoonDayTextFormatHelp.Name = "ActionMoonDayTextFormatHelp"; - this.ActionMoonDayTextFormatHelp.UseVisualStyleBackColor = true; - this.ActionMoonDayTextFormatHelp.Click += new System.EventHandler(this.ActionMoonDayTextFormatHelp_Click); - // - // EditCalendarShowParashah - // - resources.ApplyResources(this.EditCalendarShowParashah, "EditCalendarShowParashah"); - this.EditCalendarShowParashah.Name = "EditCalendarShowParashah"; - this.EditCalendarShowParashah.UseVisualStyleBackColor = true; - this.EditCalendarShowParashah.CheckedChanged += new System.EventHandler(this.EditMonthViewOptionChanged); - // - // EditSelectedDayBoxColorOnlyCurrent - // - resources.ApplyResources(this.EditSelectedDayBoxColorOnlyCurrent, "EditSelectedDayBoxColorOnlyCurrent"); - this.EditSelectedDayBoxColorOnlyCurrent.Name = "EditSelectedDayBoxColorOnlyCurrent"; - this.EditSelectedDayBoxColorOnlyCurrent.UseVisualStyleBackColor = true; - this.EditSelectedDayBoxColorOnlyCurrent.CheckedChanged += new System.EventHandler(this.EditMonthViewOptionChanged); - // - // EditCalendarShowSelectedBox - // - resources.ApplyResources(this.EditCalendarShowSelectedBox, "EditCalendarShowSelectedBox"); - this.EditCalendarShowSelectedBox.Name = "EditCalendarShowSelectedBox"; - this.EditCalendarShowSelectedBox.UseVisualStyleBackColor = true; - this.EditCalendarShowSelectedBox.CheckedChanged += new System.EventHandler(this.EditMonthViewOptionChanged); - // - // EditCalendarUseHoverEffect - // - resources.ApplyResources(this.EditCalendarUseHoverEffect, "EditCalendarUseHoverEffect"); - this.EditCalendarUseHoverEffect.Name = "EditCalendarUseHoverEffect"; - this.EditCalendarUseHoverEffect.UseVisualStyleBackColor = true; - this.EditCalendarUseHoverEffect.CheckedChanged += new System.EventHandler(this.EditMonthViewOptionChanged); - // - // EditMonthViewChangeDayOnClick - // - resources.ApplyResources(this.EditMonthViewChangeDayOnClick, "EditMonthViewChangeDayOnClick"); - this.EditMonthViewChangeDayOnClick.Name = "EditMonthViewChangeDayOnClick"; - this.EditMonthViewChangeDayOnClick.UseVisualStyleBackColor = true; - this.EditMonthViewChangeDayOnClick.CheckedChanged += new System.EventHandler(this.EditMonthViewOptionChanged); - // - // LabelMonthViewFontSize - // - resources.ApplyResources(this.LabelMonthViewFontSize, "LabelMonthViewFontSize"); - this.LabelMonthViewFontSize.Name = "LabelMonthViewFontSize"; - // - // EditCalendarLineSpacing - // - this.EditCalendarLineSpacing.BackColor = System.Drawing.SystemColors.Window; - resources.ApplyResources(this.EditCalendarLineSpacing, "EditCalendarLineSpacing"); - this.EditCalendarLineSpacing.Name = "EditCalendarLineSpacing"; - this.EditCalendarLineSpacing.ReadOnly = true; - this.EditCalendarLineSpacing.ValueChanged += new System.EventHandler(this.EditMonthViewOptionChanged); - // - // EditMonthViewFontSize - // - this.EditMonthViewFontSize.BackColor = System.Drawing.SystemColors.Window; - resources.ApplyResources(this.EditMonthViewFontSize, "EditMonthViewFontSize"); - this.EditMonthViewFontSize.Maximum = new decimal(new int[] { - 30, - 0, - 0, - 0}); - this.EditMonthViewFontSize.Minimum = new decimal(new int[] { - 6, - 0, - 0, - 0}); - this.EditMonthViewFontSize.Name = "EditMonthViewFontSize"; - this.EditMonthViewFontSize.ReadOnly = true; - this.EditMonthViewFontSize.Value = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.EditMonthViewFontSize.ValueChanged += new System.EventHandler(this.EditMonthViewFontSize_ValueChanged); - // - // LabelCalendarLineSpacing - // - resources.ApplyResources(this.LabelCalendarLineSpacing, "LabelCalendarLineSpacing"); - this.LabelCalendarLineSpacing.Name = "LabelCalendarLineSpacing"; - // // TabPageTextReport // this.TabPageTextReport.BackColor = System.Drawing.SystemColors.Window; @@ -2751,46 +2801,6 @@ private void InitializeComponent() this.ActionSelectHebrewLettersPath.UseVisualStyleBackColor = true; this.ActionSelectHebrewLettersPath.Click += new System.EventHandler(this.ActionSelectHebrewLettersPath_Click); // - // EditGPSLatitude - // - this.EditGPSLatitude.CaretAfterPaste = Ordisoftware.Core.CaretPositionAfterPaste.Ending; - resources.ApplyResources(this.EditGPSLatitude, "EditGPSLatitude"); - this.EditGPSLatitude.Name = "EditGPSLatitude"; - this.EditGPSLatitude.ReadOnly = true; - this.EditGPSLatitude.TabStop = false; - // - // EditTimeZone - // - this.EditTimeZone.CaretAfterPaste = Ordisoftware.Core.CaretPositionAfterPaste.Ending; - resources.ApplyResources(this.EditTimeZone, "EditTimeZone"); - this.EditTimeZone.Name = "EditTimeZone"; - this.EditTimeZone.ReadOnly = true; - this.EditTimeZone.TabStop = false; - // - // EditGPSLongitude - // - this.EditGPSLongitude.CaretAfterPaste = Ordisoftware.Core.CaretPositionAfterPaste.Ending; - resources.ApplyResources(this.EditGPSLongitude, "EditGPSLongitude"); - this.EditGPSLongitude.Name = "EditGPSLongitude"; - this.EditGPSLongitude.ReadOnly = true; - this.EditGPSLongitude.TabStop = false; - // - // EditAutoGenerateYearsInterval - // - this.EditAutoGenerateYearsInterval.CaretAfterPaste = Ordisoftware.Core.CaretPositionAfterPaste.Ending; - resources.ApplyResources(this.EditAutoGenerateYearsInterval, "EditAutoGenerateYearsInterval"); - this.EditAutoGenerateYearsInterval.Name = "EditAutoGenerateYearsInterval"; - this.EditAutoGenerateYearsInterval.ReadOnly = true; - this.EditAutoGenerateYearsInterval.TabStop = false; - // - // EditMoonDayTextFormat - // - this.EditMoonDayTextFormat.BackColor = System.Drawing.SystemColors.Window; - this.EditMoonDayTextFormat.CaretAfterPaste = Ordisoftware.Core.CaretPositionAfterPaste.Ending; - resources.ApplyResources(this.EditMoonDayTextFormat, "EditMoonDayTextFormat"); - this.EditMoonDayTextFormat.Name = "EditMoonDayTextFormat"; - this.EditMoonDayTextFormat.TextChanged += new System.EventHandler(this.EditMoonDayTextFormat_TextChanged); - // // EditHebrewWordsPath // this.EditHebrewWordsPath.BackColor = System.Drawing.SystemColors.Control; @@ -2885,10 +2895,12 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.EditRemindCelebrationsDaysBefore)).EndInit(); this.TabPageMonthView.ResumeLayout(false); this.TabPageMonthView.PerformLayout(); - this.PanelCalendarColors.ResumeLayout(false); - this.PanelCalendarColors.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.EditCalendarLineSpacing)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.EditMonthViewFontSize)).EndInit(); + this.TabPageColors.ResumeLayout(false); + this.TabPageColors.PerformLayout(); + this.PanelCalendarColors.ResumeLayout(false); + this.PanelCalendarColors.PerformLayout(); this.TabPageTextReport.ResumeLayout(false); this.TabPageTextReport.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.EditTextReportFontSize)).EndInit(); @@ -3209,5 +3221,6 @@ private void InitializeComponent() private System.Windows.Forms.RadioButton SelectCalendarDoubleClickActionSelect; private System.Windows.Forms.RadioButton SelectCalendarDoubleClickActionNothing; private System.Windows.Forms.RadioButton SelectCalendarDoubleClickActionSetActive; + private System.Windows.Forms.TabPage TabPageColors; } } diff --git a/Project/Source/Forms/Config/PreferencesForm.fr.resx b/Project/Source/Forms/Config/PreferencesForm.fr.resx index d05194e35..e8d1689e3 100644 --- a/Project/Source/Forms/Config/PreferencesForm.fr.resx +++ b/Project/Source/Forms/Config/PreferencesForm.fr.resx @@ -898,4 +898,7 @@ Préférences + + Couleurs + \ No newline at end of file diff --git a/Project/Source/Forms/Config/PreferencesForm.resx b/Project/Source/Forms/Config/PreferencesForm.resx index 51923081e..1b996cd8b 100644 --- a/Project/Source/Forms/Config/PreferencesForm.resx +++ b/Project/Source/Forms/Config/PreferencesForm.resx @@ -2081,7 +2081,7 @@ NoControl - 23, 220 + 23, 215 122, 17 @@ -2114,7 +2114,7 @@ NoControl - 23, 176 + 23, 175 116, 17 @@ -2210,7 +2210,7 @@ NoControl - 23, 198 + 23, 195 115, 17 @@ -2390,7 +2390,7 @@ 4 - 23, 255 + 23, 250 485, 97 @@ -3552,7 +3552,7 @@ EditGPSLatitude - Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.3.0.0, Culture=neutral, PublicKeyToken=null + Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.5.0.0, Culture=neutral, PublicKeyToken=null TabPageGeneration @@ -3582,7 +3582,7 @@ EditTimeZone - Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.3.0.0, Culture=neutral, PublicKeyToken=null + Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.5.0.0, Culture=neutral, PublicKeyToken=null TabPageGeneration @@ -3606,7 +3606,7 @@ EditGPSLongitude - Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.3.0.0, Culture=neutral, PublicKeyToken=null + Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.5.0.0, Culture=neutral, PublicKeyToken=null TabPageGeneration @@ -3633,7 +3633,7 @@ EditAutoGenerateYearsInterval - Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.3.0.0, Culture=neutral, PublicKeyToken=null + Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.5.0.0, Culture=neutral, PublicKeyToken=null TabPageGeneration @@ -5076,7 +5076,7 @@ NoControl - 442, 91 + 20, 110 98, 13 @@ -5109,13 +5109,13 @@ NoControl - 445, 150 + 23, 170 75, 17 - 53 + 6 Select day @@ -5142,13 +5142,13 @@ NoControl - 445, 110 + 23, 130 62, 17 - 51 + 4 Nothing @@ -5175,13 +5175,13 @@ NoControl - 445, 130 + 23, 150 93, 17 - 52 + 5 Set active day @@ -5208,7 +5208,7 @@ NoControl - 411, 43 + 66, 228 28, 13 @@ -5238,7 +5238,7 @@ NoControl - 20, 20 + 20, 320 106, 13 @@ -5283,13 +5283,13 @@ NoControl - 294, 36 + 354, 335 26, 26 - 1 + 10 ActionMoonDayTextFormatReset @@ -5313,7 +5313,7 @@ NoControl - 516, 43 + 66, 283 28, 13 @@ -5336,1631 +5336,1640 @@ 7 - + Flat - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAgxJREFUOE/F0t9LU2EYB/DzF/ivNCh1/drWHHUV3XVVlheWOsVKrSCDkHlTy8rp - Vqxd2IUXSdCFF5pl3Rk159lpv2drIA1rILq1uZ2z9e37njNaBBJB0Asf9nLG8zzv87yv9P+X8tD+XJ46 - irXJQzqxl73HlMbff14iALV1YDdhUNNYnWhF6MHBn0mbDusFwj57vBEuSeIjdqOohs+jInehnp8Hykmg - kjJU00zKAoJGyEKetkDxH9/fTFB+h2q0l/rJqe9V0uJ9UCM92FnpREF4exaVjXn9FCv3rL2NBEeA4hto - qcvQ0sOopUcM61ehpoYQeezAe3c7tSHobkXw7gGE7pv1JIqvI88EnMG3RQYPoRB0orjaj2JIGGDwCXx5 - cdpopRynGEX1llmFSSzgEC3A9hxiAVGprelOO74un4GWHIQa62NbPahGLtIF1DJjKGefYsllXpTkaRtK - 8dtIzDiA+kcOi9V4E1AzbGOYW9HKCHEvJK8AmzPIvR5FYNDUKYW9dmwuO5F7NQAUllDPsP/MNbqO2qcb - dPMXo6hnb/HEz/AhcBIcYQsfUgeSs6dQSk0AW0/w/fMYuQy58d+4gLwXpYQbL8fNC/otKI8cHIaVdzzH - 2/ADO5Pk2VtlFhsL3fBfMp3TE8g+R0GcQp6y8aVZENJZ97Tm4a/Hts3QFj0Bl4nEq/ob++hfLEn6ARk1 - G0tPEW/pAAAAAElFTkSuQmCC + vAAADrwBlbxySQAAAkVJREFUOE99UN1LU2Ec3l9gw20XBtlNd3nRF12l3YiaJdH6WkcbI0QrQ6G8kEwL + KyhBo2yWtvIjSS3PmbuyLkpFBmNuprm1ndVsiEle2FVQXj29z7vj7It+8ON3nk94j+nPsVZobrND+252 + qNgklpeYvGH599icWtFmpw+ujhA8E4sYnVmBN7wiLzF56vQZkY0hmXdhDL1TS2h7lUJJexhb6ydgqx2X + l5g8dfr+KskRzdr0F1T3xbCtYQpXvR/w6xCTp04f/UY0/ebGZ1HUDenYcz2AvGa/DE3qq9hSP4nx+KrE + 25v8UqeP/sw/yVZGfnS+WUL+7RAKxO69EZSBsnuz2HEtgKOdcxLvaglInT76mZMFFkVDg3cBRe0zKL7z + FoVtYexvNcpuBhH5/E0W7LsVkh4u/czJAmu5hnODCZS532X2YMccCkXZ69hXGa4e0FF8dxaH7qd1+pmT + BbZyL5SeGI53R3CsK732hxEcECWcy6NJlIpv+4N5qdFHP3NGgbbm8ERR0atDeRKT63gcg70rilL3PA6L + spOe9xmNPvqZkwUW+6PhghY/qgY/4szTBFz9Opx9cZwQIQ4vMXnq9NHPnCwQk8v3OHviqBn5hLPDSVQK + 0+n+hCzgJSZPnT7j/bnpuBhz/sWaHJcPlQMJXPItok5L4fyLBVQNJeUlJk+dPvqNaGaySFoUFSWtQdSq + KVx5uYzGsWV5iclTN8JZ6djvQ3K35Uj3c6uirmWfUrG+xOSpG77/Dt+2UyzN60u88ebMmEw/AdDTBeRn + kM5gAAAAAElFTkSuQmCC - + NoControl - - 482, 190 + + 384, 335 - + 26, 26 - - 20 + + 11 - - ActionOpenTheme + + ActionMoonDayTextFormatHelp - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - PanelCalendarColors + + TabPageMonthView - - 0 + + 8 - - Flat + + True - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAoNJREFUOE+Nkl1IU2EYx89FRNFFUCsUuvem6CLooqsGCaLdhBdRdwZBUEFe2ZZ9 - 2EUWRRclJZruw6igiDB0N96EIWipfTg3peS4Nbfp5na2ec7Ox/bveZ5GeCHUC/+9z/b8fs97OO+Uuq5Q - p6srhN03RrCrcwQ7/xFmmGWHXWUfFdMZYDzp4H8Xs+ywq+y5NYqvmQqUO4vSjCY0SgERynw8j3Ash8gv - DfOceE4YZtlhVwZMpKtQ3O3S9Ho88Hq9CASC8Pl8WMro6OjooO8B+H2DwijuK+LIgL1doxiLO9jW1g/T - qSC1UUGyVEWiYFOc2m4jrllIaCYMi9k+cdhVXDTl3Y8yDvSqKNs2rl31IOgPYlV34KF6KDCEgM+PdMmC - f2AAumkKyw67MuBlVEfDM5UezkbRdpAzHayXbeTpNM66aSNbNqGZFqpVCw39qjh/BtBj+OdKOBpYRmip - QEMcVGiQQ+F9c/gAZphlh126xlH0fSmi8VUCx1/EqRnD4cEYDg0s42AtXPNv3GOGWXbYlQE9M0WceruC - ltcJPJ9c4Re9aVUpFdm51/ImISw7MmA/fTz8XMTZ4RQ1kgQ6iKgZLNK9L9J/Iqxm8f3nKsJLaerZwjDL - Drsy4N4nDedCaZweTsKml1UwKvDc7Ib7RDPVVUTj61iIZWEbZWJSwrLzd0D3VBGXx7JoC63B2CjTSYC7 - sRl3H/RIraY0qMk8jJIhDLPsyIC62yHcn9ZxfaKA9g95OsUSqanpJB497pV6NWdgLafD0k1hmGWHXcV1 - 6ekTLvhOt3vf49tsBJMzUZy/cLFVOXamdWZ2AeNTYXycmqPevDDMikOuQquecmSL7Khlq14tSv1vbU/x - i7m5HQgAAAAASUVORK5CYII= - + + Microsoft Sans Serif, 8.25pt - + NoControl - - 512, 190 + + 23, 20 - - 26, 26 + + 111, 17 - - 21 + + 0 - - ActionSaveTheme + + Indicate parashah - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + EditCalendarShowParashah - - PanelCalendarColors + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + TabPageMonthView - + + 9 + + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 17, 150 - - - 62, 13 - - - 47 + + 23, 60 - - Torah back + + 136, 17 - - label1 + + 2 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Show selected day box - - PanelCalendarColors + + EditCalendarShowSelectedBox - - 2 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Microsoft Sans Serif, 8.25pt + + TabPageMonthView - - 21, 166 + + 10 - - 25, 25 + + True - - 13 + + Microsoft Sans Serif, 8.25pt - - EditEventColorTorah + + NoControl - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 23, 40 - - PanelCalendarColors + + 105, 17 - - 3 + + 1 - - Microsoft Sans Serif, 8.25pt + + Use hover effect - - 221, 166 + + EditCalendarUseHoverEffect - - 25, 25 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 15 + + TabPageMonthView - - EditEventColorShabat + + 11 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - PanelCalendarColors + + Microsoft Sans Serif, 8.25pt - - 4 + + NoControl - - Microsoft Sans Serif, 8.25pt + + 23, 80 - - 121, 166 + + 123, 17 - - 25, 25 + + 3 - - 14 + + Change day on click - - EditEventColorSeason + + EditMonthViewChangeDayOnClick - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - PanelCalendarColors + + TabPageMonthView - - 5 + + 12 - + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 217, 3 + + 20, 205 - - 73, 13 + + 49, 13 - - 52 + + 3 - - No days back + + Font size - - LabelColorNoDay + + LabelMonthViewFontSize - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - PanelCalendarColors + + TabPageMonthView - - 6 + + 13 - + Microsoft Sans Serif, 8.25pt - - 422, 166 + + 23, 279 - - 25, 25 + + 37, 20 - - 17 + + 8 - - EditEventColorNext + + EditCalendarLineSpacing - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - PanelCalendarColors + + TabPageMonthView - + + 14 + + + Microsoft Sans Serif, 8.25pt + + + 23, 224 + + + 37, 20 + + 7 - + + EditMonthViewFontSize + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPageMonthView + + + 15 + + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 317, 150 + + 20, 260 - - 88, 13 + + 67, 13 - - 47 + + 5 - - New month back + + Line spacing - - label5 + + LabelCalendarLineSpacing - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - PanelCalendarColors + + TabPageMonthView - - 8 + + 16 - + Microsoft Sans Serif, 8.25pt - - 320, 166 - - - 25, 25 - - - 16 + + 23, 339 - - EditEventColorMonth + + 320, 20 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 9 - - PanelCalendarColors + + EditMoonDayTextFormat - - 9 + + Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.5.0.0, Culture=neutral, PublicKeyToken=null - - True + + TabPageMonthView - - Microsoft Sans Serif, 8.25pt + + 17 - - NoControl + + 4, 49 - - 417, 150 + + 3, 3, 3, 3 - - 94, 13 + + 571, 395 - - 47 + + 2 - - Future event back + + Month view - - label4 + + TabPageMonthView - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - PanelCalendarColors + + TabControl - - 10 + + 8 - + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 117, 199 + + 23, 20 - - 62, 13 + + 230, 17 - - 19 + + 0 - - Dark theme + + Use colors for calendar and reminder boxes - - ActionMonthViewThemeDark + + EditUseColors - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - PanelCalendarColors + + TabPageColors - - 11 + + 0 - + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 17, 3 - - - 61, 13 + + 23, 40 - - 52 + + 220, 17 - - Default text + + 1 - - LabelColorText + + Use selected day box color only for today - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + TopLeft - - PanelCalendarColors + + EditSelectedDayBoxColorOnlyCurrent - - 12 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + TabPageColors - - Microsoft Sans Serif, 8.25pt + + 1 - - NoControl + + Flat - - 17, 199 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAgxJREFUOE/F0t9LU2EYB/DzF/ivNCh1/drWHHUV3XVVlheWOsVKrSCDkHlTy8rp + Vqxd2IUXSdCFF5pl3Rk159lpv2drIA1rILq1uZ2z9e37njNaBBJB0Asf9nLG8zzv87yv9P+X8tD+XJ46 + irXJQzqxl73HlMbff14iALV1YDdhUNNYnWhF6MHBn0mbDusFwj57vBEuSeIjdqOohs+jInehnp8Hykmg + kjJU00zKAoJGyEKetkDxH9/fTFB+h2q0l/rJqe9V0uJ9UCM92FnpREF4exaVjXn9FCv3rL2NBEeA4hto + qcvQ0sOopUcM61ehpoYQeezAe3c7tSHobkXw7gGE7pv1JIqvI88EnMG3RQYPoRB0orjaj2JIGGDwCXx5 + cdpopRynGEX1llmFSSzgEC3A9hxiAVGprelOO74un4GWHIQa62NbPahGLtIF1DJjKGefYsllXpTkaRtK + 8dtIzDiA+kcOi9V4E1AzbGOYW9HKCHEvJK8AmzPIvR5FYNDUKYW9dmwuO5F7NQAUllDPsP/MNbqO2qcb + dPMXo6hnb/HEz/AhcBIcYQsfUgeSs6dQSk0AW0/w/fMYuQy58d+4gLwXpYQbL8fNC/otKI8cHIaVdzzH + 2/ADO5Pk2VtlFhsL3fBfMp3TE8g+R0GcQp6y8aVZENJZ97Tm4a/Hts3QFj0Bl4nEq/ob++hfLEn6ARk1 + G0tPEW/pAAAAAElFTkSuQmCC + - - 62, 13 + + NoControl - - 18 + + 471, 283 - - Light theme + + 26, 26 - - ActionMonthViewThemeLight + + 20 - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ActionOpenTheme - + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + PanelCalendarColors - - 13 + + 0 - - True + + Flat - - Microsoft Sans Serif, 8.25pt + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAoNJREFUOE+Nkl1IU2EYx89FRNFFUCsUuvem6CLooqsGCaLdhBdRdwZBUEFe2ZZ9 + 2EUWRRclJZruw6igiDB0N96EIWipfTg3peS4Nbfp5na2ec7Ox/bveZ5GeCHUC/+9z/b8fs97OO+Uuq5Q + p6srhN03RrCrcwQ7/xFmmGWHXWUfFdMZYDzp4H8Xs+ywq+y5NYqvmQqUO4vSjCY0SgERynw8j3Ash8gv + DfOceE4YZtlhVwZMpKtQ3O3S9Ho88Hq9CASC8Pl8WMro6OjooO8B+H2DwijuK+LIgL1doxiLO9jW1g/T + qSC1UUGyVEWiYFOc2m4jrllIaCYMi9k+cdhVXDTl3Y8yDvSqKNs2rl31IOgPYlV34KF6KDCEgM+PdMmC + f2AAumkKyw67MuBlVEfDM5UezkbRdpAzHayXbeTpNM66aSNbNqGZFqpVCw39qjh/BtBj+OdKOBpYRmip + QEMcVGiQQ+F9c/gAZphlh126xlH0fSmi8VUCx1/EqRnD4cEYDg0s42AtXPNv3GOGWXbYlQE9M0WceruC + ltcJPJ9c4Re9aVUpFdm51/ImISw7MmA/fTz8XMTZ4RQ1kgQ6iKgZLNK9L9J/Iqxm8f3nKsJLaerZwjDL + Drsy4N4nDedCaZweTsKml1UwKvDc7Ib7RDPVVUTj61iIZWEbZWJSwrLzd0D3VBGXx7JoC63B2CjTSYC7 + sRl3H/RIraY0qMk8jJIhDLPsyIC62yHcn9ZxfaKA9g95OsUSqanpJB497pV6NWdgLafD0k1hmGWHXcV1 + 6ekTLvhOt3vf49tsBJMzUZy/cLFVOXamdWZ2AeNTYXycmqPevDDMikOuQquecmSL7Khlq14tSv1vbU/x + i7m5HQgAAAAASUVORK5CYII= + - + NoControl - - 117, 150 - - - 70, 13 + + 501, 283 - - 47 + + 26, 26 - - Season back + + 21 - - label3 + + ActionSaveTheme - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 14 + + 1 - + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 217, 150 + + 17, 185 - - 68, 13 + + 62, 13 - + 47 - - Shabat back + + Torah back - - label2 + + label1 - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 15 + + 2 - + Microsoft Sans Serif, 8.25pt - - 20, 68 + + 21, 203 - + 25, 25 - - 3 + + 13 - - EditCurrentDayForeColor + + EditEventColorTorah - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 16 + + 3 - + Microsoft Sans Serif, 8.25pt - - 220, 19 + + 221, 203 - + 25, 25 - - 2 + + 15 - - EditMonthViewNoDaysBackColor + + EditEventColorShabat - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 17 + + 4 - + Microsoft Sans Serif, 8.25pt - - 220, 117 + + 121, 203 - + 25, 25 - - 10 + + 14 - - EditCalendarColorMoon + + EditEventColorSeason - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 18 + + 5 - + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 17, 52 + + 217, 5 - - 57, 13 + + 73, 13 - - 47 + + 52 - - Today text + + No days back - - LabelColorToday + + LabelColorNoDay - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 19 - - - True + + 6 - + Microsoft Sans Serif, 8.25pt - - NoControl - - - 217, 101 - - - 53, 13 + + 422, 203 - - 47 + + 25, 25 - - Moon rise + + 17 - - LabelColorMoon + + EditEventColorNext - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 20 + + 7 - + + True + + Microsoft Sans Serif, 8.25pt - - 20, 19 + + NoControl - + + 317, 185 + + + 88, 13 + + + 47 + + + New month back + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PanelCalendarColors + + + 8 + + + Microsoft Sans Serif, 8.25pt + + + 320, 203 + + 25, 25 - - 0 + + 16 - - EditMonthViewTextColor + + EditEventColorMonth - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 21 + + 9 - + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 417, 101 + + 417, 185 - - 87, 13 + + 94, 13 - + 47 - - Parashah portion + + Future event back - - LabelColorParashah + + label4 - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 22 + + 10 - + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 117, 101 + + 18, 275 - - 73, 13 + + 62, 13 - - 47 + + 19 - - Season event + + Dark theme - - LabelColorSeason + + ActionMonthViewThemeDark - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 23 + + 11 - + + True + + Microsoft Sans Serif, 8.25pt - - 320, 117 + + NoControl - - 25, 25 + + 17, 5 - - 11 + + 61, 13 - - EditCalendarColorFullMoon + + 52 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Default text - + + LabelColorText + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + PanelCalendarColors - - 24 + + 12 - + + True + + Microsoft Sans Serif, 8.25pt - - 422, 117 + + NoControl - - 25, 25 + + 17, 250 - - 12 + + 62, 13 - - EditCalendarColorParashah + + 18 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Light theme - + + ActionMonthViewThemeLight + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + PanelCalendarColors - - 25 + + 13 - + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 117, 3 + + 117, 185 - - 68, 13 + + 70, 13 - - 53 + + 47 - - Default back + + Season back - - LabelColorEmpty + + label3 - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 26 + + 14 - + + True + + Microsoft Sans Serif, 8.25pt - - 120, 117 + + NoControl - - 25, 25 + + 217, 185 - - 9 + + 68, 13 - - EditCalendarColorSeason + + 47 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Shabat back - - PanelCalendarColors + + label2 - - 27 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Microsoft Sans Serif, 8.25pt + + PanelCalendarColors - - 120, 68 + + 15 - + + Microsoft Sans Serif, 8.25pt + + + 20, 83 + + 25, 25 - - 4 + + 3 - - EditCurrentDayBackColor + + EditCurrentDayForeColor - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 28 - - - True + + 16 - + Microsoft Sans Serif, 8.25pt - - NoControl - - - 317, 101 - - - 52, 13 + + 220, 23 - - 49 + + 25, 25 - - Full moon + + 2 - - LabelColorFullMoon + + EditMonthViewNoDaysBackColor - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 29 + + 17 - + Microsoft Sans Serif, 8.25pt - - 120, 19 + + 220, 143 - + 25, 25 - - 1 + + 10 - - EditMonthViewBackColor + + EditCalendarColorMoon - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 30 + + 18 - + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 17, 101 + + 17, 65 - - 65, 13 + + 57, 13 - + 47 - - Torah event + + Today text - - LabelColorTorah + + LabelColorToday - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 31 + + 19 - + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 317, 52 + + 217, 125 - - 57, 13 + + 53, 13 - + 47 - - Active day + + Moon rise - - LabelCalendarColorActiveDay + + LabelColorMoon - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 32 - - - True + + 20 - + Microsoft Sans Serif, 8.25pt - - NoControl - - - 417, 52 - - - 69, 13 + + 20, 23 - - 47 + + 25, 25 - - Mouse hover + + 0 - - LabelColorHoverEffect + + EditMonthViewTextColor - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 33 + + 21 - + + True + + Microsoft Sans Serif, 8.25pt - - 320, 68 + + NoControl - - 25, 25 + + 417, 125 - - 6 + + 87, 13 - - EditCalendarColorActiveDay + + 47 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Parashah portion - + + LabelColorParashah + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + PanelCalendarColors - - 34 + + 22 - + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 217, 52 + + 117, 125 - - 69, 13 + + 73, 13 - + 47 - - Selected day + + Season event - - LabelColorSelectedDayBox + + LabelColorSeason - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 35 + + 23 - + Microsoft Sans Serif, 8.25pt - - 420, 68 + + 320, 143 - + 25, 25 - - 7 + + 11 - - EditCalendarColorHoverEffect + + EditCalendarColorFullMoon - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 36 - - - True + + 24 - + Microsoft Sans Serif, 8.25pt - - NoControl - - - 117, 52 - - - 64, 13 + + 422, 143 - - 47 + + 25, 25 - - Today back + + 12 - - LabelColorTodayBack + + EditCalendarColorParashah - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 37 + + 25 - + + True + + Microsoft Sans Serif, 8.25pt - - 220, 68 + + NoControl - - 25, 25 + + 117, 5 - - 5 + + 68, 13 - - EditSelectedDayBoxColor + + 53 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Default back - + + LabelColorEmpty + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + PanelCalendarColors - - 38 + + 26 - + Microsoft Sans Serif, 8.25pt - - 20, 117 + + 120, 143 - + 25, 25 - - 8 + + 9 - - EditCalendarColorTorahEvent + + EditCalendarColorSeason - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + PanelCalendarColors - - 39 + + 27 - - 23, 170 + + Microsoft Sans Serif, 8.25pt - - 540, 220 + + 120, 83 - - 48 + + 25, 25 - - PanelCalendarColors + + 4 - + + EditCurrentDayBackColor + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPageMonthView + + PanelCalendarColors - - 8 + + 28 - + True - + Microsoft Sans Serif, 8.25pt - - NoControl - - - 23, 150 - - - 230, 17 - - - 10 - - - Use colors for calendar and reminder boxes - - - EditUseColors - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPageMonthView - - - 9 - - - Flat - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAkVJREFUOE99UN1LU2Ec3l9gw20XBtlNd3nRF12l3YiaJdH6WkcbI0QrQ6G8kEwL - KyhBo2yWtvIjSS3PmbuyLkpFBmNuprm1ndVsiEle2FVQXj29z7vj7It+8ON3nk94j+nPsVZobrND+252 - qNgklpeYvGH599icWtFmpw+ujhA8E4sYnVmBN7wiLzF56vQZkY0hmXdhDL1TS2h7lUJJexhb6ydgqx2X - l5g8dfr+KskRzdr0F1T3xbCtYQpXvR/w6xCTp04f/UY0/ebGZ1HUDenYcz2AvGa/DE3qq9hSP4nx+KrE - 25v8UqeP/sw/yVZGfnS+WUL+7RAKxO69EZSBsnuz2HEtgKOdcxLvaglInT76mZMFFkVDg3cBRe0zKL7z - FoVtYexvNcpuBhH5/E0W7LsVkh4u/czJAmu5hnODCZS532X2YMccCkXZ69hXGa4e0FF8dxaH7qd1+pmT - BbZyL5SeGI53R3CsK732hxEcECWcy6NJlIpv+4N5qdFHP3NGgbbm8ERR0atDeRKT63gcg70rilL3PA6L - spOe9xmNPvqZkwUW+6PhghY/qgY/4szTBFz9Opx9cZwQIQ4vMXnq9NHPnCwQk8v3OHviqBn5hLPDSVQK - 0+n+hCzgJSZPnT7j/bnpuBhz/sWaHJcPlQMJXPItok5L4fyLBVQNJeUlJk+dPvqNaGaySFoUFSWtQdSq - KVx5uYzGsWV5iclTN8JZ6djvQ3K35Uj3c6uirmWfUrG+xOSpG77/Dt+2UyzN60u88ebMmEw/AdDTBeRn - kM5gAAAAAElFTkSuQmCC - - - + NoControl - - 324, 36 - - - 26, 26 + + 317, 125 - - 2 + + 52, 13 - - ActionMoonDayTextFormatHelp + + 49 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Full moon - - TabPageMonthView + + LabelColorFullMoon - - 10 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + PanelCalendarColors - - TopLeft + + 29 - + Microsoft Sans Serif, 8.25pt - - NoControl - - - 23, 65 - - - 111, 17 - - - 5 + + 120, 23 - - Indicate parashah + + 25, 25 - - TopLeft + + 1 - - EditCalendarShowParashah + + EditMonthViewBackColor - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPageMonthView + + PanelCalendarColors - - 11 + + 30 - + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 23, 133 - - - 220, 17 + + 17, 125 - - 9 + + 65, 13 - - Use selected day box color only for today + + 47 - - TopLeft + + Torah event - - EditSelectedDayBoxColorOnlyCurrent + + LabelColorTorah - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPageMonthView + + PanelCalendarColors - - 12 + + 31 - + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 23, 116 - - - 136, 17 + + 317, 65 - - 8 + + 57, 13 - - Show selected day box + + 47 - - TopLeft + + Active day - - EditCalendarShowSelectedBox + + LabelCalendarColorActiveDay - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPageMonthView + + PanelCalendarColors - - 13 + + 32 - + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 23, 82 - - - 105, 17 - - - 6 - - - Use hover effect - - - TopLeft - - - EditCalendarUseHoverEffect - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 417, 65 - - TabPageMonthView + + 69, 13 - - 14 + + 47 - - True + + Mouse hover - - TopLeft + + LabelColorHoverEffect - - Microsoft Sans Serif, 8.25pt + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl + + PanelCalendarColors - - 23, 99 + + 33 - - 123, 17 + + Microsoft Sans Serif, 8.25pt - - 7 + + 320, 83 - - Change day on click + + 25, 25 - - TopLeft + + 6 - - EditMonthViewChangeDayOnClick + + EditCalendarColorActiveDay - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPageMonthView + + PanelCalendarColors - - 15 + + 34 - + True - + Microsoft Sans Serif, 8.25pt - + NoControl - - 365, 20 + + 217, 65 - - 49, 13 + + 69, 13 - - 3 + + 47 - - Font size + + Selected day - - LabelMonthViewFontSize + + LabelColorSelectedDayBox - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPageMonthView + + PanelCalendarColors - - 16 + + 35 - + Microsoft Sans Serif, 8.25pt - - 473, 39 + + 420, 83 - - 37, 20 + + 25, 25 - - 4 + + 7 - - EditCalendarLineSpacing + + EditCalendarColorHoverEffect - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPageMonthView + + PanelCalendarColors - - 17 + + 36 - + + True + + Microsoft Sans Serif, 8.25pt - - 368, 39 + + NoControl - - 37, 20 + + 117, 65 - - 3 + + 64, 13 - - EditMonthViewFontSize + + 47 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Today back - - TabPageMonthView + + LabelColorTodayBack - - 18 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + PanelCalendarColors - - Microsoft Sans Serif, 8.25pt + + 37 - - NoControl + + Microsoft Sans Serif, 8.25pt - - 470, 20 + + 220, 83 - - 67, 13 + + 25, 25 - + 5 - - Line spacing - - - LabelCalendarLineSpacing + + EditSelectedDayBoxColor - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPageMonthView + + PanelCalendarColors - - 19 + + 38 - + Microsoft Sans Serif, 8.25pt - - 23, 39 + + 20, 143 - - 265, 20 + + 25, 25 - - 0 + + 8 - - EditMoonDayTextFormat + + EditCalendarColorTorahEvent - - Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.3.0.0, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPageMonthView + + PanelCalendarColors - - 20 + + 39 - + + 23, 65 + + + 540, 320 + + + 48 + + + PanelCalendarColors + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPageColors + + + 2 + + 4, 49 - + 3, 3, 3, 3 - + 571, 395 - - 2 + + 13 - - Month view + + Colors - - TabPageMonthView + + TabPageColors - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TabControl - - 8 + + 9 True @@ -7248,7 +7257,7 @@ TabControl - 9 + 10 23, 344 @@ -7803,7 +7812,7 @@ TabControl - 10 + 11 Flat @@ -8602,7 +8611,7 @@ EditHebrewWordsPath - Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.3.0.0, Culture=neutral, PublicKeyToken=null + Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.5.0.0, Culture=neutral, PublicKeyToken=null TabPagePaths @@ -8623,7 +8632,7 @@ EditWeatherAppPath - Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.3.0.0, Culture=neutral, PublicKeyToken=null + Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.5.0.0, Culture=neutral, PublicKeyToken=null TabPagePaths @@ -8644,7 +8653,7 @@ EditExportFolder - Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.3.0.0, Culture=neutral, PublicKeyToken=null + Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.5.0.0, Culture=neutral, PublicKeyToken=null TabPagePaths @@ -8665,7 +8674,7 @@ EditCalculatorPath - Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.3.0.0, Culture=neutral, PublicKeyToken=null + Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.5.0.0, Culture=neutral, PublicKeyToken=null TabPagePaths @@ -8686,7 +8695,7 @@ EditHebrewLettersPath - Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.3.0.0, Culture=neutral, PublicKeyToken=null + Ordisoftware.Core.TextBoxEx, Ordisoftware.Hebrew.Calendar, Version=9.5.0.0, Culture=neutral, PublicKeyToken=null TabPagePaths @@ -8719,7 +8728,7 @@ TabControl - 11 + 12 Fill From 453a15146f059966feba8b38b16cd0eb3aa0b2c8 Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 19:33:00 +0200 Subject: [PATCH 16/19] Update text --- Project/Source/Program/Translations/AppTranslations.Keys.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Project/Source/Program/Translations/AppTranslations.Keys.cs b/Project/Source/Program/Translations/AppTranslations.Keys.cs index e49a2e93f..cdd5f38d6 100644 --- a/Project/Source/Program/Translations/AppTranslations.Keys.cs +++ b/Project/Source/Program/Translations/AppTranslations.Keys.cs @@ -143,8 +143,8 @@ static public readonly TranslationsDictionary NoticeKeyboardShortcuts "Maj + Gauche : Jour précédent" + Globals.NL + "Maj + Droite : Jour suivant" + Globals.NL + "Plus ou Moins : Changer de jour actif" + Globals.NL + - "Maj + Click : Définir jour actif" + Globals.NL + - "Ctrl + Click : Selectionner jour" + Globals.NL + + "Maj + Clic : Définir jour actif" + Globals.NL + + "Ctrl + Clic : Selectionner jour" + Globals.NL + "F9 : Préférences" + Globals.NL + "F10 : Fenêtre du fichier log" + Globals.NL + "F11 : Fenêtre des statistiques d'utilisation" + Globals.NL + From 62fb137aa0352a4d1f2b56e94e6c1436b039d771 Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 19:38:37 +0200 Subject: [PATCH 17/19] Update text --- Project/Source/Program/Translations/AppTranslations.News.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Project/Source/Program/Translations/AppTranslations.News.cs b/Project/Source/Program/Translations/AppTranslations.News.cs index da12ef002..f5c263e90 100644 --- a/Project/Source/Program/Translations/AppTranslations.News.cs +++ b/Project/Source/Program/Translations/AppTranslations.News.cs @@ -43,12 +43,12 @@ static public readonly NullSafeDictionary Notice { [Language.EN] = "• Improved interaction with monthly view." + Globals.NL + "• Improved day context menu to indicate the celebration." + Globals.NL + - "• Addd some parashah and celebrations online providers for the study in english and french." + Globals.NL + + "• Addd some parashah and celebrations online providers for the study." + Globals.NL + "• Updated web links.", [Language.FR] = "• Amélioration de l'interaction avec la vue mensuelle." + Globals.NL + "• Amélioration du menu contextuel du jour pour indiquer la célébration." + Globals.NL + - "• Ajout quelques fournisseurs en ligne de parashah et de célébrations pour l'étude en anglais et en français." + Globals.NL + + "• Ajout quelques fournisseurs en ligne pour l'étude de la parashah et des célébrations ." + Globals.NL + "• Mettre à jour les liens Web." }, From 866ef41281b02565d33c5dcda71242e7ccda5ac3 Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 19:38:57 +0200 Subject: [PATCH 18/19] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ba6d7e056..aa7c12aa2 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,7 @@ A libre and open-source software written in C# that allows to generate a calenda - Added option for double-click in visual month to set active or select. - Added some keyboard shortcuts to change and select day in monthly view. - Added celebration verses board and its command-line option. +- Added some parashah and celebrations online providers for the study. - Moved day of shabat selection to the generation tab of the preferences form. - Improved web links menus to display those in the current language to the top. - The monthly view shows sun times instead of moon when using sun omer. @@ -325,7 +326,7 @@ The generation of parashot relating to Shabatot is not guaranteed to be traditio - Improve interaction with monthly view. - Improve day context menu to indicate the celebration. -- Add some parashah and celebrations online providers for the study in english and french. +- Add some parashah and celebrations online providers for the study. - Update web links. #### 2021.09.24 - Version 9.4 From afa81cc60ef83395a544ad822c4eaa733e4f0fa0 Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 25 Sep 2021 19:39:32 +0200 Subject: [PATCH 19/19] Update text --- Project/Source/Program/Translations/AppTranslations.News.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project/Source/Program/Translations/AppTranslations.News.cs b/Project/Source/Program/Translations/AppTranslations.News.cs index f5c263e90..619467b3f 100644 --- a/Project/Source/Program/Translations/AppTranslations.News.cs +++ b/Project/Source/Program/Translations/AppTranslations.News.cs @@ -43,7 +43,7 @@ static public readonly NullSafeDictionary Notice { [Language.EN] = "• Improved interaction with monthly view." + Globals.NL + "• Improved day context menu to indicate the celebration." + Globals.NL + - "• Addd some parashah and celebrations online providers for the study." + Globals.NL + + "• Added some parashah and celebrations online providers for the study." + Globals.NL + "• Updated web links.", [Language.FR] = "• Amélioration de l'interaction avec la vue mensuelle." + Globals.NL +