Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace the font with Atkinson Hyperlegible, make it consistent everywhere

Browse Source
This commit is contained in:
trawzified 2023-11-18 18:34:01 +01:00
parent 0c11f11839
commit 3cdbfe490f
22 changed files with 58 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -5,4 +5,4 @@ obj
*.user
.\packages\*
/VERSION.txt
*.opencover.xml
*.opencover.xml

BIN
Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Bold.ttf Normal file
View File

Binary file not shown.

BIN
Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-BoldItalic.ttf Normal file
View File

Binary file not shown.

BIN
Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Italic.ttf Normal file
View File

Binary file not shown.

BIN
Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Regular.ttf Normal file
View File

Binary file not shown.

20
Wabbajack.App.Wpf/Themes/Styles.xaml
View File

@ -10,6 +10,8 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib"
mc:Ignorable="d">
<FontFamily x:Key="AtkinsonHyperlegible">pack://application:,,,/Resources/Fonts/#Atkinson Hyperlegible</FontFamily>
<!-- Converters -->
<local:BoolToVisibilityConverter x:Key="bool2VisibilityConverter" />
<local:BoolToVisibilityHiddenConverter x:Key="bool2VisibilityHiddenConverter" />
@ -38,11 +40,11 @@
<Color x:Key="HotColor">#525252</Color>
<Color x:Key="Yellow">#ffc400</Color>
<Color x:Key="Red">#e83a40</Color>
<Color x:Key="Green">#52b545</Color>
<Color x:Key="Red">#db2955</Color>
<Color x:Key="Green">#5fad56</Color>
<Color x:Key="YellowDark">#967400</Color>
<Color x:Key="Primary">#BB86FC</Color>
<Color x:Key="Primary">#D9BBF9</Color>
<Color x:Key="PrimaryTransparent">#00BB86FC</Color>
<Color x:Key="PrimaryVariant">#3700B3</Color>
<Color x:Key="DarkPrimaryVariant">#270080</Color>
@ -234,21 +236,21 @@
<!-- FontStyle -->
<Style TargetType="{x:Type TextBlock}">
<Setter Property="FontFamily" Value="Calibri light" />
<Setter Property="FontFamily" Value="{StaticResource AtkinsonHyperlegible}" />
<!--<Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>-->
</Style>
<Style TargetType="{x:Type Control}">
<Setter Property="FontFamily" Value="Calibri light" />
<Setter Property="FontFamily" Value="{StaticResource AtkinsonHyperlegible}" />
<Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
</Style>
<Style TargetType="{x:Type Window}">
<Setter Property="FontFamily" Value="Calibri light" />
<Setter Property="FontFamily" Value="{StaticResource AtkinsonHyperlegible}" />
<Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
<Setter Property="Background" Value="{StaticResource WindowBackgroundBrush}" />
</Style>
<!-- Necessary for Blend designer for UserControls -->
<Style TargetType="{x:Type UserControl}">
<Setter Property="FontFamily" Value="Calibri light" />
<Setter Property="FontFamily" Value="{StaticResource AtkinsonHyperlegible}" />
<Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
</Style>
@ -1620,7 +1622,7 @@
</Style>
<Style TargetType="{x:Type Expander}">
<Setter Property="Foreground" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}" />
<Setter Property="FontFamily" Value="Calibri light" />
<Setter Property="FontFamily" Value="{StaticResource AtkinsonHyperlegible}" />
<Setter Property="Padding" Value="2" />
<Setter Property="Background" Value="{StaticResource Expander.Background}" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
@ -2351,7 +2353,7 @@
<Setter Property="Height" Value="18" />
<Setter Property="Background" Value="{StaticResource WindowBackgroundBrush}" />
<Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
<Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.StatusFontFamilyKey}}" />
<Setter Property="FontFamily" Value="{StaticResource AtkinsonHyperlegible}" />
<Setter Property="FontSize" Value="{DynamicResource {x:Static SystemFonts.StatusFontSizeKey}}" />
<Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.StatusFontStyleKey}}" />
<Setter Property="FontWeight" Value="{DynamicResource {x:Static SystemFonts.StatusFontWeightKey}}" />

12
Wabbajack.App.Wpf/Views/Common/DetailImageView.xaml
View File

