Version 2.3.0

FrozenAssassine · May 13, 2023 · c649ea0 · c649ea0
1 parent f7c516f
commit c649ea0
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 14 deletions.
diff --git a/Fastedit/Assets/changelog.txt b/Fastedit/Assets/changelog.txt
@@ -1,4 +1,15 @@
-#Version 2.2.0 [02/16/2023]
+#Version 2.3.0 [05/13/2023]
+	• Added encoding to fileinfo
+	• Added selection to fileinfo
+	• Added property to align the menubar left/right/center
+	• Added reload settings to quick access
+	• Fixed quick access to not show emty boxes when there is no shortcut
+	• Fixed add documents only to recycle bin, when they are modified
+	• Fixed colors in quick access window now matching dialog color
+	• Updated to TextControlBox 1.7.1
+
+---
+#Version 2.2.0 [02/16/2023]
 	• Added design editor
 	• Added delete/import/export functionality to designs
 	• Added close and add -tab button to vertical tab flyout

diff --git a/Fastedit/Controls/RunCommandWindow.xaml b/Fastedit/Controls/RunCommandWindow.xaml
@@ -26,7 +26,7 @@
                     </Grid.ColumnDefinitions>
 
                     <TextBlock Foreground="{x:Bind TextColor}"  VerticalAlignment="Bottom" Grid.Column="0" Text="{x:Bind Command}" x:Phase="1"/>
-                    <Grid VerticalAlignment="Bottom" Grid.Column="1" BorderBrush="#555555" BorderThickness="1" CornerRadius="4">
+                    <Grid Visibility="{Binding Path=Shortcut, Mode=OneWay, Converter={StaticResource StringToVisibilityConverter}}"  VerticalAlignment="Bottom" Grid.Column="1" BorderBrush="#555555" BorderThickness="1" CornerRadius="4">
                         <TextBlock Foreground="{x:Bind TextColor}" Padding="2" Text="{x:Bind Shortcut}" x:Phase="1" />
                     </Grid>
                 </Grid>

diff --git a/Fastedit/Fastedit.csproj b/Fastedit/Fastedit.csproj
@@ -436,7 +436,7 @@
       <Version>13.0.3</Version>
     </PackageReference>
     <PackageReference Include="TextControlBox.JuliusKirsch">
-      <Version>1.7.0</Version>
+      <Version>1.7.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Fastedit/Properties/AssemblyInfo.cs b/Fastedit/Properties/AssemblyInfo.cs
@@ -25,6 +25,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("2.3.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.3.0.0")]
 [assembly: ComVisible(false)]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/Fastedit/Settings/SettingsUpdater.cs b/Fastedit/Settings/SettingsUpdater.cs
@@ -51,10 +51,10 @@ private static void UpdateTabSettings(TabPageItem tab, TextControlBox.TextContro
             tab.textbox.FontFamily = new FontFamily(AppSettings.GetSettings(AppSettingsValues.Settings_FontFamily, DefaultValues.FontFamily));
 
             tab.textbox.ShowLineHighlighter = AppSettings.GetSettingsAsBool(AppSettingsValues.Settings_ShowLineHighlighter, DefaultValues.ShowLineHighlighter);
+
             tab.textbox.ShowLineNumbers = AppSettings.GetSettingsAsBool(AppSettingsValues.Settings_ShowLineNumbers, DefaultValues.ShowLinenumbers);
 
-            //Removed du to bug (#110)
-            //tab.textbox.SyntaxHighlighting = AppSettings.GetSettingsAsBool(AppSettingsValues.Settings_Syntaxhighlighting, DefaultValues.SyntaxHighlighting);
+            tab.textbox.SyntaxHighlighting = AppSettings.GetSettingsAsBool(AppSettingsValues.Settings_Syntaxhighlighting, DefaultValues.SyntaxHighlighting);
 
             //tab.textbox.UseSpacesInsteadTabs = AppSettings.GetSettingsAsBool(AppSettingsValues.Settings_UseSpacesInsteadTabs, DefaultValues.UseSpacesInsteadTabs);
             //tab.textbox.NumberOfSpacesForTab = AppSettings.GetSettingsAsInt(AppSettingsValues.Settings_SpacesPerTab, DefaultValues.NumberOfSpacesPerTab);

diff --git a/Fastedit/Views/MainPage.xaml b/Fastedit/Views/MainPage.xaml
@@ -558,6 +558,7 @@
                 <controls:RunCommandWindowItem Command="Save as" Shortcut="Ctrl + Shift + S" RunCommandWindowItemClicked="SaveFileAs_Click"/>
                 <controls:RunCommandWindowItem Command="Save" Shortcut="Ctrl + S" RunCommandWindowItemClicked="SaveFile_Click"/>
                 <controls:RunCommandWindowItem Command="Select all" Shortcut="Ctrl + A" RunCommandWindowItemClicked="SelectAll_Click"/>
+                <controls:RunCommandWindowItem Command="Reload settings" Shortcut="Ctrl + Shift + R" RunCommandWindowItemClicked="ReloadSettings_Click"/>
                 <controls:RunCommandWindowItem Command="Share" RunCommandWindowItemClicked="ShareDocument_Click"/>
                 <controls:RunCommandWindowSubItem Command="Spaces instead tabs">
                     <controls:RunCommandWindowSubItem.Items>

diff --git a/Fastedit/Views/MainPage.xaml.cs b/Fastedit/Views/MainPage.xaml.cs
@@ -584,5 +584,9 @@ private void Statusbar_GoToLineTextbox_KeyDown(object sender, KeyRoutedEventArgs
                 Statusbar_Line.HideFlyout();
             }
         }
