Skip to content

Commit 7c65ae4

Browse files
authored
Merge pull request #1194 from Ordisoftware/dev
Dev
2 parents b24752c + 1215c02 commit 7c65ae4

File tree

8 files changed

+257
-63
lines changed

8 files changed

+257
-63
lines changed

Project/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// en utilisant '*', comme indiqué ci-dessous :
3333
// [assembly: AssemblyVersion("1.0.*")]
3434
[assembly: NeutralResourcesLanguage("en")]
35-
[assembly: AssemblyVersion("10.0.0.0")]
36-
[assembly: AssemblyFileVersion("10.0.0.0")]
35+
[assembly: AssemblyVersion("9.30.0.0")]
36+
[assembly: AssemblyFileVersion("9.30.0.0")]

Project/Source/Common/Hebrew/WinControls/LettersControl.Redraw.cs

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ partial class LettersControl
2727
/// </summary>
2828
[SuppressMessage("IDisposableAnalyzers.Correctness", "IDISP003:Dispose previous before re-assigning", Justification = "N/A")]
2929
[SuppressMessage("Design", "GCop179:Do not hardcode numbers, strings or other values. Use constant fields, enums, config files or database as appropriate.", Justification = "N/A")]
30+
[SuppressMessage("Design", "MA0051:Method is too long", Justification = "N/A")]
3031
public void Redraw()
3132
{
3233
if ( !Created || RedrawMutex ) return;

Project/Source/Forms/MainForm/MainForm.Designer.cs

+58-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Project/Source/Forms/MainForm/MainForm.cs

+29-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// You may add additional accurate notices of copyright ownership.
1212
/// </license>
1313
/// <created> 2016-04 </created>
14-
/// <edited> 2022-06 </edited>
14+
/// <edited> 2022-08 </edited>
1515
namespace Ordisoftware.Hebrew.Calendar;
1616

1717
/// <summary>
@@ -736,15 +736,25 @@ private void ActionGenerate_Click(object sender, EventArgs e)
736736
}
737737

738738
/// <summary>
739-
/// Event handler. Called by ActionOpenExportFolder for click events.
739+
/// Event handler. Called by ActionOpenFolderExport for click events.
740740
/// </summary>
741741
/// <param name="sender">Source of the event.</param>
742742
/// <param name="e">Event information.</param>
743-
private void ActionOpenExportFolder_Click(object sender, EventArgs e)
743+
private void ActionOpenFolderExport_Click(object sender, EventArgs e)
744744
{
745745
SystemManager.RunShell(Settings.GetExportDirectory());
746746
}
747747

748+
/// <summary>
749+
/// Event handler. Called by ActionOpenFolderDatabase for click events.
750+
/// </summary>
751+
/// <param name="sender">Source of the event.</param>
752+
/// <param name="e">Event information.</param>
753+
private void ActionOpenFolderDatabase_Click(object sender, EventArgs e)
754+
{
755+
SystemManager.RunShell(Globals.DatabaseFolderPath);
756+
}
757+
748758
/// <summary>
749759
/// Event handler. Called by ActionVacuumDB for click events.
750760
/// </summary>
@@ -1139,7 +1149,6 @@ private void TimerResumeReminder_Tick(object sender, EventArgs e)
11391149
MenuEnableReminder.PerformClick();
11401150
}
11411151

1142-
11431152
/// <summary>
11441153
/// Event handler. Called by TimerMidnight for tick events.
11451154
/// </summary>
@@ -1300,4 +1309,20 @@ private void ContextMenuDayManageBookmark_Click(object sender, EventArgs e)
13001309

13011310
#endregion
13021311

1312+
private void ActionTakeScreenshotWindow_Click(object sender, EventArgs e)
1313+
{
1314+
using var bitmap = this.GetBitmap();
1315+
Clipboard.SetImage(bitmap);
1316+
DisplayManager.ShowSuccessOrSound(SysTranslations.ScreenshotDone.GetLang(),
1317+
Globals.ScreenshotSoundFilePath);
1318+
}
1319+
1320+
private void ActionTakeScreenshotView_Click(object sender, EventArgs e)
1321+
{
1322+
using var bitmap = PanelMainOuter1.GetBitmap();
1323+
Clipboard.SetImage(bitmap);
1324+
DisplayManager.ShowSuccessOrSound(SysTranslations.ScreenshotDone.GetLang(),
1325+
Globals.ScreenshotSoundFilePath);
1326+
}
1327+
13031328
}

Project/Source/Forms/MainForm/MainForm.fr.resx

+10-1
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@
424424
<data name="ActionOpenExportFolder.Size" type="System.Drawing.Size, System.Drawing">
425425
<value>300, 22</value>
426426
</data>
427-
<data name="ActionOpenExportFolder.Text" xml:space="preserve">
427+
<data name="ActionOpenFolderExport.Text" xml:space="preserve">
428428
<value>Ouvrir le dossier d'export</value>
429429
</data>
430430
<data name="toolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
@@ -662,4 +662,13 @@
662662
<data name="ActionShowFoodNotice.Text" xml:space="preserve">
663663
<value>Notice sur la nourriture lors des célébrations</value>
664664
</data>
665+
<data name="ActionOpenFolderDatabase.Text" xml:space="preserve">
666+
<value>Ouvrir le dossier de la base de données</value>
667+
</data>
668+
<data name="ActionTakeScreenshotView.Text" xml:space="preserve">
669+
<value>Copie écran de la vue</value>
670+
</data>
671+
<data name="ActionTakeScreenshotWindow.Text" xml:space="preserve">
672+
<value>Copie écran de la fenêtre</value>
673+
</data>
665674
</root>

0 commit comments

Comments
 (0)