Bug fixes

This commit is contained in:
rjindael 2023-07-09 21:48:14 -07:00
parent 134839b924
commit e6aa99d7ff
No known key found for this signature in database
GPG Key ID: D069369C906CCF31
4 changed files with 105 additions and 3 deletions

View File

@ -65,6 +65,11 @@ namespace Kiseki.Launcher.Core
this.OnLaunched();
}
public async void Dispose()
{
//
}
protected virtual void OnPageHeadingChange(string Heading)
{
PageHeadingChanged.Invoke(this, Heading);

View File

@ -7,6 +7,13 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<None Remove="**\*.glade" />
<EmbeddedResource Include="**\*.glade">
<LogicalName>%(Filename)%(Extension)</LogicalName>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="GtkSharp" Version="3.24.24.95" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

View File

@ -1,7 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.40.0 -->
<interface>
<requires lib="gtk+" version="3.18"/>
<requires lib="gtk+" version="3.24"/>
<object class="GtkWindow" id="MainWindow">
<!-- TODO -->
<property name="can-focus">False</property>
<property name="title" translatable="yes">Kiseki</property>
<property name="resizable">False</property>
<property name="destroy-with-parent">True</property>
<property name="skip-taskbar-hint">True</property>
<child>
<!-- n-columns=3 n-rows=3 -->
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkButton" id="CancelButton">
<property name="label" translatable="yes">Cancel</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkImage" id="Icon">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="stock">gtk-dialog-question</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="Caption">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="valign">end</property>
<property name="margin-start">32</property>
<property name="margin-bottom">5</property>
<property name="label" translatable="yes">label</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkProgressBar" id="ProgressBar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">start</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
</interface>
</interface>

View File

@ -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;