@ -75,7 +75,7 @@
Padding="40,20"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="65"
FontWeight="Bold"
Style="{StaticResource BackgroundBlurStyle}"
@ -89,7 +89,7 @@
Margin="35,-10,-10,10"
Padding="30,10"
HorizontalAlignment="Left"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="30"
FontWeight="Bold"
Style="{StaticResource BackgroundBlurStyle}"
@ -105,7 +105,7 @@
Margin="20,25,20,0"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="65"
FontWeight="Bold"
TextWrapping="WrapWithOverflow">
@ -116,7 +116,7 @@
<TextBlock Grid.Row="3" Grid.Column="0"
x:Name="AuthorTextBlock"
Margin="55,0,20,20"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="30"
FontWeight="Bold"
TextWrapping="Wrap">
@ -132,7 +132,7 @@
Padding="30,10"
HorizontalAlignment="Right"
VerticalAlignment="Bottom"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="16"
Style="{StaticResource BackgroundBlurStyle}"
TextAlignment="Right"
@ -146,7 +146,7 @@
Margin="20,25,25,25"
HorizontalAlignment="Right"
VerticalAlignment="Bottom"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="16"
TextAlignment="Right"
TextWrapping="Wrap">

4
Wabbajack.App.Wpf/Views/Common/TopProgressView.xaml
View File

@ -78,7 +78,7 @@
Width="130"
Margin="0,0,0,0"
VerticalAlignment="Center"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontWeight="Black"
Foreground="{StaticResource ComplementaryBrush}"
TextAlignment="Right" />
@ -89,7 +89,7 @@
x:Name="TitleText"
Margin="15,0,0,0"
VerticalAlignment="Center"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="25"
FontWeight="Black" />
<ContentControl Grid.Column="2" />

8
Wabbajack.App.Wpf/Views/Common/UnderMaintenanceOverlay.xaml
View File

@ -45,13 +45,13 @@
</Grid.RowDefinitions>
<TextBlock Grid.Row="0"
Margin="0,0,0,10"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="30"
FontWeight="Bold"
Foreground="{StaticResource YellowBrush}"
Text="UNDER MAINTENANCE" />
<TextBlock Grid.Row="1"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="15"
FontWeight="Bold"
Foreground="{StaticResource YellowBrush}"
@ -72,7 +72,7 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Grid.Row="0"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="100"
FontWeight="Bold"
Foreground="{StaticResource YellowBrush}"
@ -102,7 +102,7 @@
Kind="HelpCircle" />
</Button>
<TextBlock Grid.Row="1"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="100"
FontWeight="Bold"
Foreground="{StaticResource YellowBrush}"

2
Wabbajack.App.Wpf/Views/Compilers/CompilationCompleteView.xaml
View File

@ -26,7 +26,7 @@
x:Name="TitleText"
HorizontalAlignment="Center"
VerticalAlignment="Bottom"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="22"
FontWeight="Black">
<TextBlock.Effect>

2
Wabbajack.App.Wpf/Views/Installers/InstallationCompleteView.xaml
View File

@ -29,7 +29,7 @@
x:Name="TitleText"
HorizontalAlignment="Center"
VerticalAlignment="Bottom"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="22"
FontWeight="Black">
<TextBlock.Effect>

2
Wabbajack.App.Wpf/Views/Installers/InstallationConfigurationView.xaml
View File

@ -41,7 +41,7 @@
TextAlignment="Center" />
<TextBlock x:Name="errorTextBox"
Grid.Row="3"
FontFamily="Verdana" FontSize="10" FontWeight="ExtraBold"
FontFamily="{StaticResource AtkinsonHyperlegible}" FontSize="10" FontWeight="ExtraBold"
Background="{StaticResource WindowBackgroundBrush}"
Foreground="Red"
Text=""

2
Wabbajack.App.Wpf/Views/Installers/InstallationView.xaml
View File

@ -152,7 +152,7 @@
Margin="4"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="9"
FontWeight="Bold"
Text="NSFW" />

2
Wabbajack.App.Wpf/Views/Interventions/ConfirmationInterventionView.xaml
View File

@ -24,7 +24,7 @@
<TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3"
x:Name="ShortDescription"
Margin="0,0,0,5"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="14"
FontWeight="Bold"
TextWrapping="WrapWithOverflow" />

4
Wabbajack.App.Wpf/Views/ModListTileView.xaml
View File

@ -294,7 +294,7 @@
Margin="5"
HorizontalAlignment="Center"
VerticalAlignment="Bottom"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="30"
FontWeight="Bold"
Style="{StaticResource BackgroundBlurStyle}"
@ -308,7 +308,7 @@
Margin="5"
HorizontalAlignment="Center"
VerticalAlignment="Bottom"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="30"
FontWeight="Bold"
TextWrapping="Wrap">

