diff --git a/MainLauncherForm.cs b/MainLauncherForm.cs
index c41bcfb..2cf0ccf 100644
--- a/MainLauncherForm.cs
+++ b/MainLauncherForm.cs
@@ -31,12 +31,8 @@ namespace WolfLauncher
private void Form1_LoadAsync(object sender, EventArgs e)
{
- // Alpha Warning. Will be removed in beta
- MessageBox.Show("This is a very early, usable alpha version. Shit will definitely break or be broken. Don't trust your life with this", "Alpha Warning", MessageBoxButtons.OK, MessageBoxIcon.Information);
-
- // Load player profile and instances
- loadProfile();
- loadInstances();
+ SplashScreen splash = new SplashScreen();
+ splash.ShowDialog(this);
}
private void listView1_MouseDoubleClick(object sender, MouseEventArgs e)
@@ -184,7 +180,7 @@ namespace WolfLauncher
/**
* Load user profile information from the Mojang API
**/
- private async void loadProfile()
+ public async void loadProfile()
{
// Check if any accounts are stored
if (launcher.accountHandler().AccountManager.GetAccounts().Count > 0)
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index d32fccb..a296bf3 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
//
//------------------------------------------------------------------------------
-namespace WolfLauncher.Properties
-{
-
-
+namespace WolfLauncher.Properties {
+ using System;
+
+
///
/// A strongly-typed resource class, for looking up localized strings, etc.
///
@@ -19,53 +19,55 @@ namespace WolfLauncher.Properties
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources
- {
-
+ internal class Resources {
+
private static global::System.Resources.ResourceManager resourceMan;
-
+
private static global::System.Globalization.CultureInfo resourceCulture;
-
+
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources()
- {
+ internal Resources() {
}
-
+
///
/// Returns the cached ResourceManager instance used by this class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager
- {
- get
- {
- if ((resourceMan == null))
- {
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WolfLauncher.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
-
+
///
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture
- {
- get
- {
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
return resourceCulture;
}
- set
- {
+ set {
resourceCulture = value;
}
}
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap splash1 {
+ get {
+ object obj = ResourceManager.GetObject("splash1", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
}
}
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index af7dbeb..b9c0f06 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -46,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
- : System.Serialization.Formatters.Binary.BinaryFormatter
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
: and then encoded with base64 encoding.
-->
+
@@ -68,9 +69,10 @@
-
+
+
@@ -85,9 +87,10 @@
-
+
+
@@ -109,9 +112,13 @@
2.0
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ ..\Resources\splash1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/Resources/splash1.png b/Resources/splash1.png
new file mode 100644
index 0000000..5fc2d5e
Binary files /dev/null and b/Resources/splash1.png differ
diff --git a/WolfLauncher.csproj b/WolfLauncher.csproj
index 49d689d..74c24be 100644
--- a/WolfLauncher.csproj
+++ b/WolfLauncher.csproj
@@ -176,6 +176,12 @@
InstanceWindow.cs
+
+ Form
+
+
+ SplashScreen.cs
+
Form
@@ -203,6 +209,9 @@
InstanceWindow.cs
+
+ SplashScreen.cs
+
MainLauncherForm.cs
@@ -214,19 +223,20 @@
ResXFileCodeGenerator
- Resources.Designer.cs
Designer
+ Resources.Designer.cs
-
- True
- Resources.resx
-
SettingsSingleFileGenerator
Settings.Designer.cs
+
+ True
+ True
+ Resources.resx
+
True
Settings.settings
@@ -239,6 +249,7 @@
+
diff --git a/gui/other/SplashScreen.Designer.cs b/gui/other/SplashScreen.Designer.cs
new file mode 100644
index 0000000..05a0ea4
--- /dev/null
+++ b/gui/other/SplashScreen.Designer.cs
@@ -0,0 +1,77 @@
+namespace WolfLauncher
+{
+ partial class SplashScreen
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.closeTimer = new System.Windows.Forms.Timer(this.components);
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // closeTimer
+ //
+ this.closeTimer.Enabled = true;
+ this.closeTimer.Interval = 5000;
+ this.closeTimer.Tick += new System.EventHandler(this.closeTimer_Tick);
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBox1.Image = global::WolfLauncher.Properties.Resources.splash1;
+ this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(576, 192);
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pictureBox1.TabIndex = 0;
+ this.pictureBox1.TabStop = false;
+ //
+ // SplashScreen
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(576, 192);
+ this.Controls.Add(this.pictureBox1);
+ this.DoubleBuffered = true;
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.Name = "SplashScreen";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "SplashScreen";
+ this.TopMost = true;
+ this.Load += new System.EventHandler(this.SplashScreen_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.PictureBox pictureBox1;
+ private System.Windows.Forms.Timer closeTimer;
+ }
+}
\ No newline at end of file
diff --git a/gui/other/SplashScreen.cs b/gui/other/SplashScreen.cs
new file mode 100644
index 0000000..90707f0
--- /dev/null
+++ b/gui/other/SplashScreen.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Windows.Forms;
+
+/**
+ * Author: HypherionSA
+ * Launcher Splash Screen
+ **/
+namespace WolfLauncher
+{
+ public partial class SplashScreen : Form
+ {
+ public SplashScreen()
+ {
+ InitializeComponent();
+ }
+
+ private void closeTimer_Tick(object sender, EventArgs e)
+ {
+ // Close splash after 5 seconds
+ closeTimer.Enabled = false;
+ this.Close();
+ }
+
+ private void SplashScreen_Load(object sender, EventArgs e)
+ {
+ // Load player profile and instances
+ MainLauncherForm.INSTANCE.loadProfile();
+ MainLauncherForm.INSTANCE.loadInstances();
+ }
+ }
+}
diff --git a/gui/other/SplashScreen.resx b/gui/other/SplashScreen.resx
new file mode 100644
index 0000000..dafaaef
--- /dev/null
+++ b/gui/other/SplashScreen.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file