diff --git a/Project/App.config b/Project/App.config index ce4c34d6c..c0a12d3ff 100644 --- a/Project/App.config +++ b/Project/App.config @@ -128,6 +128,24 @@ True + + Red + + + DarkRed + + + DarkGreen + + + DarkBlue + + + DarkGoldenrod + + + + diff --git a/Project/Dependencies/Calendar.NET/Calendar.cs b/Project/Dependencies/Calendar.NET/Calendar.cs index 3ffa82f14..3a2f101b8 100644 --- a/Project/Dependencies/Calendar.NET/Calendar.cs +++ b/Project/Dependencies/Calendar.NET/Calendar.cs @@ -71,6 +71,10 @@ public class Calendar : UserControl private const int MarginSize = 10; // ORDISOFTWARE MODIF END + // ORDISOFTWARE MODIF BEGIN + public Color CurrentDayColor = Color.Red; + // ORDISOFTWARE MODIF END + /// /// Indicates the font for the times on the day view /// @@ -979,7 +983,7 @@ private void RenderMonthCalendar(PaintEventArgs e) { //ORDISOFTWARE MODIF BEGIN //g.DrawString(counter.ToString(CultureInfo.InvariantCulture), _todayFont, Brushes.Black, xStart + 5, yStart + 2); - g.DrawString(counter.ToString(CultureInfo.InvariantCulture), _todayFont, Brushes.DarkRed, xStart + 5, yStart + 2); + g.DrawString(counter.ToString(CultureInfo.InvariantCulture), _todayFont, new SolidBrush(CurrentDayColor), xStart + 5, yStart + 2); //ORDISOFTWARE MODIF END } else diff --git a/Project/Hebrew Calendar (vs2017).csproj b/Project/Hebrew Calendar (vs2017).csproj index ad4e728e7..7dbd91e02 100644 --- a/Project/Hebrew Calendar (vs2017).csproj +++ b/Project/Hebrew Calendar (vs2017).csproj @@ -275,6 +275,9 @@ MainForm.cs + + PreferencesForm.cs + PreferencesForm.cs @@ -292,6 +295,7 @@ MainForm.cs + Designer PreferencesForm.cs diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 07f8936dd..3bcf9888f 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("1.9.0.0")] -[assembly: AssemblyFileVersion("1.9.0.0")] +[assembly: AssemblyVersion("1.10.0.0")] +[assembly: AssemblyFileVersion("1.10.0.0")] diff --git a/Project/Properties/Settings.Designer.cs b/Project/Properties/Settings.Designer.cs index d5f28fb39..a82e3e28b 100644 --- a/Project/Properties/Settings.Designer.cs +++ b/Project/Properties/Settings.Designer.cs @@ -500,5 +500,76 @@ public bool UpgradeRequired { this["UpgradeRequired"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Red")] + public global::System.Drawing.Color CurrentDayColor { + get { + return ((global::System.Drawing.Color)(this["CurrentDayColor"])); + } + set { + this["CurrentDayColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("DarkRed")] + public global::System.Drawing.Color TorahEventColor { + get { + return ((global::System.Drawing.Color)(this["TorahEventColor"])); + } + set { + this["TorahEventColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("DarkGreen")] + public global::System.Drawing.Color SeasonEventColor { + get { + return ((global::System.Drawing.Color)(this["SeasonEventColor"])); + } + set { + this["SeasonEventColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("DarkBlue")] + public global::System.Drawing.Color MoonEventColor { + get { + return ((global::System.Drawing.Color)(this["MoonEventColor"])); + } + set { + this["MoonEventColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("DarkGoldenrod")] + public global::System.Drawing.Color FullMoonColor { + get { + return ((global::System.Drawing.Color)(this["FullMoonColor"])); + } + set { + this["FullMoonColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Drawing.Color Paramètre { + get { + return ((global::System.Drawing.Color)(this["Paramètre"])); + } + set { + this["Paramètre"] = value; + } + } } } diff --git a/Project/Properties/Settings.settings b/Project/Properties/Settings.settings index 3875ffa6b..f5ae11287 100644 --- a/Project/Properties/Settings.settings +++ b/Project/Properties/Settings.settings @@ -127,5 +127,23 @@ True + + Red + + + DarkRed + + + DarkGreen + + + DarkBlue + + + DarkGoldenrod + + + + \ No newline at end of file diff --git a/Project/Source/Classes/Localizer.cs b/Project/Source/Classes/Localizer.cs index 563b094b0..4ef814c7f 100644 --- a/Project/Source/Classes/Localizer.cs +++ b/Project/Source/Classes/Localizer.cs @@ -258,6 +258,13 @@ static public readonly Dictionary ReplaceCalendarText "Voulez-vous continuer ?" } }; + static public readonly Dictionary NavigationDayText + = new Dictionary() + { + { "en", "Day #" }, + { "fr", "Jour #" } + }; + static public readonly Dictionary> MoonPhaseText = new Dictionary>() { diff --git a/Project/Source/Classes/SettingsHelper.cs b/Project/Source/Classes/SettingsHelper.cs index eaa108990..f9e20bff3 100644 --- a/Project/Source/Classes/SettingsHelper.cs +++ b/Project/Source/Classes/SettingsHelper.cs @@ -11,7 +11,7 @@ /// You may add additional accurate notices of copyright ownership. /// /// 2016-04 -/// 2016-04 +/// 2019-08 using System; using System.Windows.Forms; using Ordisoftware.HebrewCalendar.Properties; @@ -82,8 +82,13 @@ static internal void Retrieve(this Settings settings) PreferencesForm.Instance.PanelTopColor.BackColor = settings.NavigateTopColor; PreferencesForm.Instance.PanelMiddleColor.BackColor = settings.NavigateMiddleColor; PreferencesForm.Instance.PanelBottomColor.BackColor = settings.NavigateBottomColor; - PreferencesForm.Instance.PanelTextColor.BackColor = settings.TextColor; - PreferencesForm.Instance.PanelBackColor.BackColor = settings.TextBackground; + PreferencesForm.Instance.PanelTextColor2.BackColor = settings.TextColor; + PreferencesForm.Instance.PanelBackColor2.BackColor = settings.TextBackground; + PreferencesForm.Instance.PanelCurrentDayColor.BackColor = settings.CurrentDayColor; + PreferencesForm.Instance.PanelTorahEventColor.BackColor = settings.TorahEventColor; + PreferencesForm.Instance.PanelSeasonEventColor.BackColor = settings.SeasonEventColor; + PreferencesForm.Instance.PanelMoonEventColor.BackColor = settings.MoonEventColor; + PreferencesForm.Instance.PanelFullMoonColor.BackColor = settings.FullMoonColor; } /// @@ -113,8 +118,13 @@ static internal void Store(this Settings settings) settings.NavigateTopColor = PreferencesForm.Instance.PanelTopColor.BackColor; settings.NavigateMiddleColor = PreferencesForm.Instance.PanelMiddleColor.BackColor; settings.NavigateBottomColor = PreferencesForm.Instance.PanelBottomColor.BackColor; - settings.TextColor = PreferencesForm.Instance.PanelTextColor.BackColor; - settings.TextBackground = PreferencesForm.Instance.PanelBackColor.BackColor; + settings.TextColor = PreferencesForm.Instance.PanelTextColor2.BackColor; + settings.TextBackground = PreferencesForm.Instance.PanelBackColor2.BackColor; + settings.CurrentDayColor = PreferencesForm.Instance.PanelCurrentDayColor.BackColor; + settings.TorahEventColor = PreferencesForm.Instance.PanelTorahEventColor.BackColor; + settings.SeasonEventColor = PreferencesForm.Instance.PanelSeasonEventColor.BackColor; + settings.MoonEventColor = PreferencesForm.Instance.PanelMoonEventColor.BackColor; + settings.FullMoonColor = PreferencesForm.Instance.PanelFullMoonColor.BackColor; settings.Save(); } diff --git a/Project/Source/Forms/MainForm.Designer.cs b/Project/Source/Forms/MainForm.Designer.cs index f1b35f67e..25a43d647 100644 --- a/Project/Source/Forms/MainForm.Designer.cs +++ b/Project/Source/Forms/MainForm.Designer.cs @@ -1140,7 +1140,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem MenuAbout; internal System.Windows.Forms.ToolStripMenuItem MenuExit; private System.Windows.Forms.TabPage TabPageMonth; - private System.Windows.Forms.Panel PanelViewMonth; private System.Windows.Forms.ToolStripMenuItem ActionViewMonth; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; @@ -1155,12 +1154,13 @@ private void InitializeComponent() private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn13; - private Calendar.NET.Calendar CalendarMonth; private System.Windows.Forms.ToolStripButton ActionPrint; private System.Windows.Forms.PrintDialog PrintDialog; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.Timer TimerReminder; private System.Windows.Forms.ToolStripButton ActionCheckUpdate; + internal Calendar.NET.Calendar CalendarMonth; + internal System.Windows.Forms.Panel PanelViewMonth; } } diff --git a/Project/Source/Forms/MainForm.FillMonths.cs b/Project/Source/Forms/MainForm.FillMonths.cs index 6e05ac67b..f4bdc2b80 100644 --- a/Project/Source/Forms/MainForm.FillMonths.cs +++ b/Project/Source/Forms/MainForm.FillMonths.cs @@ -11,7 +11,7 @@ /// You may add additional accurate notices of copyright ownership. /// /// 2019-01 -/// 2019-01 +/// 2019-08 using System; using System.Drawing; using Calendar.NET; @@ -22,7 +22,7 @@ namespace Ordisoftware.HebrewCalendar public partial class MainForm { - private void FillMonths() + internal void FillMonths() { string strToolTip = "Error on getting sun rise and set"; int progress = 0; @@ -51,8 +51,8 @@ void add(Color color, string text) ? " " + Localizer.BabylonianHebrewMonthText[row.LunarMonth] : ""; colorMoon = row.IsNewMoon == 1 - ? Color.DarkRed - : ( row.IsFullMoon == 1 ? Color.DarkGoldenrod : Color.DarkBlue ); + ? Program.Settings.TorahEventColor + : ( row.IsFullMoon == 1 ? Program.Settings.FullMoonColor : Program.Settings.MoonEventColor ); if ( (MoonriseType)row.MoonriseType == MoonriseType.AfterSet ) { if ( row.Moonset != "" ) add(Color.Black, Localizer.EphemerisText.GetLang(EphemerisType.Set) + row.Moonset); @@ -66,9 +66,9 @@ void add(Color color, string text) if ( row.Moonset != "" ) add(Color.Black, Localizer.EphemerisText.GetLang(EphemerisType.Set) + row.Moonset); } if ( row.SeasonChange != 0 ) - add(Color.DarkGreen, Localizer.SeasonEventText.GetLang((SeasonChangeType)row.SeasonChange)); + add(Program.Settings.SeasonEventColor, Localizer.SeasonEventText.GetLang((SeasonChangeType)row.SeasonChange)); if ( row.TorahEvents != 0 ) - add(Color.DarkRed, Localizer.TorahEventText.GetLang((TorahEventType)row.TorahEvents)); + add(Program.Settings.TorahEventColor, Localizer.TorahEventText.GetLang((TorahEventType)row.TorahEvents)); } } diff --git a/Project/Source/Forms/MainForm.LoadData.cs b/Project/Source/Forms/MainForm.LoadData.cs index 056355d4b..6ff401844 100644 --- a/Project/Source/Forms/MainForm.LoadData.cs +++ b/Project/Source/Forms/MainForm.LoadData.cs @@ -27,7 +27,6 @@ public partial class MainForm private void LoadData() { - int progress = 0; void update(object tableSender, DataRowChangeEventArgs tableEvent) { @@ -35,6 +34,7 @@ void update(object tableSender, DataRowChangeEventArgs tableEvent) }; LunisolarCalendar.LunisolarDays.RowChanged += update; Cursor = Cursors.WaitCursor; + Enabled = false; try { SQLiteUtility.CreateDatabaseIfNotExists(); @@ -79,6 +79,7 @@ void update(object tableSender, DataRowChangeEventArgs tableEvent) } finally { + Enabled = true; Cursor = Cursors.Default; LunisolarCalendar.LunisolarDays.RowChanged -= update; SetView(Program.Settings.CurrentView, true); diff --git a/Project/Source/Forms/MainForm.Update.cs b/Project/Source/Forms/MainForm.Update.cs index 9bd25a391..c42216336 100644 --- a/Project/Source/Forms/MainForm.Update.cs +++ b/Project/Source/Forms/MainForm.Update.cs @@ -11,7 +11,7 @@ /// You may add additional accurate notices of copyright ownership. /// /// 2016-04 -/// 2016-04 +/// 2019-08 using System; using System.Drawing; using System.Windows.Forms; @@ -43,7 +43,7 @@ private bool UpdateProgress(int index, int count, string text) /// /// Update the buttons. /// - private void UpdateButtons() + internal void UpdateButtons() { try { diff --git a/Project/Source/Forms/MainForm.cs b/Project/Source/Forms/MainForm.cs index b51e6b1ee..d758b43d6 100644 --- a/Project/Source/Forms/MainForm.cs +++ b/Project/Source/Forms/MainForm.cs @@ -50,7 +50,7 @@ static MainForm() /// /// Indicate if generation is in progress. /// - private bool IsGenerating = false; + internal bool IsGenerating = false; /// /// Indicate if application can be closed. @@ -77,6 +77,7 @@ private MainForm() SystemEvents.SessionEnding += SessionEnding; CalendarText.ForeColor = Program.Settings.TextColor; CalendarText.BackColor = Program.Settings.TextBackground; + CalendarMonth.CurrentDayColor = Program.Settings.CurrentDayColor; CalendarMonth.CalendarDateChanged += (date) => { NavigationForm.Instance.Date = date; diff --git a/Project/Source/Forms/MainForm.resx b/Project/Source/Forms/MainForm.resx index 9e69cf008..acb8ee681 100644 --- a/Project/Source/Forms/MainForm.resx +++ b/Project/Source/Forms/MainForm.resx @@ -265,7 +265,7 @@ CalendarMonth - Calendar.NET.Calendar, Ordisoftware.HebrewCalendar, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null + Calendar.NET.Calendar, Ordisoftware.HebrewCalendar, Version=1.10.0.0, Culture=neutral, PublicKeyToken=null PanelViewMonth @@ -1244,36 +1244,36 @@ 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 @@ -2334,7 +2334,7 @@ LunisolarCalendar - Ordisoftware.HebrewCalendar.Data.LunisolarCalendar, Ordisoftware.HebrewCalendar, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null + Ordisoftware.HebrewCalendar.Data.LunisolarCalendar, Ordisoftware.HebrewCalendar, Version=1.10.0.0, Culture=neutral, PublicKeyToken=null bindingNavigatorCountItem @@ -2694,19 +2694,19 @@ LunisolarDaysTableAdapter - Ordisoftware.HebrewCalendar.Data.LunisolarCalendarTableAdapters.LunisolarDaysTableAdapter, Ordisoftware.HebrewCalendar, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null + Ordisoftware.HebrewCalendar.Data.LunisolarCalendarTableAdapters.LunisolarDaysTableAdapter, Ordisoftware.HebrewCalendar, Version=1.10.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager - Ordisoftware.HebrewCalendar.Data.LunisolarCalendarTableAdapters.TableAdapterManager, Ordisoftware.HebrewCalendar, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null + Ordisoftware.HebrewCalendar.Data.LunisolarCalendarTableAdapters.TableAdapterManager, Ordisoftware.HebrewCalendar, Version=1.10.0.0, Culture=neutral, PublicKeyToken=null ReportTableAdapter - Ordisoftware.HebrewCalendar.Data.LunisolarCalendarTableAdapters.ReportTableAdapter, Ordisoftware.HebrewCalendar, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null + Ordisoftware.HebrewCalendar.Data.LunisolarCalendarTableAdapters.ReportTableAdapter, Ordisoftware.HebrewCalendar, Version=1.10.0.0, Culture=neutral, PublicKeyToken=null MainForm diff --git a/Project/Source/Forms/NavigationForm.cs b/Project/Source/Forms/NavigationForm.cs index 295e9c293..a5d3304ab 100644 --- a/Project/Source/Forms/NavigationForm.cs +++ b/Project/Source/Forms/NavigationForm.cs @@ -51,7 +51,7 @@ public DateTime Date LabelDate.Text = value.ToLongDateString(); string strMonth = Localizer.BabylonianHebrewMonthText[row.LunarMonth]; LabelLunarMonthValue.Text = strMonth + " #" + row.LunarMonth.ToString(); - LabelLunarDayValue.Text = "Day #" + row.LunarDay.ToString(); + LabelLunarDayValue.Text = Localizer.NavigationDayText.GetLang() + row.LunarDay.ToString(); if ( value.DayOfWeek == (DayOfWeek)Program.Settings.ShabatDay ) LabelLunarDayValue.Text += " (Shabat)"; LabelSunriseValue.Text = row.Sunrise.ToString(); diff --git a/Project/Source/Forms/PreferencesForm.cs b/Project/Source/Forms/PreferencesForm.cs index 3289e7b8f..41861949c 100644 --- a/Project/Source/Forms/PreferencesForm.cs +++ b/Project/Source/Forms/PreferencesForm.cs @@ -11,7 +11,7 @@ /// You may add additional accurate notices of copyright ownership. /// /// 2016-04 -/// 2019-01 +/// 2019-08 using System; using System.Drawing; using System.Drawing.Text; @@ -60,14 +60,14 @@ private PreferencesForm() LoadEvents(); LoadFonts(); BindingSettings.DataSource = Program.Settings; - } + } - /// - /// Event handler. Called by PreferencesForm for shown events. - /// - /// Source of the event. - /// Event information. - private void PreferencesForm_Shown(object sender, EventArgs e) + /// + /// Event handler. Called by PreferencesForm for shown events. + /// + /// Source of the event. + /// Event information. + private void PreferencesForm_Shown(object sender, EventArgs e) { OldShabatDay = Program.Settings.ShabatDay; OldLatitude = Program.Settings.Latitude; @@ -97,7 +97,7 @@ private void PreferencesForm_FormClosing(object sender, FormClosingEventArgs e) Program.Settings.TrayIconClickOpen = TrayIconClickOpen.NavigationForm; Program.Settings.ShabatDay = (int)( (DayOfWeekItem)EditShabatDay.SelectedItem ).Day; Program.Settings.ReminderInterval = (int)EditTimerInterval.Value; - for (int index = 0; index < EditEvents.Items.Count; index++ ) + for ( int index = 0; index < EditEvents.Items.Count; index++ ) try { string name = "TorahEventRemind" + ( (TorahEventItem)EditEvents.Items[index] ).Event.ToString(); @@ -106,7 +106,7 @@ private void PreferencesForm_FormClosing(object sender, FormClosingEventArgs e) catch { } - Program.Settings.Save(); + Program.Settings.Store(); } /// @@ -148,9 +148,9 @@ private void EitFontName_Changed(object sender, EventArgs e) /// Event information. private void PanelBackColor_Click(object sender, EventArgs e) { - DialogColor.Color = PanelBackColor.BackColor; + DialogColor.Color = PanelBackColor2.BackColor; if ( DialogColor.ShowDialog() == DialogResult.Cancel ) return; - PanelBackColor.BackColor = DialogColor.Color; + PanelBackColor2.BackColor = DialogColor.Color; MainForm.CalendarText.BackColor = DialogColor.Color; } @@ -161,9 +161,9 @@ private void PanelBackColor_Click(object sender, EventArgs e) /// Event information. private void PanelTextColor_Click(object sender, EventArgs e) { - DialogColor.Color = PanelTextColor.BackColor; + DialogColor.Color = PanelTextColor2.BackColor; if ( DialogColor.ShowDialog() == DialogResult.Cancel ) return; - PanelTextColor.BackColor = DialogColor.Color; + PanelTextColor2.BackColor = DialogColor.Color; MainForm.CalendarText.ForeColor = DialogColor.Color; } @@ -257,6 +257,86 @@ private void ActionUseDefaultColors_LinkClicked(object sender, LinkLabelLinkClic NavigationForm.Instance.PanelBottom.BackColor = PanelBottomColor.BackColor; } + private void UpdateCalendarMonth() + { + Program.Settings.Store(); + MainForm.Instance.IsGenerating = true; + Cursor = Cursors.WaitCursor; + MainForm.Instance.Cursor = Cursors.WaitCursor; + Enabled = false; + MainForm.Instance.PanelViewMonth.Parent = null; + try + { + MainForm.Instance.CalendarMonth.CurrentDayColor = PanelCurrentDayColor.BackColor; + MainForm.Instance.CalendarMonth.LoadPresetHolidays = false; + MainForm.Instance.FillMonths(); + } + finally + { + Enabled = true; + Cursor = Cursors.Default; + MainForm.Instance.Cursor = Cursors.Default; + MainForm.Instance.IsGenerating = false; + MainForm.Instance.SetView(Program.Settings.CurrentView, true); + MainForm.Instance.UpdateButtons(); + } + } + + /// + /// Event handler. Called by PanelCurrentDayColor for click events. + /// + /// Source of the event. + /// Event information. + private void PanelCurrentDayColor_MouseClick(object sender, MouseEventArgs e) + { + DialogColor.Color = PanelCurrentDayColor.BackColor; + if ( DialogColor.ShowDialog() == DialogResult.Cancel ) return; + PanelCurrentDayColor.BackColor = DialogColor.Color; + UpdateCalendarMonth(); + } + + private void PanelTorahEventColor_Click(object sender, EventArgs e) + { + DialogColor.Color = PanelTorahEventColor.BackColor; + if ( DialogColor.ShowDialog() == DialogResult.Cancel ) return; + PanelTorahEventColor.BackColor = DialogColor.Color; + UpdateCalendarMonth(); + } + + private void PanelSeasonEventColor_Click(object sender, EventArgs e) + { + DialogColor.Color = PanelSeasonEventColor.BackColor; + if ( DialogColor.ShowDialog() == DialogResult.Cancel ) return; + PanelSeasonEventColor.BackColor = DialogColor.Color; + UpdateCalendarMonth(); + } + + private void PanelMoonEventColor_Click(object sender, EventArgs e) + { + DialogColor.Color = PanelMoonEventColor.BackColor; + if ( DialogColor.ShowDialog() == DialogResult.Cancel ) return; + PanelMoonEventColor.BackColor = DialogColor.Color; + UpdateCalendarMonth(); + } + + private void PanelFullMoonColor_Click(object sender, EventArgs e) + { + DialogColor.Color = PanelFullMoonColor.BackColor; + if ( DialogColor.ShowDialog() == DialogResult.Cancel ) return; + PanelFullMoonColor.BackColor = DialogColor.Color; + UpdateCalendarMonth(); + } + + private void ActionRestoreCalendarColors_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + PanelCurrentDayColor.BackColor = Color.Red; + PanelTorahEventColor.BackColor = Color.DarkRed; + PanelSeasonEventColor.BackColor = Color.DarkGreen; + PanelMoonEventColor.BackColor = Color.DarkBlue; + PanelFullMoonColor.BackColor = Color.DarkGoldenrod; + UpdateCalendarMonth(); + } + /// /// Loads the days. /// diff --git a/Project/Source/Forms/PreferencesForm.designer.cs b/Project/Source/Forms/PreferencesForm.designer.cs index 569032eb7..2c8421b1d 100644 --- a/Project/Source/Forms/PreferencesForm.designer.cs +++ b/Project/Source/Forms/PreferencesForm.designer.cs @@ -37,20 +37,20 @@ private void InitializeComponent() this.EditFontName = new System.Windows.Forms.ComboBox(); this.BindingSettings = new System.Windows.Forms.BindingSource(this.components); this.LabelShabatDay = new System.Windows.Forms.Label(); - this.EditFontSize = new System.Windows.Forms.NumericUpDown(); this.LabelFontSize = new System.Windows.Forms.Label(); - this.PanelBackColor = new System.Windows.Forms.Panel(); - this.LabelTextColor = new System.Windows.Forms.Label(); this.EditShabatDay = new System.Windows.Forms.ComboBox(); this.LabelFontName = new System.Windows.Forms.Label(); - this.PanelTextColor = new System.Windows.Forms.Panel(); - this.LabelBackColor = new System.Windows.Forms.Label(); this.GPSLatitudeTextBox = new System.Windows.Forms.TextBox(); this.GPSLongitudeTextBox = new System.Windows.Forms.TextBox(); this.PanelButtons = new System.Windows.Forms.Panel(); this.ActionUsePersonalShabat = new System.Windows.Forms.LinkLabel(); this.GroupBoxGPS = new System.Windows.Forms.GroupBox(); this.GroupBoxText = new System.Windows.Forms.GroupBox(); + this.EditFontSize2 = new System.Windows.Forms.NumericUpDown(); + this.LabelBackColor2 = new System.Windows.Forms.Label(); + this.PanelTextColor2 = new System.Windows.Forms.Panel(); + this.LabelTextColor2 = new System.Windows.Forms.Label(); + this.PanelBackColor2 = new System.Windows.Forms.Panel(); this.BroupBoxShabat = new System.Windows.Forms.GroupBox(); this.GroupBoxNavigation = new System.Windows.Forms.GroupBox(); this.ActionUseBlackAndWhiteColors = new System.Windows.Forms.LinkLabel(); @@ -73,18 +73,31 @@ private void InitializeComponent() this.LabelTimerInterval = new System.Windows.Forms.Label(); this.EditTimerEnabled = new System.Windows.Forms.CheckBox(); this.EditShowMonthDayToolTip = new System.Windows.Forms.CheckBox(); + this.GroupBoxCalendar = new System.Windows.Forms.GroupBox(); + this.ActionRestoreCalendarColors = new System.Windows.Forms.LinkLabel(); + this.label5 = new System.Windows.Forms.Label(); + this.PanelFullMoonColor = new System.Windows.Forms.Panel(); + this.label4 = new System.Windows.Forms.Label(); + this.PanelMoonEventColor = new System.Windows.Forms.Panel(); + this.label3 = new System.Windows.Forms.Label(); + this.PanelSeasonEventColor = new System.Windows.Forms.Panel(); + this.label2 = new System.Windows.Forms.Label(); + this.PanelTorahEventColor = new System.Windows.Forms.Panel(); + this.label1 = new System.Windows.Forms.Label(); + this.PanelCurrentDayColor = new System.Windows.Forms.Panel(); GPSLatitudeLabel = new System.Windows.Forms.Label(); GPSLongitudeLabel = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.BindingSettings)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.EditFontSize)).BeginInit(); this.PanelButtons.SuspendLayout(); this.GroupBoxGPS.SuspendLayout(); this.GroupBoxText.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.EditFontSize2)).BeginInit(); this.BroupBoxShabat.SuspendLayout(); this.GroupBoxNavigation.SuspendLayout(); this.GroupBoxTrayIcon.SuspendLayout(); this.GroupBoxReminder.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.EditTimerInterval)).BeginInit(); + this.GroupBoxCalendar.SuspendLayout(); this.SuspendLayout(); // // GPSLatitudeLabel @@ -126,46 +139,11 @@ private void InitializeComponent() resources.ApplyResources(this.LabelShabatDay, "LabelShabatDay"); this.LabelShabatDay.Name = "LabelShabatDay"; // - // EditFontSize - // - resources.ApplyResources(this.EditFontSize, "EditFontSize"); - this.EditFontSize.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.BindingSettings, "FontSize", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.EditFontSize.Maximum = new decimal(new int[] { - 32, - 0, - 0, - 0}); - this.EditFontSize.Minimum = new decimal(new int[] { - 4, - 0, - 0, - 0}); - this.EditFontSize.Name = "EditFontSize"; - this.EditFontSize.Value = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.EditFontSize.ValueChanged += new System.EventHandler(this.EitFontName_Changed); - // // LabelFontSize // resources.ApplyResources(this.LabelFontSize, "LabelFontSize"); this.LabelFontSize.Name = "LabelFontSize"; // - // PanelBackColor - // - resources.ApplyResources(this.PanelBackColor, "PanelBackColor"); - this.PanelBackColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(250)))), ((int)(((byte)(250)))), ((int)(((byte)(250))))); - this.PanelBackColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.PanelBackColor.Name = "PanelBackColor"; - this.PanelBackColor.Click += new System.EventHandler(this.PanelBackColor_Click); - // - // LabelTextColor - // - resources.ApplyResources(this.LabelTextColor, "LabelTextColor"); - this.LabelTextColor.Name = "LabelTextColor"; - // // EditShabatDay // resources.ApplyResources(this.EditShabatDay, "EditShabatDay"); @@ -178,19 +156,6 @@ private void InitializeComponent() resources.ApplyResources(this.LabelFontName, "LabelFontName"); this.LabelFontName.Name = "LabelFontName"; // - // PanelTextColor - // - resources.ApplyResources(this.PanelTextColor, "PanelTextColor"); - this.PanelTextColor.BackColor = System.Drawing.Color.Black; - this.PanelTextColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.PanelTextColor.Name = "PanelTextColor"; - this.PanelTextColor.Click += new System.EventHandler(this.PanelTextColor_Click); - // - // LabelBackColor - // - resources.ApplyResources(this.LabelBackColor, "LabelBackColor"); - this.LabelBackColor.Name = "LabelBackColor"; - // // GPSLatitudeTextBox // resources.ApplyResources(this.GPSLatitudeTextBox, "GPSLatitudeTextBox"); @@ -230,17 +195,65 @@ private void InitializeComponent() // GroupBoxText // resources.ApplyResources(this.GroupBoxText, "GroupBoxText"); + this.GroupBoxText.Controls.Add(this.EditFontSize2); this.GroupBoxText.Controls.Add(this.LabelFontName); - this.GroupBoxText.Controls.Add(this.LabelBackColor); - this.GroupBoxText.Controls.Add(this.PanelTextColor); - this.GroupBoxText.Controls.Add(this.LabelTextColor); + this.GroupBoxText.Controls.Add(this.LabelBackColor2); + this.GroupBoxText.Controls.Add(this.PanelTextColor2); + this.GroupBoxText.Controls.Add(this.LabelTextColor2); + this.GroupBoxText.Controls.Add(this.PanelBackColor2); this.GroupBoxText.Controls.Add(this.EditFontName); - this.GroupBoxText.Controls.Add(this.PanelBackColor); this.GroupBoxText.Controls.Add(this.LabelFontSize); - this.GroupBoxText.Controls.Add(this.EditFontSize); this.GroupBoxText.Name = "GroupBoxText"; this.GroupBoxText.TabStop = false; // + // EditFontSize2 + // + resources.ApplyResources(this.EditFontSize2, "EditFontSize2"); + this.EditFontSize2.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.BindingSettings, "FontSize", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.EditFontSize2.Maximum = new decimal(new int[] { + 32, + 0, + 0, + 0}); + this.EditFontSize2.Minimum = new decimal(new int[] { + 4, + 0, + 0, + 0}); + this.EditFontSize2.Name = "EditFontSize2"; + this.EditFontSize2.Value = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.EditFontSize2.ValueChanged += new System.EventHandler(this.EitFontName_Changed); + // + // LabelBackColor2 + // + resources.ApplyResources(this.LabelBackColor2, "LabelBackColor2"); + this.LabelBackColor2.Name = "LabelBackColor2"; + // + // PanelTextColor2 + // + resources.ApplyResources(this.PanelTextColor2, "PanelTextColor2"); + this.PanelTextColor2.BackColor = System.Drawing.Color.Black; + this.PanelTextColor2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelTextColor2.Name = "PanelTextColor2"; + this.PanelTextColor2.Click += new System.EventHandler(this.PanelTextColor_Click); + // + // LabelTextColor2 + // + resources.ApplyResources(this.LabelTextColor2, "LabelTextColor2"); + this.LabelTextColor2.Name = "LabelTextColor2"; + // + // PanelBackColor2 + // + resources.ApplyResources(this.PanelBackColor2, "PanelBackColor2"); + this.PanelBackColor2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(250)))), ((int)(((byte)(250)))), ((int)(((byte)(250))))); + this.PanelBackColor2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelBackColor2.Name = "PanelBackColor2"; + this.PanelBackColor2.Click += new System.EventHandler(this.PanelBackColor_Click); + // // BroupBoxShabat // resources.ApplyResources(this.BroupBoxShabat, "BroupBoxShabat"); @@ -412,6 +425,96 @@ private void InitializeComponent() this.EditShowMonthDayToolTip.Name = "EditShowMonthDayToolTip"; this.EditShowMonthDayToolTip.UseVisualStyleBackColor = true; // + // GroupBoxCalendar + // + resources.ApplyResources(this.GroupBoxCalendar, "GroupBoxCalendar"); + this.GroupBoxCalendar.Controls.Add(this.ActionRestoreCalendarColors); + this.GroupBoxCalendar.Controls.Add(this.label5); + this.GroupBoxCalendar.Controls.Add(this.PanelFullMoonColor); + this.GroupBoxCalendar.Controls.Add(this.label4); + this.GroupBoxCalendar.Controls.Add(this.PanelMoonEventColor); + this.GroupBoxCalendar.Controls.Add(this.label3); + this.GroupBoxCalendar.Controls.Add(this.PanelSeasonEventColor); + this.GroupBoxCalendar.Controls.Add(this.label2); + this.GroupBoxCalendar.Controls.Add(this.PanelTorahEventColor); + this.GroupBoxCalendar.Controls.Add(this.label1); + this.GroupBoxCalendar.Controls.Add(this.PanelCurrentDayColor); + this.GroupBoxCalendar.Name = "GroupBoxCalendar"; + this.GroupBoxCalendar.TabStop = false; + // + // ActionRestoreCalendarColors + // + resources.ApplyResources(this.ActionRestoreCalendarColors, "ActionRestoreCalendarColors"); + this.ActionRestoreCalendarColors.LinkColor = System.Drawing.Color.Blue; + this.ActionRestoreCalendarColors.Name = "ActionRestoreCalendarColors"; + this.ActionRestoreCalendarColors.TabStop = true; + this.ActionRestoreCalendarColors.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.ActionRestoreCalendarColors_LinkClicked); + // + // label5 + // + resources.ApplyResources(this.label5, "label5"); + this.label5.Name = "label5"; + // + // PanelFullMoonColor + // + resources.ApplyResources(this.PanelFullMoonColor, "PanelFullMoonColor"); + this.PanelFullMoonColor.BackColor = System.Drawing.Color.DarkGoldenrod; + this.PanelFullMoonColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelFullMoonColor.Name = "PanelFullMoonColor"; + this.PanelFullMoonColor.Click += new System.EventHandler(this.PanelFullMoonColor_Click); + // + // label4 + // + resources.ApplyResources(this.label4, "label4"); + this.label4.Name = "label4"; + // + // PanelMoonEventColor + // + resources.ApplyResources(this.PanelMoonEventColor, "PanelMoonEventColor"); + this.PanelMoonEventColor.BackColor = System.Drawing.Color.DarkBlue; + this.PanelMoonEventColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelMoonEventColor.Name = "PanelMoonEventColor"; + this.PanelMoonEventColor.Click += new System.EventHandler(this.PanelMoonEventColor_Click); + // + // label3 + // + resources.ApplyResources(this.label3, "label3"); + this.label3.Name = "label3"; + // + // PanelSeasonEventColor + // + resources.ApplyResources(this.PanelSeasonEventColor, "PanelSeasonEventColor"); + this.PanelSeasonEventColor.BackColor = System.Drawing.Color.DarkGreen; + this.PanelSeasonEventColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelSeasonEventColor.Name = "PanelSeasonEventColor"; + this.PanelSeasonEventColor.Click += new System.EventHandler(this.PanelSeasonEventColor_Click); + // + // label2 + // + resources.ApplyResources(this.label2, "label2"); + this.label2.Name = "label2"; + // + // PanelTorahEventColor + // + resources.ApplyResources(this.PanelTorahEventColor, "PanelTorahEventColor"); + this.PanelTorahEventColor.BackColor = System.Drawing.Color.DarkRed; + this.PanelTorahEventColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelTorahEventColor.Name = "PanelTorahEventColor"; + this.PanelTorahEventColor.Click += new System.EventHandler(this.PanelTorahEventColor_Click); + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // + // PanelCurrentDayColor + // + resources.ApplyResources(this.PanelCurrentDayColor, "PanelCurrentDayColor"); + this.PanelCurrentDayColor.BackColor = System.Drawing.Color.Red; + this.PanelCurrentDayColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelCurrentDayColor.Name = "PanelCurrentDayColor"; + this.PanelCurrentDayColor.MouseClick += new System.Windows.Forms.MouseEventHandler(this.PanelCurrentDayColor_MouseClick); + // // PreferencesForm // this.AcceptButton = this.ButtonClose; @@ -423,6 +526,7 @@ private void InitializeComponent() this.Controls.Add(this.GroupBoxReminder); this.Controls.Add(this.GroupBoxTrayIcon); this.Controls.Add(this.GroupBoxText); + this.Controls.Add(this.GroupBoxCalendar); this.Controls.Add(this.GroupBoxNavigation); this.Controls.Add(this.BroupBoxShabat); this.Controls.Add(this.GroupBoxGPS); @@ -435,12 +539,12 @@ private void InitializeComponent() this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.PreferencesForm_FormClosing); this.Shown += new System.EventHandler(this.PreferencesForm_Shown); ((System.ComponentModel.ISupportInitialize)(this.BindingSettings)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.EditFontSize)).EndInit(); this.PanelButtons.ResumeLayout(false); this.GroupBoxGPS.ResumeLayout(false); this.GroupBoxGPS.PerformLayout(); this.GroupBoxText.ResumeLayout(false); this.GroupBoxText.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.EditFontSize2)).EndInit(); this.BroupBoxShabat.ResumeLayout(false); this.BroupBoxShabat.PerformLayout(); this.GroupBoxNavigation.ResumeLayout(false); @@ -450,6 +554,8 @@ private void InitializeComponent() this.GroupBoxReminder.ResumeLayout(false); this.GroupBoxReminder.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.EditTimerInterval)).EndInit(); + this.GroupBoxCalendar.ResumeLayout(false); + this.GroupBoxCalendar.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -460,12 +566,9 @@ private void InitializeComponent() private System.Windows.Forms.Button ButtonClose; private System.Windows.Forms.Label LabelShabatDay; private System.Windows.Forms.Label LabelFontSize; - private System.Windows.Forms.Label LabelTextColor; private System.Windows.Forms.Label LabelFontName; - private System.Windows.Forms.Label LabelBackColor; private System.Windows.Forms.BindingSource BindingSettings; private System.Windows.Forms.ComboBox EditFontName; - private System.Windows.Forms.NumericUpDown EditFontSize; private System.Windows.Forms.ComboBox EditShabatDay; private System.Windows.Forms.TextBox GPSLatitudeTextBox; private System.Windows.Forms.TextBox GPSLongitudeTextBox; @@ -479,8 +582,6 @@ private void InitializeComponent() private System.Windows.Forms.Label labelBottomColor; private System.Windows.Forms.Label LabelMiddleColor; private System.Windows.Forms.LinkLabel ActionUseSystemColors; - internal System.Windows.Forms.Panel PanelBackColor; - internal System.Windows.Forms.Panel PanelTextColor; internal System.Windows.Forms.Panel PanelTopColor; internal System.Windows.Forms.Panel PanelBottomColor; internal System.Windows.Forms.Panel PanelMiddleColor; @@ -497,5 +598,22 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox EditRemindShabat; private System.Windows.Forms.CheckBox EditShowMonthDayToolTip; private System.Windows.Forms.LinkLabel ActionUseBlackAndWhiteColors; + private System.Windows.Forms.GroupBox GroupBoxCalendar; + private System.Windows.Forms.Label label1; + internal System.Windows.Forms.Panel PanelCurrentDayColor; + private System.Windows.Forms.NumericUpDown EditFontSize2; + private System.Windows.Forms.Label LabelBackColor2; + internal System.Windows.Forms.Panel PanelTextColor2; + private System.Windows.Forms.Label LabelTextColor2; + internal System.Windows.Forms.Panel PanelBackColor2; + private System.Windows.Forms.Label label4; + internal System.Windows.Forms.Panel PanelMoonEventColor; + private System.Windows.Forms.Label label3; + internal System.Windows.Forms.Panel PanelSeasonEventColor; + internal System.Windows.Forms.Panel PanelTorahEventColor; + private System.Windows.Forms.Label label5; + internal System.Windows.Forms.Panel PanelFullMoonColor; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.LinkLabel ActionRestoreCalendarColors; } } \ No newline at end of file diff --git a/Project/Source/Forms/PreferencesForm.fr-FR.resx b/Project/Source/Forms/PreferencesForm.fr-FR.resx new file mode 100644 index 000000000..51d713e43 --- /dev/null +++ b/Project/Source/Forms/PreferencesForm.fr-FR.resx @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 19, 52 + + + 181, 52 + + + 36, 13 + + + Police + + + 244, 50 + + + 241, 31 + + + 34, 13 + + + Texte + + + 302, 50 + + + 299, 31 + + + 31, 13 + + + Fond + + + 368, 90 + + + 30, 13 + + + Haut + + + 25, 13 + + + Bas + + + 34, 13 + + + Milieu + + + 142, 13 + + + Utiliser couleurs noir et blanc + + + 112, 13 + + + Utiliser couleurs pastel + + + 59, 13 + + + Aujourd'hui + + + 122, 13 + + + Utiliser couleurs système + + + Calendrier + + + + AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAADMAAAAzAAAAMwAAADMAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGhrcP9sbW7/bW1u/2xtbv9oa3D/AAAAAAAA + AAAAAAAAAAAAAAAAAAAHBQE1AAAAMwAAADMAAAAzAAAAMwAAADMAAAAzAAAAM2dpbv8AAAAzAAAAMwAA + ADMAAAAzAAAAMwAAADMAAAAzypY2/9+sSP/bpkH/26ZA/9umP//fqD//5aw+/+6yP/9bYGj/7rI//+Ws + Pv/fqD//26Y//9umQf/cqEb/1KE7/6lxF///////////////////////////////////////U1VZ//// + /////////////////////////////9unRf+qcRT//////////////////////////////////////1BR + Uv/////////////////////////////////apUD/qnEU///////QlTD/0Zg4/9KZOv/RmDj/0ZUv//// + //9QUVL/////////////////////////////////2qQ//6pyFf//////0po6/9SfRf/VoUj/1Z9F/9Sb + Ov//////UlNU///////5+fj/9vb1//b29f/29/f//////9qlP/+qchX//////9KXM//Umzz/1Z0+/9Sc + PP/VmTT/+Pv//1RVVv/29fT/7ezr/+vq6f/q6un/6enq///////apT//q3MW///////f4+3/4OXw/+Hm + 8f/h5fD/4ubu/+nq7v9VV1n/6ejq/+Dg4v/e3uD/3t7g/93d4P//////26dB/612G//27+X/8+rc//Tq + 2//06tv/9Orb//Xs2//98d7/WFxj//3x3v/169r/8+nZ//Pp2f/y6dn/8uvh/96rSf+weyT/rXYc/6x0 + GP+sdBj/rHQY/610F/+vdRb/tHgV/11lcv+0eBX/r3UW/610F/+sdBj/rHQY/6pzGv/KlTb/AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAADNja3f/AAAAMwAAADMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGZsdv9pbXT/am1y/2ltdP9mbHb/AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA//8AAPwfAAD8HwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwf + AAD8HwAA//8AAA== + + + \ No newline at end of file diff --git a/Project/Source/Forms/PreferencesForm.fr.resx b/Project/Source/Forms/PreferencesForm.fr.resx index eddf17687..33ef34093 100644 --- a/Project/Source/Forms/PreferencesForm.fr.resx +++ b/Project/Source/Forms/PreferencesForm.fr.resx @@ -128,7 +128,7 @@ Fermer - 19, 47 + 19, 52 147, 21 @@ -139,26 +139,11 @@ Jour - - 19, 97 - - 89, 13 + 36, 13 - Taille de la police - - - 19, 150 - - - 16, 131 - - - 84, 13 - - - Couleur du texte + Police 147, 21 @@ -169,18 +154,6 @@ Nom de la police - - 19, 204 - - - 16, 185 - - - 82, 13 - - - Couleur du fond - 75, 31 @@ -196,6 +169,9 @@ Coordonnées GPS + + 368, 89 + Texte @@ -215,10 +191,10 @@ Utiliser couleurs pastel - 82, 13 + 30, 13 - Couleur du haut + Haut 122, 13 @@ -227,16 +203,16 @@ Utiliser couleurs système - 78, 13 + 25, 13 - Couleur du bas + Bas - 87, 13 + 34, 13 - Couleur du milieu + Milieu Clic sur la Tray Icon ouvre @@ -298,6 +274,69 @@ Afficher le lever et coucher du soleil dans la vue par mois + + Calendrier + + + 157, 13 + + + Restaurer les valeurs par défaut + + + 75, 70 + + + 59, 13 + + + Pleine lune + + + 78, 88 + + + 13, 70 + + + 31, 13 + + + Lune + + + 16, 88 + + + 134, 21 + + + 39, 13 + + + Saison + + + 137, 39 + + + 75, 21 + + + 78, 39 + + + 13, 21 + + + 59, 13 + + + Aujourd'hui + + + 16, 39 + AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA diff --git a/Project/Source/Forms/PreferencesForm.resx b/Project/Source/Forms/PreferencesForm.resx index bbaf94495..be37843b4 100644 --- a/Project/Source/Forms/PreferencesForm.resx +++ b/Project/Source/Forms/PreferencesForm.resx @@ -118,6 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 7 + 61 @@ -125,33 +128,48 @@ CenterParent - - 47 + + 1 - - LabelTextColor + + 3 + + 37, 20 + + + 8 + 75, 23 - - 150, 21 + + True - + 1 + + 150, 21 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 2 - - 7 + + 47 - - 511, 3 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 2 + + + $this BroupBoxShabat @@ -159,15 +177,15 @@ 46 - - 16, 31 - 58 GroupBoxReminder + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + True @@ -183,11 +201,14 @@ True + + 49 + labelBottomColor - - True + + GroupBoxCalendar GroupBoxReminder @@ -196,10 +217,10 @@ True - 188, 243 + 188, 247 - - PanelBackColor + + ActionUseSystemColors 25, 25 @@ -213,20 +234,32 @@ 61, 13 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Today 18, 30 + + 2 + + + 188, 100 + + + 32, 13 + Navigation Form 3 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 25, 25 + + + Restore to defaults 69, 31 @@ -243,39 +276,48 @@ 0 + + PanelSeasonEventColor + 102, 17 54 + + 511, 3 + 0 NoControl - - Day + + GroupBoxCalendar RadioButtonNavigationForm + + 47 + Hide the application at startup 45 + + GroupBoxCalendar + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 75, 20 - - Shabat - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -285,26 +327,32 @@ 7 + + 7 + + + 7 + NoControl 66, 20 - - 16, 206 + + LabelMiddleColor - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 16, 94 - - Tray Icon click open + + 269, 31 System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + 63 LabelFontSize @@ -312,30 +360,27 @@ True - - 25, 25 - $this - 18, 47 + 18, 51 DialogColor - - LabelBackColor - - - Back color - - - PanelTextColor + + LabelTextColor2 GroupBoxNavigation + + 8 + + + 47 + True @@ -354,17 +399,23 @@ True + + True + 2 + + 7 + RadioButtonMainForm 60 - - 150, 139 + + PanelBackColor2 EditTimerEnabled @@ -379,22 +430,31 @@ ActionUseDefaultColors - 19, 66 + 19, 69 + + + True GPSLongitudeLabel + + 201, 17 + $this - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 25, 25 - - NoControl + + 19, 39 + + + ActionRestoreCalendarColors + + + 9 EditShabatDay @@ -402,20 +462,26 @@ 6, 13 - - 104, 39 + + 15, 131 65 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + NoControl - - 0 + + Bottom - 66, 13 + 40, 13 4 @@ -426,26 +492,23 @@ GroupBoxText + + 70, 21 + Enabled - - 37, 20 - - - 5 + + ButtonClose - - 2 + + 3 GroupBoxNavigation - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ActionUseSystemColors + + 34, 13 0 @@ -453,59 +516,83 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 7 + + + 55 + 167, 17 218, 15 - - EditFontSize + + GroupBoxText - - 15, 15 + + 9 GroupBoxGPS + + 5 + + + 25, 25 + GroupBoxNavigation - - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - True 399, 131 - - 150, 21 + + NoControl + + + 4 + + + 96, 13 1 - - 218, 131 + + PanelCurrentDayColor BroupBoxShabat - - NoControl + + $this + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 NoControl + + NoControl + 92, 13 + + Moon + 123, 17 - - True + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 0 @@ -513,23 +600,29 @@ 49 + + GroupBoxCalendar + 45, 13 - - 5 + + Back - 6 + 7 1 + + 317, 49 + - 10, 420 + 10, 425 - - 15, 131 + + GroupBoxText $this @@ -537,8 +630,8 @@ 26, 13 - - 49 + + 37, 13 10, 10, 10, 10 @@ -546,14 +639,14 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + PanelTorahEventColor NoControl - 52, 13 + 26, 13 4 @@ -564,38 +657,50 @@ Reminder + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 25, 25 NoControl - - NoControl + + 187, 140 + + + 3 + + + 165, 140 NoControl - - True - NoControl True - - 19, 202 + + GroupBoxCalendar + + + 0 - 6 + 7 GPS coordonates - - Use black and white colors + + 18, 53 + + + 48 Longitude @@ -603,30 +708,33 @@ 54, 13 - - GroupBoxText + + True System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Show sun rise and set in month view - - 16, 31 + + 17, 21 - - 8 + + 16, 21 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 51 $this + + GroupBoxCalendar + 3 @@ -642,14 +750,11 @@ Text - - $this - - - 8 + + 0 - - 3 + + Use black and white colors System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -663,6 +768,12 @@ NoControl + + Full moon + + + NoControl + 47 @@ -672,6 +783,15 @@ EditEvents + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 73, 91 + + + NoControl + 99, 17 @@ -681,24 +801,36 @@ Use personal shabat - - 4 + + 0 + + + 70, 73 Use system colors - 16, 85 + 59, 21 0 + + label2 + Remind Shabat ActionUseBlackAndWhiteColors + + Day + + + 272, 49 + Font name @@ -717,11 +849,20 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 62 - - 25, 25 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PanelTextColor2 + + + 203, 51 @@ -759,20 +900,17 @@ GroupBoxReminder + + 25, 25 + GroupBoxTrayIcon - - 49 - 3 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 165, 243 + + True EditFontName @@ -780,32 +918,50 @@ GroupBoxGPS + + Bottom, Left + + + 47 + LabelShabatDay PanelButtons - - 55 + + 2 - - NoControl + + Shabat + + + GroupBoxText + + + EditShowMonthDayToolTip + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 EditRemindShabat - - 16, 184 + + 8 LabelTimerInterval - - 63 + + 10 - - 75, 20 + + 25, 25 Navigation window @@ -813,14 +969,20 @@ 5 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + GroupBoxGPS 59 + + 52, 13 + - 19, 49 + 19, 39 59 @@ -828,8 +990,8 @@ 57, 13 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Text 0 @@ -837,35 +999,41 @@ System.Windows.Forms.BindingSource, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - PanelBottomColor + + 1 - + NoControl + + 127, 39 + BroupBoxShabat - - 188, 100 + + 7 + + + 16, 21 Use pastel colors - 15, 390 + 15, 395 NoControl - - 1 - - - 8 + + Center - 16, 139 + 102, 21 + + + 73, 39 GPSLatitudeTextBox @@ -876,14 +1044,14 @@ $this - - 7 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Center color + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl + + GroupBoxCalendar GroupBoxTrayIcon @@ -891,17 +1059,20 @@ True + + NoControl + 399, 15 - - PreferencesForm + + PanelBottomColor Latitude - - GroupBoxText + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Application's window @@ -910,20 +1081,32 @@ PanelMiddleColor - 16, 222 + 16, 110 + + + 16, 71 - 19, 157 + 105, 39 + + + $this System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 218, 390 + 218, 395 PanelButtons + + 62 + + + 49 + GPSLongitudeTextBox @@ -931,22 +1114,37 @@ GroupBoxGPS - 19, 103 + 62, 39 4 + + True + GroupBoxText 5 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBoxCalendar + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 19 + + 6 + + + 19, 91 + + + 8 GroupBoxNavigation @@ -960,23 +1158,32 @@ EditStartupHide + + 35, 13 + + + True + GroupBoxNavigation - - NoControl + + 124, 21 - - EditShowMonthDayToolTip + + GroupBoxCalendar 11, 59 + + PanelMoonEventColor + NoControl - - 18, 97 + + Bottom, Left 1 @@ -984,50 +1191,62 @@ 48 - - 589, 28 + + 75, 20 - - Bottom + + PreferencesForm - - 64, 13 + + 16, 31 - - LabelMiddleColor + + 6 + + + NoControl + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 19, 42 + + label1 + True - - GroupBoxText - - - 15, 130 - - 19, 216 + 19, 219 - - 201, 17 + + 150, 139 - - True + + 38, 13 + + + 15, 238 True - - 18, 148 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl True - - 7 + + Season + + + LabelBackColor2 System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1039,7 +1258,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Top color + Top 4 @@ -1047,30 +1266,54 @@ System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 15, 15 + + + True + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - 16, 26 + 16, 23 - - Text color + + 47 - - 0 + + 7 - + GroupBoxText - - GroupBoxText + + 6 - - 16, 71 + + 1 + + + 59 + + + 28, 13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 104, 13 + + NoControl + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + PanelFullMoonColor + 8 @@ -1086,8 +1329,8 @@ 57 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GroupBoxCalendar 0 @@ -1101,41 +1344,68 @@ GroupBoxTrayIcon - - 58, 13 + + label3 GroupBoxGPS + + Calendar + - 19, 37 + 19, 39 187, 100 + + GroupBoxCalendar + BindingSettings - - 3 + + 25, 25 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + GroupBoxCalendar + + + 0 GroupBoxNavigation - 609, 458 + 609, 463 GroupBoxText - - Bottom color + + label4 135, 13 - - 59 + + 25, 25 + + + NoControl + + + GroupBoxText + + + NoControl GroupBoxReminder @@ -1152,8 +1422,14 @@ GroupBoxNavigation - - 7 + + label5 + + + Tray Icon click open + + + 5 3 @@ -1170,30 +1446,27 @@ True - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GroupBoxNavigation System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ButtonClose - System.Windows.Forms.ColorDialog, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 16, 73 + + + 25, 25 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1203,29 +1476,41 @@ 58 - - 6 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 16, 190 + 16, 78 + + + 4 + + + 218, 238 165, 100 + + 314, 31 + 65, 17 + + 104, 41 + - 187, 243 + 368, 91 6 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + 151, 21 True @@ -1236,14 +1521,29 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 15, 122 + Font size - - 18, 53 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 54, 13 + + True + + + EditFontSize2 + + + 5 + + + Torah + + + 49 Close @@ -1251,8 +1551,11 @@ GroupBoxReminder + + 59 + - 16, 81 + 200, 31 2 @@ -1260,8 +1563,20 @@ $this - - 2 + + True + + + True + + + 589, 28 + + + Bottom + + + 43, 13 17, 17 diff --git a/README.md b/README.md index 05a07562b..093532d42 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,11 @@ These are Pesa'h or Easter which is the liberation of illusions, Shavuot or Week ## Changelog -#### 2019.08.25 - Version 1.9 +#### 2019.08.25 - Version 1.10 + +- Add colors parameters for calendar month view. + +#### 2019.08.24 - Version 1.9 - Improve check update. diff --git a/Setup/OrdisoftwareHebrewCalendarSetup.iss b/Setup/OrdisoftwareHebrewCalendarSetup.iss index 6962fdd59..f70ef950d 100644 --- a/Setup/OrdisoftwareHebrewCalendarSetup.iss +++ b/Setup/OrdisoftwareHebrewCalendarSetup.iss @@ -3,7 +3,7 @@ #define MyAppName "Hebrew Calendar" #define MyAppNameNoSpace "HebrewCalendar" -#define MyAppVersion "1.9" +#define MyAppVersion "1.10" #define MyAppPublisher "Ordisoftware" #define MyAppURL "http://www.ordisoftware.com/projects/hebrew-calendar" #define MyAppExeName "Ordisoftware.HebrewCalendar.exe"