Merge pull request #1194 from Ordisoftware/dev

Dev
Ordisoftware · Aug 5, 2022 · 7c65ae4 · 7c65ae4
2 parents b24752c + 1215c02
commit 7c65ae4
Show file tree

Hide file tree

Showing 8 changed files with 257 additions and 63 deletions.
diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: NeutralResourcesLanguage("en")]
-[assembly: AssemblyVersion("10.0.0.0")]
-[assembly: AssemblyFileVersion("10.0.0.0")]
+[assembly: AssemblyVersion("9.30.0.0")]
+[assembly: AssemblyFileVersion("9.30.0.0")]
diff --git a/Project/Source/Common/Hebrew/WinControls/LettersControl.Redraw.cs b/Project/Source/Common/Hebrew/WinControls/LettersControl.Redraw.cs
@@ -27,6 +27,7 @@ partial class LettersControl
   /// </summary>
   [SuppressMessage("IDisposableAnalyzers.Correctness", "IDISP003:Dispose previous before re-assigning", Justification = "N/A")]
   [SuppressMessage("Design", "GCop179:Do not hardcode numbers, strings or other values. Use constant fields, enums, config files or database as appropriate.", Justification = "N/A")]
+  [SuppressMessage("Design", "MA0051:Method is too long", Justification = "N/A")]
   public void Redraw()
   {
     if ( !Created || RedrawMutex ) return;

diff --git a/Project/Source/Forms/MainForm/MainForm.Designer.cs b/Project/Source/Forms/MainForm/MainForm.Designer.cs
diff --git a/Project/Source/Forms/MainForm/MainForm.cs b/Project/Source/Forms/MainForm/MainForm.cs
@@ -11,7 +11,7 @@
 /// You may add additional accurate notices of copyright ownership.
 /// </license>
 /// <created> 2016-04 </created>
-/// <edited> 2022-06 </edited>
+/// <edited> 2022-08 </edited>
 namespace Ordisoftware.Hebrew.Calendar;
 
 /// <summary>
@@ -736,15 +736,25 @@ private void ActionGenerate_Click(object sender, EventArgs e)
   }
 
   /// <summary>
-  /// Event handler. Called by ActionOpenExportFolder for click events.
+  /// Event handler. Called by ActionOpenFolderExport for click events.
   /// </summary>
   /// <param name="sender">Source of the event.</param>
   /// <param name="e">Event information.</param>
-  private void ActionOpenExportFolder_Click(object sender, EventArgs e)
+  private void ActionOpenFolderExport_Click(object sender, EventArgs e)
   {
     SystemManager.RunShell(Settings.GetExportDirectory());
   }
 
+  /// <summary>
+  /// Event handler. Called by ActionOpenFolderDatabase for click events.
+  /// </summary>
+  /// <param name="sender">Source of the event.</param>
+  /// <param name="e">Event information.</param>
+  private void ActionOpenFolderDatabase_Click(object sender, EventArgs e)
+  {
+    SystemManager.RunShell(Globals.DatabaseFolderPath);
+  }
+
   /// <summary>
   /// Event handler. Called by ActionVacuumDB for click events.
   /// </summary>
@@ -1139,7 +1149,6 @@ private void TimerResumeReminder_Tick(object sender, EventArgs e)
     MenuEnableReminder.PerformClick();
   }
 
-
   /// <summary>
   /// Event handler. Called by TimerMidnight for tick events.
   /// </summary>
@@ -1300,4 +1309,20 @@ private void ContextMenuDayManageBookmark_Click(object sender, EventArgs e)
 
   #endregion
 
+  private void ActionTakeScreenshotWindow_Click(object sender, EventArgs e)
+  {
+    using var bitmap = this.GetBitmap();
+    Clipboard.SetImage(bitmap);
+    DisplayManager.ShowSuccessOrSound(SysTranslations.ScreenshotDone.GetLang(),
+                                      Globals.ScreenshotSoundFilePath);
+  }
+
+  private void ActionTakeScreenshotView_Click(object sender, EventArgs e)
+  {
+    using var bitmap = PanelMainOuter1.GetBitmap();
+    Clipboard.SetImage(bitmap);
+    DisplayManager.ShowSuccessOrSound(SysTranslations.ScreenshotDone.GetLang(),
+                                      Globals.ScreenshotSoundFilePath);
+  }
+
 }
diff --git a/Project/Source/Forms/MainForm/MainForm.fr.resx b/Project/Source/Forms/MainForm/MainForm.fr.resx
@@ -424,7 +424,7 @@
   <data name="ActionOpenExportFolder.Size" type="System.Drawing.Size, System.Drawing">
     <value>300, 22</value>
   </data>
-  <data name="ActionOpenExportFolder.Text" xml:space="preserve">
+  <data name="ActionOpenFolderExport.Text" xml:space="preserve">
     <value>Ouvrir le dossier d'export</value>
   </data>
   <data name="toolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
@@ -662,4 +662,13 @@
   <data name="ActionShowFoodNotice.Text" xml:space="preserve">
     <value>Notice sur la nourriture lors des célébrations</value>
   </data>
+  <data name="ActionOpenFolderDatabase.Text" xml:space="preserve">
+    <value>Ouvrir le dossier de la base de données</value>
+  </data>
+  <data name="ActionTakeScreenshotView.Text" xml:space="preserve">
+    <value>Copie écran de la vue</value>
+  </data>
+  <data name="ActionTakeScreenshotWindow.Text" xml:space="preserve">
+    <value>Copie écran de la fenêtre</value>
+  </data>
 </root>