diff --git a/ShiftOS-TheRevival/API/ConsoleAPI.vb b/ShiftOS-TheRevival/API/ConsoleAPI.vb index 34a4cec..bf7f0ad 100644 --- a/ShiftOS-TheRevival/API/ConsoleAPI.vb +++ b/ShiftOS-TheRevival/API/ConsoleAPI.vb @@ -1,5 +1,6 @@ Module ConsoleAPI Public StayAtChapter As Boolean = False 'If this set to true, then intro for chapters are mostly going to be in + Public NewBackground As System.ComponentModel.BackgroundWorker Public Sub Console_Windowed() Console.WindowState = FormWindowState.Normal @@ -43,4 +44,25 @@ Console.TextBox1.Select(Console.TextBox1.Lines.Length - 1, 0) Console.TextBox1.ScrollToCaret() End Sub + + Public Function NewBackgroundWorker(WorkSub As System.ComponentModel.DoWorkEventHandler, ProgressSub As System.ComponentModel.ProgressChangedEventHandler, CompleteSub As System.ComponentModel.RunWorkerCompletedEventHandler) + NewLine("NewBW") + NewBackground = New ComponentModel.BackgroundWorker + NewBackground.WorkerReportsProgress = True + NewBackground.WorkerSupportsCancellation = True + AddHandler NewBackground.DoWork, WorkSub + AddHandler NewBackground.ProgressChanged, ProgressSub + AddHandler NewBackground.RunWorkerCompleted, CompleteSub + NewBackground.RunWorkerAsync() + + 'Return NewBackground + End Function + + Public Sub StopBackgroundWorker(WhichBackgroundWorker As System.ComponentModel.BackgroundWorker) + If WhichBackgroundWorker IsNot Nothing AndAlso WhichBackgroundWorker.WorkerSupportsCancellation Then + ' Request cancellation + NewLine("CloseBW") + WhichBackgroundWorker.CancelAsync() + End If + End Sub End Module diff --git a/ShiftOS-TheRevival/API/TerminalAPI.vb b/ShiftOS-TheRevival/API/TerminalAPI.vb index d40e2cc..26b1179 100644 --- a/ShiftOS-TheRevival/API/TerminalAPI.vb +++ b/ShiftOS-TheRevival/API/TerminalAPI.vb @@ -309,21 +309,25 @@ Module TerminalAPI Case "shutdown", "shut down" TerminateShiftOS() Case "startg" - If Strings.AvailableFeature(35) = 1 Then - If IsStartG = False Then - StartG() - AdvancedCommand = False - NormalCommand() - End If - End If + NormalCommand() + Undeveloped() + 'If Strings.AvailableFeature(35) = 1 Then + ' If IsStartG = False Then + ' StartG() + ' AdvancedCommand = False + ' NormalCommand() + ' End If + 'End If Case "stopg" - If Strings.AvailableFeature(35) = 1 Then - If IsStartG = True Then - StopG() - AdvancedCommand = False - NormalCommand() - End If - End If + NormalCommand() + Undeveloped() + 'If Strings.AvailableFeature(35) = 1 Then + ' If IsStartG = True Then + ' StopG() + ' AdvancedCommand = False + ' NormalCommand() + ' End If + 'End If Case "textpad" If Strings.AvailableFeature(17) = "1" Then TextPad_WarnFile() @@ -402,6 +406,11 @@ Module TerminalAPI Infobar() End If End If + If command Like "lang *" Then + Lang() + AdvancedCommand = False + NormalCommand() + End If If command Like "taskkill *" Then Taskkill() AdvancedCommand = False diff --git a/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb b/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb index ab38b16..c960ba0 100644 --- a/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb +++ b/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb @@ -2,7 +2,7 @@ Public Shared OSInfo() As String Public Shared ComputerInfo(7) As String Public Shared IsFree As Boolean - Public Shared OnceInfo(8) As String + Public Shared OnceInfo(9) As String Public Shared AvailableFeature(53) As String Public Shared CLIInterpreter As String Public Shared SaveFile As String @@ -38,6 +38,7 @@ '6 = GameMode (0.2.3) (dependant) '7 = MaxWidth (0.2.4) (depentant) '8 = MaxHeight (0.2.4) (depentant) + '9 = Language (0.2.9) (default : 1) ' 'ComputerInfo Strings: '0 = Computer Name (0.1) (default : shiftos) diff --git a/ShiftOS-TheRevival/Languages/lang_en.Designer.vb b/ShiftOS-TheRevival/Languages/lang_en.Designer.vb new file mode 100644 index 0000000..8b0c195 --- /dev/null +++ b/ShiftOS-TheRevival/Languages/lang_en.Designer.vb @@ -0,0 +1,76 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + +Imports System + +Namespace My.Resources + + 'This class was auto-generated by the StronglyTypedResourceBuilder + 'class via a tool like ResGen or Visual Studio. + 'To add or remove a member, edit your .ResX file then rerun ResGen + 'with the /str option, or rebuild your VS project. + ''' + ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' + _ + Friend Class lang_en + + Private Shared resourceMan As Global.System.Resources.ResourceManager + + Private Shared resourceCulture As Global.System.Globalization.CultureInfo + + _ + Friend Sub New() + MyBase.New + End Sub + + ''' + ''' Returns the cached ResourceManager instance used by this class. + ''' + _ + Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("ShiftOS_TheRevival.lang_en", GetType(lang_en).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Overrides the current thread's CurrentUICulture property for all + ''' resource lookups using this strongly typed resource class. + ''' + _ + Friend Shared Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set + resourceCulture = value + End Set + End Property + + ''' + ''' Looks up a localized string similar to ShiftOS TheRevival version . + ''' + Friend Shared ReadOnly Property Console_Ver_FullString() As String + Get + Return ResourceManager.GetString("Console_Ver_FullString", resourceCulture) + End Get + End Property + End Class +End Namespace diff --git a/ShiftOS-TheRevival/Languages/lang_en.resx b/ShiftOS-TheRevival/Languages/lang_en.resx new file mode 100644 index 0000000..710734c --- /dev/null +++ b/ShiftOS-TheRevival/Languages/lang_en.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 + + + ShiftOS TheRevival version + + \ No newline at end of file diff --git a/ShiftOS-TheRevival/Languages/lang_id.Designer.vb b/ShiftOS-TheRevival/Languages/lang_id.Designer.vb new file mode 100644 index 0000000..5a57f14 --- /dev/null +++ b/ShiftOS-TheRevival/Languages/lang_id.Designer.vb @@ -0,0 +1,76 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + +Imports System + +Namespace My.Resources + + 'This class was auto-generated by the StronglyTypedResourceBuilder + 'class via a tool like ResGen or Visual Studio. + 'To add or remove a member, edit your .ResX file then rerun ResGen + 'with the /str option, or rebuild your VS project. + ''' + ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' + _ + Friend Class lang_id + + Private Shared resourceMan As Global.System.Resources.ResourceManager + + Private Shared resourceCulture As Global.System.Globalization.CultureInfo + + _ + Friend Sub New() + MyBase.New + End Sub + + ''' + ''' Returns the cached ResourceManager instance used by this class. + ''' + _ + Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("ShiftOS_TheRevival.lang_id", GetType(lang_id).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Overrides the current thread's CurrentUICulture property for all + ''' resource lookups using this strongly typed resource class. + ''' + _ + Friend Shared Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set + resourceCulture = value + End Set + End Property + + ''' + ''' Looks up a localized string similar to ShiftOS TheRevival versi . + ''' + Friend Shared ReadOnly Property Console_Ver_FullString() As String + Get + Return ResourceManager.GetString("Console_Ver_FullString", resourceCulture) + End Get + End Property + End Class +End Namespace diff --git a/ShiftOS-TheRevival/Languages/lang_id.resx b/ShiftOS-TheRevival/Languages/lang_id.resx new file mode 100644 index 0000000..620e2c1 --- /dev/null +++ b/ShiftOS-TheRevival/Languages/lang_id.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 + + + ShiftOS TheRevival versi + + \ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb index 762c95d..0933ba9 100644 --- a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb +++ b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb @@ -28,6 +28,7 @@ Public Class ShiftOSMenu Try Strings.IsFree = True Strings.OnceInfo(6) = "free" + Strings.OnceInfo(9) = 1 IsConsoleParent = True FreeRoamMode() Console.Show() diff --git a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj index 320f984..723980b 100644 --- a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj +++ b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj @@ -99,6 +99,16 @@ + + True + True + lang_en.resx + + + True + True + lang_id.resx + DuWM_Shifter_About.vb @@ -267,6 +277,7 @@ + @@ -302,6 +313,16 @@ + + My.Resources + ResXFileCodeGenerator + lang_en.Designer.vb + + + My.Resources + ResXFileCodeGenerator + lang_id.Designer.vb + DuWM_Shifter_About.vb diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Lang.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Lang.vb new file mode 100644 index 0000000..864a6ea --- /dev/null +++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Lang.vb @@ -0,0 +1,15 @@ +Module Com_Lang + Public LangNum As Integer + + Public Sub Lang() + LangNum = RawCommand.Substring(5) + Select Case LangNum + Case 1 + ' English + Strings.OnceInfo(9) = 1 + Case 2 + ' Indonesian + Strings.OnceInfo(9) = 2 + End Select + End Sub +End Module diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Ver.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Ver.vb index 8b2de41..dbbd541 100644 --- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Ver.vb +++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Ver.vb @@ -1,5 +1,10 @@ Module Com_Ver Public Sub Terminal_Version() - NewLine("ShiftOS TheRevival version " & My.Resources.CurrentVersion) + Select Case Strings.OnceInfo(9) + Case 1 + NewLine(My.Resources.lang_en.Console_Ver_FullString & My.Resources.CurrentVersion) + Case 2 + NewLine(My.Resources.lang_id.Console_Ver_FullString & My.Resources.CurrentVersion) + End Select End Sub End Module