diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.Designer.vb b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.Designer.vb index 69e79e9..e3dc6c0 100644 --- a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.Designer.vb +++ b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.Designer.vb @@ -1,5 +1,5 @@  _ -Partial Class Form1 +Partial Class ShiftOSMenu Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. @@ -108,10 +108,7 @@ Partial Class Form1 Me.btn_Exit.Text = "Exit" Me.btn_Exit.UseVisualStyleBackColor = True ' - 'BackgroundWorker1 - ' - ' - 'Form1 + 'ShiftOSMenu ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font @@ -125,7 +122,7 @@ Partial Class Form1 Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.Label1) Me.MaximizeBox = False - Me.Name = "Form1" + Me.Name = "ShiftOSMenu" Me.ShowIcon = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Main Menu" diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb index eba98ed..5e6d171 100644 --- a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb +++ b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb @@ -1,24 +1,27 @@ Imports System.IO -Public Class Form1 +Public Class ShiftOSMenu Public Shared ActualBuildLab As String Public Shared BuildLab() As String Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try - BuildLab = File.ReadAllLines("D:\ShiftOSBuildLab.txt") - If BuildLab(0) = "No" Then - Dim BuildNum As Integer = BuildLab(1) - BuildNum = BuildLab(1) + 1 - ActualBuildLab = "ShiftOS_TheRevival." & BuildLab(3) & "." & BuildNum & "." & Date.Today.Year & Date.Today.Month & Date.Today.Day - BuildLab(1) = BuildNum - File.WriteAllLines("D:\ShiftOSBuildLab.txt", BuildLab) + If File.Exists("D:\ShiftOSBuildLab.txt") Then + BuildLab = File.ReadAllLines("D:\ShiftOSBuildLab.txt") + If BuildLab(0) = "No" Then + Dim BuildNum As Integer = BuildLab(1) + BuildNum = BuildLab(1) + 1 + ActualBuildLab = "ShiftOS_TheRevival." & BuildLab(3) & "." & BuildNum & "." & Date.Today.Year & Date.Today.Month & Date.Today.Day + BuildLab(1) = BuildNum + File.WriteAllLines("D:\ShiftOSBuildLab.txt", BuildLab) + End If + lbl_BuildString.Text = ActualBuildLab + Else + End If - lbl_BuildString.Text = ActualBuildLab Catch ex As Exception MsgBox("Why? Because of " & ex.Message) - lbl_BuildString.Text = ActualBuildLab End Try End Sub diff --git a/ShiftOS-TheRevival/MainForms/Strings.vb b/ShiftOS-TheRevival/MainForms/Strings.vb index 96285a5..f6cb57a 100644 --- a/ShiftOS-TheRevival/MainForms/Strings.vb +++ b/ShiftOS-TheRevival/MainForms/Strings.vb @@ -3,6 +3,8 @@ Public Shared ComputerInfo(1) As String Public Shared IsFree As Boolean Public Shared OnceInfo(0) As String + Public Shared StoryChapter As Integer + Public Shared AvailableFeature() As String 'STRING CATEGORIZATION WRITING RULES! 'THIS IS IN ORDER TO REMAIN COMPATIBLE WITH OLDER VERSIONS! @@ -24,10 +26,10 @@ '0 = OSVersion (default : dependant) ' 'OnceInfo Strings: - '0 = IsRoot? (default : 0) + '0 = IsRoot? (0.1) (default : 0) ' 'ComputerInfo Strings: - '0 = Computer Name (default : shiftos) - '1 = Username (default : user) + '0 = Computer Name (0.1) (default : shiftos) + '1 = Username (0.1) (default : user) ' End Class diff --git a/ShiftOS-TheRevival/MainForms/Terminal.Designer.vb b/ShiftOS-TheRevival/MainForms/Terminal.Designer.vb index 21c4b62..5dec2f5 100644 --- a/ShiftOS-TheRevival/MainForms/Terminal.Designer.vb +++ b/ShiftOS-TheRevival/MainForms/Terminal.Designer.vb @@ -28,6 +28,7 @@ Partial Class Terminal 'TextBox1 ' Me.TextBox1.BackColor = System.Drawing.Color.Black + Me.TextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None Me.TextBox1.Dock = System.Windows.Forms.DockStyle.Fill Me.TextBox1.Font = New System.Drawing.Font("Consolas", 11.0!) Me.TextBox1.ForeColor = System.Drawing.Color.Silver diff --git a/ShiftOS-TheRevival/MainForms/Terminal.vb b/ShiftOS-TheRevival/MainForms/Terminal.vb index aa88625..2b8abd0 100644 --- a/ShiftOS-TheRevival/MainForms/Terminal.vb +++ b/ShiftOS-TheRevival/MainForms/Terminal.vb @@ -2,6 +2,7 @@ Public command As String Public DefaultPrompt As String Public TrackPos As Integer + Public AdvancedCommand As Boolean Private Sub Terminal_Load(sender As Object, e As EventArgs) Handles MyBase.Load FormBorderStyle = FormBorderStyle.None @@ -11,7 +12,11 @@ Strings.ComputerInfo(1) = "user" PrintPrompt() AssignPrompt() + Else + End If + TextBox1.Select(TextBox1.TextLength, 0) + TextBox1.ScrollToCaret() End Sub Public Sub PrintPrompt() @@ -44,6 +49,31 @@ command = command.ToLower() End Sub + Private Sub DoCommand() + AdvancedCommand = True + Select Case command + Case "clear" + TextBox1.Text = Nothing + AdvancedCommand = False + Case "ver" + TextBox1.Text = TextBox1.Text & Environment.NewLine & "ShiftOS TheRevival version 0.1.1" + AdvancedCommand = False + Case "shutdown", "shut down" + ShiftOSMenu.Show() + Close() + End Select + + If AdvancedCommand = True Then + If command Like "print *" Then + TextBox1.Text = TextBox1.Text & Environment.NewLine & command.Substring(6) + Dim printed As String = command.Replace("print ", "") + ''It has the same issue, only displays in lowercase + 'TextBox1.Text = TextBox1.Text & Environment.NewLine & printed + End If + AdvancedCommand = False + End If + End Sub + Private Sub txtterm_KeyPress(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles TextBox1.KeyDown If e.KeyCode = Keys.T AndAlso e.Control Then Me.Hide() @@ -85,7 +115,7 @@ If e.KeyCode = Keys.Enter Then e.SuppressKeyPress = True ReadCommand() - 'DoCommand() + DoCommand() If command = "clear" Then PrintPrompt() diff --git a/ShiftOS-TheRevival/MainForms/app.manifest b/ShiftOS-TheRevival/MainForms/app.manifest new file mode 100644 index 0000000..438ee0d --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/app.manifest @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ShiftOS-TheRevival/My Project/Application.Designer.vb b/ShiftOS-TheRevival/My Project/Application.Designer.vb index 38484b7..3ab54de 100644 --- a/ShiftOS-TheRevival/My Project/Application.Designer.vb +++ b/ShiftOS-TheRevival/My Project/Application.Designer.vb @@ -32,7 +32,7 @@ Namespace My _ Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.ShiftOS_TheRevival.Form1 + Me.MainForm = Global.ShiftOS_TheRevival.ShiftOSMenu End Sub End Class End Namespace diff --git a/ShiftOS-TheRevival/My Project/Resources.Designer.vb b/ShiftOS-TheRevival/My Project/Resources.Designer.vb index 271c441..413136f 100644 --- a/ShiftOS-TheRevival/My Project/Resources.Designer.vb +++ b/ShiftOS-TheRevival/My Project/Resources.Designer.vb @@ -61,15 +61,11 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to No - '''12 - '''Enter your username for the build lab below : - '''ewindows - '''. + ''' Looks up a localized string similar to . ''' - Friend ReadOnly Property ShiftOSBuildLab() As String + Friend ReadOnly Property BuildString() As String Get - Return ResourceManager.GetString("ShiftOSBuildLab", resourceCulture) + Return ResourceManager.GetString("BuildString", resourceCulture) End Get End Property End Module diff --git a/ShiftOS-TheRevival/My Project/Resources.resx b/ShiftOS-TheRevival/My Project/Resources.resx index bcce77f..008acd0 100644 --- a/ShiftOS-TheRevival/My Project/Resources.resx +++ b/ShiftOS-TheRevival/My Project/Resources.resx @@ -117,8 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\ShiftOSBuildLab.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + \ No newline at end of file diff --git a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj index 2c7264c..89b80db 100644 --- a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj +++ b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj @@ -13,6 +13,21 @@ WindowsForms v4.5 true + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true AnyCPU @@ -46,6 +61,9 @@ On + + MainForms\app.manifest + @@ -127,6 +145,7 @@ + MyApplicationCodeGenerator Application.Designer.vb @@ -144,5 +163,12 @@ + + + False + .NET Framework 3.5 SP1 + false + + \ No newline at end of file