Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply the font set in settings to certain output text boxes #536

Merged
merged 1 commit into from
May 27, 2022
Merged

Apply the font set in settings to certain output text boxes #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
SelectionChanged="TextBox_SelectionChanged"
CopyingToClipboard="TextBox_CopyingToClipboard"
CuttingToClipboard="TextBox_CuttingToClipboard"
AutomationProperties.LabeledBy="{Binding ElementName=HeaderTextBlock}"/>
AutomationProperties.LabeledBy="{Binding ElementName=HeaderTextBlock}" Loading="TextBox_Loading" />
<RichEditBox
x:Name="RichEditBox"
x:Load="{x:Bind IsRichTextEdit}"
Expand Down
46 changes: 46 additions & 0 deletions src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
using System.Collections.Generic;
using System.Linq;
using System.Windows.Input;
using DevToys.Api.Core.Settings;
using DevToys.Core;
using DevToys.Core.Settings;
using DevToys.Core.Threading;
using Microsoft.Toolkit.Mvvm.Input;
using Windows.ApplicationModel.DataTransfer;
Expand Down Expand Up @@ -128,6 +130,28 @@ public int SelectionStart
set => SetValue(SelectionStartProperty, value);
}

public static readonly DependencyProperty SettingsProviderProperty
= DependencyProperty.Register(
nameof(SettingsProvider),
typeof(ISettingsProvider),
typeof(CustomTextBox),
new PropertyMetadata(
null,
(d, e) =>
{
if (e.NewValue is ISettingsProvider settingsProvider)
{
var textBox = (CustomTextBox)d;
settingsProvider.SettingChanged += textBox.SettingsProvider_SettingChanged;
}
}));

public ISettingsProvider? SettingsProvider
{
get => (ISettingsProvider?)GetValue(SettingsProviderProperty);
set => SetValue(SettingsProviderProperty, value);
}

public CustomTextBox()
{
InitializeComponent();
Expand Down Expand Up @@ -787,5 +811,27 @@ private static void OnTextPropertyChangedCalled(DependencyObject sender, Depende
}
}
}

private void SettingsProvider_SettingChanged(object sender, SettingChangedEventArgs e)
{
if (e.SettingName.Contains("TextEditor"))
{
ApplySettings();
}
}

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));
}
}
}
}
28 changes: 14 additions & 14 deletions src/dev/impl/DevToys/ViewModels/Tools/Generators/GuidGenerator/GuidGeneratorToolViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private static readonly SettingDefinition<int> GuidsToGenerate
internal const string VersionOne = "One";

private readonly IMarketingService _marketingService;
private readonly ISettingsProvider _settingsProvider;
internal ISettingsProvider SettingsProvider { get; }

private string _output = string.Empty;
private bool _toolSuccessfullyWorked;
Expand All @@ -80,51 +80,51 @@ private static readonly SettingDefinition<int> GuidsToGenerate

internal bool IsUppercase
{
get => _settingsProvider.GetSetting(Uppercase);
get => SettingsProvider.GetSetting(Uppercase);
set
{
if (_settingsProvider.GetSetting(Uppercase) != value)
if (SettingsProvider.GetSetting(Uppercase) != value)
{
_settingsProvider.SetSetting(Uppercase, value);
SettingsProvider.SetSetting(Uppercase, value);
OnPropertyChanged();
}
}
}

internal bool IncludeHyphens
{
get => _settingsProvider.GetSetting(Hyphens);
get => SettingsProvider.GetSetting(Hyphens);
set
{
if (_settingsProvider.GetSetting(Hyphens) != value)
if (SettingsProvider.GetSetting(Hyphens) != value)
{
_settingsProvider.SetSetting(Hyphens, value);
SettingsProvider.SetSetting(Hyphens, value);
OnPropertyChanged();
}
}
}

