diff --git a/ShiftOS.WinForms/GUILogin.Designer.cs b/ShiftOS.WinForms/GUILogin.Designer.cs
new file mode 100644
index 0000000..9125d98
--- /dev/null
+++ b/ShiftOS.WinForms/GUILogin.Designer.cs
@@ -0,0 +1,135 @@
+namespace ShiftOS.WinForms
+{
+ partial class GUILogin
+ {
+ ///
+ /// 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.pnlloginform = new System.Windows.Forms.Panel();
+ this.btnlogin = new System.Windows.Forms.Button();
+ this.txtpassword = new System.Windows.Forms.TextBox();
+ this.txtusername = new System.Windows.Forms.TextBox();
+ this.lblogintitle = new System.Windows.Forms.Label();
+ this.btnshutdown = new System.Windows.Forms.Button();
+ this.pnlloginform.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // pnlloginform
+ //
+ this.pnlloginform.Controls.Add(this.btnlogin);
+ this.pnlloginform.Controls.Add(this.txtpassword);
+ this.pnlloginform.Controls.Add(this.txtusername);
+ this.pnlloginform.Location = new System.Drawing.Point(13, 13);
+ this.pnlloginform.Name = "pnlloginform";
+ this.pnlloginform.Size = new System.Drawing.Size(358, 236);
+ this.pnlloginform.TabIndex = 0;
+ this.pnlloginform.Tag = "";
+ //
+ // btnlogin
+ //
+ this.btnlogin.AutoSize = true;
+ this.btnlogin.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.btnlogin.Location = new System.Drawing.Point(129, 184);
+ this.btnlogin.Name = "btnlogin";
+ this.btnlogin.Size = new System.Drawing.Size(43, 23);
+ this.btnlogin.TabIndex = 2;
+ this.btnlogin.Text = "Login";
+ this.btnlogin.UseVisualStyleBackColor = true;
+ this.btnlogin.Click += new System.EventHandler(this.btnlogin_Click);
+ //
+ // txtpassword
+ //
+ this.txtpassword.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtpassword.Location = new System.Drawing.Point(24, 157);
+ this.txtpassword.Name = "txtpassword";
+ this.txtpassword.Size = new System.Drawing.Size(301, 20);
+ this.txtpassword.TabIndex = 1;
+ this.txtpassword.UseSystemPasswordChar = true;
+ //
+ // txtusername
+ //
+ this.txtusername.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtusername.Location = new System.Drawing.Point(24, 131);
+ this.txtusername.Name = "txtusername";
+ this.txtusername.Size = new System.Drawing.Size(301, 20);
+ this.txtusername.TabIndex = 0;
+ //
+ // lblogintitle
+ //
+ this.lblogintitle.AutoSize = true;
+ this.lblogintitle.Location = new System.Drawing.Point(99, 553);
+ this.lblogintitle.Name = "lblogintitle";
+ this.lblogintitle.Size = new System.Drawing.Size(103, 13);
+ this.lblogintitle.TabIndex = 1;
+ this.lblogintitle.Tag = "header1 keepbg";
+ this.lblogintitle.Text = "Welcome to ShiftOS";
+ //
+ // btnshutdown
+ //
+ this.btnshutdown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnshutdown.AutoSize = true;
+ this.btnshutdown.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.btnshutdown.Location = new System.Drawing.Point(924, 652);
+ this.btnshutdown.Name = "btnshutdown";
+ this.btnshutdown.Size = new System.Drawing.Size(65, 23);
+ this.btnshutdown.TabIndex = 2;
+ this.btnshutdown.Text = "Shutdown";
+ this.btnshutdown.UseVisualStyleBackColor = true;
+ this.btnshutdown.Click += new System.EventHandler(this.btnshutdown_Click);
+ //
+ // GUILogin
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.Black;
+ this.ClientSize = new System.Drawing.Size(1001, 687);
+ this.Controls.Add(this.btnshutdown);
+ this.Controls.Add(this.lblogintitle);
+ this.Controls.Add(this.pnlloginform);
+ this.ForeColor = System.Drawing.Color.White;
+ this.Name = "GUILogin";
+ this.Text = "GUILogin";
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.GUILogin_FormClosing);
+ this.Load += new System.EventHandler(this.GUILogin_Load);
+ this.pnlloginform.ResumeLayout(false);
+ this.pnlloginform.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Panel pnlloginform;
+ private System.Windows.Forms.Button btnlogin;
+ private System.Windows.Forms.TextBox txtpassword;
+ private System.Windows.Forms.TextBox txtusername;
+ private System.Windows.Forms.Label lblogintitle;
+ private System.Windows.Forms.Button btnshutdown;
+ }
+}
\ No newline at end of file
diff --git a/ShiftOS.WinForms/GUILogin.cs b/ShiftOS.WinForms/GUILogin.cs
new file mode 100644
index 0000000..66ff06d
--- /dev/null
+++ b/ShiftOS.WinForms/GUILogin.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using ShiftOS.Engine;
+using ShiftOS.Objects;
+using ShiftOS.WinForms.Tools;
+
+namespace ShiftOS.WinForms
+{
+ public partial class GUILogin : Form
+ {
+ public GUILogin()
+ {
+ InitializeComponent();
+ uiTimer.Tick += (o, a) =>
+ {
+ btnlogin.Left = txtusername.Left + ((txtusername.Width - btnlogin.Width) / 2);
+ btnlogin.Top = txtpassword.Top + txtpassword.Height + 5;
+
+ lblogintitle.Left = pnlloginform.Left + ((pnlloginform.Width - lblogintitle.Width) / 2);
+ lblogintitle.Top = pnlloginform.Top - lblogintitle.Width - 5;
+
+ };
+ uiTimer.Interval = 100;
+ this.FormBorderStyle = FormBorderStyle.None;
+ this.WindowState = FormWindowState.Maximized;
+ this.TopMost = true;
+ }
+
+ Timer uiTimer = new Timer();
+
+ public event Action LoginComplete;
+
+ private void GUILogin_Load(object sender, EventArgs e)
+ {
+ uiTimer.Start();
+ ControlManager.SetupControl(lblogintitle);
+ ControlManager.SetupControls(pnlloginform);
+ ControlManager.SetupControl(btnshutdown);
+ pnlloginform.CenterParent();
+ this.BackColor = SkinEngine.LoadedSkin.LoginScreenColor;
+ this.BackgroundImage = SkinEngine.GetImage("login");
+ this.BackgroundImageLayout = SkinEngine.GetImageLayout("login");
+ }
+
+ private ClientSave User = null;
+
+ bool userRequestClose = true;
+ bool shuttingdown = false;
+
+ private void GUILogin_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ e.Cancel = userRequestClose;
+ if (!e.Cancel)
+ {
+ uiTimer.Stop();
+ if (shuttingdown == false)
+ {
+ LoginComplete?.Invoke(User);
+ }
+ }
+ }
+
+ private void btnlogin_Click(object sender, EventArgs e)
+ {
+ if (string.IsNullOrWhiteSpace(txtusername.Text))
+ {
+ Infobox.Show("Enter a username", "You must enter your username to login.");
+ return;
+ }
+
+ //Don't check for blank passwords.
+
+ var user = SaveSystem.CurrentSave.Users.FirstOrDefault(x => x.Username == txtusername.Text);
+ if(user == null)
+ {
+ Infobox.Show("Invalid username", "That username was not found on your system.");
+ return;
+ }
+
+ if (user.Password != txtpassword.Text)
+ {
+ Infobox.Show("Access denied.", "That password didn't work. Please try a different one.");
+ return;
+ }
+
+ User = user;
+ userRequestClose = false;
+ shuttingdown = false;
+ this.Close();
+ }
+
+ private void btnshutdown_Click(object sender, EventArgs e)
+ {
+ userRequestClose = false;
+ shuttingdown = true;
+ this.Close();
+ SaveSystem.CurrentUser = SaveSystem.CurrentSave.Users.FirstOrDefault(x => x.Username == "root");
+ TerminalBackend.InvokeCommand("sos.shutdown");
+ }
+ }
+
+ public class GUILoginFrontend : ILoginFrontend
+ {
+ public bool UseGUILogin
+ {
+ get
+ {
+ return Shiftorium.UpgradeInstalled("gui_based_login_screen");
+ }
+ }
+
+ public event Action LoginComplete;
+
+ public void Login()
+ {
+ var lform = new GUILogin();
+ lform.LoginComplete += (user) =>
+ {
+ LoginComplete?.Invoke(user);
+ };
+ lform.Show();
+ }
+ }
+}
diff --git a/ShiftOS.WinForms/GUILogin.resx b/ShiftOS.WinForms/GUILogin.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/ShiftOS.WinForms/GUILogin.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
\ No newline at end of file
diff --git a/ShiftOS.WinForms/Program.cs b/ShiftOS.WinForms/Program.cs
index b2f064d..ad8fc83 100644
--- a/ShiftOS.WinForms/Program.cs
+++ b/ShiftOS.WinForms/Program.cs
@@ -49,6 +49,7 @@ namespace ShiftOS.WinForms
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
//if ANYONE puts code before those two winforms config lines they will be declared a drunky. - Michael
+ LoginManager.Init(new GUILoginFrontend());
CrashHandler.SetGameMetadata(Assembly.GetExecutingAssembly());
SkinEngine.SetIconProber(new ShiftOSIconProvider());
ShiftOS.Engine.AudioManager.Init(new ShiftOSAudioProvider());
diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt
index b528c72..c3d27ae 100644
--- a/ShiftOS.WinForms/Resources/Shiftorium.txt
+++ b/ShiftOS.WinForms/Resources/Shiftorium.txt
@@ -7,6 +7,13 @@
Dependencies: "desktop",
Category: "Enhancements",
},
+ {
+ Name: "GUI Based Login Screen",
+ Cost: 500,
+ Description: "Tired of using the text-based login screen in ShiftOS? Well, we have a functioning window manager, and a functioning desktop, why not use these tools to create a functioning and awesome-looking login screen?",
+ Dependencies: "skinning;desktop;wm_free_placement",
+ Category: "Kernel & System"
+ },
{
Name: "Shift Screensavers",
Cost: 100,
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index 1607ae9..411d701 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -323,6 +323,12 @@
DownloadControl.cs
+
+ Form
+
+
+ GUILogin.cs
+
@@ -520,6 +526,9 @@
DownloadControl.cs
+
+ GUILogin.cs
+
Oobe.cs
diff --git a/ShiftOS_TheReturn/LoginManager.cs b/ShiftOS_TheReturn/LoginManager.cs
new file mode 100644
index 0000000..d326f2c
--- /dev/null
+++ b/ShiftOS_TheReturn/LoginManager.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ShiftOS.Objects;
+
+namespace ShiftOS.Engine
+{
+ public static class LoginManager
+ {
+ private static ILoginFrontend _login = null;
+
+ public static void Init(ILoginFrontend login)
+ {
+ _login = login;
+ }
+
+ public static void PromptForLogin()
+ {
+ _login.LoginComplete += (user) =>
+ {
+ LoginComplete?.Invoke(user);
+ };
+ _login.Login();
+ }
+
+ public static bool ShouldUseGUILogin
+ {
+ get
+ {
+ if (_login == null)
+ return false;
+ return _login.UseGUILogin;
+ }
+ }
+
+ public static event Action LoginComplete;
+ }
+
+ ///
+ /// Interface for GUI-based logins.
+ ///
+ public interface ILoginFrontend
+ {
+ ///
+ /// When implemented, shows the login UI.
+ ///
+ void Login();
+
+ ///
+ /// Gets whether the ShiftOS engine should use a GUI-based login system or the default one.
+ ///
+ bool UseGUILogin { get; }
+
+
+ ///
+ /// Occurs when the login is complete.
+ ///
+ event Action LoginComplete;
+
+
+
+ }
+}
diff --git a/ShiftOS_TheReturn/SaveSystem.cs b/ShiftOS_TheReturn/SaveSystem.cs
index f29e5b8..93a8add 100644
--- a/ShiftOS_TheReturn/SaveSystem.cs
+++ b/ShiftOS_TheReturn/SaveSystem.cs
@@ -263,70 +263,90 @@ namespace ShiftOS.Engine
TerminalBackend.PrefixEnabled = false;
- Login:
- string username = "";
- int progress = 0;
- bool goback = false;
- TextSentEventHandler ev = null;
- ev = (text) =>
+ if (LoginManager.ShouldUseGUILogin)
{
- if (progress == 0)
+ Action Completed = null;
+ Completed += (user) =>
{
- if (!string.IsNullOrWhiteSpace(text))
+ CurrentUser = user;
+ LoginManager.LoginComplete -= Completed;
+ };
+ LoginManager.LoginComplete += Completed;
+ Desktop.InvokeOnWorkerThread(() =>
+ {
+ LoginManager.PromptForLogin();
+ });
+ while (CurrentUser == null)
+ {
+ Thread.Sleep(10);
+ }
+ }
+ else
+ {
+
+ Login:
+ string username = "";
+ int progress = 0;
+ bool goback = false;
+ TextSentEventHandler ev = null;
+ ev = (text) =>
+ {
+ if (progress == 0)
{
- if (CurrentSave.Users.FirstOrDefault(x => x.Username == text) == null)
+ if (!string.IsNullOrWhiteSpace(text))
{
- Console.WriteLine("User not found.");
+ if (CurrentSave.Users.FirstOrDefault(x => x.Username == text) == null)
+ {
+ Console.WriteLine("User not found.");
+ goback = true;
+ progress++;
+ TerminalBackend.TextSent -= ev;
+ return;
+ }
+ username = text;
+ progress++;
+ }
+ else
+ {
+ Console.WriteLine("Username not provided.");
+ TerminalBackend.TextSent -= ev;
goback = true;
progress++;
- TerminalBackend.TextSent -= ev;
- return;
}
- username = text;
- progress++;
}
- else
+ else if (progress == 1)
{
- Console.WriteLine("Username not provided.");
+ var user = CurrentSave.Users.FirstOrDefault(x => x.Username == username);
+ if (user.Password == text)
+ {
+ Console.WriteLine("Welcome to ShiftOS.");
+ CurrentUser = user;
+ Thread.Sleep(2000);
+ progress++;
+ }
+ else
+ {
+ Console.WriteLine("Access denied.");
+ goback = true;
+ progress++;
+ }
TerminalBackend.TextSent -= ev;
- goback = true;
- progress++;
}
- }
- else if (progress == 1)
+ };
+ TerminalBackend.TextSent += ev;
+ Console.WriteLine(CurrentSave.SystemName + " login:");
+ while (progress == 0)
{
- var user = CurrentSave.Users.FirstOrDefault(x => x.Username == username);
- if (user.Password == text)
- {
- Console.WriteLine("Welcome to ShiftOS.");
- CurrentUser = user;
- Thread.Sleep(2000);
- progress++;
- }
- else
- {
- Console.WriteLine("Access denied.");
- goback = true;
- progress++;
- }
- TerminalBackend.TextSent -= ev;
+ Thread.Sleep(10);
}
- };
- TerminalBackend.TextSent += ev;
- Console.WriteLine(CurrentSave.SystemName + " login:");
- while(progress == 0)
- {
- Thread.Sleep(10);
+ if (goback)
+ goto Login;
+ Console.WriteLine("password:");
+ while (progress == 1)
+ Thread.Sleep(10);
+ if (goback)
+ goto Login;
}
- if (goback)
- goto Login;
- Console.WriteLine("password:");
- while (progress == 1)
- Thread.Sleep(10);
- if (goback)
- goto Login;
-
-
TerminalBackend.PrefixEnabled = true;
Shiftorium.LogOrphanedUpgrades = true;
Desktop.InvokeOnWorkerThread(new Action(() =>
diff --git a/ShiftOS_TheReturn/ShiftOS.Engine.csproj b/ShiftOS_TheReturn/ShiftOS.Engine.csproj
index fb33dc5..3b5eadd 100644
--- a/ShiftOS_TheReturn/ShiftOS.Engine.csproj
+++ b/ShiftOS_TheReturn/ShiftOS.Engine.csproj
@@ -111,6 +111,7 @@
+
diff --git a/ShiftOS_TheReturn/Skinning.cs b/ShiftOS_TheReturn/Skinning.cs
index 4cc9bbd..b731c4f 100644
--- a/ShiftOS_TheReturn/Skinning.cs
+++ b/ShiftOS_TheReturn/Skinning.cs
@@ -267,6 +267,22 @@ namespace ShiftOS.Engine
[ShifterHidden]
public Dictionary AppIcons = new Dictionary();
+ [ShifterMeta("System")]
+ [ShifterCategory("Login Screen")]
+ [RequiresUpgrade("gui_based_login_screen")]
+ [ShifterName("Login Screen Background Color")]
+ [ShifterDescription("Change the background color of the login screen.")]
+ public Color LoginScreenColor = Skin.DesktopBG;
+
+ [ShifterMeta("System")]
+ [ShifterCategory("Login Screen")]
+ [RequiresUpgrade("skinning;gui_based_login_screen")]
+ [ShifterName("Login Screen Background Image")]
+ [ShifterDescription("Set an image as your login screen!")]
+ [Image("login")]
+ public byte[] LoginScreenBG = null;
+
+
[RequiresUpgrade("shift_screensaver")]
[ShifterMeta("System")]
[ShifterCategory("Screen saver")]