diff --git a/Fastedit/Assets/changelog.txt b/Fastedit/Assets/changelog.txt
index fa5bd7c..96f7e3f 100644
--- 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
index 97fa25c..7686361 100644
--- a/Fastedit/Controls/RunCommandWindow.xaml
+++ b/Fastedit/Controls/RunCommandWindow.xaml
@@ -26,7 +26,7 @@
-
+
diff --git a/Fastedit/Fastedit.csproj b/Fastedit/Fastedit.csproj
index 4c4b5f8..3530b9d 100644
--- a/Fastedit/Fastedit.csproj
+++ b/Fastedit/Fastedit.csproj
@@ -436,7 +436,7 @@
13.0.3
- 1.7.0
+ 1.7.1
diff --git a/Fastedit/Properties/AssemblyInfo.cs b/Fastedit/Properties/AssemblyInfo.cs
index a45c20b..dcc583d 100644
--- 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
index 0749e2b..da19458 100644
--- 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
index 07490be..44595de 100644
--- a/Fastedit/Views/MainPage.xaml
+++ b/Fastedit/Views/MainPage.xaml
@@ -558,6 +558,7 @@
+
diff --git a/Fastedit/Views/MainPage.xaml.cs b/Fastedit/Views/MainPage.xaml.cs
index d617c98..03dda21 100644
--- 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
index 43174d8..07495cd 100644
--- a/Fastedit/Views/SettingsPages/Settings_DocumentPage.xaml
+++ b/Fastedit/Views/SettingsPages/Settings_DocumentPage.xaml
@@ -29,13 +29,13 @@
-
+
diff --git a/Fastedit/Views/SettingsPages/Settings_DocumentPage.xaml.cs b/Fastedit/Views/SettingsPages/Settings_DocumentPage.xaml.cs
index a269469..df838e2 100644
--- 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)
{