From 6356526a8a64db049598c1549b9c9fcf0315faf1 Mon Sep 17 00:00:00 2001 From: Olivier Rogier Date: Sat, 4 Dec 2021 23:37:38 +0100 Subject: [PATCH 1/2] Update file --- Project/Medias/Icons/Fatcow/help32.ico | Bin 5430 -> 4286 bytes .../SysTranslations.Processing.cs | 6 ++++++ 2 files changed, 6 insertions(+) diff --git a/Project/Medias/Icons/Fatcow/help32.ico b/Project/Medias/Icons/Fatcow/help32.ico index e296afc765ce923e5005688264a2ebca3bf71908..5f568e5fdb89d44b69237c1aef8f81bedb529e7c 100644 GIT binary patch delta 29 gcmdm{wNFumfq@YS6%;_U0>cUc1_m*PjVh}I07Ux)lmGw# delta 1065 zcmZ{jTS${}7{>pV(48%vf?;Z4(ZP#W;Z>OzqGm~?9p4Aia9}KmY0IrVrll{hsIjJulz4@gLat_He8a z+r)Me6T==Ox-~)^5JG5Vr!EW4(2 zIT_^gz(voI8v$Qu9+n)XShSU3;q`UQcjv24O`mgen>)7hQ8uGli@8=4zP%~Jd`}_1 zcICm>kpo`r)bu$gXESOc)BJq#EK}PvT9qJ~eE42og|{OYbL}R4Zn>=T?9}u*Cr6$+ z=55CC4Y#>P4{uvGJTDCXdaj4NDFd_hX>c{3m&>jMX5`$GXOIi*#xQtV4RAGIf~)DG zzZx?zU3W&kzy?sQ@$&qJ{c_GX~I7|`v@zDlPdjUquWAVjqR-vsMHGR&> zk@tuF_r9F4SP~QC+w Date: Sun, 5 Dec 2021 09:59:10 +0100 Subject: [PATCH 2/2] Refactor --- .../Source/Forms/MainForm/MainForm.Analyse.cs | 2 +- .../Forms/MainForm/MainForm.Initialize.cs | 4 +-- .../Source/Forms/MainForm/MainForm.Keys.cs | 2 +- .../Source/Forms/MainForm/MainForm.SetView.cs | 27 ++++++------------- 4 files changed, 12 insertions(+), 23 deletions(-) diff --git a/Project/Source/Forms/MainForm/MainForm.Analyse.cs b/Project/Source/Forms/MainForm/MainForm.Analyse.cs index db8d4e3e..3583467e 100644 --- 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 index c97b88bf..0a62714e 100644 --- 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) /// 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 index e3343a87..ee8d63b5 100644 --- 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 index 5d783eb9..3aa56fd3 100644 --- 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; - /// - /// Sets the view panel. - /// - /// The view mode. - public void SetView(ViewMode view) - { - SetView(view, false); - } - /// /// Sets the view panel. /// /// The view mode. /// true to first. - public void SetView(ViewMode view, bool first) + public void SetView(ViewMode view, bool first = false) { var ViewPanels = new Dictionary() { @@ -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;