Skip to content

A Swiss Army knife for developers.

Added an option to clear text editor when pasting from the clipboard. (#580)

Etienne Baudoux45a00ba29512
diff --git a/src/dev/impl/DevToys/Core/Settings/PredefinedSettings.cs b/src/dev/impl/DevToys/Core/Settings/PredefinedSettings.cs
index eb058fe93..63a0b99f4 100644
--- a/src/dev/impl/DevToys/Core/Settings/PredefinedSettings.cs
+++ b/src/dev/impl/DevToys/Core/Settings/PredefinedSettings.cs
@@ -122,5 +122,14 @@ namespace DevToys.Core.Settings
name: nameof(TextEditorRenderWhitespace),
isRoaming: true,
defaultValue: false);
+
+ /// <summary>
+ /// Whether when using the Paste command, the text in the editor should be replaced or appended.
+ /// </summary>
+ public static readonly SettingDefinition<bool> TextEditorPasteClearsText
+ = new(
+ name: nameof(TextEditorPasteClearsText),
+ isRoaming: true,
+ defaultValue: false);
}
}
diff --git a/src/dev/impl/DevToys/LanguageManager.cs b/src/dev/impl/DevToys/LanguageManager.cs
index e92e934b0..4a177a3b6 100644
--- a/src/dev/impl/DevToys/LanguageManager.cs
+++ b/src/dev/impl/DevToys/LanguageManager.cs
@@ -2337,6 +2337,16 @@ namespace DevToys
/// Gets the resource HelpTranslating.
/// </summary>
public string HelpTranslating => _resources.GetString("HelpTranslating");
+
+ /// <summary>
+ /// Gets the resource PasteClearsText.
+ /// </summary>
+ public string PasteClearsText => _resources.GetString("PasteClearsText");
+
+ /// <summary>
+ /// Gets the resource PasteClearsTextDescription.
+ /// </summary>
+ public string PasteClearsTextDescription => _resources.GetString("PasteClearsTextDescription");
}
public class SqlFormatterStrings : ObservableObject
diff --git a/src/dev/impl/DevToys/Strings/en-US/Settings.resw b/src/dev/impl/DevToys/Strings/en-US/Settings.resw
index 306ea1103..6865e7d59 100644
--- a/src/dev/impl/DevToys/Strings/en-US/Settings.resw
+++ b/src/dev/impl/DevToys/Strings/en-US/Settings.resw
@@ -234,4 +234,10 @@
<data name="HelpTranslating" xml:space="preserve">
<value>Help us translating DevToys!</value>
</data>
+ <data name="PasteClearsText" xml:space="preserve">
+ <value>Replace text when pasting</value>
+ </data>
+ <data name="PasteClearsTextDescription" xml:space="preserve">
+ <value>When clicking the Paste button, clear the text before pasting instead of appending to the existing text editor content.</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/src/dev/impl/DevToys/UI/Controls/CodeEditor.xaml.cs b/src/dev/impl/DevToys/UI/Controls/CodeEditor.xaml.cs
index a0fc9602c..66418f10b 100644
--- a/src/dev/impl/DevToys/UI/Controls/CodeEditor.xaml.cs
+++ b/src/dev/impl/DevToys/UI/Controls/CodeEditor.xaml.cs
@@ -7,6 +7,7 @@ using DevToys.Core.Settings;
using DevToys.Core.Threading;
using DevToys.MonacoEditor.CodeEditorControl;
using DevToys.MonacoEditor.Monaco.Editor;
+using DevToys.Shared.Core;
using Windows.ApplicationModel.DataTransfer;
using Windows.Storage;
using Windows.Storage.Pickers;
@@ -33,10 +34,14 @@ namespace DevToys.UI.Controls
null,
(d, e) =>
{
- if (e.NewValue is ISettingsProvider settingsProvider)
+ var codeEditor = (CodeEditor)d;
+ if (e.OldValue is ISettingsProvider settingsProvider)
{
- var codeEditor = (CodeEditor)d;
- settingsProvider.SettingChanged += codeEditor.SettingsProvider_SettingChanged;
+ settingsProvider.SettingChanged -= codeEditor.SettingsProvider_SettingChanged;
+ }
+ if (e.NewValue is ISettingsProvider settingsProvider2)
+ {
+ settingsProvider2.SettingChanged += codeEditor.SettingsProvider_SettingChanged;
}
}));
@@ -186,6 +191,8 @@ namespace DevToys.UI.Controls
public CodeEditor()
{
+ SettingsProvider = MefComposer.Provider.Import<ISettingsProvider>();
+
InitializeComponent();
_codeEditorCore = ReloadCodeEditorCore();
@@ -465,6 +472,12 @@ namespace DevToys.UI.Controls
lock (_lockObject)
{
+ if (SettingsProvider != null
+ && SettingsProvider.GetSetting(PredefinedSettings.TextEditorPasteClearsText))
+ {
+ _codeEditorCore.Text = string.Empty;
+ }
+
_codeEditorCore.SelectedText = text;
_codeEditorCore.Focus(FocusState.Programmatic);
}
diff --git a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml
index 3d2761180..df838caef 100644
--- a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml
+++ b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml
@@ -134,7 +134,7 @@
SelectionChanged="TextBox_SelectionChanged"
CopyingToClipboard="TextBox_CopyingToClipboard"
CuttingToClipboard="TextBox_CuttingToClipboard"
- AutomationProperties.LabeledBy="{Binding ElementName=HeaderTextBlock}" Loading="TextBox_Loading" />
+ AutomationProperties.LabeledBy="{Binding ElementName=HeaderTextBlock}"/>
<RichEditBox
x:Name="RichEditBox"
x:Load="{x:Bind IsRichTextEdit}"
diff --git a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
index 930b3c7e2..4dbcaff78 100644
--- a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
+++ b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
@@ -139,10 +139,14 @@ namespace DevToys.UI.Controls
null,
(d, e) =>
{
- if (e.NewValue is ISettingsProvider settingsProvider)
+ var textBox = (CustomTextBox)d;
+ if (e.OldValue is ISettingsProvider settingsProvider)
{
- var textBox = (CustomTextBox)d;
- settingsProvider.SettingChanged += textBox.SettingsProvider_SettingChanged;
+ settingsProvider.SettingChanged -= textBox.SettingsProvider_SettingChanged;
+ }
+ if (e.NewValue is ISettingsProvider settingsProvider2)
+ {
+ settingsProvider2.SettingChanged += textBox.SettingsProvider_SettingChanged;
}
}));
@@ -154,6 +158,8 @@ namespace DevToys.UI.Controls
public CustomTextBox()
{
+ SettingsProvider = Shared.Core.MefComposer.Provider.Import<ISettingsProvider>();
+
InitializeComponent();
Loaded += OnLoaded;
@@ -244,7 +250,7 @@ namespace DevToys.UI.Controls
private bool CanExecuteDeleteCommand()
{
- return IsEnabled
+ return IsEnabled
&& !IsReadOnly
&& RichEditBox != null
&& RichEditBox.TextDocument.Selection.Length != 0;
@@ -569,6 +575,7 @@ namespace DevToys.UI.Controls
private void OnLoaded(object sender, RoutedEventArgs e)
{
UpdateUI();
+ ApplySettings();
}
private void OnActualThemeChanged(FrameworkElement sender, object args)
@@ -597,6 +604,13 @@ namespace DevToys.UI.Controls
string? text = await dataPackageView.GetTextAsync();
richEditBox.TextDocument.BeginUndoGroup();
+
+ if (SettingsProvider != null
+ && SettingsProvider.GetSetting(PredefinedSettings.TextEditorPasteClearsText))
+ {
+ richEditBox.TextDocument.SetText(TextSetOptions.None, string.Empty);
+ }
+
richEditBox.TextDocument.Selection.SetText(TextSetOptions.None, text);
richEditBox.TextDocument.Selection.StartPosition = richEditBox.TextDocument.Selection.EndPosition;
richEditBox.TextDocument.EndUndoGroup();
@@ -608,6 +622,11 @@ namespace DevToys.UI.Controls
}
else
{
+ if (SettingsProvider != null
+ && SettingsProvider.GetSetting(PredefinedSettings.TextEditorPasteClearsText))
+ {
+ TextBox.Text = string.Empty;
+ }
TextBox.PasteFromClipboard();
}
}
@@ -820,17 +839,20 @@ namespace DevToys.UI.Controls
}
}
- private void TextBox_Loading(FrameworkElement sender, object args)
- {
- ApplySettings();
- }
-
private void ApplySettings()
{
ISettingsProvider? settingsProvider = SettingsProvider;
if (settingsProvider is not null)
{
- TextBox.FontFamily = new FontFamily(settingsProvider.GetSetting(PredefinedSettings.TextEditorFont));
+ if (TextBox is not null)
+ {
+ TextBox.FontFamily = new FontFamily(settingsProvider.GetSetting(PredefinedSettings.TextEditorFont));
+ }
+
+ if (RichEditBox is not null)
+ {
+ RichEditBox.FontFamily = new FontFamily(settingsProvider.GetSetting(PredefinedSettings.TextEditorFont));
+ }
}
}
}
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/EncodersDecoders/Base64ImageEncoderDecoder/MockSettingsProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/EncodersDecoders/Base64ImageEncoderDecoder/MockSettingsProvider.cs
index 5c4eac531..34ba4e080 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/EncodersDecoders/Base64ImageEncoderDecoder/MockSettingsProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/EncodersDecoders/Base64ImageEncoderDecoder/MockSettingsProvider.cs
@@ -16,6 +16,12 @@ namespace DevToys.ViewModels.Tools.Base64ImageEncoderDecoder
public MockSettingsProvider(ISettingsProvider realSettingsProvider)
{
_realSettingsProvider = realSettingsProvider;
+ _realSettingsProvider.SettingChanged += realSettingsProvider_SettingChanged;
+ }
+
+ private void realSettingsProvider_SettingChanged(object sender, SettingChangedEventArgs e)
+ {
+ SettingChanged?.Invoke(this, e);
}
public T GetSetting<T>(SettingDefinition<T> settingDefinition)
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolViewModel.cs
index 997ca4913..01c02d0c8 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolViewModel.cs
@@ -92,6 +92,12 @@ namespace DevToys.ViewModels.Settings
set => _settingsProvider.SetSetting(PredefinedSettings.TextEditorRenderWhitespace, value);
}
+ internal bool TextEditorPasteClearsText
+ {
+ get => _settingsProvider.GetSetting(PredefinedSettings.TextEditorPasteClearsText);
+ set => _settingsProvider.SetSetting(PredefinedSettings.TextEditorPasteClearsText, value);
+ }
+
/// <summary>
/// Gets the version of the application.
/// </summary>
diff --git a/src/dev/impl/DevToys/Views/Tools/Converters/JsonYaml/JsonYamlToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/Converters/JsonYaml/JsonYamlToolPage.xaml
index 348f543b6..8f210a60d 100644
--- a/src/dev/impl/DevToys/Views/Tools/Converters/JsonYaml/JsonYamlToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Converters/JsonYaml/JsonYamlToolPage.xaml
@@ -96,7 +96,6 @@
Grid.Row="0"
Grid.RowSpan="3"
Header="{x:Bind ViewModel.Strings.Input}"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.InputValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
CodeLanguage="{x:Bind ViewModel.InputValueLanguage, Mode=OneWay}"/>
@@ -139,7 +138,6 @@
Grid.RowSpan="3"
IsReadOnly="True"
Header="{x:Bind ViewModel.Strings.Output}"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.OutputValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
CodeLanguage="{x:Bind ViewModel.OutputValueLanguage, Mode=OneWay}"/>
</Grid>
diff --git a/src/dev/impl/DevToys/Views/Tools/Formatters/JsonFormatter/JsonFormatterToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/Formatters/JsonFormatter/JsonFormatterToolPage.xaml
index 2ec708db5..78fdf7b45 100644
--- a/src/dev/impl/DevToys/Views/Tools/Formatters/JsonFormatter/JsonFormatterToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Formatters/JsonFormatter/JsonFormatterToolPage.xaml
@@ -93,7 +93,6 @@
Grid.Row="0"
Grid.RowSpan="3"
Header="{x:Bind ViewModel.Strings.Input}"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.InputValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
CodeLanguage="json"/>
@@ -135,7 +134,6 @@
Grid.Row="0"
Grid.RowSpan="3"
Header="{x:Bind ViewModel.Strings.Output}"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.OutputValue, Mode=OneWay}"
CodeLanguage="json"
IsReadOnly="True"/>
diff --git a/src/dev/impl/DevToys/Views/Tools/Formatters/SqlFormatter/SqlFormatterToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/Formatters/SqlFormatter/SqlFormatterToolPage.xaml
index be6ebfbdb..532085e8e 100644
--- a/src/dev/impl/DevToys/Views/Tools/Formatters/SqlFormatter/SqlFormatterToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Formatters/SqlFormatter/SqlFormatterToolPage.xaml
@@ -98,7 +98,6 @@
Grid.Row="0"
Grid.RowSpan="3"
Header="{x:Bind ViewModel.Strings.Input}"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.InputValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
CodeLanguage="sql"/>
@@ -140,7 +139,6 @@
Grid.Row="0"
Grid.RowSpan="3"
Header="{x:Bind ViewModel.Strings.Output}"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.OutputValue, Mode=OneWay}"
CodeLanguage="sql"
IsReadOnly="True"/>
diff --git a/src/dev/impl/DevToys/Views/Tools/Formatters/XmlFormatter/XmlFormatterToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/Formatters/XmlFormatter/XmlFormatterToolPage.xaml
index dfc01de5d..d58d23710 100644
--- a/src/dev/impl/DevToys/Views/Tools/Formatters/XmlFormatter/XmlFormatterToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Formatters/XmlFormatter/XmlFormatterToolPage.xaml
@@ -96,7 +96,6 @@
Grid.Row="0"
Grid.RowSpan="3"
Header="{x:Bind ViewModel.Strings.Input}"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.InputValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
CodeLanguage="xml"/>
@@ -138,7 +137,6 @@
Grid.Row="0"
Grid.RowSpan="3"
Header="{x:Bind ViewModel.Strings.Output}"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.OutputValue, Mode=OneWay}"
CodeLanguage="xml"
IsReadOnly="True"/>
diff --git a/src/dev/impl/DevToys/Views/Tools/Generators/GuidGenerator/GuidGeneratorToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/Generators/GuidGenerator/GuidGeneratorToolPage.xaml
index 3b71d59d2..19e822021 100644
--- a/src/dev/impl/DevToys/Views/Tools/Generators/GuidGenerator/GuidGeneratorToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Generators/GuidGenerator/GuidGeneratorToolPage.xaml
@@ -112,7 +112,6 @@
AcceptsReturn="True"
IsReadOnly="True"
CanClearWhenReadOnly="True"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.Output, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
</Grid>
</Page>
diff --git a/src/dev/impl/DevToys/Views/Tools/Generators/HashGenerator/HashGeneratorToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/Generators/HashGenerator/HashGeneratorToolPage.xaml
index fdd3d78c1..770e9a64a 100644
--- a/src/dev/impl/DevToys/Views/Tools/Generators/HashGenerator/HashGeneratorToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Generators/HashGenerator/HashGeneratorToolPage.xaml
@@ -71,25 +71,21 @@
<controls:CustomTextBox
Header="{x:Bind ViewModel.Strings.MD5}"
IsReadOnly="True"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.MD5, Mode=OneWay}"/>
<controls:CustomTextBox
Header="{x:Bind ViewModel.Strings.SHA1}"
IsReadOnly="True"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.SHA1, Mode=OneWay}"/>
<controls:CustomTextBox
Header="{x:Bind ViewModel.Strings.SHA256}"
IsReadOnly="True"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.SHA256, Mode=OneWay}"/>
<controls:CustomTextBox
Header="{x:Bind ViewModel.Strings.SHA512}"
IsReadOnly="True"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.SHA512, Mode=OneWay}"/>
</StackPanel>
</Page>
diff --git a/src/dev/impl/DevToys/Views/Tools/Settings/SettingsToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/Settings/SettingsToolPage.xaml
index 4ecd4a647..3a36b9b5b 100644
--- a/src/dev/impl/DevToys/Views/Tools/Settings/SettingsToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Settings/SettingsToolPage.xaml
@@ -126,6 +126,14 @@
</controls:ExpandableSettingControl.Icon>
<ToggleSwitch Style="{StaticResource RightAlignedToggleSwitchStyle}" IsOn="{x:Bind ViewModel.TextEditorRenderWhitespace, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
</controls:ExpandableSettingControl>
+ <controls:ExpandableSettingControl
+ Title="{x:Bind ViewModel.Strings.PasteClearsText}"
+ Description="{x:Bind ViewModel.Strings.PasteClearsTextDescription}">
+ <controls:ExpandableSettingControl.Icon>
+ <FontIcon Glyph="&#xF2D5;" />
+ </controls:ExpandableSettingControl.Icon>
+ <ToggleSwitch Style="{StaticResource RightAlignedToggleSwitchStyle}" IsOn="{x:Bind ViewModel.TextEditorPasteClearsText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+ </controls:ExpandableSettingControl>
<TextBlock Style="{StaticResource SubTitleTextBlock}" Text="{x:Bind ViewModel.Strings.About}" />
diff --git a/src/dev/impl/DevToys/Views/Tools/Text/MarkdownPreview/MarkdownPreviewToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/Text/MarkdownPreview/MarkdownPreviewToolPage.xaml
index a4dd33ce8..247e74475 100644
--- a/src/dev/impl/DevToys/Views/Tools/Text/MarkdownPreview/MarkdownPreviewToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Text/MarkdownPreview/MarkdownPreviewToolPage.xaml
@@ -91,7 +91,6 @@
Grid.Row="0"
Grid.RowSpan="3"
Header="{x:Bind ViewModel.Strings.Input}"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.InputValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
CodeLanguage="markdown"/>
diff --git a/src/dev/impl/DevToys/Views/Tools/Text/RegEx/RegExToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/Text/RegEx/RegExToolPage.xaml
index 9bf69d21d..b66d2512c 100644
--- a/src/dev/impl/DevToys/Views/Tools/Text/RegEx/RegExToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Text/RegEx/RegExToolPage.xaml
@@ -101,7 +101,6 @@
<controls:CustomTextBox
Grid.Row="1"
Header="{x:Bind ViewModel.Strings.RegularExpression}"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.RegularExpression, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
<controls:CustomTextBox
@@ -111,7 +110,6 @@
AcceptsReturn="True"
IsRichTextEdit="True"
MinHeight="150"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
</Grid>
</Page>
diff --git a/src/dev/impl/DevToys/Views/Tools/Text/TextDiff/TextDiffToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/Text/TextDiff/TextDiffToolPage.xaml
index accece689..1fc006daa 100644
--- a/src/dev/impl/DevToys/Views/Tools/Text/TextDiff/TextDiffToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Text/TextDiff/TextDiffToolPage.xaml
@@ -70,7 +70,6 @@
Grid.Column="0"
MinHeight="200"
Header="{x:Bind ViewModel.Strings.LeftText}"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.OldText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
<toolkit:GridSplitter
@@ -92,7 +91,6 @@
Grid.Column="2"
MinHeight="200"
Header="{x:Bind ViewModel.Strings.RightText}"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.NewText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
</Grid>
@@ -114,7 +112,6 @@
MinHeight="200"
Grid.Row="3"
Header="{x:Bind ViewModel.Strings.Difference}"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
IsReadOnly="True"
IsDiffViewMode="True"
InlineDiffViewMode="{x:Bind ViewModel.InlineMode, Mode=OneWay}"
diff --git a/src/dev/impl/DevToys/Views/Tools/Text/XmlValidator/XmlValidatorToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/Text/XmlValidator/XmlValidatorToolPage.xaml
index c49768695..c42fb8a46 100644
--- a/src/dev/impl/DevToys/Views/Tools/Text/XmlValidator/XmlValidatorToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Text/XmlValidator/XmlValidatorToolPage.xaml
@@ -69,7 +69,6 @@
Grid.Row="0"
Grid.RowSpan="3"
Header="{x:Bind ViewModel.Strings.XsdScheme}"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.XsdSchema, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
CodeLanguage="xml"/>
@@ -111,7 +110,6 @@
Grid.Row="0"
Grid.RowSpan="3"
Header="{x:Bind ViewModel.Strings.XmlData}"
- SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.XmlData, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
CodeLanguage="xml"/>
</Grid>