diff options
| -rw-r--r-- | ShiftOS-TheRevival/MainForms/Console.vb | 70 | ||||
| -rw-r--r-- | ShiftOS-TheRevival/MainForms/ConsoleAPI.vb | 6 | ||||
| -rw-r--r-- | ShiftOS-TheRevival/MainForms/DirectoryManagements.vb | 25 | ||||
| -rw-r--r-- | ShiftOS-TheRevival/MainForms/Epilepsy.Designer.vb | 2 | ||||
| -rw-r--r-- | ShiftOS-TheRevival/MainForms/FileManagement.vb | 2 | ||||
| -rw-r--r-- | ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb | 21 | ||||
| -rw-r--r-- | ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb | 6 | ||||
| -rw-r--r-- | ShiftOS-TheRevival/MainForms/Shiftoriums.vb | 215 | ||||
| -rw-r--r-- | ShiftOS-TheRevival/MainForms/Strings.vb | 17 | ||||
| -rw-r--r-- | ShiftOS-TheRevival/MainForms/TerminalAPI.vb | 21 | ||||
| -rw-r--r-- | ShiftOS-TheRevival/MainForms/TerminalColorSystem.vb | 59 | ||||
| -rw-r--r-- | ShiftOS-TheRevival/MainForms/TerminalExternalApps.vb | 35 | ||||
| -rw-r--r-- | ShiftOS-TheRevival/MainForms/TerminalInternalApps.vb | 47 | ||||
| -rw-r--r-- | ShiftOS-TheRevival/MainForms/TheUpdater.vb | 48 |
14 files changed, 456 insertions, 118 deletions
diff --git a/ShiftOS-TheRevival/MainForms/Console.vb b/ShiftOS-TheRevival/MainForms/Console.vb index e273917..f4c5d1c 100644 --- a/ShiftOS-TheRevival/MainForms/Console.vb +++ b/ShiftOS-TheRevival/MainForms/Console.vb @@ -101,7 +101,7 @@ Public Class Console NewLine("Oopsie! It's only for newer version") End Sub - Private Sub DoCommand() + Public Sub DoCommand() AdvancedCommand = True BadCommand = True Select Case command @@ -134,6 +134,43 @@ Public Class Console DisplayColors() AdvancedCommand = False BadCommand = False + Case "date" + If Strings.AvailableFeature(24) = 1 Then + NewLine("The date is " & Date.Now.DayOfYear & " days since the first day of the year") + AdvancedCommand = False + BadCommand = False + ElseIf Strings.AvailableFeature(24) = 3 Then + If Strings.AvailableFeature(25) = 1 Then + Dim TheWeek As String = Date.Now.DayOfYear / 7 + NewLine("The date is " & TheWeek.Substring(0, 2) & " weeks since the first week of the year") + AdvancedCommand = False + BadCommand = False + ElseIf Strings.AvailableFeature(25) = 3 Then + If Strings.AvailableFeature(26) = 1 Then + NewLine("The date is " & Date.Now.Month & " months since the first month of the year") + AdvancedCommand = False + BadCommand = False + ElseIf Strings.AvailableFeature(26) = 3 Then + If Strings.AvailableFeature(27) = 1 Then + NewLine("The year is " & Date.Now.Year) + AdvancedCommand = False + BadCommand = False + ElseIf Strings.AvailableFeature(27) = 3 Then + If Strings.AvailableFeature(28) = 1 Then + NewLine("The date is " & Date.Now.Day & "/" & Date.Now.Month) + AdvancedCommand = False + BadCommand = False + ElseIf Strings.AvailableFeature(28) = 3 Then + If Strings.AvailableFeature(29) = 1 Then + NewLine("The date is " & Date.Now.Day & "/" & Date.Now.Month & "/" & Date.Now.Year) + AdvancedCommand = False + BadCommand = False + End If + End If + End If + End If + End If + End If Case "dir" If Strings.AvailableFeature(16) = "1" Then TerminalDirectories(CurrentDirectory) @@ -181,6 +218,29 @@ Public Class Console If Strings.AvailableFeature(22) = 1 Then NewLine("COWSAY Spawn a cow And saying anything you want") End If + If Strings.AvailableFeature(24) = 1 Then + NewLine("DATE Displays date in days since first day of the year format") + ElseIf Strings.AvailableFeature(24) = 3 Then + If Strings.AvailableFeature(25) = 1 Then + NewLine("DATE Displays date in weeks since first week of the year format") + ElseIf Strings.AvailableFeature(25) = 3 Then + If Strings.AvailableFeature(26) = 1 Then + NewLine("DATE Displays date in months since first month of the year format") + ElseIf Strings.AvailableFeature(26) = 3 Then + If Strings.AvailableFeature(27) = 1 Then + NewLine("DATE Displays date in year format format") + ElseIf Strings.AvailableFeature(27) = 3 Then + If Strings.AvailableFeature(28) = 1 Then + NewLine("DATE Displays date in MM/YYYY format") + ElseIf Strings.AvailableFeature(28) = 3 Then + If Strings.AvailableFeature(29) = 1 Then + NewLine("DATE Displays date in general DD/MM/YYYY format") + End If + End If + End If + End If + End If + End If If Strings.AvailableFeature(16) = 1 Then NewLine("DEL Delete a selected file from the directory") NewLine("DIR Displays subdirectories And files In a directory") @@ -455,6 +515,13 @@ Public Class Console BadCommand = False End If End If + If command Like "run *" Then + If Strings.AvailableFeature(30) = 1 Then + Terminal_RunTerminalFile(command.Substring(4)) + AdvancedCommand = False + BadCommand = False + End If + End If If command Like "shiftorium *" Then Dim prompt As String = command.Replace("shiftorium ", "") NewLine("Shiftorium ShiftOS Center") @@ -493,7 +560,6 @@ Public Class Console End If End If End If - If BadCommand = True Then NewLine("Bad command or wrong file name") End If diff --git a/ShiftOS-TheRevival/MainForms/ConsoleAPI.vb b/ShiftOS-TheRevival/MainForms/ConsoleAPI.vb index 28b7efc..155173e 100644 --- a/ShiftOS-TheRevival/MainForms/ConsoleAPI.vb +++ b/ShiftOS-TheRevival/MainForms/ConsoleAPI.vb @@ -15,4 +15,10 @@ Console.TextBox1.Select(Console.TextBox1.Text.Length, 0) Console.TextBox1.ScrollToCaret() End Sub + + Public Sub TextRebindBehind() + 'Console.TextBox1.Select(Console.TextBox1.Lines.Length - 1, 0) + Console.TextBox1.Select(Console.TextBox1.Lines.Length - 1, 0) + Console.TextBox1.ScrollToCaret() + End Sub End Module diff --git a/ShiftOS-TheRevival/MainForms/DirectoryManagements.vb b/ShiftOS-TheRevival/MainForms/DirectoryManagements.vb index 1ab684d..7647e1e 100644 --- a/ShiftOS-TheRevival/MainForms/DirectoryManagements.vb +++ b/ShiftOS-TheRevival/MainForms/DirectoryManagements.vb @@ -2,12 +2,13 @@ Dim spaces As String Public Sub TerminalDirectories(TheDirectory As String) Console.Pseudodir = TheDirectory.Replace(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\ShiftFS", "!") - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Contents of " & Console.Pseudodir & Environment.NewLine - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "[DIR] 0 KB ." - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "[DIR] 0 KB .." + NewLine("Contents of " & Console.Pseudodir) + NewLine(Nothing) + NewLine("[DIR] 0 KB .") + NewLine("[DIR] 0 KB ..") For Each Dir As String In IO.Directory.GetDirectories(TheDirectory) Dim dirinf As New IO.DirectoryInfo(Dir) - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "[DIR] 0 KB " & dirinf.Name + NewLine("[DIR] 0 KB " & dirinf.Name) Next For Each file As String In IO.Directory.GetFiles(TheDirectory) Dim filinf As New IO.FileInfo(file) @@ -33,11 +34,11 @@ End Select Select Case thesize Case 1 - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & spaces & filsize & " KB " & filinf.Name + NewLine(spaces & filsize & " KB " & filinf.Name) Case 2 - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & spaces & filsize & " MB " & filinf.Name + NewLine(spaces & filsize & " MB " & filinf.Name) Case 3 - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & spaces & filsize & " GB " & filinf.Name + NewLine(spaces & filsize & " GB " & filinf.Name) End Select Next End Sub @@ -45,7 +46,7 @@ Public Sub NavigateDir(TheDirectory As String) If TheDirectory = ".." Then If Console.CurrentDirectory = Strings.OnceInfo(1) Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "!\" + NewLine("!\") Else Console.CurrentDirectory = IO.Directory.GetParent(Console.CurrentDirectory).ToString End If @@ -55,14 +56,14 @@ ElseIf IO.Directory.Exists(TheDirectory) Then Console.CurrentDirectory = TheDirectory Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "The directory is not exist!" + NewLine("The directory is not exist!") End If End If End Sub Public Sub CreateDir(TheDirectory As String) If IO.Directory.Exists(Console.CurrentDirectory + "\" + TheDirectory) Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Directory is already exists!" + NewLine("Directory is already exists!") Else IO.Directory.CreateDirectory(Console.CurrentDirectory + "\" + TheDirectory) End If @@ -73,10 +74,10 @@ Try IO.Directory.Delete(Console.CurrentDirectory + "\" + TheDirectory) Catch ex As Exception - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ex.Message + NewLine(ex.Message) End Try Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "The directory is not exists!" + NewLine("The directory is not exists!") End If End Sub End Module diff --git a/ShiftOS-TheRevival/MainForms/Epilepsy.Designer.vb b/ShiftOS-TheRevival/MainForms/Epilepsy.Designer.vb index 12410a1..6c9a256 100644 --- a/ShiftOS-TheRevival/MainForms/Epilepsy.Designer.vb +++ b/ShiftOS-TheRevival/MainForms/Epilepsy.Designer.vb @@ -77,6 +77,8 @@ Partial Class Epilepsy Me.ForeColor = System.Drawing.Color.White Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Name = "Epilepsy" + Me.ShowIcon = False + Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Epilepsy" Me.ResumeLayout(False) diff --git a/ShiftOS-TheRevival/MainForms/FileManagement.vb b/ShiftOS-TheRevival/MainForms/FileManagement.vb index 76b0d59..b84a2a0 100644 --- a/ShiftOS-TheRevival/MainForms/FileManagement.vb +++ b/ShiftOS-TheRevival/MainForms/FileManagement.vb @@ -4,7 +4,7 @@ Module FileManagement Public Sub CatFile(filename As String) If File.Exists(Console.CurrentDirectory & "\" & filename) = True Then Dim ContentsFinal As String = File.ReadAllText(Console.CurrentDirectory & "\" & filename) - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ContentsFinal + NewLine(ContentsFinal) End If End Sub diff --git a/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb b/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb index 7b14171..9f15e8b 100644 --- a/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb +++ b/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb @@ -37,6 +37,13 @@ Module SaveLoadSystem Strings.AvailableFeature(22) = "2" '0.2.5 Features Strings.AvailableFeature(23) = "2" + Strings.AvailableFeature(24) = "2" + Strings.AvailableFeature(25) = "2" + Strings.AvailableFeature(26) = "2" + Strings.AvailableFeature(27) = "2" + Strings.AvailableFeature(28) = "2" + Strings.AvailableFeature(29) = "2" + Strings.AvailableFeature(30) = "2" End Sub Public Sub FreeRoamMode() @@ -70,6 +77,13 @@ Module SaveLoadSystem Strings.AvailableFeature(22) = "1" '0.2.5 Features Strings.AvailableFeature(23) = "1" + Strings.AvailableFeature(24) = "3" + Strings.AvailableFeature(25) = "3" + Strings.AvailableFeature(26) = "3" + Strings.AvailableFeature(27) = "3" + Strings.AvailableFeature(28) = "3" + Strings.AvailableFeature(29) = "1" + Strings.AvailableFeature(30) = "1" End Sub Public Sub GodMode() @@ -102,6 +116,13 @@ Module SaveLoadSystem Strings.AvailableFeature(22) = "2" '0.2.5 Features Strings.AvailableFeature(23) = "2" + Strings.AvailableFeature(24) = "2" + Strings.AvailableFeature(25) = "2" + Strings.AvailableFeature(26) = "2" + Strings.AvailableFeature(27) = "2" + Strings.AvailableFeature(28) = "2" + Strings.AvailableFeature(29) = "2" + Strings.AvailableFeature(30) = "2" End Sub Public Sub SaveGame() diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb index 746e5da..1ea49e8 100644 --- a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb +++ b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb @@ -150,9 +150,9 @@ Public Class ShiftOSMenu btn_StoryMode.Enabled = False ShouldUpdate = True ShiftOSUpdater.Show() - 'ShiftOSUpdater.Label2.Text = "A new version, " & CurrentVersion & " is available." & Environment.NewLine & "Your version is " & TheUpdater.WhatVersion & "Update now to get more features." 'ShiftOSUpdater.Label2.Text = "A new version, " & CurrentVersion & " is available." & Environment.NewLine & "Your version is " & TheUpdater.WhatVersion & "Update now to get more features." - ShiftOSUpdater.Label2.Text = "Update function is temporarily disabled." & Environment.NewLine & "Click the 'Reset' to reset the save" - ShiftOSUpdater.Button2.Text = "Reset" + ShiftOSUpdater.Label2.Text = "A new version, " & CurrentVersion & " is available." & Environment.NewLine & "Your version is " & TheUpdater.WhatVersion & Environment.NewLine & "Update now to get more features." 'ShiftOSUpdater.Label2.Text = "A new version, " & CurrentVersion & " is available." & Environment.NewLine & "Your version is " & TheUpdater.WhatVersion & "Update now to get more features." + 'ShiftOSUpdater.Label2.Text = "Update function is temporarily disabled." & Environment.NewLine & "Click the 'Reset' to reset the save" + 'ShiftOSUpdater.Button2.Text = "Reset" End If Else If Directory.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS") = True Then diff --git a/ShiftOS-TheRevival/MainForms/Shiftoriums.vb b/ShiftOS-TheRevival/MainForms/Shiftoriums.vb index 0c85b46..3511f2e 100644 --- a/ShiftOS-TheRevival/MainForms/Shiftoriums.vb +++ b/ShiftOS-TheRevival/MainForms/Shiftoriums.vb @@ -2,52 +2,57 @@ Public prompt As String Public Sub Shiftorium_ListFeatures() - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium Available Feature(s)" & Environment.NewLine + NewLine("Shiftorium Available Feature(s)") + NewLine(Nothing) If Strings.AvailableFeature(11) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(key | 5 CP) ShiftOS Key" + NewLine("(key | 5 CP) ShiftOS Key") Else If Strings.AvailableFeature(0) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(man | 10 CP) ShiftOS Help Manual" + NewLine("(man | 10 CP) ShiftOS Help Manual") Else If Strings.AvailableFeature(19) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(username | 15 CP) Custom Username" + NewLine("(username | 15 CP) Custom Username") End If If Strings.AvailableFeature(20) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(hostname | 15 CP) Custom hostname" + NewLine("(hostname | 15 CP) Custom hostname") End If End If - If Strings.AvailableFeature(1) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(clear | 20 CP) Clear Terminal Screen" + If Strings.AvailableFeature(1) = "0" Then + NewLine("(clear | 20 CP) Clear Terminal Screen") Else If Strings.AvailableFeature(2) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(print | 25 CP) Print Terminal Screen" + NewLine("(print | 25 CP) Print Terminal Screen") Else If Strings.AvailableFeature(3) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(termdspdrv | 40 CP) Terminal Display Driver" + NewLine("(termdspdrv | 40 CP) Terminal Display Driver") Else If Strings.AvailableFeature(4) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(infobar | 50 CP) Terminal InfoBar" + NewLine("(infobar | 50 CP) Terminal InfoBar") End If If Strings.AvailableFeature(8) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(shiftfetch | 55 CP) Shiftfetch" + NewLine("(shiftfetch | 55 CP) Shiftfetch") End If If Strings.AvailableFeature(10) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(2bitcolor | 60 CP) 2-bit Color Support" + NewLine("(2bitcolor | 60 CP) 2-bit Color Support") Else If Strings.AvailableFeature(13) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(rgb | 70 CP) Red, Green, and Blue" + NewLine("(rgb | 70 CP) Red, Green, and Blue") Else If Strings.AvailableFeature(14) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(rgb2 | 75 CP) RGB Variant" + NewLine("(rgb2 | 75 CP) RGB Variant") Else If Strings.AvailableFeature(15) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(4bitcolor | 80 CP) 4-bit Color Support" + NewLine("(4bitcolor | 80 CP) 4-bit Color Support") Else If Strings.AvailableFeature(16) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(romdriver | 90 CP) Terminal Read-Only Memory Support" + NewLine("(romdriver | 90 CP) Terminal Read-Only Memory Support") Else If Strings.AvailableFeature(17) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(textpad | 100 CP) TextPad" + NewLine("(textpad | 100 CP) TextPad") + Else + If Strings.AvailableFeature(30) = "0" Then + NewLine("(script | 100 CP) ShiftOS Batch Script Support") + End If End If End If End If @@ -56,37 +61,41 @@ End If End If If Strings.AvailableFeature(18) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(shiftkey | 45 CP) ShiftKey" + NewLine("(shiftkey | 45 CP) ShiftKey") End If If Strings.AvailableFeature(21) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(rev | 30 CP) Reverse String" + NewLine("(rev | 30 CP) Reverse String") Else If Strings.AvailableFeature(22) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(cowsay | 50 CP) Cowsay" + NewLine("(cowsay | 50 CP) Cowsay") End If End If End If If Strings.AvailableFeature(5) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(stime | 10 CP) Time by Seconds" + NewLine("(stime | 10 CP) Time by Seconds") Else If Strings.AvailableFeature(6) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(mtime | 20 CP) Time by Minutes" + NewLine("(mtime | 20 CP) Time by Minutes") Else If Strings.AvailableFeature(7) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(htime | 30 CP) Time by Hours" + NewLine("(htime | 30 CP) Time by Hours") Else If Strings.AvailableFeature(12) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(pmam | 40 CP) PM and AM" + NewLine("(pmam | 40 CP) PM and AM") Else If Strings.AvailableFeature(23) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(hhmm | 50 CP) Time by Hours and Minutes" + NewLine("(hhmm | 50 CP) Time by Hours and Minutes") + Else + If Strings.AvailableFeature(24) = "0" Then + NewLine("(date | 70 CP) Date command") + End If End If End If End If End If End If If Strings.AvailableFeature(9) = "0" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "(bc | 55 CP) Basic Calculator" + NewLine("(bc | 55 CP) Basic Calculator") End If End If End If @@ -102,7 +111,11 @@ If Strings.AvailableFeature(0) = "0" Then ManHeader(0) = "ShiftOS Help Manual (command: man)" ManHeader(1) = "10 CP" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows up any further help instruction on each command, its corresponding action and its example if necessary" & Environment.NewLine & Environment.NewLine & ManHeader(1) + NewLine(ManHeader(0)) + NewLine(Nothing) + NewLine("Shows up any further help instruction on each command, its corresponding action and its example if necessary") + NewLine(Nothing) + NewLine(ManHeader(1)) Console.BadCommand = False End If Case "clear" @@ -266,6 +279,83 @@ Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in Hours and Minutes format" & Environment.NewLine & Environment.NewLine & ManHeader(1) Console.BadCommand = False End If + Case "date" + If Strings.AvailableFeature(24) = "0" Then + ManHeader(0) = "Date command" + ManHeader(1) = "70 CP" + NewLine(ManHeader(0)) + NewLine(Nothing) + NewLine("Displays date in days format since first day of the year") + NewLine(Nothing) + NewLine(ManHeader(1)) + Console.BadCommand = False + End If + Case "woy" + If Strings.AvailableFeature(25) = "0" Then + ManHeader(0) = "Date by week of year" + ManHeader(1) = "75 CP" + NewLine(ManHeader(0)) + NewLine(Nothing) + NewLine("Displays date in week format since first week of the year") + NewLine(Nothing) + NewLine(ManHeader(1)) + Console.BadCommand = False + End If + Case "moy" + If Strings.AvailableFeature(26) = "0" Then + ManHeader(0) = "Date by month of year" + ManHeader(1) = "80 CP" + NewLine(ManHeader(0)) + NewLine(Nothing) + NewLine("Displays date in month format since first month of the year") + NewLine(Nothing) + NewLine(ManHeader(1)) + Console.BadCommand = False + End If + Case "year" + If Strings.AvailableFeature(27) = "0" Then + ManHeader(0) = "Date by year" + ManHeader(1) = "85 CP" + NewLine(ManHeader(0)) + NewLine(Nothing) + NewLine("Displays date in year format") + NewLine(Nothing) + NewLine(ManHeader(1)) + Console.BadCommand = False + End If + Case "mmyyyy" + If Strings.AvailableFeature(28) = "0" Then + ManHeader(0) = "Date by month and year" + ManHeader(1) = "90 CP" + NewLine(ManHeader(0)) + NewLine(Nothing) + NewLine("Displays date in month and year format") + NewLine(Nothing) + NewLine(ManHeader(1)) + Console.BadCommand = False + End If + Case "generaldate" + If Strings.AvailableFeature(29) = "0" Then + ManHeader(0) = "Date by general format" + ManHeader(1) = "95 CP" + NewLine(ManHeader(0)) + NewLine(Nothing) + NewLine("Displays date in DD/MM/YYYY format") + NewLine(Nothing) + NewLine(ManHeader(1)) + Console.BadCommand = False + End If + Case "batchscript" + If Strings.AvailableFeature(30) = "0" Then + ManHeader(0) = "ShiftOS Batch Script Support" + ManHeader(1) = "100 CP" + NewLine(ManHeader(0)) + NewLine(Nothing) + NewLine("Adds the supports for ShiftOS Batch Script") + NewLine(Nothing) + NewLine(ManHeader(1)) + Console.BadCommand = False + End If Case Else Console.BadCommand = False Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Bad command or not available" @@ -273,7 +363,7 @@ End Sub Public Sub Shiftorium_DetectInstallFeatures() - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Installing feature..." + NewLine("Installing feature...") Select Case prompt Case "man" Shiftorium_InstallFeatures(True, "man", 0, 10) @@ -347,9 +437,30 @@ Case "hhmm" Shiftorium_InstallFeatures(True, "hhmm", 23, 50) Console.BadCommand = False + Case "date" + Shiftorium_InstallFeatures(True, "date", 24, 70) + Console.BadCommand = False + Case "woy" + Shiftorium_InstallFeatures(True, "woy", 25, 75) + Console.BadCommand = False + Case "moy" + Shiftorium_InstallFeatures(True, "moy", 26, 80) + Console.BadCommand = False + Case "year" + Shiftorium_InstallFeatures(True, "year", 27, 85) + Console.BadCommand = False + Case "mmyyyy" + Shiftorium_InstallFeatures(True, "mmyyyy", 28, 90) + Console.BadCommand = False + Case "generaldate" + Shiftorium_InstallFeatures(True, "generaldate", 29, 95) + Console.BadCommand = False + Case "batchscript" + Shiftorium_InstallFeatures(True, "batchscript", 30, 100) + Console.BadCommand = False Case Else Console.BadCommand = False - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Bad command or not available" + NewLine("Shiftorium: Bad command or not available") End Select End Sub @@ -438,6 +549,7 @@ success = True Case "textpad" Strings.AvailableFeature(17) = "1" + Strings.AvailableFeature(30) = "0" success = True Case "shiftkey" Strings.AvailableFeature(18) = "1" @@ -454,39 +566,72 @@ success = True Case "cowsay" Strings.AvailableFeature(22) = "1" + success = True Case "hhmm" Strings.AvailableFeature(12) = "3" Strings.AvailableFeature(23) = "1" + Strings.AvailableFeature(24) = "0" + success = True + Case "date" + Strings.AvailableFeature(24) = "1" + Strings.AvailableFeature(25) = "0" + success = True + Case "woy" + Strings.AvailableFeature(24) = "3" + Strings.AvailableFeature(25) = "1" + Strings.AvailableFeature(26) = "0" + success = True + Case "moy" + Strings.AvailableFeature(25) = "3" + Strings.AvailableFeature(26) = "1" + Strings.AvailableFeature(27) = "0" + success = True + Case "year" + Strings.AvailableFeature(26) = "3" + Strings.AvailableFeature(27) = "1" + Strings.AvailableFeature(28) = "0" + success = True + Case "mmyyyy" + Strings.AvailableFeature(27) = "3" + Strings.AvailableFeature(28) = "1" + Strings.AvailableFeature(29) = "0" + success = True + Case "generaldate" + Strings.AvailableFeature(28) = "3" + Strings.AvailableFeature(29) = "1" + success = True + Case "batchscript" + Strings.AvailableFeature(30) = "1" success = True End Select If success = False Then If IsCLI = True Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Invalid command or feature already installed" + NewLine("Shiftorium: Invalid command or feature already installed") End If Else Strings.ComputerInfo(4) = Strings.ComputerInfo(4) + 1 TempCP = TempCP - Codepoint Strings.ComputerInfo(2) = Convert.ToString(TempCP) If IsCLI = True Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Feature has been install succesfully" + NewLine("Feature has been install succesfully") End If End If Else If IsCLI = True Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Insufficent Codepoint" + NewLine("Shiftorium: Insufficent Codepoint") End If End If Case "1" If IsCLI = True Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Feature has already been installed" + NewLine("Shiftorium: Feature has already been installed") End If Case "2" If IsCLI = True Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Feature is not available" + NewLine("Shiftorium: Feature is not available") End If Case "3" If IsCLI = True Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Feature is already upgraded to a newer one" + NewLine("Shiftorium: Feature is already upgraded to a newer one") End If End Select End Sub diff --git a/ShiftOS-TheRevival/MainForms/Strings.vb b/ShiftOS-TheRevival/MainForms/Strings.vb index 1e6eba9..41dcbe9 100644 --- a/ShiftOS-TheRevival/MainForms/Strings.vb +++ b/ShiftOS-TheRevival/MainForms/Strings.vb @@ -3,7 +3,7 @@ Public Shared ComputerInfo(6) As String Public Shared IsFree As Boolean Public Shared OnceInfo(8) As String - Public Shared AvailableFeature(24) As String + Public Shared AvailableFeature(30) As String Public Shared CLIInterpreter As String Public Shared SaveFile As String Public Shared Achievement As String @@ -72,7 +72,13 @@ '21 = Reverse String [Reverse a text] (0.2.4) (default : 0) '22 = Cowsay [Cowsay] (0.2.4) (default : 0) '23 = Time by Hours and Minutes [Shows time in Hours and Minutes format] (0.2.5) (default : 0) - '24 = fortune command [Shows random quote] (0.2.5) (default : 0) + '24 = Date command [Shows date in days since first day of the year format] (0.2.5) (default : 0) + '25 = Date by week [Shows date in weeks since first week of the year format] (0.2.5) (default : 0) + '26 = Date by month [Shows date in months since first month of the year format] (0.2.5) (default : 0) + '27 = Date by year [Shows date in year format] (0.2.5) (default : 0) + '28 = Date by month and year [Shows date in MM/YYYY format] (0.2.5) (default : 0) + '29 = Date by general [Shows date in general DD/MM/YYYY format] (0.2.5) (default : 0) + '30 = Batch-file support for ShiftOS [Gives execution support for ShiftOS Script File (.scr)] (0.2.5) (default : 0) ' 'Features bought hierarchy : 'ShiftOS Key (KEY) (5 CP) @@ -94,10 +100,17 @@ '>>>>>>>4-bit Color Display (4BITCOLOR) (80 CP) '>>>>>>>>Terminal Read-Only Memory Driver (ROMDRIVER, DIR, MKDIR, RMDIR, CD, PWD) (90 CP) '>>>>>>>>>TextPad (100 CP) + '>>>>>>>>>>ShiftOS Batch Script Support (BATCHSCRIPT) (100 CP) '>>Basic Calculator (BC) (55 CP) '>>Time by Seconds (TIME, STIME) (10 CP) '>>>Time by Minutes (TIME, MTIME) (20 CP) '>>>>Time by Hours (Time, HTIME) (30 CP) '>>>>>PM and AM (Time, PMAM (40 CP)) '>>>>>>Time by Hours and Minutes (Time, HHMM (50 CP)) + '>>>>>>>Date command (DATE (70 CP)) + '>>>>>>>>Date by week (DATE, WOY (75 CP)) + '>>>>>>>>>Date by month (DATE, MOY (80 CP)) + '>>>>>>>>>>Date by year (DATE, YEAR (85 CP)) + '>>>>>>>>>>>Date by month and year (DATE, MMYYYY (90 CP)) + '>>>>>>>>>>>>Date by general (DATE, GENERALDATE (95 CP)) End Class diff --git a/ShiftOS-TheRevival/MainForms/TerminalAPI.vb b/ShiftOS-TheRevival/MainForms/TerminalAPI.vb index 667d2ef..715e075 100644 --- a/ShiftOS-TheRevival/MainForms/TerminalAPI.vb +++ b/ShiftOS-TheRevival/MainForms/TerminalAPI.vb @@ -46,4 +46,25 @@ End If End If End Sub + + Public Sub Terminal_RunTerminalFile(filename As String) + Dim sr As System.IO.StreamReader + If My.Computer.FileSystem.FileExists(Console.CurrentDirectory & "\" & filename) Then + Dim fileext As New IO.FileInfo(Console.CurrentDirectory & "\" & filename) + If fileext.Extension = ".scr" Then + sr = My.Computer.FileSystem.OpenTextFileReader(Console.CurrentDirectory & "\" & filename) + Dim linenum As Integer = IO.File.ReadAllLines(Console.CurrentDirectory & "\" & filename).Length + Dim i As Integer = 1 + While i <= linenum + command = sr.ReadLine() + Console.DoCommand() + NewLine(Nothing) + i = i + 1 + End While + sr.Close() + Else + + End If + End If + End Sub End Module diff --git a/ShiftOS-TheRevival/MainForms/TerminalColorSystem.vb b/ShiftOS-TheRevival/MainForms/TerminalColorSystem.vb index 83a5e9e..9042910 100644 --- a/ShiftOS-TheRevival/MainForms/TerminalColorSystem.vb +++ b/ShiftOS-TheRevival/MainForms/TerminalColorSystem.vb @@ -13,48 +13,49 @@ Public FgColor As Color Public Sub DisplayColors() - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "TERMINAL SUPPORTED COLORS" & Environment.NewLine & Environment.NewLine + NewLine("TERMINAL SUPPORTED COLORS") + NewLine(Nothing) + NewLine(Nothing) If Strings.AvailableFeature(10) = "1" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "0 = Black 8 = Gray" + NewLine("0 = Black 8 = Gray") Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "0 = Black 8 = ???" + NewLine("0 = Black 8 = ???") End If If Strings.AvailableFeature(14) = "1" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "1 = Blue 9 = Light Blue" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "2 = Green A = Light Green" - + NewLine("1 = Blue 9 = Light Blue") + NewLine("2 = Green A = Light Green") Else If Strings.AvailableFeature(13) = "1" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "1 = ??? 9 = Light Blue" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "2 = Green A = ???" + NewLine("1 = ??? 9 = Light Blue") + NewLine("2 = Green A = ???") Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "1 = ??? 9 = ???" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "2 = ??? A = ???" + NewLine("1 = ??? 9 = ???") + NewLine("2 = ??? A = ???") End If End If If Strings.AvailableFeature(15) = "1" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "3 = Aqua B = Light Aqua" + NewLine("3 = Aqua B = Light Aqua") Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "3 = ??? B = ???" + NewLine("3 = ??? B = ???") End If If Strings.AvailableFeature(14) = "1" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "4 = Red C = Light Red" + NewLine("4 = Red C = Light Red") ElseIf Strings.AvailableFeature(13) = "1" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "4 = ??? C = Light Red" + NewLine("4 = ??? C = Light Red") Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "4 = ??? C = ???" + NewLine("4 = ??? C = ???") End If If Strings.AvailableFeature(15) = "1" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "5 = Purple D = Light Purple" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "6 = Yellow E = Yellow" + NewLine("5 = Purple D = Light Purple") + NewLine("6 = Yellow E = Yellow") Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "5 = ??? D = ???" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "6 = ??? E = ???" + NewLine("5 = ??? D = ???") + NewLine("6 = ??? E = ???") End If If Strings.AvailableFeature(10) = "1" Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "7 = Dark Gray F = White" + NewLine("7 = Dark Gray F = White") Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "7 = ??? F = White" + NewLine("7 = ??? F = White") End If End Sub @@ -68,7 +69,7 @@ FgColor = Color.Black End Select If Bg = Fg Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Background and Foreground Color cannot be same!" + NewLine("Background and Foreground Color cannot be same!") Else If Strings.AvailableFeature(10) = "1" Then Select Case Bg @@ -91,7 +92,7 @@ BgColor = Color.Red End Select Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available." + NewLine("One or two colors you selected is not available.") End If Case "1", "4", "a" If Strings.AvailableFeature(14) = "1" Then @@ -104,7 +105,7 @@ BgColor = Color.Lime End Select Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available." + NewLine("One or two colors you selected is not available.") End If Case "3", "5", "6", "b", "d", "e" If Strings.AvailableFeature(15) = "1" Then @@ -123,7 +124,7 @@ BgColor = Color.Yellow End Select Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available." + NewLine("One or two colors you selected is not available.") End If Case Else BgColor = Color.Black @@ -148,7 +149,7 @@ FgColor = Color.Red End Select Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available." + NewLine("One or two colors you selected is not available.") End If Case "1", "4", "a" If Strings.AvailableFeature(14) = "1" Then @@ -161,7 +162,7 @@ FgColor = Color.Lime End Select Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available." + NewLine("One or two colors you selected is not available.") End If Case "3", "5", "6", "b", "d", "e" If Strings.AvailableFeature(15) = "1" Then @@ -180,13 +181,13 @@ FgColor = Color.Yellow End Select Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "One or two colors you selected is not available." + NewLine("One or two colors you selected is not available.") End If Case Else FgColor = Color.White End Select Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Color is not supported for 1-bit Color Display" + NewLine("Color is not supported for 1-bit Color Display") Select Case App Case "terminal" BgColor = Color.Black diff --git a/ShiftOS-TheRevival/MainForms/TerminalExternalApps.vb b/ShiftOS-TheRevival/MainForms/TerminalExternalApps.vb index a7b29b8..a489c54 100644 --- a/ShiftOS-TheRevival/MainForms/TerminalExternalApps.vb +++ b/ShiftOS-TheRevival/MainForms/TerminalExternalApps.vb @@ -33,12 +33,18 @@ Module TerminalExternalApps Select Case App Case "bc" Console.DefaultPrompt = "> " - Console.TextBox1.Text = "bc (Basic Calcultator)" & Environment.NewLine & "Copyright, Free Software Foundation." & Environment.NewLine & "ShiftOS port by DevX." & Environment.NewLine & "This is free software with ABSOLUTELY NO WARRANTY." & Environment.NewLine + ResetLine("bc (Basic Calcultator)") + NewLine("Copyright, Free Software Foundation.") + NewLine("ShiftOS port by DevX.") + NewLine("This is free software with ABSOLUTELY NO WARRANTY.") + NewLine(Nothing) Console.CurrentInterpreter = "bc" ShouldChange = True Case "guess" 'Guess the Number Console.DefaultPrompt = "Your answer: " - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Guess the Number" & Environment.NewLine & "Guess the correct number between 1 and 50 and you'll get anything between 1 to 10 Codepoints" & Environment.NewLine & "Type 'exit' to terminate this game" + NewLine("Guess the Number") + NewLine("Guess the correct number between 1 and 50 and you'll get anything between 1 to 10 Codepoints") + NewLine("Type 'exit' to terminate this game") Console.CurrentInterpreter = "guess" GTN_GenerateNumber() ShouldChange = True @@ -53,7 +59,8 @@ Module TerminalExternalApps Console.DefaultPrompt = "Navigate> " Console.CurrentInterpreter = "shiftoriumfx" ShiftoriumFX_DisplayPackages() - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & Environment.NewLine & "Type any package you want to investigate" + NewLine(Nothing) + NewLine("Type any package you want to investigate") ShouldChange = True Case "textpad" Console.DefaultPrompt = Nothing @@ -64,6 +71,7 @@ Module TerminalExternalApps TextPad_CheckExist(command) Console.ToolBar.Text = "TextPad - " & command & Environment.NewLine & "Ctrl-Q Exit | Ctrl-N New | Ctrl-O Open | Ctrl-S Save | F12 Save As" Console.ReleaseCursor = True + TextRebind() End Select If Console.ReleaseCursor = True Then 'Strings.OnceInfo(5) = Terminal.TrackPos @@ -157,7 +165,7 @@ Module TerminalExternalApps Try GTN_CheckNumber() Catch ex As Exception - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Invalid value!" + NewLine("Invalid value!") End Try End Select Case "shiftoriumfx" @@ -168,14 +176,18 @@ Module TerminalExternalApps TerminateApp(Nothing) Case Else ShiftoriumFX_DisplayPackages() - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & Environment.NewLine & "Type any package you want to investigate" & Environment.NewLine & "Invalid package or bad command" + NewLine(Nothing) + NewLine("Type any package you want to investigate") + NewLine("Invalid package or bad command") End Select Case "bc" Select Case command Case "jim" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "69, the funni number" & Environment.NewLine & "gotcha!" + NewLine("69, the funni number") + NewLine("gotcha!") Case "ojas" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "dis calculator is very gud" & Environment.NewLine & "it counts from another universe" + NewLine("dis calculator is very gud") + NewLine("it counts from another universe") Case "exit" TerminateApp(Nothing) Case Else @@ -224,7 +236,7 @@ Module TerminalExternalApps End Try BC_Counting(BC_Numbers1, BC_Numbers2, BC_Operation2) BC_ThriceMoreValue = Nothing - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & BC_Result + NewLine(BC_Result) End Select End Select End Sub @@ -254,13 +266,14 @@ Module TerminalExternalApps Dim GetCP As New Random Dim GotCP As Integer = GetCP.Next(1, 11) ChangeCP(True, GotCP) - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "You are correct!, you got " & GotCP & " Codepoint(s)" & Environment.NewLine & "Guess the new number between 1 and 50." + NewLine("You are correct!, you got " & GotCP & " Codepoint(s)") + NewLine("Guess the new number between 1 and 50.") GTN_GenerateNumber() Else If TheirNumber < TheNumber Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Higher!" + NewLine("Higher!") ElseIf TheirNumber > TheNumber Then - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Lower!" + NewLine("Lower!") End If End If End If diff --git a/ShiftOS-TheRevival/MainForms/TerminalInternalApps.vb b/ShiftOS-TheRevival/MainForms/TerminalInternalApps.vb index c4db4bd..baba0e0 100644 --- a/ShiftOS-TheRevival/MainForms/TerminalInternalApps.vb +++ b/ShiftOS-TheRevival/MainForms/TerminalInternalApps.vb @@ -13,44 +13,44 @@ Exit Do End If Loop - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "< " & Say & " >" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " " + NewLine("< " & Say & " >") + NewLine(" ") Do - Console.TextBox1.Text = Console.TextBox1.Text & "-" + AddLine("-") SubtractLength = SubtractLength - 1 If SubtractLength = 0 Then - Console.TextBox1.Text = Console.TextBox1.Text & "-" + AddLine("-") SubtractLength = Say.Length + 1 Exit Do End If Loop - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " \ ^__^" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " \ (oo)\_______" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " (__)\ )\/\" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " ||----w |" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " || ||" + NewLine(" \ ^__^") + NewLine(" \ (oo)\_______") + NewLine(" (__)\ )\/\") + NewLine(" ||----w |") + NewLine(" || ||") Case 41 To 80 - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " __________________________________________ " - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "/ " & Say.Substring(0, 40) & " \" + NewLine(" __________________________________________ ") + NewLine("/ " & Say.Substring(0, 40) & " \") Say = Say.Substring(40, Say.Length - 40) - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "\ " & Say + NewLine("\ " & Say) Dim Spaces As Integer = 40 - Say.Length Do - Console.TextBox1.Text = Console.TextBox1.Text & " " + AddLine(" ") If Spaces = 0 Then - Console.TextBox1.Text = Console.TextBox1.Text & "/" + AddLine("/") Exit Do End If Spaces = Spaces - 1 Loop - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " ------------------------------------------ " - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " \ ^__^" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " \ (oo)\_______" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " (__)\ )\/\" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " ||----w |" - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & " || ||" + NewLine(" ------------------------------------------ ") + NewLine(" \ ^__^") + NewLine(" \ (oo)\_______") + NewLine(" (__)\ )\/\") + NewLine(" ||----w |") + NewLine(" || ||") Case >= 81 - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "cowsay: Character limit exceeded" + NewLine("cowsay: Character limit exceeded") 'Dim SubtractLength As Integer = Say.Length + 1 'Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & " __________________________________________ " 'Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "/ " & Say.Substring(0, 40) & " \" @@ -92,7 +92,8 @@ 'Summary of the command's action ' 'Example usage : command - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "ShiftOS Help Manual" & Environment.NewLine + NewLine("ShiftOS Help Manual") + NewLine(Nothing) 'Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & command.Substring(4) Dim mancommand As String = Command.Replace("man ", "") Dim TempUsage As String = "'" & mancommand & "' Usage: " @@ -237,7 +238,7 @@ Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_ver & Environment.NewLine Console.BadCommand = False Case Else - Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "MAN : Invalid command" + NewLine("MAN : Invalid command") End Select End Sub End Module diff --git a/ShiftOS-TheRevival/MainForms/TheUpdater.vb b/ShiftOS-TheRevival/MainForms/TheUpdater.vb index 1ef506a..ca1f7d9 100644 --- a/ShiftOS-TheRevival/MainForms/TheUpdater.vb +++ b/ShiftOS-TheRevival/MainForms/TheUpdater.vb @@ -60,6 +60,54 @@ Module TheUpdater Strings.ComputerInfo(5) = "0F" Strings.ComputerInfo(6) = "F0" ShiftOSUpdater.Button2.Text = "Updated!" + Case "0.2.4" + Strings.AvailableFeature(0) = AvailableFeatureHere(0) + Strings.AvailableFeature(1) = AvailableFeatureHere(1) + Strings.AvailableFeature(2) = AvailableFeatureHere(2) + Strings.AvailableFeature(3) = AvailableFeatureHere(3) + Strings.AvailableFeature(4) = AvailableFeatureHere(4) + Strings.AvailableFeature(5) = AvailableFeatureHere(5) + Strings.AvailableFeature(6) = AvailableFeatureHere(6) + Strings.AvailableFeature(7) = AvailableFeatureHere(7) + Strings.AvailableFeature(8) = AvailableFeatureHere(8) + Strings.AvailableFeature(9) = AvailableFeatureHere(9) + Strings.AvailableFeature(10) = AvailableFeatureHere(10) + Strings.AvailableFeature(11) = AvailableFeatureHere(11) + Strings.AvailableFeature(12) = AvailableFeatureHere(12) + Strings.AvailableFeature(13) = AvailableFeatureHere(13) + Strings.AvailableFeature(14) = AvailableFeatureHere(14) + Strings.AvailableFeature(15) = AvailableFeatureHere(15) + Strings.AvailableFeature(16) = AvailableFeatureHere(16) + Strings.AvailableFeature(17) = AvailableFeatureHere(17) + Strings.AvailableFeature(18) = AvailableFeatureHere(18) + Strings.AvailableFeature(19) = AvailableFeatureHere(19) + Strings.AvailableFeature(20) = AvailableFeatureHere(20) + Strings.AvailableFeature(21) = AvailableFeatureHere(21) + Strings.AvailableFeature(22) = AvailableFeatureHere(22) + If Strings.AvailableFeature(12) = "1" Then + Strings.AvailableFeature(23) = "0" + Else + Strings.AvailableFeature(23) = "2" + End If + Strings.AvailableFeature(24) = "2" + Strings.AvailableFeature(25) = "2" + Strings.AvailableFeature(26) = "2" + Strings.AvailableFeature(27) = "2" + Strings.AvailableFeature(28) = "2" + Strings.AvailableFeature(29) = "2" + If Strings.AvailableFeature(17) = 1 Then + Strings.AvailableFeature(30) = "0" + Else + Strings.AvailableFeature(30) = "2" + End If + Strings.ComputerInfo(0) = ComputerInfoHere(0) + Strings.ComputerInfo(1) = ComputerInfoHere(1) + Strings.ComputerInfo(2) = ComputerInfoHere(2) + Strings.ComputerInfo(3) = ComputerInfoHere(3) + Strings.ComputerInfo(4) = ComputerInfoHere(4) + Strings.ComputerInfo(5) = "0F" + Strings.ComputerInfo(6) = "F0" + ShiftOSUpdater.Button2.Text = "Updated!" End Select File.WriteAllText(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\version.txt", My.Resources.CurrentVersion) File.WriteAllLines(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\AvailableFeature.sos", Strings.AvailableFeature) |