internal string UuidVersion
{
get => _settingsProvider.GetSetting(Version);
get => SettingsProvider.GetSetting(Version);
set
{
if (_settingsProvider.GetSetting(Version) != value)
if (SettingsProvider.GetSetting(Version) != value)
{
_settingsProvider.SetSetting(Version, value);
SettingsProvider.SetSetting(Version, value);
OnPropertyChanged();
}
}
}

internal int NumberOfGuidsToGenerate
{
get => _settingsProvider.GetSetting(GuidsToGenerate);
get => SettingsProvider.GetSetting(GuidsToGenerate);
set
{
if (_settingsProvider.GetSetting(GuidsToGenerate) != value)
if (SettingsProvider.GetSetting(GuidsToGenerate) != value)
{
_settingsProvider.SetSetting(GuidsToGenerate, value);
SettingsProvider.SetSetting(GuidsToGenerate, value);
OnPropertyChanged();
}
}
Expand All @@ -141,7 +141,7 @@ internal string Output
[ImportingConstructor]
public GuidGeneratorToolViewModel(ISettingsProvider settingsProvider, IMarketingService marketingService)
{
_settingsProvider = settingsProvider;
SettingsProvider = settingsProvider;
_marketingService = marketingService;

GenerateCommand = new RelayCommand(ExecuteGenerateCommand);
Expand Down
17 changes: 9 additions & 8 deletions src/dev/impl/DevToys/ViewModels/Tools/Generators/HashGenerator/HashGeneratorToolViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ private static readonly SettingDefinition<string> OutType
defaultValue: DefaultOutputType);

private readonly IMarketingService _marketingService;
private readonly ISettingsProvider _settingsProvider;

internal ISettingsProvider SettingsProvider;

private bool _toolSuccessfullyWorked;
private string? _input;
Expand All @@ -56,12 +57,12 @@ private static readonly SettingDefinition<string> OutType

internal bool IsUppercase
{
get => _settingsProvider.GetSetting(Uppercase);
get => SettingsProvider.GetSetting(Uppercase);
set
{
if (_settingsProvider.GetSetting(Uppercase) != value)
if (SettingsProvider.GetSetting(Uppercase) != value)
{
_settingsProvider.SetSetting(Uppercase, value);
SettingsProvider.SetSetting(Uppercase, value);
OnPropertyChanged();
QueueHashCalculation();
}
Expand All @@ -70,12 +71,12 @@ internal bool IsUppercase

internal string OutputType
{
get => _settingsProvider.GetSetting(OutType);
get => SettingsProvider.GetSetting(OutType);
set
{
if (_settingsProvider.GetSetting(OutType) != value)
if (SettingsProvider.GetSetting(OutType) != value)
{
_settingsProvider.SetSetting(OutType, value);
SettingsProvider.SetSetting(OutType, value);
OnPropertyChanged();
QueueHashCalculation();
}
Expand Down Expand Up @@ -119,7 +120,7 @@ internal string? SHA512
[ImportingConstructor]
public HashGeneratorToolViewModel(ISettingsProvider settingsProvider, IMarketingService marketingService)
{
_settingsProvider = settingsProvider;
SettingsProvider = settingsProvider;
_marketingService = marketingService;
}

Expand Down
1 change: 1 addition & 0 deletions src/dev/impl/DevToys/Views/Tools/Generators/GuidGenerator/GuidGeneratorToolPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
AcceptsReturn="True"
IsReadOnly="True"
CanClearWhenReadOnly="True"
SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.Output, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
</Grid>
</Page>
4 changes: 4 additions & 0 deletions src/dev/impl/DevToys/Views/Tools/Generators/HashGenerator/HashGeneratorToolPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,25 @@
<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>
2 changes: 2 additions & 0 deletions src/dev/impl/DevToys/Views/Tools/Text/RegEx/RegExToolPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
<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
Expand All @@ -110,6 +111,7 @@
AcceptsReturn="True"
IsRichTextEdit="True"
MinHeight="150"
SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Text="{x:Bind ViewModel.Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
</Grid>
</Page>