Skip to content

Commit

Permalink
Merge pull request #1294 from Ordisoftware/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Ordisoftware authored Mar 27, 2023
2 parents 383d867 + 7d8b244 commit 5ee50b2
Show file tree
Hide file tree
Showing 28 changed files with 32 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Project/Dependencies/CultureManager/CultureManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ protected virtual bool IsExcluded(string componentName, string propertyName)
string resourceName = $"{componentName}.{propertyName}";
foreach ( string value in _excludeProperties )
{
if ( value.IndexOf('.') >= 0 )
if ( value.Contains('.') )
{
if ( resourceName.Contains(value) ) return true;
}
Expand Down
2 changes: 1 addition & 1 deletion Project/Hebrew Calendar (vs2022).csproj
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Meziantou.Analyzer">
<Version>2.0.20</Version>
<Version>2.0.26</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Common/Core/WinForms/EditMemoForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2022-04 </edited>
namespace Ordisoftware.Core;

public partial class EditMemoForm : Form
public sealed partial class EditMemoForm : Form
{

static public readonly Point LocationZero;
Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Common/Core/WinForms/HTMLBrowserForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2022-05 </edited>
namespace Ordisoftware.Core;

public partial class HTMLBrowserForm : Form
public sealed partial class HTMLBrowserForm : Form
{

private readonly string LocationPropertyName;
Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Common/Core/WinForms/InputBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace Ordisoftware.Core;
/// <summary>
/// Provides input box.
/// </summary>
public partial class InputBox<T> : Form
public sealed partial class InputBox<T> : Form
where T : IConvertible
{

Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Common/Core/WinForms/MessageBoxEx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2022-06 </edited>
namespace Ordisoftware.Core;

public partial class MessageBoxEx : Form
public sealed partial class MessageBoxEx : Form
{

public const bool DefaultJustifyEnabled = true;
Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Common/Core/WinForms/ShowTextForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2020-11 </edited>
namespace Ordisoftware.Core;

public partial class ShowTextForm : Form
public sealed partial class ShowTextForm : Form
{

private readonly bool HideOnClose;
Expand Down
6 changes: 3 additions & 3 deletions Project/Source/Common/Core/WinForms/TraceForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2022-03 </edited>
namespace Ordisoftware.Core;

public partial class TraceForm : Form
public sealed partial class TraceForm : Form
{

private readonly string LocationPropertyName;
Expand Down Expand Up @@ -154,8 +154,8 @@ private void ActionRefreshFiles_Click(object sender, EventArgs e)
else
{
var content = File.ReadAllText(file);
string strError = $"{LogTraceEvent.Error} {DebugManager.EventSeparator}";
string strException = $"{LogTraceEvent.Exception} {DebugManager.EventSeparator}";
string strError = $"{nameof(LogTraceEvent.Error)} {DebugManager.EventSeparator}";
string strException = $"{nameof(LogTraceEvent.Exception)} {DebugManager.EventSeparator}";
if ( content.IndexOf(strError, StringComparison.OrdinalIgnoreCase) >= 0
|| content.IndexOf(strException, StringComparison.OrdinalIgnoreCase) >= 0 )
SelectFile.Items.Add(file);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2022-11 </edited>
namespace Ordisoftware.Hebrew;

public partial class CelebrationVersesBoardForm : Form
sealed public partial class CelebrationVersesBoardForm : Form
{

private const float FontFactor = 1.5f;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2022-03 </edited>
namespace Ordisoftware.Hebrew.Calendar;

sealed partial class LunarMonthsForm : Form
partial class LunarMonthsForm : Form
{

[SuppressMessage("IDisposableAnalyzers.Correctness", "IDISP001:Dispose created", Justification = "<En attente>")]
Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Forms/Boxes/Boards/LunarMonthsForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2022-04 </edited>
namespace Ordisoftware.Hebrew.Calendar;

partial class LunarMonthsForm : Form
sealed partial class LunarMonthsForm : Form
{

static private readonly Properties.Settings Settings = Program.Settings;
Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Forms/Boxes/Boards/NextCelebrationsForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2022-11 </edited>
namespace Ordisoftware.Hebrew.Calendar;

partial class NextCelebrationsForm : Form
sealed partial class NextCelebrationsForm : Form
{

static public NextCelebrationsForm Instance { get; private set; }
Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Forms/Boxes/Boards/ParashotForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace Ordisoftware.Hebrew;
using MainForm = Calendar.MainForm;
using System.Windows.Forms;

partial class ParashotForm : Form
sealed partial class ParashotForm : Form
{

static public ParashotForm Instance { get; private set; }
Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Forms/Boxes/Reminder/ReminderForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2022-11 </edited>
namespace Ordisoftware.Hebrew.Calendar;

partial class ReminderForm : Form
sealed partial class ReminderForm : Form
{

#region Static Constructor and Run
Expand Down
6 changes: 3 additions & 3 deletions Project/Source/Forms/Boxes/Reminder/ReminderForm.resx
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
<value>Flat</value>
</data>
<data name="ActionClose.Location" type="System.Drawing.Point, System.Drawing">
<value>344, 115</value>
<value>344, 125</value>
</data>
<data name="ActionClose.Size" type="System.Drawing.Size, System.Drawing">
<value>40, 26</value>
Expand Down Expand Up @@ -600,7 +600,7 @@
<value>Parashot board</value>
</data>
<data name="ContextMenuParashah.Size" type="System.Drawing.Size, System.Drawing">
<value>211, 176</value>
<value>211, 154</value>
</data>
<data name="&gt;&gt;ContextMenuParashah.Name" xml:space="preserve">
<value>ContextMenuParashah</value>
Expand Down Expand Up @@ -767,7 +767,7 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>384, 141</value>
<value>384, 151</value>
</data>
<data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>10, 10, 10, 10</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2021-04 </edited>
namespace Ordisoftware.Hebrew.Calendar;

partial class SelectSuspendDelayForm : Form
sealed partial class SelectSuspendDelayForm : Form
{

static private readonly Properties.Settings Settings = Program.Settings;
Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Forms/Boxes/Search/SearchEventForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2021-05 </edited>
namespace Ordisoftware.Hebrew.Calendar;

partial class SearchEventForm : Form
sealed partial class SearchEventForm : Form
{

private readonly MainForm MainForm = MainForm.Instance;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2022-11 </edited>
namespace Ordisoftware.Hebrew.Calendar;

partial class SearchGregorianMonthForm : Form
sealed partial class SearchGregorianMonthForm : Form
{

private readonly MainForm MainForm = MainForm.Instance;
Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Forms/Boxes/Search/SearchLunarMonthForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2022-11 </edited>
namespace Ordisoftware.Hebrew.Calendar;

partial class SearchLunarMonthForm : Form
sealed partial class SearchLunarMonthForm : Form
{

private readonly MainForm MainForm = MainForm.Instance;
Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Forms/Boxes/Select/SelectCityForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2023-01 </edited>
namespace Ordisoftware.Hebrew.Calendar;

partial class SelectCityForm : Form
sealed partial class SelectCityForm : Form
{

static private readonly Properties.Settings Settings = Program.Settings;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Ordisoftware.Hebrew.Calendar;

using MoreLinq;

partial class SelectExportTargetForm : Form
sealed partial class SelectExportTargetForm : Form
{

static private readonly Properties.Settings Settings = Program.Settings;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2022-01 </edited>
namespace Ordisoftware.Hebrew.Calendar;

partial class ManageAcquaintanceEventsForm : Form
sealed partial class ManageAcquaintanceEventsForm : Form
{

//private const string TableName = "Date Bookmarks";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2022-11 </edited>
namespace Ordisoftware.Hebrew.Calendar;

sealed partial class ManageBookmarksForm : Form
partial class ManageBookmarksForm : Form
{

private const string TableName = "Date Bookmarks";
Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Forms/Boxes/Tools/ManageBookmarksForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2022-08 </edited>
namespace Ordisoftware.Hebrew.Calendar;

partial class ManageBookmarksForm : Form
sealed partial class ManageBookmarksForm : Form
{

static private readonly Properties.Settings Settings = Program.Settings;
Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Forms/Boxes/Tools/NavigationForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// <edited> 2022-11 </edited>
namespace Ordisoftware.Hebrew.Calendar;

partial class NavigationForm : Form
sealed partial class NavigationForm : Form
{

private const string NoDataField = "-";
Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Forms/Config/PreferencesForm.Initialize.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace Ordisoftware.Hebrew.Calendar;
/// </summary>
/// <seealso cref="T:System.Windows.Forms.Form"/>
[SuppressMessage("CodeQuality", "IDE0052:Supprimer les membres privés non lus", Justification = "N/A")]
sealed partial class PreferencesForm
partial class PreferencesForm
{

private sealed class LayoutSectionItem
Expand Down
2 changes: 1 addition & 1 deletion Project/Source/Forms/Config/PreferencesForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace Ordisoftware.Hebrew.Calendar;
/// Provides form to edit the preferences.
/// </summary>
/// <seealso cref="T:System.Windows.Forms.Form"/>
partial class PreferencesForm : Form
sealed partial class PreferencesForm : Form
{

#region Variables
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ It is therefore possible to use [AutoHotKey](https://www.autohotkey.com) to defi

#### TO DO Next

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

0 comments on commit 5ee50b2

Please sign in to comment.