From 7dfedbc73bb559d83bff1cc814912b8e2cfb4b88 Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Sun, 24 Jul 2022 16:51:38 -0600 Subject: [PATCH] Remove beta checkbox --- Source/LibationAvalonia/AppBasic.axaml | 16 ----------- Source/LibationAvalonia/AppBasic.axaml.cs | 28 ------------------- .../Dialogs/SettingsDialog.axaml | 3 +- .../LibationAvalonia/LibationAvalonia.csproj | 3 -- Source/LibationAvalonia/Program.cs | 6 ---- 5 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 Source/LibationAvalonia/AppBasic.axaml delete mode 100644 Source/LibationAvalonia/AppBasic.axaml.cs diff --git a/Source/LibationAvalonia/AppBasic.axaml b/Source/LibationAvalonia/AppBasic.axaml deleted file mode 100644 index 910f2a87..00000000 --- a/Source/LibationAvalonia/AppBasic.axaml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/LibationAvalonia/AppBasic.axaml.cs b/Source/LibationAvalonia/AppBasic.axaml.cs deleted file mode 100644 index e3a82116..00000000 --- a/Source/LibationAvalonia/AppBasic.axaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Avalonia; -using Avalonia.Controls.ApplicationLifetimes; -using Avalonia.Markup.Xaml; -using Avalonia.Controls; -using LibationAvalonia.Dialogs; - -namespace LibationAvalonia -{ - public class AppBasic : Application - { - public override void Initialize() - { - AvaloniaXamlLoader.Load(this); - } - public Window MainWindow { get; set; } - - public override void OnFrameworkInitializationCompleted() - { - if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) - { - desktop.MainWindow = new SetupDialog(); - } - - base.OnFrameworkInitializationCompleted(); - } - - } -} \ No newline at end of file diff --git a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml index 3bd65b81..fd4bf1a9 100644 --- a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml +++ b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml @@ -102,7 +102,7 @@ Click="OpenLogFolderButton_Click" /> - + diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj index 0e1d2a8b..09c06b27 100644 --- a/Source/LibationAvalonia/LibationAvalonia.csproj +++ b/Source/LibationAvalonia/LibationAvalonia.csproj @@ -82,9 +82,6 @@ - - AppBasic.axaml - ProcessBookControl.axaml diff --git a/Source/LibationAvalonia/Program.cs b/Source/LibationAvalonia/Program.cs index b5cf1d10..8410798f 100644 --- a/Source/LibationAvalonia/Program.cs +++ b/Source/LibationAvalonia/Program.cs @@ -5,8 +5,6 @@ using System.Threading.Tasks; using ApplicationServices; using Avalonia; using Avalonia.Controls.ApplicationLifetimes; -using Avalonia.Media.Imaging; -using Avalonia.Platform; using Avalonia.ReactiveUI; using LibationFileManager; @@ -53,10 +51,6 @@ namespace LibationAvalonia .UsePlatformDetect() .LogToTrace() .UseReactiveUI(); - public static AppBuilder BuildAvaloniaAppBasic() - => AppBuilder.Configure() - .UsePlatformDetect() - .LogToTrace(); public static bool RunDbMigrations(Configuration config) {