A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Fixed bugs
Etienne Baudoux45c8c93ae4da
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xamlindex ac50d396d..4b4b48446 100644--- a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml@@ -9,7 +9,7 @@mc:Ignorable="d"NavigationCacheMode="Required">- <Grid RowSpacing="12" Margin="0,0,0,16">+ <Grid x:Name="RootGrid" RowSpacing="12" Margin="0,0,0,16"><VisualStateManager.VisualStateGroups><VisualStateGroup><VisualState>diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.csindex 03a678723..39be7da5d 100644--- a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.cs+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.cs@@ -35,13 +35,17 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder{var parameters = (NavigationParameter)e.Parameter;- // Set the view model- Assumes.NotNull(parameters.ViewModel, nameof(parameters.ViewModel));- ViewModel = (Base64EncoderDecoderToolViewModel)parameters.ViewModel!;- DataContext = ViewModel;+ if (ViewModel is null)+ {+ // Set the view model+ Assumes.NotNull(parameters.ViewModel, nameof(parameters.ViewModel));+ ViewModel = (Base64EncoderDecoderToolViewModel)parameters.ViewModel!;+ DataContext = ViewModel;+ }+if (!string.IsNullOrWhiteSpace(parameters.ClipBoardContent)){- ViewModel.ConversionMode = "Decode";+ ViewModel.ConversionMode = Base64EncoderDecoderToolViewModel.DecodeConversion;ViewModel.InputValue = parameters.ClipBoardContent;}diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.csindex 3ca965f13..eadd8fad0 100644--- a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs@@ -17,6 +17,7 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder{private const string DefaultEncoding = "UTF-8";private const string DefaultConversion = "Encode";+ internal const string DecodeConversion = "Decode";private string? _inputValue;private string? _outputValue;@@ -40,8 +41,7 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoderset{_thread.ThrowIfNotOnUIThread();- _inputValue = value;- OnPropertyChanged();+ SetProperty(ref _inputValue, value);QueueConversionCalculation();}}@@ -64,7 +64,7 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoderset{_thread.ThrowIfNotOnUIThread();- _conversionMode = value;+ SetProperty(ref _conversionMode, value);string? tmp = InputValue;InputValue = OutputValue;OutputValue = tmp;@@ -80,7 +80,7 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoderset{_thread.ThrowIfNotOnUIThread();- _encodingMode = value;+ SetProperty(ref _encodingMode, value);}}diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml.csindex 828e0d176..7e60e2e2d 100644--- a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml.cs+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml.cs@@ -33,12 +33,15 @@ namespace DevTools.Providers.Impl.Tools.HashGeneratorprotected override void OnNavigatedTo(NavigationEventArgs e){- var parameters = (NavigationParameter)e.Parameter;+ if (ViewModel is null)+ {+ var parameters = (NavigationParameter)e.Parameter;- // Set the view model- Assumes.NotNull(parameters.ViewModel, nameof(parameters.ViewModel));- ViewModel = (HashGeneratorToolViewModel)parameters.ViewModel!;- DataContext = ViewModel;+ // Set the view model+ Assumes.NotNull(parameters.ViewModel, nameof(parameters.ViewModel));+ ViewModel = (HashGeneratorToolViewModel)parameters.ViewModel!;+ DataContext = ViewModel;+ }base.OnNavigatedTo(e);}diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml.csindex a5dbee5c0..b6d1ebf66 100644--- a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml.cs+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml.cs@@ -35,12 +35,16 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter{var parameters = (NavigationParameter)e.Parameter;- // Set the view model- Assumes.NotNull(parameters.ViewModel, nameof(parameters.ViewModel));- ViewModel = (JsonFormatterToolViewModel)parameters.ViewModel!;- DataContext = ViewModel;+ if (ViewModel is null)+ {+ // Set the view model+ Assumes.NotNull(parameters.ViewModel, nameof(parameters.ViewModel));+ ViewModel = (JsonFormatterToolViewModel)parameters.ViewModel!;+ DataContext = ViewModel;++ ViewModel.OutputTextBlock = OutputTextBlock;+ }- ViewModel.OutputTextBlock = OutputTextBlock;if (!string.IsNullOrWhiteSpace(parameters.ClipBoardContent)){ViewModel.InputValue = parameters.ClipBoardContent;diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolPage.xaml.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolPage.xaml.csindex f2cdd1701..55bc35fb0 100644--- a/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolPage.xaml.cs+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolPage.xaml.cs@@ -33,14 +33,17 @@ namespace DevTools.Providers.Impl.Tools.RegExprotected override void OnNavigatedTo(NavigationEventArgs e){- var parameters = (NavigationParameter)e.Parameter;+ if (ViewModel is null)+ {+ var parameters = (NavigationParameter)e.Parameter;- // Set the view model- Assumes.NotNull(parameters.ViewModel, nameof(parameters.ViewModel));- ViewModel = (RegExToolViewModel)parameters.ViewModel!;- DataContext = ViewModel;+ // Set the view model+ Assumes.NotNull(parameters.ViewModel, nameof(parameters.ViewModel));+ ViewModel = (RegExToolViewModel)parameters.ViewModel!;+ DataContext = ViewModel;- ViewModel.MatchTextBox = MatchTextBox;+ ViewModel.MatchTextBox = MatchTextBox;+ }base.OnNavigatedTo(e);}diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml.csindex 12a8fbce6..8a92969f0 100644--- a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml.cs+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml.cs@@ -33,14 +33,17 @@ namespace DevTools.Providers.Impl.Tools.TextDiffprotected override void OnNavigatedTo(NavigationEventArgs e){- var parameters = (NavigationParameter)e.Parameter;+ if (ViewModel is null)+ {+ var parameters = (NavigationParameter)e.Parameter;- // Set the view model- Assumes.NotNull(parameters.ViewModel, nameof(parameters.ViewModel));- ViewModel = (TextDiffToolViewModel)parameters.ViewModel!;- DataContext = ViewModel;+ // Set the view model+ Assumes.NotNull(parameters.ViewModel, nameof(parameters.ViewModel));+ ViewModel = (TextDiffToolViewModel)parameters.ViewModel!;+ DataContext = ViewModel;- ViewModel.OutputTextBlock = OuputTextEditor;+ ViewModel.OutputTextBlock = OuputTextEditor;+ }base.OnNavigatedTo(e);}