From e6aa99d7ffa7c5de4473e3b8b097206d1beecfbf Mon Sep 17 00:00:00 2001 From: rjindael Date: Sun, 9 Jul 2023 21:48:14 -0700 Subject: [PATCH] Bug fixes --- Kiseki.Launcher.Core/Controller.cs | 5 ++ .../Kiseki.Launcher.Linux.csproj | 7 ++ Kiseki.Launcher.Linux/MainWindow.glade | 85 ++++++++++++++++++- Kiseki.Launcher.Windows/MainWindow.cs | 11 +++ 4 files changed, 105 insertions(+), 3 deletions(-) diff --git a/Kiseki.Launcher.Core/Controller.cs b/Kiseki.Launcher.Core/Controller.cs index 23ea79b..4bceae6 100644 --- a/Kiseki.Launcher.Core/Controller.cs +++ b/Kiseki.Launcher.Core/Controller.cs @@ -65,6 +65,11 @@ namespace Kiseki.Launcher.Core this.OnLaunched(); } + public async void Dispose() + { + // + } + protected virtual void OnPageHeadingChange(string Heading) { PageHeadingChanged.Invoke(this, Heading); diff --git a/Kiseki.Launcher.Linux/Kiseki.Launcher.Linux.csproj b/Kiseki.Launcher.Linux/Kiseki.Launcher.Linux.csproj index 3fb0f90..2447a4b 100644 --- a/Kiseki.Launcher.Linux/Kiseki.Launcher.Linux.csproj +++ b/Kiseki.Launcher.Linux/Kiseki.Launcher.Linux.csproj @@ -7,6 +7,13 @@ enable + + + + %(Filename)%(Extension) + + + diff --git a/Kiseki.Launcher.Linux/MainWindow.glade b/Kiseki.Launcher.Linux/MainWindow.glade index 6bbc00d..a3a1b12 100644 --- a/Kiseki.Launcher.Linux/MainWindow.glade +++ b/Kiseki.Launcher.Linux/MainWindow.glade @@ -1,7 +1,86 @@  + - + - + False + Kiseki + False + True + True + + + + True + False + + + Cancel + True + True + True + center + center + + + 2 + 2 + + + + + True + False + gtk-dialog-question + + + 0 + 0 + + + + + True + False + start + end + 32 + 5 + label + + + 1 + 0 + + + + + True + False + center + start + + + 1 + 1 + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/Kiseki.Launcher.Windows/MainWindow.cs b/Kiseki.Launcher.Windows/MainWindow.cs index 45ce0ba..fbb6c72 100644 --- a/Kiseki.Launcher.Windows/MainWindow.cs +++ b/Kiseki.Launcher.Windows/MainWindow.cs @@ -32,10 +32,21 @@ namespace Kiseki.Launcher.Windows this.Controller.ProgressBarChanged += Controller_ProgressBarChanged; this.Controller.ProgressBarStateChanged += Controller_ProgressBarStateChanged; this.Controller.Launched += Controller_Launched; + + this.Page.Destroyed += (s, e) => + { + this.Controller.Dispose(); + Environment.Exit(0); + }; this.ShowProgressDialog(); } + private void CloseButton_Click(object? sender, EventArgs e) + { + throw new NotImplementedException(); + } + private void Controller_PageHeadingChanged(object sender, string Heading) { this.Page.Heading = Heading;