more clear namings

This commit is contained in:
intervinn 2025-06-19 18:31:55 +03:00
parent f2d7271b3d
commit 9fee1d1d5a
2 changed files with 7 additions and 7 deletions

View File

@ -99,7 +99,7 @@
Description="{x:Static resources:Strings.Menu_Mods_Misc_CustomFont_Description}"> Description="{x:Static resources:Strings.Menu_Mods_Misc_CustomFont_Description}">
<StackPanel> <StackPanel>
<ui:Button Icon="DocumentAdd16" Content="{x:Static resources:Strings.Menu_Mods_Misc_CustomFont_Choose}" Command="{Binding ManageCustomFontCommand}" Visibility="{Binding ChooseCustomFontVisibility, Mode=OneWay}" /> <ui:Button Icon="DocumentAdd16" Content="{x:Static resources:Strings.Menu_Mods_Misc_CustomFont_Choose}" Command="{Binding ManageCustomFontCommand}" Visibility="{Binding ChooseCustomFontVisibility, Mode=OneWay}" />
<ui:Button Icon="Delete16" FontFamily="{Binding CustomFontFont}" Content="{Binding CustomFontName}" Appearance="Danger" Command="{Binding ManageCustomFontCommand}" Visibility="{Binding DeleteCustomFontVisibility, Mode=OneWay}" /> <ui:Button Icon="Delete16" FontFamily="{Binding DeleteCustomFontFontFamily}" Content="{Binding DeleteCustomFontFontName}" Appearance="Danger" Command="{Binding ManageCustomFontCommand}" Visibility="{Binding DeleteCustomFontVisibility, Mode=OneWay}" />
</StackPanel> </StackPanel>
</controls:OptionControl> </controls:OptionControl>
</StackPanel> </StackPanel>

View File

@ -57,8 +57,8 @@ namespace Bloxstrap.UI.ViewModels.Settings
OnPropertyChanged(nameof(ChooseCustomFontVisibility)); OnPropertyChanged(nameof(ChooseCustomFontVisibility));
OnPropertyChanged(nameof(DeleteCustomFontVisibility)); OnPropertyChanged(nameof(DeleteCustomFontVisibility));
OnPropertyChanged(nameof(CustomFontFont)); OnPropertyChanged(nameof(DeleteCustomFontFontFamily));
OnPropertyChanged(nameof(CustomFontName)); OnPropertyChanged(nameof(DeleteCustomFontFontName));
} }
public ICommand OpenModsFolderCommand => new RelayCommand(OpenModsFolder); public ICommand OpenModsFolderCommand => new RelayCommand(OpenModsFolder);
@ -67,7 +67,7 @@ namespace Bloxstrap.UI.ViewModels.Settings
public Visibility DeleteCustomFontVisibility => !String.IsNullOrEmpty(TextFontTask.NewState) ? Visibility.Visible : Visibility.Collapsed; public Visibility DeleteCustomFontVisibility => !String.IsNullOrEmpty(TextFontTask.NewState) ? Visibility.Visible : Visibility.Collapsed;
public System.Windows.Media.FontFamily CustomFontFont public System.Windows.Media.FontFamily DeleteCustomFontFontFamily
{ {
get get
{ {
@ -88,7 +88,7 @@ namespace Bloxstrap.UI.ViewModels.Settings
} }
} }
public string CustomFontName public string DeleteCustomFontFontName
{ {
get get
{ {
@ -97,8 +97,8 @@ namespace Bloxstrap.UI.ViewModels.Settings
return String.Empty; return String.Empty;
} }
var fontFamily = CustomFontFont; var fontFamily = DeleteCustomFontFontFamily;
return fontFamily.FamilyNames.Values.First(); return String.Join(" ", fontFamily.FamilyNames.Values);
} }
} }