3
Wabbajack.App.Wpf/Views/ModeSelectionView.xaml
View File

@ -25,6 +25,7 @@
</LinearGradientBrush>
</Rectangle.Fill>
</Rectangle>
<!--
<Viewbox Grid.Row="0" Grid.RowSpan="3"
Name="Banner"
HorizontalAlignment="Center"
@ -32,6 +33,8 @@
Stretch="UniformToFill">
<Image Margin="40,20,40,240" Source="../Resources/Wabba_Mouth.png" />
</Viewbox>
-->
<Label Content="Welcome to Wabbajack" FontSize="36" FontWeight="Bold"/>
<Grid Grid.Row="1" Margin="5,15">
<Grid.ColumnDefinitions>

2
Wabbajack.App.Wpf/Views/Settings/AuthorFilesView.xaml
View File

@ -33,7 +33,7 @@
</Grid.ColumnDefinitions>
<TextBlock Grid.ColumnSpan="3"
Margin="5,0"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="20"
FontWeight="Bold"
Text="File Uploader" />

2
Wabbajack.App.Wpf/Views/Settings/LoginSettingsView.xaml
View File

@ -34,7 +34,7 @@
</Grid.Resources>
<TextBlock
Margin="5,0"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="20"
FontWeight="Bold"
Text="Logins" />

2
Wabbajack.App.Wpf/Views/Settings/MiscSettingsView.xaml
View File

@ -34,7 +34,7 @@
<TextBlock
Grid.Column="0"
Grid.ColumnSpan="2"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="20"
FontWeight="Bold"
Text="Misc Settings" />

2
Wabbajack.App.Wpf/Views/Settings/PerformanceSettingsView.xaml
View File

@ -40,7 +40,7 @@
<TextBlock
Grid.Column="0"
Grid.ColumnSpan="3"
FontFamily="Lucida Sans"
FontFamily="{StaticResource AtkinsonHyperlegible}"
FontSize="20"
FontWeight="Bold"
Text="Performance" />

2
Wabbajack.App.Wpf/Views/Settings/SettingsView.xaml
View File

@ -13,7 +13,7 @@
mc:Ignorable="d">
<UserControl.Resources>
<Style TargetType="TextBlock">
<Setter Property="FontFamily" Value="Lucida Sans" />
<Setter Property="FontFamily" Value="{StaticResource AtkinsonHyperlegible}" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="FontSize" Value="12" />
</Style>

19
Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj
View File

@ -51,6 +51,12 @@
<ItemGroup>
<None Remove="Readme.md" />
<None Remove="Resources\Fonts\Atkinson-Hyperlegible-Italic-102.ttf" />
<None Remove="Resources\Fonts\Atkinson-Hyperlegible-Regular-102.ttf" />
<None Remove="Resources\Fonts\AtkinsonHyperlegible-Bold.ttf" />
<None Remove="Resources\Fonts\AtkinsonHyperlegible-BoldItalic.ttf" />
<None Remove="Resources\Fonts\AtkinsonHyperlegible-Italic.ttf" />
<None Remove="Resources\Fonts\AtkinsonHyperlegible-Regular.ttf" />
<None Remove="Resources\GameGridIcons\Fallout4.png" />
<None Remove="Resources\GameGridIcons\SkyrimSpecialEdition.png" />
<None Remove="Resources\Icons\middle_mouse_button.png" />
@ -101,6 +107,7 @@
<PackageReference Include="ReactiveUI.WPF" Version="19.5.1" />
<PackageReference Include="Silk.NET.DXGI" Version="2.18.0" />
<PackageReference Include="System.Reactive" Version="6.0.1-preview.1" />
<PackageReference Include="WPF-UI" Version="3.0.0-preview.9" />
<PackageReference Include="WPFThemes.DarkBlend" Version="1.0.8" />
</ItemGroup>
@ -110,6 +117,18 @@
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Fonts\AtkinsonHyperlegible-Bold.ttf">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\Fonts\AtkinsonHyperlegible-BoldItalic.ttf">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\Fonts\AtkinsonHyperlegible-Italic.ttf">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\Fonts\AtkinsonHyperlegible-Regular.ttf">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\middle_mouse_button.png" />
<Resource Include="Resources\MO2Button.png" />
<Resource Include="Resources\VortexButton.png" />