Merge pull request #318 from Ordisoftware/dev

Dev
Ordisoftware · Dec 5, 2021 · ae1ee05 · ae1ee05
2 parents 2c6cd91 + 899aebc
commit ae1ee05
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 23 deletions.
diff --git a/Project/Medias/Icons/Fatcow/help32.ico b/Project/Medias/Icons/Fatcow/help32.ico
diff --git a/Project/Source/Common/Core/Globalization/SysTranslations.Processing.cs b/Project/Source/Common/Core/Globalization/SysTranslations.Processing.cs
@@ -44,6 +44,12 @@ static partial class SysTranslations
     [Language.FR] = "Chargement des données..."
   };
 
+  static public readonly TranslationsDictionary LoadingDataDetailed = new()
+  {
+    [Language.EN] = "Loading data... {0}",
+    [Language.FR] = "Chargement des données... {0}"
+  };
+
   static public readonly TranslationsDictionary BindingData = new()
   {
     [Language.EN] = "Binding data...",

diff --git a/Project/Source/Forms/MainForm/MainForm.Analyse.cs b/Project/Source/Forms/MainForm/MainForm.Analyse.cs
@@ -101,7 +101,7 @@ private void DoAnalyse()
           LettersMeanings[letter.ValueSimple][indexMeaning++] = letter.Structure;
           LettersMeanings[letter.ValueSimple][indexMeaning++] = letter.Function;
           LettersMeanings[letter.ValueSimple][indexMeaning++] = Globals.ListSeparator;
-          if ( Program.Settings.AutoSortAnalysisMeanings )
+          if ( Settings.AutoSortAnalysisMeanings )
             Array.Sort(rowsMeanings, (x, y) => x.Text.CompareTo(y.Text));
           foreach ( var meaning in rowsMeanings )
             LettersMeanings[letter.ValueSimple][indexMeaning++] = meaning.Text;

diff --git a/Project/Source/Forms/MainForm/MainForm.Initialize.cs b/Project/Source/Forms/MainForm/MainForm.Initialize.cs
@@ -85,7 +85,7 @@ private void DoFormLoad(object sender, EventArgs e)
     Globals.ChronoStartingApp.Start();
     InitializeTheme();
     InitializeDialogsDirectory();
-    Program.Settings.CurrentView = ViewMode.Analysis;
+    Settings.CurrentView = ViewMode.Analysis;
     LoadData();
     Program.UpdateLocalization();
     Globals.IsReady = true;
@@ -162,7 +162,7 @@ private void DoFormShown(object sender, EventArgs e)
   /// </summary>
   private void DoFormClosed(object sender, FormClosedEventArgs e)
   {
-    Program.Settings.CurrentView = ViewMode.Analysis;
+    Settings.CurrentView = ViewMode.Analysis;
     Globals.IsExiting = true;
     Globals.IsSessionEnding = true;
     Globals.AllowClose = true;

diff --git a/Project/Source/Forms/MainForm/MainForm.Keys.cs b/Project/Source/Forms/MainForm/MainForm.Keys.cs
@@ -92,7 +92,7 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
         return true;
     }
     // Letters navigation
-    if ( Globals.AllowClose && Program.Settings.CurrentView == ViewMode.Letters )
+    if ( Globals.AllowClose && Settings.CurrentView == ViewMode.Letters )
       switch ( keyData )
       {
         case Keys.Control | Keys.Home:

diff --git a/Project/Source/Forms/MainForm/MainForm.SetView.cs b/Project/Source/Forms/MainForm/MainForm.SetView.cs
@@ -48,21 +48,12 @@ private sealed class ViewConnector
   private int SavedSelectionLength;
   private bool ViewNotebookFirstTime = true;
 
-  /// <summary>
-  /// Sets the view panel.
-  /// </summary>
-  /// <param name="view">The view mode.</param>
-  public void SetView(ViewMode view)
-  {
-    SetView(view, false);
-  }
-
   /// <summary>
   /// Sets the view panel.
   /// </summary>
   /// <param name="view">The view mode.</param>
   /// <param name="first">true to first.</param>
-  public void SetView(ViewMode view, bool first)
+  public void SetView(ViewMode view, bool first = false)
   {
     var ViewPanels = new Dictionary<ViewMode, ViewConnector>()
     {
@@ -94,17 +85,16 @@ public void SetView(ViewMode view, bool first)
         }
       }
     };
-    if ( Program.Settings.CurrentView == view && !first ) return;
-    if ( Program.Settings.CurrentView == ViewMode.Letters )
-    {
-      ViewPanels[Program.Settings.CurrentView].Focused.Focus();
-    }
-    ViewPanels[Program.Settings.CurrentView].MenuItem.Checked = false;
-    ViewPanels[Program.Settings.CurrentView].Panel.Parent = null;
+    if ( Settings.CurrentView == view && !first ) return;
+    if ( Settings.CurrentView == ViewMode.Letters )
+      ViewPanels[Settings.CurrentView].Focused.Focus();
+    ViewPanels[Settings.CurrentView].MenuItem.Checked = false;
+    ViewPanels[Settings.CurrentView].Panel.Parent = null;
     ViewPanels[view].MenuItem.Checked = true;
     ViewPanels[view].Panel.Parent = PanelMainCenter;
     ViewPanels[view].Focused.Focus();
-    Program.Settings.CurrentView = view;
+    Settings.CurrentView = view;
+    LabelCurrentView.Text = AppTranslations.CurrentViewText[view].GetLang();
     if ( view == ViewMode.Analysis )
     {
       EditWord.TextBox.SelectionStart = SavedSelectionStart;
@@ -122,7 +112,6 @@ public void SetView(ViewMode view, bool first)
       SavedSelectionStart = EditWord.TextBox.SelectionStart;
       SavedSelectionLength = EditWord.TextBox.SelectionLength;
     }
-    LabelCurrentView.Text = AppTranslations.CurrentViewText[view].GetLang();
     if ( view == ViewMode.Notebook && ViewNotebookFirstTime )
     {
       ViewNotebookFirstTime = false;