Merge pull request #317 from Ordisoftware/dev

Dev
Ordisoftware · Dec 4, 2021 · 2c6cd91 · 2c6cd91
2 parents b7a13e2 + 7ee9162
commit 2c6cd91
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/Project/Source/Common/Core/Globalization/SysTranslations.Processing.cs b/Project/Source/Common/Core/Globalization/SysTranslations.Processing.cs
@@ -11,7 +11,7 @@
 /// You may add additional accurate notices of copyright ownership.
 /// </license>
 /// <created> 2016-04 </created>
-/// <edited> 2021-02 </edited>
+/// <edited> 2021-12 </edited>
 namespace Ordisoftware.Core;
 
 /// <summary>
@@ -44,6 +44,12 @@ static partial class SysTranslations
     [Language.FR] = "Chargement des données..."
   };
 
+  static public readonly TranslationsDictionary BindingData = new()
+  {
+    [Language.EN] = "Binding data...",
+    [Language.FR] = "Liaison des données..."
+  };
+
   static public readonly TranslationsDictionary CreatingData = new()
   {
     [Language.EN] = "Creating data...",

diff --git a/Project/Source/Common/Core/WinControls/ComboBoxEx.cs b/Project/Source/Common/Core/WinControls/ComboBoxEx.cs
@@ -28,6 +28,9 @@ public ComboBoxEx()
     SelectedIndexPrevious = SelectedIndexLast;
   }
 
+  /// <summary>
+  /// Disallows the selection of separator item.
+  /// </summary>
   protected override void OnSelectedIndexChanged(EventArgs e)
   {
     if ( Mutex ) return;

diff --git a/Project/Source/Common/Core/WinControls/ComboBoxNavigator.cs b/Project/Source/Common/Core/WinControls/ComboBoxNavigator.cs
@@ -19,6 +19,8 @@ partial class ComboBoxNavigator : UserControl
 
   private bool Mutex;
 
+  public bool KeepFocus { get; set; } = true;
+
   public ComboBox ComboBox
   {
     get => _ComboBox;
@@ -129,28 +131,28 @@ private void ComboBox_SelectedIndexChanged(object sender, EventArgs e)
   private void ActionFirst_Click(object sender, EventArgs e)
   {
     _ComboBox.SelectedIndex = 0;
-    ActiveControl = ActionNext;
+    if ( KeepFocus ) ActiveControl = ActionNext;
     Navigated?.Invoke(sender, e);
   }
 
   private void ActionPrevious_Click(object sender, EventArgs e)
   {
     if ( _ComboBox.SelectedIndex > 0 ) _ComboBox.SelectedIndex--;
-    if ( _ComboBox.SelectedIndex == 0 ) ActiveControl = ActionNext;
+    if ( _ComboBox.SelectedIndex == 0 && KeepFocus ) ActiveControl = ActionNext;
     Navigated?.Invoke(sender, e);
   }
 
   private void ActionNext_Click(object sender, EventArgs e)
   {
     if ( _ComboBox.SelectedIndex < _ComboBox.Items.Count - 1 ) _ComboBox.SelectedIndex++;
-    if ( _ComboBox.SelectedIndex == _ComboBox.Items.Count - 1 ) ActiveControl = ActionPrevious;
+    if ( _ComboBox.SelectedIndex == _ComboBox.Items.Count - 1 && KeepFocus ) ActiveControl = ActionPrevious;
     Navigated?.Invoke(sender, e);
   }
 
   private void ActionLast_Click(object sender, EventArgs e)
   {
     _ComboBox.SelectedIndex = _ComboBox.Items.Count - 1;
-    ActiveControl = ActionPrevious;
+    if ( KeepFocus ) ActiveControl = ActionPrevious;
     Navigated?.Invoke(sender, e);
   }
 

diff --git a/Project/Source/Forms/MainForm/MainForm.Initialize.cs b/Project/Source/Forms/MainForm/MainForm.Initialize.cs
@@ -154,6 +154,7 @@ private void DoFormShown(object sender, EventArgs e)
     ProcessNewsAndCommandLine();
     if ( Globals.IsDebugExecutable ) // TODO remove when ready
       ActionViewNotebook.Visible = true;
+    this.ForceBringToFront();
   }
 
   /// <summary>

diff --git a/Project/Source/Forms/MainForm/MainForm.SetView.cs b/Project/Source/Forms/MainForm/MainForm.SetView.cs
@@ -46,6 +46,7 @@ private sealed class ViewConnector
 
   private int SavedSelectionStart;
   private int SavedSelectionLength;
+  private bool ViewNotebookFirstTime = true;
 
   /// <summary>
   /// Sets the view panel.
@@ -122,6 +123,11 @@ public void SetView(ViewMode view, bool first)
       SavedSelectionLength = EditWord.TextBox.SelectionLength;
     }
     LabelCurrentView.Text = AppTranslations.CurrentViewText[view].GetLang();
+    if ( view == ViewMode.Notebook && ViewNotebookFirstTime )
+    {
+      ViewNotebookFirstTime = false;
+      ActionNotebookClearLetter.PerformClick();
+    }
   }
 
 }
diff --git a/Project/Source/Forms/MainForm/MainForm.cs b/Project/Source/Forms/MainForm/MainForm.cs
@@ -431,16 +431,9 @@ private void ActionViewLetters_Click(object sender, EventArgs e)
     SetView(ViewMode.Letters);
   }
 
-  private bool ViewNotebookFirstTime = true;
-
   private void ActionViewNotebook_Click(object sender, EventArgs e)
   {
     SetView(ViewMode.Notebook);
-    if ( ViewNotebookFirstTime )
-    {
-      ViewNotebookFirstTime = false;
-      ActionNotebookClearLetter.PerformClick();
-    }
   }
 
   /// <summary>