+        private void ReloadSettings_Click(object sender, RoutedEventArgs e)
+        {
+            ApplySettings();
+        }
     }
 }
diff --git a/Fastedit/Views/SettingsPages/Settings_DocumentPage.xaml b/Fastedit/Views/SettingsPages/Settings_DocumentPage.xaml
@@ -29,13 +29,13 @@
         </controls:SettingsControl>
 
         <controls:SetingsItemSeparator Header="Features"/>
-        <!-- Removed du to bug (#101)
+
         <controls:SettingsControl Header="Show linenumbers" >
             <controls:SettingsControl.Content>
                 <ToggleSwitch Style="{StaticResource LeftSideToggleSwitch}" x:Name="ShowLinenumbersSwitch" Toggled="ShowLinenumbersSwitch_Toggled"/>
             </controls:SettingsControl.Content>
         </controls:SettingsControl>
-        -->
+
         <controls:SettingsControl Header="Show linehighlighter">
             <controls:SettingsControl.Content>
                 <ToggleSwitch Style="{StaticResource LeftSideToggleSwitch}" x:Name="ShowLinehighlighterSwitch" Toggled="ShowLinehighlighterSwitch_Toggled"/>

diff --git a/Fastedit/Views/SettingsPages/Settings_DocumentPage.xaml.cs b/Fastedit/Views/SettingsPages/Settings_DocumentPage.xaml.cs
@@ -35,8 +35,7 @@ public Settings_DocumentPage()
             FontFamilyCombobox.SelectedItem = AppSettings.GetSettings(AppSettingsValues.Settings_FontFamily, DefaultValues.FontFamily);
             FontSizeNumberBox.Value = AppSettings.GetSettingsAsInt(AppSettingsValues.Settings_FontSize, DefaultValues.FontSize);
 
-            //Removed du to bug (#110)
-            //ShowLinenumbersSwitch.IsOn = AppSettings.GetSettingsAsBool(AppSettingsValues.Settings_ShowLineNumbers, DefaultValues.ShowLinenumbers);
+            ShowLinenumbersSwitch.IsOn = AppSettings.GetSettingsAsBool(AppSettingsValues.Settings_ShowLineNumbers, DefaultValues.ShowLinenumbers);
             EnableSyntaxhighlightingSwitch.IsOn = AppSettings.GetSettingsAsBool(AppSettingsValues.Settings_Syntaxhighlighting, DefaultValues.SyntaxHighlighting);
             ShowLinehighlighterSwitch.IsOn = AppSettings.GetSettingsAsBool(AppSettingsValues.Settings_ShowLineHighlighter, DefaultValues.ShowLineHighlighter);
         }
@@ -60,10 +59,10 @@ private void FontSizeNumberBox_ValueChanged(Microsoft.UI.Xaml.Controls.NumberBox
             AppSettings.SaveSettings(AppSettingsValues.Settings_FontSize, FontSizeNumberBox.Value);
         }
         //Removed du to bug (#110)
-        //private void ShowLinenumbersSwitch_Toggled(object sender, RoutedEventArgs e)
-        //{
-        //    AppSettings.SaveSettings(AppSettingsValues.Settings_ShowLineNumbers, ShowLinenumbersSwitch.IsOn);
-        //}
+        private void ShowLinenumbersSwitch_Toggled(object sender, RoutedEventArgs e)
+        {
+            AppSettings.SaveSettings(AppSettingsValues.Settings_ShowLineNumbers, ShowLinenumbersSwitch.IsOn);
+        }
 
         private void ShowLinehighlighterSwitch_Toggled(object sender, RoutedEventArgs e)
         {