diff --git a/Wabbajack.App.Wpf/Consts.cs b/Wabbajack.App.Wpf/Consts.cs index 8f1ada39..7e47b8e6 100644 --- a/Wabbajack.App.Wpf/Consts.cs +++ b/Wabbajack.App.Wpf/Consts.cs @@ -9,6 +9,7 @@ public static class Consts public static RelativePath MO2IniName = "ModOrganizer.ini".ToRelativePath(); public static string AppName = "Wabbajack"; public static Uri WabbajackBuildServerUri => new("https://build.wabbajack.org"); + public static Uri WabbajackModlistWizardUri => new("https://wizard.wabbajack.org"); public static Version CurrentMinimumWabbajackVersion { get; set; } = Version.Parse("2.3.0.0"); public static bool UseNetworkWorkaroundMode { get; set; } = false; public static AbsolutePath CefCacheLocation { get; } = KnownFolders.WabbajackAppLocal.Combine("Cef"); diff --git a/Wabbajack.App.Wpf/Converters/WidthHeightRectConverter.cs b/Wabbajack.App.Wpf/Converters/WidthHeightRectConverter.cs new file mode 100644 index 00000000..4c865596 --- /dev/null +++ b/Wabbajack.App.Wpf/Converters/WidthHeightRectConverter.cs @@ -0,0 +1,25 @@ +using System; +using System.Globalization; +using System.Windows; +using System.Windows.Data; + +namespace Wabbajack +{ + public class WidthHeightRectConverter : IMultiValueConverter + { + public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) + { + double rectWidth = 0; + double rectHeight = 0; + if (values[0] is not null && double.TryParse(values[0].ToString(), out var width)) + rectWidth = width; + else return null; + if (values[1] is not null && double.TryParse(values[1].ToString(), out var height)) + rectHeight = height; + else return null; + return new Rect(0, 0, rectWidth, rectHeight); + } + public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) + => throw new NotImplementedException(); + } +} diff --git a/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Bold.ttf b/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Bold.ttf deleted file mode 100644 index 14b71961..00000000 Binary files a/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Bold.ttf and /dev/null differ diff --git a/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-BoldItalic.ttf b/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-BoldItalic.ttf deleted file mode 100644 index 45327058..00000000 Binary files a/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-BoldItalic.ttf and /dev/null differ diff --git a/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Italic.ttf b/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Italic.ttf deleted file mode 100644 index 89e5ce4b..00000000 Binary files a/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Italic.ttf and /dev/null differ diff --git a/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Regular.ttf b/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Regular.ttf deleted file mode 100644 index c4fa6fbe..00000000 Binary files a/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Regular.ttf and /dev/null differ diff --git a/Wabbajack.App.Wpf/Resources/Fonts/Gabarito-VariableFont_wght-BF651cdf1f55e6c.ttf b/Wabbajack.App.Wpf/Resources/Fonts/Gabarito-VariableFont_wght-BF651cdf1f55e6c.ttf new file mode 100644 index 00000000..81d33a6b Binary files /dev/null and b/Wabbajack.App.Wpf/Resources/Fonts/Gabarito-VariableFont_wght-BF651cdf1f55e6c.ttf differ diff --git a/Wabbajack.App.Wpf/Themes/Styles.xaml b/Wabbajack.App.Wpf/Themes/Styles.xaml index 30a0012f..e947c272 100644 --- a/Wabbajack.App.Wpf/Themes/Styles.xaml +++ b/Wabbajack.App.Wpf/Themes/Styles.xaml @@ -10,7 +10,7 @@ xmlns:sys="clr-namespace:System;assembly=mscorlib" mc:Ignorable="d"> - pack://application:,,,/Resources/Fonts/#Atkinson Hyperlegible + pack://application:,,,/Resources/Fonts/#Gabarito @@ -21,13 +21,14 @@ + - #121212 - #222222 - #272727 + #222531 + #222531 + #2A2B41 #424242 - #323232 + #222531 #424242 #323232 #666666 @@ -46,7 +47,7 @@ #D9BBF9 #00BB86FC - #3700B3 + #8866ad #270080 #1b0059 #03DAC6 @@ -236,21 +237,21 @@ @@ -1176,13 +1177,13 @@ - - + + - - + + @@ -1241,13 +1242,13 @@ - - + + - - + + @@ -1288,8 +1289,8 @@ - - + + @@ -1319,7 +1320,7 @@ - + @@ -1341,12 +1342,12 @@ - - + + - + @@ -1622,7 +1623,7 @@ diff --git a/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj b/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj index 18fe20eb..aab59dc9 100644 --- a/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj +++ b/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj @@ -53,10 +53,11 @@ - - - - + + + + + @@ -85,6 +86,7 @@ NU1701 + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -117,16 +119,7 @@ - - Never - - - Never - - - Never - - + Never