diff --git a/ShiftOS-TheRevival/API/ConsoleAPI.vb b/ShiftOS-TheRevival/API/ConsoleAPI.vb index 7021e2e..c7b83d8 100644 --- a/ShiftOS-TheRevival/API/ConsoleAPI.vb +++ b/ShiftOS-TheRevival/API/ConsoleAPI.vb @@ -1,4 +1,14 @@ Module ConsoleAPI + + Public Sub Console_Windowed() + Console.WindowState = FormWindowState.Normal + End Sub + + Public Sub Console_Full() + Console.FormBorderStyle = FormBorderStyle.None + Console.WindowState = FormWindowState.Maximized + End Sub + Public Sub NewLine(str As String) Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & str End Sub diff --git a/ShiftOS-TheRevival/API/TerminalAPI.vb b/ShiftOS-TheRevival/API/TerminalAPI.vb index c77524b..e9b7bde 100644 --- a/ShiftOS-TheRevival/API/TerminalAPI.vb +++ b/ShiftOS-TheRevival/API/TerminalAPI.vb @@ -170,13 +170,10 @@ Console.BadCommand = False Undeveloped() Case "shutdown", "shut down" - NewLine("Saving game...") - If Strings.OnceInfo(6) = "story" Then - SaveGame() - End If - Cursor.Show() - ShiftOSMenu.Show() - Console.Close() + TerminateShiftOS() + Case "startx" + StartX() + Console_Windowed() Case "textpad" If Strings.AvailableFeature(17) = "1" Then TextPad_WarnFile() diff --git a/ShiftOS-TheRevival/Functions/InGame/Terminate.vb b/ShiftOS-TheRevival/Functions/InGame/Terminate.vb new file mode 100644 index 0000000..9654185 --- /dev/null +++ b/ShiftOS-TheRevival/Functions/InGame/Terminate.vb @@ -0,0 +1,15 @@ +Module Terminate + Public Sub TerminateShiftOS() + NewLine("Stopping the Window Manager...") + StopX() + Console_Full() + If Strings.OnceInfo(6) = "story" Then + NewLine("Saving game...") + SaveGame() + End If + Cursor.Show() + NewLine("Shutting down...") + ShiftOSMenu.Show() + Console.Close() + End Sub +End Module diff --git a/ShiftOS-TheRevival/MainForms/Console.vb b/ShiftOS-TheRevival/MainForms/Console.vb index 79dae40..0e38d0e 100644 --- a/ShiftOS-TheRevival/MainForms/Console.vb +++ b/ShiftOS-TheRevival/MainForms/Console.vb @@ -16,8 +16,7 @@ Public Class Console Public ShOSKey As String Private Sub Console_Load(sender As Object, e As EventArgs) Handles MyBase.Load - FormBorderStyle = FormBorderStyle.None - WindowState = FormWindowState.Maximized + Console_Full() Cursor.Hide() InitializeTerminal() End Sub diff --git a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb new file mode 100644 index 0000000..ac5d776 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb @@ -0,0 +1,43 @@ + _ +Partial Class Desktop + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.SuspendLayout() + ' + 'Desktop + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackColor = System.Drawing.Color.Red + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.ForeColor = System.Drawing.Color.White + Me.Name = "Desktop" + Me.ShowIcon = False + Me.ShowInTaskbar = False + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Desktop" + Me.TopMost = True + Me.ResumeLayout(False) + + End Sub +End Class diff --git a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.resx b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.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-TheRevival/MainForms/DesktopEnvironment/master/Desktop.vb b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.vb new file mode 100644 index 0000000..4ddf223 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.vb @@ -0,0 +1,3 @@ +Public Class Desktop + +End Class \ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb new file mode 100644 index 0000000..8250340 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb @@ -0,0 +1,12 @@ +Module DesktopManager + Public Sub StartX() + Desktop.Show() + Desktop.TopMost = False + Desktop.FormBorderStyle = FormBorderStyle.None + Desktop.WindowState = FormWindowState.Maximized + End Sub + + Public Sub StopX() + Desktop.Close() + End Sub +End Module diff --git a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj index 9052206..cb0c8b3 100644 --- a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj +++ b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj @@ -93,6 +93,7 @@ + BugSlap.vb @@ -112,6 +113,13 @@ Form + + Desktop.vb + + + Form + + Epilepsy.vb @@ -149,24 +157,24 @@ - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -184,7 +192,7 @@ Settings.settings True - + @@ -196,6 +204,9 @@ DebugWindow.vb + + Desktop.vb + Epilepsy.vb @@ -233,6 +244,8 @@ + + diff --git a/ShiftOS-TheRevival/Terminal Applications/External/App_TextPad.vb b/ShiftOS-TheRevival/TerminalApplications/External/App_TextPad.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/External/App_TextPad.vb rename to ShiftOS-TheRevival/TerminalApplications/External/App_TextPad.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/External/TerminalExternalApps.vb b/ShiftOS-TheRevival/TerminalApplications/External/TerminalExternalApps.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/External/TerminalExternalApps.vb rename to ShiftOS-TheRevival/TerminalApplications/External/TerminalExternalApps.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/Com_05tray.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_05tray.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/Com_05tray.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/Com_05tray.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/Com_Codepoint.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Codepoint.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/Com_Codepoint.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/Com_Codepoint.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/Com_Cowsay.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Cowsay.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/Com_Cowsay.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/Com_Cowsay.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/Com_Date.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Date.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/Com_Date.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/Com_Date.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/Com_Help.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Help.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/Com_Help.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/Com_Help.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/Com_Hostname.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Hostname.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/Com_Hostname.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/Com_Hostname.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/Com_Infobar.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Infobar.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/Com_Infobar.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/Com_Infobar.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/Com_Pwd.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Pwd.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/Com_Pwd.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/Com_Pwd.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/Com_Rev.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Rev.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/Com_Rev.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/Com_Rev.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/Com_Shiftfetch.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftfetch.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/Com_Shiftfetch.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftfetch.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/Com_Shiftorium.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftorium.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/Com_Shiftorium.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftorium.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/Com_Su.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Su.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/Com_Su.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/Com_Su.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/Com_Time.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Time.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/Com_Time.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/Com_Time.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/Com_Username.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Username.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/Com_Username.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/Com_Username.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/Com_Ver.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Ver.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/Com_Ver.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/Com_Ver.vb diff --git a/ShiftOS-TheRevival/Terminal Applications/Internal/TerminalInternalApps.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/TerminalInternalApps.vb similarity index 100% rename from ShiftOS-TheRevival/Terminal Applications/Internal/TerminalInternalApps.vb rename to ShiftOS-TheRevival/TerminalApplications/Internal/TerminalInternalApps.vb