diff --git a/Project_Periodensystem.Controller/Project_Periodensystem.Controller.csproj b/Project_Periodensystem.Controller/Project_Periodensystem.Controller.csproj index b66d3a2..566ae43 100644 --- a/Project_Periodensystem.Controller/Project_Periodensystem.Controller.csproj +++ b/Project_Periodensystem.Controller/Project_Periodensystem.Controller.csproj @@ -6,7 +6,7 @@ - net9.0 + net8.0 enable enable diff --git a/Project_Periodensystem.Model/Project_Periodensystem.Model.csproj b/Project_Periodensystem.Model/Project_Periodensystem.Model.csproj index 125f4c9..fa71b7a 100644 --- a/Project_Periodensystem.Model/Project_Periodensystem.Model.csproj +++ b/Project_Periodensystem.Model/Project_Periodensystem.Model.csproj @@ -1,7 +1,7 @@  - net9.0 + net8.0 enable enable diff --git a/Project_Periodensystem.Persistence/Project_Periodensystem.Persistence.csproj b/Project_Periodensystem.Persistence/Project_Periodensystem.Persistence.csproj index d11543f..631b156 100644 --- a/Project_Periodensystem.Persistence/Project_Periodensystem.Persistence.csproj +++ b/Project_Periodensystem.Persistence/Project_Periodensystem.Persistence.csproj @@ -2,7 +2,7 @@ - net9.0 + net8.0 enable diff --git a/Project_Periodensystem.View/AboutPage.axaml b/Project_Periodensystem.View/AboutPage.axaml new file mode 100644 index 0000000..73c9f0a --- /dev/null +++ b/Project_Periodensystem.View/AboutPage.axaml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/Project_Periodensystem.View/AboutPage.axaml.cs b/Project_Periodensystem.View/AboutPage.axaml.cs new file mode 100644 index 0000000..5ae8acc --- /dev/null +++ b/Project_Periodensystem.View/AboutPage.axaml.cs @@ -0,0 +1,27 @@ +using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.Markup.Xaml; +using Avalonia.VisualTree; + +namespace Project_Periodensystem.View +{ + public partial class AboutPage : UserControl + { + public AboutPage() + { + InitializeComponent(); + } + + private void InitializeComponent() + => AvaloniaXamlLoader.Load(this); + + private void BackButton_Click(object sender, RoutedEventArgs e) + { + var window = this.GetVisualRoot() as MainWindow; + if (window != null) + { + window.ShowLanding(); + } + } + } +} diff --git a/Project_Periodensystem.View/App.axaml b/Project_Periodensystem.View/App.axaml index 2020807..09e0eda 100644 --- a/Project_Periodensystem.View/App.axaml +++ b/Project_Periodensystem.View/App.axaml @@ -1,7 +1,6 @@ + x:Class="Project_Periodensystem.View.App"> diff --git a/Project_Periodensystem.View/App.axaml.cs b/Project_Periodensystem.View/App.axaml.cs index c31d742..1b535e1 100644 --- a/Project_Periodensystem.View/App.axaml.cs +++ b/Project_Periodensystem.View/App.axaml.cs @@ -7,12 +7,16 @@ namespace Project_Periodensystem.View public partial class App : Application { public override void Initialize() - => AvaloniaXamlLoader.Load(this); + { + AvaloniaXamlLoader.Load(this); + } public override void OnFrameworkInitializationCompleted() { if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + { desktop.MainWindow = new MainWindow(); + } base.OnFrameworkInitializationCompleted(); } diff --git a/Project_Periodensystem.View/LandingPage.axaml b/Project_Periodensystem.View/LandingPage.axaml new file mode 100644 index 0000000..8de217f --- /dev/null +++ b/Project_Periodensystem.View/LandingPage.axaml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/Project_Periodensystem.View/PeriodicTablePage.axaml.cs b/Project_Periodensystem.View/PeriodicTablePage.axaml.cs new file mode 100644 index 0000000..54a3d89 --- /dev/null +++ b/Project_Periodensystem.View/PeriodicTablePage.axaml.cs @@ -0,0 +1,29 @@ +using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.Markup.Xaml; +using Avalonia.VisualTree; + +namespace Project_Periodensystem.View +{ + public partial class PeriodicTablePage : UserControl + { + public PeriodicTablePage() + { + InitializeComponent(); + } + + private void InitializeComponent() + { + AvaloniaXamlLoader.Load(this); + } + + private void AboutButton_Click(object sender, RoutedEventArgs e) + { + var window = this.GetVisualRoot() as MainWindow; + if (window != null) + { + window.ShowAbout(); + } + } + } +} diff --git a/Project_Periodensystem.View/Program.cs b/Project_Periodensystem.View/Program.cs index 3887d6b..47d1bb8 100644 --- a/Project_Periodensystem.View/Program.cs +++ b/Project_Periodensystem.View/Program.cs @@ -1,18 +1,19 @@ -using System; -using Avalonia; +using Avalonia; namespace Project_Periodensystem.View { - class Program + internal static class Program { - [STAThread] + [System.STAThread] // <-- Das ist korrekt! public static void Main(string[] args) - => BuildAvaloniaApp() - .StartWithClassicDesktopLifetime(args); + { + BuildAvaloniaApp() + .StartWithClassicDesktopLifetime(args); + } public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure() - .UsePlatformDetect() - .LogToTrace(); + .UsePlatformDetect() + .LogToTrace(); } } diff --git a/Project_Periodensystem.View/Project_Periodensystem.View.csproj b/Project_Periodensystem.View/Project_Periodensystem.View.csproj index 39e1e1a..0dab29c 100644 --- a/Project_Periodensystem.View/Project_Periodensystem.View.csproj +++ b/Project_Periodensystem.View/Project_Periodensystem.View.csproj @@ -1,32 +1,25 @@  + net8.0 WinExe - net9.0 enable - true - app.manifest - - - true - - - false + false + false - - - - - - None - All - + + + + + + + diff --git a/program.cs b/program.cs deleted file mode 100644 index e69de29..0000000