From 38b51f3f1dc8dc046b6c3bf80d5fe2885ff38a3c Mon Sep 17 00:00:00 2001 From: EverythingWindows Date: Tue, 1 Nov 2022 19:48:52 +0700 Subject: [PATCH] Added Terminal, nice try to do Free Roam test, welp --- .../MainForms/BugSlap.Designer.vb | 63 +++++++++ .../{ShiftOS Menu.resx => BugSlap.resx} | 0 ShiftOS-TheRevival/MainForms/BugSlap.vb | 3 + ...nu.Designer.vb => ShiftOSMenu.Designer.vb} | 5 + ShiftOS-TheRevival/MainForms/ShiftOSMenu.resx | 123 ++++++++++++++++++ .../{ShiftOS Menu.vb => ShiftOSMenu.vb} | 13 ++ ShiftOS-TheRevival/MainForms/Strings.vb | 35 +++++ .../MainForms/TerminalPrompt.Designer.vb | 54 ++++++++ .../MainForms/TerminalPrompt.resx | 120 +++++++++++++++++ .../MainForms/TerminalPrompt.vb | 27 ++++ .../My Project/Application.Designer.vb | 12 +- .../My Project/Application.myapp | 5 +- .../My Project/Resources.Designer.vb | 27 ---- ShiftOS-TheRevival/My Project/Resources.resx | 9 -- ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj | 30 ++++- 15 files changed, 476 insertions(+), 50 deletions(-) create mode 100644 ShiftOS-TheRevival/MainForms/BugSlap.Designer.vb rename ShiftOS-TheRevival/MainForms/{ShiftOS Menu.resx => BugSlap.resx} (100%) create mode 100644 ShiftOS-TheRevival/MainForms/BugSlap.vb rename ShiftOS-TheRevival/MainForms/{ShiftOS Menu.Designer.vb => ShiftOSMenu.Designer.vb} (96%) create mode 100644 ShiftOS-TheRevival/MainForms/ShiftOSMenu.resx rename ShiftOS-TheRevival/MainForms/{ShiftOS Menu.vb => ShiftOSMenu.vb} (70%) create mode 100644 ShiftOS-TheRevival/MainForms/Strings.vb create mode 100644 ShiftOS-TheRevival/MainForms/TerminalPrompt.Designer.vb create mode 100644 ShiftOS-TheRevival/MainForms/TerminalPrompt.resx create mode 100644 ShiftOS-TheRevival/MainForms/TerminalPrompt.vb diff --git a/ShiftOS-TheRevival/MainForms/BugSlap.Designer.vb b/ShiftOS-TheRevival/MainForms/BugSlap.Designer.vb new file mode 100644 index 0000000..654c600 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/BugSlap.Designer.vb @@ -0,0 +1,63 @@ + _ +Partial Class BugSlap + 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.Label1 = New System.Windows.Forms.Label() + Me.TextBox1 = New System.Windows.Forms.TextBox() + Me.SuspendLayout() + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Arial Narrow", 36.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New System.Drawing.Point(13, 13) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(456, 57) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "Bug has been slapped!" + ' + 'TextBox1 + ' + Me.TextBox1.Location = New System.Drawing.Point(23, 74) + Me.TextBox1.Multiline = True + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(765, 364) + Me.TextBox1.TabIndex = 1 + ' + 'BugSlap + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.TextBox1) + Me.Controls.Add(Me.Label1) + Me.Name = "BugSlap" + Me.Text = "BugSlap" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents Label1 As Label + Friend WithEvents TextBox1 As TextBox +End Class diff --git a/ShiftOS-TheRevival/MainForms/ShiftOS Menu.resx b/ShiftOS-TheRevival/MainForms/BugSlap.resx similarity index 100% rename from ShiftOS-TheRevival/MainForms/ShiftOS Menu.resx rename to ShiftOS-TheRevival/MainForms/BugSlap.resx diff --git a/ShiftOS-TheRevival/MainForms/BugSlap.vb b/ShiftOS-TheRevival/MainForms/BugSlap.vb new file mode 100644 index 0000000..7dd057c --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/BugSlap.vb @@ -0,0 +1,3 @@ +Public Class BugSlap + +End Class \ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/ShiftOS Menu.Designer.vb b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.Designer.vb similarity index 96% rename from ShiftOS-TheRevival/MainForms/ShiftOS Menu.Designer.vb rename to ShiftOS-TheRevival/MainForms/ShiftOSMenu.Designer.vb index 4e27707..69e79e9 100644 --- a/ShiftOS-TheRevival/MainForms/ShiftOS Menu.Designer.vb +++ b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.Designer.vb @@ -29,6 +29,7 @@ Partial Class Form1 Me.btn_StoryMode = New System.Windows.Forms.Button() Me.btn_FreeRoam = New System.Windows.Forms.Button() Me.btn_Exit = New System.Windows.Forms.Button() + Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.SuspendLayout() ' 'Label1 @@ -107,6 +108,9 @@ Partial Class Form1 Me.btn_Exit.Text = "Exit" Me.btn_Exit.UseVisualStyleBackColor = True ' + 'BackgroundWorker1 + ' + ' 'Form1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -137,4 +141,5 @@ Partial Class Form1 Friend WithEvents btn_StoryMode As Button Friend WithEvents btn_FreeRoam As Button Friend WithEvents btn_Exit As Button + Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker End Class diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.resx b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.resx new file mode 100644 index 0000000..71e4907 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.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 diff --git a/ShiftOS-TheRevival/MainForms/ShiftOS Menu.vb b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb similarity index 70% rename from ShiftOS-TheRevival/MainForms/ShiftOS Menu.vb rename to ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb index ebfe7f2..d669242 100644 --- a/ShiftOS-TheRevival/MainForms/ShiftOS Menu.vb +++ b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb @@ -24,4 +24,17 @@ Public Class Form1 Private Sub btn_Exit_Click(sender As Object, e As EventArgs) Handles btn_Exit.Click Close() End Sub + + Private Sub btn_FreeRoam_Click(sender As Object, e As EventArgs) Handles btn_FreeRoam.Click + Try + Strings.GameState(0) = "Free" + TerminalPrompt.Show() + Close() + Catch ex As Exception + Dim NewBugSlap As New BugSlap + NewBugSlap.Show() + NewBugSlap.TextBox1.Text = ex.Message + Close() + End Try + End Sub End Class diff --git a/ShiftOS-TheRevival/MainForms/Strings.vb b/ShiftOS-TheRevival/MainForms/Strings.vb new file mode 100644 index 0000000..15303d2 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/Strings.vb @@ -0,0 +1,35 @@ +Public Class Strings + Public Shared OSInfo() As String + Public Shared ComputerInfo() As String + Public Shared GameState() As String + Public Shared OnceInfo() As String + + 'STRING CATEGORIZATION WRITING RULES! + 'THIS IS IN ORDER TO REMAIN COMPATIBLE WITH OLDER VERSIONS! + ' + 'General string : + '(Row Number) = Function/Subject (default value : default) + ' + 'Each have to placed in numerical order + 'If there's moved strings for newer version, example: + '0 = Computer Name (0.1) => OS Version (0.2) => Root Location (0.3), etc. + 'If there's removed strings for newer version, example: + '69 = Secret Easter Egg (removed in 0.420) + 'If there's repurposed strings for newer version after removed, example: + '5 = FreeRoam enabled? (removed in 0.4) => Story Mode State + ' + 'ALWAYS WRITE THE NOTES IN COMMENTS, THIS CLASS ONLY IS FOR STORING STRINGS AND DEPLOYING STRINGS TO DISK + + 'OSInfo Strings: + '0 = OSVersion (default : dependant) + ' + 'OnceInfo Strings: + '0 = IsRoot? (default : 0) + ' + 'ComputerInfo Strings: + '0 = Computer Name (default : shiftos) + '1 = Username (default : user) + ' + 'GameState Strings: + '0 = Playing Mode (default : Story) +End Class diff --git a/ShiftOS-TheRevival/MainForms/TerminalPrompt.Designer.vb b/ShiftOS-TheRevival/MainForms/TerminalPrompt.Designer.vb new file mode 100644 index 0000000..f73536b --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/TerminalPrompt.Designer.vb @@ -0,0 +1,54 @@ + _ +Partial Class TerminalPrompt + 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.TextBox1 = New System.Windows.Forms.TextBox() + Me.SuspendLayout() + ' + 'TextBox1 + ' + Me.TextBox1.BackColor = System.Drawing.Color.Black + Me.TextBox1.Dock = System.Windows.Forms.DockStyle.Fill + Me.TextBox1.ForeColor = System.Drawing.Color.Silver + Me.TextBox1.Location = New System.Drawing.Point(0, 0) + Me.TextBox1.Multiline = True + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(800, 450) + Me.TextBox1.TabIndex = 0 + ' + 'Terminal + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackColor = System.Drawing.Color.Black + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.TextBox1) + Me.Name = "Terminal" + Me.Text = "Terminal" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents TextBox1 As TextBox +End Class diff --git a/ShiftOS-TheRevival/MainForms/TerminalPrompt.resx b/ShiftOS-TheRevival/MainForms/TerminalPrompt.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/TerminalPrompt.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/TerminalPrompt.vb b/ShiftOS-TheRevival/MainForms/TerminalPrompt.vb new file mode 100644 index 0000000..b86e071 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/TerminalPrompt.vb @@ -0,0 +1,27 @@ +Public Class TerminalPrompt + Private Sub Terminal_Load(sender As Object, e As EventArgs) Handles MyBase.Load + FormBorderStyle = FormBorderStyle.None + WindowState = FormWindowState.Maximized + If Strings.GameState(0) = "Free" Then + Strings.ComputerInfo(0) = "shiftos" + Strings.ComputerInfo(1) = "user" + PrintPrompt() + End If + End Sub + + Public Sub PrintPrompt() + If TextBox1.Text = Nothing Then + If Strings.OnceInfo(0) = "No" Then + TextBox1.Text = "root@" & Strings.ComputerInfo(0) & " #> " + Else + TextBox1.Text = Strings.ComputerInfo(1) & "@" & Strings.ComputerInfo(0) & " $> " + End If + Else + If Strings.OnceInfo(0) = "No" Then + TextBox1.Text = TextBox1.Text & Environment.NewLine & "root@" & Strings.ComputerInfo(0) & " #> " + Else + TextBox1.Text = TextBox1.Text & Environment.NewLine & Strings.ComputerInfo(1) & "@" & Strings.ComputerInfo(0) & " $> " + End If + End If + End Sub +End Class \ No newline at end of file diff --git a/ShiftOS-TheRevival/My Project/Application.Designer.vb b/ShiftOS-TheRevival/My Project/Application.Designer.vb index a2e4b61..38484b7 100644 --- a/ShiftOS-TheRevival/My Project/Application.Designer.vb +++ b/ShiftOS-TheRevival/My Project/Application.Designer.vb @@ -13,24 +13,24 @@ Option Explicit On Namespace My - + 'NOTE: This file is auto-generated; do not modify it directly. To make changes, ' or if you encounter build errors in this file, go to the Project Designer ' (go to Project Properties or double-click the My Project node in ' Solution Explorer), and make changes on the Application tab. ' Partial Friend Class MyApplication - - _ + + _ Public Sub New() MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) Me.IsSingleInstance = false Me.EnableVisualStyles = true Me.SaveMySettingsOnExit = true - Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses + Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterAllFormsClose End Sub - - _ + + _ Protected Overrides Sub OnCreateMainForm() Me.MainForm = Global.ShiftOS_TheRevival.Form1 End Sub diff --git a/ShiftOS-TheRevival/My Project/Application.myapp b/ShiftOS-TheRevival/My Project/Application.myapp index 1243847..effc3c8 100644 --- a/ShiftOS-TheRevival/My Project/Application.myapp +++ b/ShiftOS-TheRevival/My Project/Application.myapp @@ -3,9 +3,8 @@ true Form1 false - 0 + 1 true 0 - 0 true - + \ No newline at end of file diff --git a/ShiftOS-TheRevival/My Project/Resources.Designer.vb b/ShiftOS-TheRevival/My Project/Resources.Designer.vb index 1b5c31f..271c441 100644 --- a/ShiftOS-TheRevival/My Project/Resources.Designer.vb +++ b/ShiftOS-TheRevival/My Project/Resources.Designer.vb @@ -60,33 +60,6 @@ Namespace My.Resources End Set End Property - ''' - ''' Looks up a localized string similar to ewindows. - ''' - Friend ReadOnly Property BuildLab() As String - Get - Return ResourceManager.GetString("BuildLab", resourceCulture) - End Get - End Property - - ''' - ''' Looks up a localized string similar to 8. - ''' - Friend ReadOnly Property BuildNumber() As String - Get - Return ResourceManager.GetString("BuildNumber", resourceCulture) - End Get - End Property - - ''' - ''' Looks up a localized string similar to No. - ''' - Friend ReadOnly Property ReleasedExe() As String - Get - Return ResourceManager.GetString("ReleasedExe", resourceCulture) - End Get - End Property - ''' ''' Looks up a localized string similar to No '''12 diff --git a/ShiftOS-TheRevival/My Project/Resources.resx b/ShiftOS-TheRevival/My Project/Resources.resx index bbfb66c..bcce77f 100644 --- a/ShiftOS-TheRevival/My Project/Resources.resx +++ b/ShiftOS-TheRevival/My Project/Resources.resx @@ -117,15 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ewindows - - - 8 - - - No - ..\Resources\ShiftOSBuildLab.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 diff --git a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj index 48676cf..43de5df 100644 --- a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj +++ b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj @@ -72,17 +72,31 @@ - + + BugSlap.vb + + Form - - ShiftOS Menu.vb + + Form + + + ShiftOSMenu.vb + Form + + + + TerminalPrompt.vb + + Form True Application.myapp + True True @@ -96,14 +110,20 @@ + + BugSlap.vb + + + TerminalPrompt.vb + VbMyResourcesResXFileCodeGenerator Resources.Designer.vb My.Resources Designer - - ShiftOS Menu.vb + + ShiftOSMenu.vb