diff --git a/UVtools.WPF/App.axaml.cs b/UVtools.WPF/App.axaml.cs index 85895f8..f553192 100644 --- a/UVtools.WPF/App.axaml.cs +++ b/UVtools.WPF/App.axaml.cs @@ -16,7 +16,7 @@ namespace UVtools.WPF { public class App : Application { - public static IThemeSelector? Selector { get; set; } + public static IThemeSelector? ThemeSelector { get; set; } public static FileFormat SlicerFile = null; @@ -31,14 +31,14 @@ namespace UVtools.WPF { UserSettings.Load(); - Selector = ThemeSelector.Create("Assets/Themes"); - Selector.LoadSelectedTheme("Assets/selected.theme"); + ThemeSelector = Avalonia.ThemeManager.ThemeSelector.Create("Assets/Themes"); + ThemeSelector.LoadSelectedTheme("Assets/selected.theme"); desktop.MainWindow = new MainWindow { //DataContext = Selector }; desktop.Exit += (sender, e) - => Selector.SaveSelectedTheme("Assets/selected.theme"); + => ThemeSelector.SaveSelectedTheme("Assets/selected.theme"); } base.OnFrameworkInitializationCompleted(); diff --git a/UVtools.WPF/MainWindow.axaml b/UVtools.WPF/MainWindow.axaml index a89a854..1b5c877 100644 --- a/UVtools.WPF/MainWindow.axaml +++ b/UVtools.WPF/MainWindow.axaml @@ -181,6 +181,4 @@ - - diff --git a/UVtools.WPF/MainWindow.axaml.cs b/UVtools.WPF/MainWindow.axaml.cs index 2de8811..3ad375e 100644 --- a/UVtools.WPF/MainWindow.axaml.cs +++ b/UVtools.WPF/MainWindow.axaml.cs @@ -86,7 +86,7 @@ namespace UVtools.WPF #if DEBUG //this.AttachDevTools(); #endif - App.Selector?.EnableThemes(this); + App.ThemeSelector?.EnableThemes(this); ViewModel = new MainWindowViewModel(this); DataContext = ViewModel; diff --git a/UVtools.WPF/Windows/SettingsWindow.axaml b/UVtools.WPF/Windows/SettingsWindow.axaml index 6ff2278..42e86b7 100644 --- a/UVtools.WPF/Windows/SettingsWindow.axaml +++ b/UVtools.WPF/Windows/SettingsWindow.axaml @@ -7,13 +7,12 @@ WindowStartupLocation="CenterOwner" SizeToContent="WidthAndHeight" CanResize="false" - SystemDecorations="Full" MinWidth="500" Title="UVtools - Settings" Icon="/Assets/Icons/UVtools.ico" > - + + + + + + + + + + +