Fixed little issues and updated version, for final release

FrozenAssassine · May 20, 2022 · 0b4b6af · 0b4b6af
1 parent 3073adc
commit 0b4b6af
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 16 deletions.
diff --git a/Fastedit/Assets/news.txt b/Fastedit/Assets/news.txt
@@ -1,5 +1,11 @@
 Fastedit Changelog:
 
+-------------------------------------------------------
+Version 1.6.2 [05/20/2022]
+	• Added a searchbox to the secondary instance
+	• Fixed very small bugs
+	• Improved search experience
+
 -------------------------------------------------------
 Version 1.5.2 [05/06/2022]
 	• Added number of lines to fileinfo

diff --git a/Fastedit/Controls/Textbox/Searchdialog.xaml.cs b/Fastedit/Controls/Textbox/Searchdialog.xaml.cs
@@ -42,7 +42,15 @@ public Searchdialog(TextControlBox textbox)
         public bool SearchIsOpen
         {
             get => this.Visibility == Visibility.Visible;
-            set { this.Visibility = Convert.BoolToVisibility(value); }
+            set
+            {
+                this.Visibility = Convert.BoolToVisibility(value);
+                if (value)
+                {
+                    TextToFindTextbox.Focus(FocusState.Keyboard);
+                    TextToFindTextbox.SelectAll();
+                }
+            }
         }
         private bool _ReplaceIsOpen = false;
         public bool ReplaceIsOpen
@@ -55,20 +63,23 @@ public bool ReplaceIsOpen
                     ExpandSearch.Begin();
                     SearchWindow.Height = 125;
                     ExpandSearchBoxForReplaceButton.Content = "\uF0AD";
-                    if(SaveToSettings)
+                    if (SaveToSettings)
                         appsettings.SaveSettings("SearchExpanded", 0);
+
                 }
                 else
                 {
                     if (SearchWindow.Height > 45)
                         CollapseSearch.Begin();
                     ExpandSearchBoxForReplaceButton.Content = "\uF0AE";
-                    if(SaveToSettings)
+                    if (SaveToSettings)
                         appsettings.SaveSettings("SearchExpanded", 1);
                 }
                 _ReplaceIsOpen = value;
                 TextToReplaceTextBox.Visibility = ReplaceAllButton.Visibility =
                 StartReplaceButton.Visibility = Convert.BoolToVisibility(value);
+                TextToReplaceTextBox.Focus(FocusState.Keyboard);
+                TextToReplaceTextBox.SelectAll();
             }
         }
         public void Find(bool Up = false)
@@ -111,16 +122,16 @@ public void Toggle(bool Replace)
                 this.Replace(Replace);
             }
             else
-            {
                 Close();
-            }
         }
         public void Replace(bool IsOn)
         {
             ReplaceIsOpen = IsOn;
         }
         public bool SaveToSettings { get; set; } = true;
 
+
+
         private void ColorWindowBorder(bool state)
         {
             if (SaveToSettings)

diff --git a/Fastedit/Properties/AssemblyInfo.cs b/Fastedit/Properties/AssemblyInfo.cs
@@ -24,7 +24,7 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, 
 // indem Sie "*" wie unten gezeigt eingeben:
 // [Assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.2.0")]
-[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyVersion("1.6.2.0")]
+[assembly: AssemblyFileVersion("1.6.2.0")]
 [assembly: ComVisible(false)]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/Fastedit/Strings/de-DE/Resources.resw b/Fastedit/Strings/de-DE/Resources.resw
@@ -1164,10 +1164,7 @@
   <data name="FileInfo_Lines.Text" xml:space="preserve">
     <value>Zeilen:</value>
   </data>
-  <data name="MainPage_SearchWindow_FindMatchCase.Text" xml:space="preserve">
+  <data name="MainPage_SearchWindow_FindMatchCase.Content" xml:space="preserve">
     <value>Groß/Kleinschreibung</value>
   </data>
-  <data name="MainPage_SearchWindow_FindWholeWordButton.Text" xml:space="preserve">
-    <value>Ganzes Wort</value>
-  </data>
 </root>
diff --git a/Fastedit/Strings/en-US/Resources.resw b/Fastedit/Strings/en-US/Resources.resw
@@ -1096,10 +1096,7 @@
   <data name="FileInfo_Lines.Text" xml:space="preserve">
     <value>Lines:</value>
   </data>
-  <data name="MainPage_SearchWindow_FindMatchCase.Text" xml:space="preserve">
+  <data name="MainPage_SearchWindow_FindMatchCase.Content" xml:space="preserve">
     <value>Match case</value>
   </data>
-  <data name="MainPage_SearchWindow_FindWholeWordButton.Text" xml:space="preserve">
-    <value>Whole word</value>
-  </data>
 </root>
diff --git a/Fastedit/Views/TextboxViewPage.xaml.cs b/Fastedit/Views/TextboxViewPage.xaml.cs
@@ -114,11 +114,12 @@ private async void TextboxViewPage_KeyDown(object sender, Windows.UI.Xaml.Input.
                 }
                 if(e.Key == VirtualKey.F)
                 {
-                    searchDialog.Show();
+                    searchDialog.SearchIsOpen = !searchDialog.SearchIsOpen;
                 }
                 if(e.Key == VirtualKey.R)
                 {
                     searchDialog.Replace(!searchDialog.ReplaceIsOpen);
+                    searchDialog.Focus(FocusState.Programmatic);
                 }
 
                 //if (e.Key == VirtualKey.S)