Minor bugfixes and enhancements.

XamDR · Jul 13, 2020 · 78ab327 · 78ab327
1 parent 81cbef8
commit 78ab327
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/ModernNotepad/Behaviors/TextChangedBehavior.cs b/ModernNotepad/Behaviors/TextChangedBehavior.cs
@@ -25,7 +25,8 @@ private void OnTextChanged(object sender, TextChangedEventArgs e)
             var viewModel = Application.Current.MainWindow.DataContext as MainViewModel;            
             var textArea = viewModel.TextEditor.TextArea;
 
-            if (e.Changes.FirstOrDefault().AddedLength != textArea.Text.Length || 
+            if (e.Changes.FirstOrDefault().AddedLength > 0 ||
+                e.Changes.FirstOrDefault().AddedLength != textArea.Text.Length || 
                 e.Changes.FirstOrDefault().RemovedLength > 0)
             {                
                 viewModel.Title = $"*{viewModel.Title.Replace("*", "")}";

diff --git a/ModernNotepad/Locales/Strings_en-US.xaml b/ModernNotepad/Locales/Strings_en-US.xaml
@@ -33,14 +33,14 @@
     <sys:String x:Key="OpenToolTip">Open File (Ctrl+A)</sys:String>
     <sys:String x:Key="SaveToolTip">Save File (Ctrl+S)</sys:String>
     <sys:String x:Key="SaveAsToolTip">Save File As (Ctrl+Shift+S)</sys:String>
-    <sys:String x:Key="SettingsToolTip">Show Settings Window</sys:String>
-    <sys:String x:Key="FindToolTip">Find or Replace Text (Ctrl+F)</sys:String>
+    <sys:String x:Key="SettingsToolTip">Show Settings Window (Ctrl+G)</sys:String>
+    <sys:String x:Key="FindToolTip">Find or Replace Text (Ctrl+R)</sys:String>
     <sys:String x:Key="FindNextButtonTooltip">Find Next</sys:String>
     <sys:String x:Key="FindPreviousButtonTooltip">Find Previous</sys:String>
     <sys:String x:Key="ReplaceButtonTooltip">Replace</sys:String>
     <sys:String x:Key="ReplaceAllButtonTooltip">Replace All</sys:String>
-    <sys:String x:Key="FontToolTip">Font Settings</sys:String>    
-    <sys:String x:Key="PrintPreviewToolTip">Show Print Preview</sys:String>
+    <sys:String x:Key="FontToolTip">Font Settings (Ctrl+F)</sys:String>    
+    <sys:String x:Key="PrintPreviewToolTip">Show Print Preview (Ctrl+P)</sys:String>
     <sys:String x:Key="PrintTooltip">Show Print Dialog</sys:String>
     <sys:String x:Key="PreviousPageToolTip">Previous Page</sys:String>
     <sys:String x:Key="NextPageToolTip">Next Page</sys:String>

diff --git a/ModernNotepad/Locales/Strings_es-ES.xaml b/ModernNotepad/Locales/Strings_es-ES.xaml
@@ -32,14 +32,14 @@
     <sys:String x:Key="OpenToolTip">Abrir archivo (Ctrl+A)</sys:String>
     <sys:String x:Key="SaveToolTip">Guardar archivo (Ctrl+S)</sys:String>
     <sys:String x:Key="SaveAsToolTip">Guardar archivo como (Ctrl+S)</sys:String>
-    <sys:String x:Key="SettingsToolTip">Mostrar ventana de configuración</sys:String>
-    <sys:String x:Key="FindToolTip">Buscar o reemplazar texto (Ctrl+B)</sys:String>
+    <sys:String x:Key="SettingsToolTip">Mostrar ventana de configuración (Ctrl+G)</sys:String>
+    <sys:String x:Key="FindToolTip">Buscar o reemplazar texto (Ctrl+R)</sys:String>
     <sys:String x:Key="FindNextButtonTooltip">Buscar siguiente</sys:String>
     <sys:String x:Key="FindPreviousButtonTooltip">Buscar anterior</sys:String>
     <sys:String x:Key="ReplaceButtonTooltip">Reemplazar</sys:String>
     <sys:String x:Key="ReplaceAllButtonTooltip">Reemplazar todo</sys:String>
-    <sys:String x:Key="FontToolTip">Configuración de la fuente</sys:String>
-    <sys:String x:Key="PrintPreviewToolTip">Mostrar vista previa de impresión</sys:String>
+    <sys:String x:Key="FontToolTip">Configuración de la fuente (Ctrl+F)</sys:String>
+    <sys:String x:Key="PrintPreviewToolTip">Mostrar vista previa de impresión (Ctrl+P)</sys:String>
     <sys:String x:Key="PrintTooltip">Mostrar diálogo de impresión</sys:String>    
     <sys:String x:Key="PreviousPageToolTip">Página anterior</sys:String>
     <sys:String x:Key="NextPageToolTip">Página siguiente</sys:String>

diff --git a/ModernNotepad/Views/MainWindow.xaml b/ModernNotepad/Views/MainWindow.xaml
@@ -27,9 +27,11 @@
         <KeyBinding Command="{Binding TextEditor.CreateNewDocumentCommand}" Gesture="Ctrl+N"/>
         <KeyBinding Command="{Binding TextEditor.OpenFileCommand}" Gesture="Ctrl+E"/>
         <KeyBinding Command="{Binding TextEditor.SaveFileCommand}" Gesture="Ctrl+S"/>
-        <KeyBinding Command="{Binding ShowFindReplaceWindowCommand}" Gesture="Ctrl+F"/>
+        <KeyBinding Command="{Binding ShowFindReplaceWindowCommand}" Gesture="Ctrl+R"/>
+        <KeyBinding Command="{Binding ShowFontSettingsWindowCommand}" Gesture="Ctrl+F"/>
         <KeyBinding Command="{Binding TextEditor.SaveFileAsCommand}" Gesture="Ctrl+Shift+S"/>
         <KeyBinding Command="{Binding ShowPrintPreviewCommand}" Gesture="Ctrl+P"/>
+        <KeyBinding Command="{Binding ShowSettingsWindowCommand}" Gesture="Ctrl+G"/>
     </Window.InputBindings>
 
     <Window.Resources>
@@ -112,7 +114,7 @@
                     <Border BorderThickness="1" CornerRadius="5" Padding="10">
                         <TextBlock FontFamily="{x:Static SystemFonts.MessageFontFamily}">
                             <Run Text="{DynamicResource NoFindResults}"/>
-                            <Run Text="{Binding FindReplaceViewModel.TextToFind, StringFormat=' &quot;\{0\}&quot;'}"/>
+                            <Run Text="{Binding FindReplaceViewModel.TextToFind, StringFormat='&quot;\{0\}&quot;'}"/>
                         </TextBlock>
                         <Border.Style>
                             <Style TargetType="Border">
@@ -123,6 +125,10 @@
                                         <Setter Property="Background" Value="#323232"/>
                                         <Setter Property="BorderBrush" Value="#323232"/>
                                     </DataTrigger>
+                                    <DataTrigger Binding="{Binding SettingsViewModel.IsDarkThemeEnabled}" Value="{x:Null}">
+                                        <Setter Property="Background" Value="#323232"/>
+                                        <Setter Property="BorderBrush" Value="#323232"/>
+                                    </DataTrigger>
                                 </Style.Triggers>
                             </Style>
                         </Border.Style>