Skip to content

Commit 5ee50b2

Browse files
authored
Merge pull request #1294 from Ordisoftware/dev
Dev
2 parents 383d867 + 7d8b244 commit 5ee50b2

28 files changed

+32
-31
lines changed

Project/Dependencies/CultureManager/CultureManager.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ protected virtual bool IsExcluded(string componentName, string propertyName)
613613
string resourceName = $"{componentName}.{propertyName}";
614614
foreach ( string value in _excludeProperties )
615615
{
616-
if ( value.IndexOf('.') >= 0 )
616+
if ( value.Contains('.') )
617617
{
618618
if ( resourceName.Contains(value) ) return true;
619619
}

Project/Hebrew Calendar (vs2022).csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,7 @@
12101210
<PrivateAssets>all</PrivateAssets>
12111211
</PackageReference>
12121212
<PackageReference Include="Meziantou.Analyzer">
1213-
<Version>2.0.20</Version>
1213+
<Version>2.0.26</Version>
12141214
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
12151215
<PrivateAssets>all</PrivateAssets>
12161216
</PackageReference>

Project/Source/Common/Core/WinForms/EditMemoForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2022-04 </edited>
1515
namespace Ordisoftware.Core;
1616

17-
public partial class EditMemoForm : Form
17+
public sealed partial class EditMemoForm : Form
1818
{
1919

2020
static public readonly Point LocationZero;

Project/Source/Common/Core/WinForms/HTMLBrowserForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2022-05 </edited>
1515
namespace Ordisoftware.Core;
1616

17-
public partial class HTMLBrowserForm : Form
17+
public sealed partial class HTMLBrowserForm : Form
1818
{
1919

2020
private readonly string LocationPropertyName;

Project/Source/Common/Core/WinForms/InputBox.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Ordisoftware.Core;
1717
/// <summary>
1818
/// Provides input box.
1919
/// </summary>
20-
public partial class InputBox<T> : Form
20+
public sealed partial class InputBox<T> : Form
2121
where T : IConvertible
2222
{
2323

Project/Source/Common/Core/WinForms/MessageBoxEx.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2022-06 </edited>
1515
namespace Ordisoftware.Core;
1616

17-
public partial class MessageBoxEx : Form
17+
public sealed partial class MessageBoxEx : Form
1818
{
1919

2020
public const bool DefaultJustifyEnabled = true;

Project/Source/Common/Core/WinForms/ShowTextForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2020-11 </edited>
1515
namespace Ordisoftware.Core;
1616

17-
public partial class ShowTextForm : Form
17+
public sealed partial class ShowTextForm : Form
1818
{
1919

2020
private readonly bool HideOnClose;

Project/Source/Common/Core/WinForms/TraceForm.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2022-03 </edited>
1515
namespace Ordisoftware.Core;
1616

17-
public partial class TraceForm : Form
17+
public sealed partial class TraceForm : Form
1818
{
1919

2020
private readonly string LocationPropertyName;
@@ -154,8 +154,8 @@ private void ActionRefreshFiles_Click(object sender, EventArgs e)
154154
else
155155
{
156156
var content = File.ReadAllText(file);
157-
string strError = $"{LogTraceEvent.Error} {DebugManager.EventSeparator}";
158-
string strException = $"{LogTraceEvent.Exception} {DebugManager.EventSeparator}";
157+
string strError = $"{nameof(LogTraceEvent.Error)} {DebugManager.EventSeparator}";
158+
string strException = $"{nameof(LogTraceEvent.Exception)} {DebugManager.EventSeparator}";
159159
if ( content.IndexOf(strError, StringComparison.OrdinalIgnoreCase) >= 0
160160
|| content.IndexOf(strException, StringComparison.OrdinalIgnoreCase) >= 0 )
161161
SelectFile.Items.Add(file);

Project/Source/Common/Hebrew/WinForms/CelebrationVersesBoardForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2022-11 </edited>
1515
namespace Ordisoftware.Hebrew;
1616

17-
public partial class CelebrationVersesBoardForm : Form
17+
sealed public partial class CelebrationVersesBoardForm : Form
1818
{
1919

2020
private const float FontFactor = 1.5f;

Project/Source/Forms/Boxes/Boards/LunarMonthsForm.CreateControls.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2022-03 </edited>
1515
namespace Ordisoftware.Hebrew.Calendar;
1616

17-
sealed partial class LunarMonthsForm : Form
17+
partial class LunarMonthsForm : Form
1818
{
1919

2020
[SuppressMessage("IDisposableAnalyzers.Correctness", "IDISP001:Dispose created", Justification = "<En attente>")]

Project/Source/Forms/Boxes/Boards/LunarMonthsForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2022-04 </edited>
1515
namespace Ordisoftware.Hebrew.Calendar;
1616

17-
partial class LunarMonthsForm : Form
17+
sealed partial class LunarMonthsForm : Form
1818
{
1919

2020
static private readonly Properties.Settings Settings = Program.Settings;

Project/Source/Forms/Boxes/Boards/NextCelebrationsForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2022-11 </edited>
1515
namespace Ordisoftware.Hebrew.Calendar;
1616

17-
partial class NextCelebrationsForm : Form
17+
sealed partial class NextCelebrationsForm : Form
1818
{
1919

2020
static public NextCelebrationsForm Instance { get; private set; }

Project/Source/Forms/Boxes/Boards/ParashotForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Ordisoftware.Hebrew;
1919
using MainForm = Calendar.MainForm;
2020
using System.Windows.Forms;
2121

22-
partial class ParashotForm : Form
22+
sealed partial class ParashotForm : Form
2323
{
2424

2525
static public ParashotForm Instance { get; private set; }

Project/Source/Forms/Boxes/Reminder/ReminderForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2022-11 </edited>
1515
namespace Ordisoftware.Hebrew.Calendar;
1616

17-
partial class ReminderForm : Form
17+
sealed partial class ReminderForm : Form
1818
{
1919

2020
#region Static Constructor and Run

Project/Source/Forms/Boxes/Reminder/ReminderForm.resx

+3-3
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@
223223
<value>Flat</value>
224224
</data>
225225
<data name="ActionClose.Location" type="System.Drawing.Point, System.Drawing">
226-
<value>344, 115</value>
226+
<value>344, 125</value>
227227
</data>
228228
<data name="ActionClose.Size" type="System.Drawing.Size, System.Drawing">
229229
<value>40, 26</value>
@@ -600,7 +600,7 @@
600600
<value>Parashot board</value>
601601
</data>
602602
<data name="ContextMenuParashah.Size" type="System.Drawing.Size, System.Drawing">
603-
<value>211, 176</value>
603+
<value>211, 154</value>
604604
</data>
605605
<data name="&gt;&gt;ContextMenuParashah.Name" xml:space="preserve">
606606
<value>ContextMenuParashah</value>
@@ -767,7 +767,7 @@
767767
<value>6, 13</value>
768768
</data>
769769
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
770-
<value>384, 141</value>
770+
<value>384, 151</value>
771771
</data>
772772
<data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
773773
<value>10, 10, 10, 10</value>

Project/Source/Forms/Boxes/Reminder/SelectSuspendDelayForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2021-04 </edited>
1515
namespace Ordisoftware.Hebrew.Calendar;
1616

17-
partial class SelectSuspendDelayForm : Form
17+
sealed partial class SelectSuspendDelayForm : Form
1818
{
1919

2020
static private readonly Properties.Settings Settings = Program.Settings;

Project/Source/Forms/Boxes/Search/SearchEventForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2021-05 </edited>
1515
namespace Ordisoftware.Hebrew.Calendar;
1616

17-
partial class SearchEventForm : Form
17+
sealed partial class SearchEventForm : Form
1818
{
1919

2020
private readonly MainForm MainForm = MainForm.Instance;

Project/Source/Forms/Boxes/Search/SearchGregorianMonthForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2022-11 </edited>
1515
namespace Ordisoftware.Hebrew.Calendar;
1616

17-
partial class SearchGregorianMonthForm : Form
17+
sealed partial class SearchGregorianMonthForm : Form
1818
{
1919

2020
private readonly MainForm MainForm = MainForm.Instance;

Project/Source/Forms/Boxes/Search/SearchLunarMonthForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2022-11 </edited>
1515
namespace Ordisoftware.Hebrew.Calendar;
1616

17-
partial class SearchLunarMonthForm : Form
17+
sealed partial class SearchLunarMonthForm : Form
1818
{
1919

2020
private readonly MainForm MainForm = MainForm.Instance;

Project/Source/Forms/Boxes/Select/SelectCityForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2023-01 </edited>
1515
namespace Ordisoftware.Hebrew.Calendar;
1616

17-
partial class SelectCityForm : Form
17+
sealed partial class SelectCityForm : Form
1818
{
1919

2020
static private readonly Properties.Settings Settings = Program.Settings;

Project/Source/Forms/Boxes/Select/SelectExportTargetForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace Ordisoftware.Hebrew.Calendar;
1616

1717
using MoreLinq;
1818

19-
partial class SelectExportTargetForm : Form
19+
sealed partial class SelectExportTargetForm : Form
2020
{
2121

2222
static private readonly Properties.Settings Settings = Program.Settings;

Project/Source/Forms/Boxes/Tools/ManageAcquaintanceEventsForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2022-01 </edited>
1515
namespace Ordisoftware.Hebrew.Calendar;
1616

17-
partial class ManageAcquaintanceEventsForm : Form
17+
sealed partial class ManageAcquaintanceEventsForm : Form
1818
{
1919

2020
//private const string TableName = "Date Bookmarks";

Project/Source/Forms/Boxes/Tools/ManageBookmarksForm.Save.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2022-11 </edited>
1515
namespace Ordisoftware.Hebrew.Calendar;
1616

17-
sealed partial class ManageBookmarksForm : Form
17+
partial class ManageBookmarksForm : Form
1818
{
1919

2020
private const string TableName = "Date Bookmarks";

Project/Source/Forms/Boxes/Tools/ManageBookmarksForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2022-08 </edited>
1515
namespace Ordisoftware.Hebrew.Calendar;
1616

17-
partial class ManageBookmarksForm : Form
17+
sealed partial class ManageBookmarksForm : Form
1818
{
1919

2020
static private readonly Properties.Settings Settings = Program.Settings;

Project/Source/Forms/Boxes/Tools/NavigationForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// <edited> 2022-11 </edited>
1515
namespace Ordisoftware.Hebrew.Calendar;
1616

17-
partial class NavigationForm : Form
17+
sealed partial class NavigationForm : Form
1818
{
1919

2020
private const string NoDataField = "-";

Project/Source/Forms/Config/PreferencesForm.Initialize.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace Ordisoftware.Hebrew.Calendar;
2222
/// </summary>
2323
/// <seealso cref="T:System.Windows.Forms.Form"/>
2424
[SuppressMessage("CodeQuality", "IDE0052:Supprimer les membres privés non lus", Justification = "N/A")]
25-
sealed partial class PreferencesForm
25+
partial class PreferencesForm
2626
{
2727

2828
private sealed class LayoutSectionItem

Project/Source/Forms/Config/PreferencesForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace Ordisoftware.Hebrew.Calendar;
2121
/// Provides form to edit the preferences.
2222
/// </summary>
2323
/// <seealso cref="T:System.Windows.Forms.Form"/>
24-
partial class PreferencesForm : Form
24+
sealed partial class PreferencesForm : Form
2525
{
2626

2727
#region Variables

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ It is therefore possible to use [AutoHotKey](https://www.autohotkey.com) to defi
376376

377377
#### TO DO Next
378378

379+
>- Add previous and next buttons to parashah description box.
379380
>- Add lunar months board with Hebrew names, meanings, lettriqs and tools.
380381
>- Add command-line option `--lunarmonths` to show the lunar months board.
381382
>- Add comments to bookmarks.

0 commit comments

Comments
 (0)