diff options
| author | EverythingWindows <[email protected]> | 2022-11-19 07:25:02 +0700 |
|---|---|---|
| committer | EverythingWindows <[email protected]> | 2022-11-19 07:25:02 +0700 |
| commit | eb41e07992fa2cb51194a0d4327a494f66b87b9b (patch) | |
| tree | 478517af232619faafb8e09d11041ed1c778cac6 | |
| parent | 1d1722345b99abe7f52e999994ccb3e088cbd3c2 (diff) | |
| download | shiftos-therevival-old-eb41e07992fa2cb51194a0d4327a494f66b87b9b.tar.gz shiftos-therevival-old-eb41e07992fa2cb51194a0d4327a494f66b87b9b.tar.bz2 shiftos-therevival-old-eb41e07992fa2cb51194a0d4327a494f66b87b9b.zip | |
completing any migration from TerminalExternalApps into its own module
6 files changed, 11 insertions, 7 deletions
diff --git a/ShiftOS-TheRevival/API/ConsoleAPI.vb b/ShiftOS-TheRevival/API/ConsoleAPI.vb index c7b83d8..adb0d6f 100644 --- a/ShiftOS-TheRevival/API/ConsoleAPI.vb +++ b/ShiftOS-TheRevival/API/ConsoleAPI.vb @@ -9,6 +9,13 @@ Console.WindowState = FormWindowState.Maximized End Sub + Public Sub Console_Interpreters() + If Console.ShouldChange = True Then + Console.ChangeInterpreter = True + Console.ShouldChange = False + End If + 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 66b6af6..c6c8535 100644 --- a/ShiftOS-TheRevival/API/TerminalAPI.vb +++ b/ShiftOS-TheRevival/API/TerminalAPI.vb @@ -167,7 +167,6 @@ Case "bc" If Strings.AvailableFeature(9) = "1" Then Console.ChangeInterpreter = True - 'AppHost("bc", False) BC_Start() AdvancedCommand = False NormalCommand() @@ -206,7 +205,6 @@ End If Case "guess" Console.ChangeInterpreter = True - 'AppHost("guess", False) GTN_Start() AdvancedCommand = False NormalCommand() @@ -382,7 +380,6 @@ Console.ChangeInterpreter = True command = RawCommand.Replace("textpad ", "") TextPad_Start() - 'AppHost("textpad", True) AdvancedCommand = False NormalCommand() End If diff --git a/ShiftOS-TheRevival/TerminalApplications/External/BasicCalculator/App_BC.vb b/ShiftOS-TheRevival/TerminalApplications/External/BasicCalculator/App_BC.vb index 06525cb..52a1f30 100644 --- a/ShiftOS-TheRevival/TerminalApplications/External/BasicCalculator/App_BC.vb +++ b/ShiftOS-TheRevival/TerminalApplications/External/BasicCalculator/App_BC.vb @@ -18,6 +18,7 @@ NewLine(Nothing) Console.CurrentInterpreter = "bc" Console.ShouldChange = True + Console_Interpreters() End Sub Public Sub BC_Calculate() diff --git a/ShiftOS-TheRevival/TerminalApplications/External/GuessTheNumber/App_Guess.vb b/ShiftOS-TheRevival/TerminalApplications/External/GuessTheNumber/App_Guess.vb index 32910ed..e9e5410 100644 --- a/ShiftOS-TheRevival/TerminalApplications/External/GuessTheNumber/App_Guess.vb +++ b/ShiftOS-TheRevival/TerminalApplications/External/GuessTheNumber/App_Guess.vb @@ -11,6 +11,7 @@ Console.CurrentInterpreter = "guess" GTN_GenerateNumber() Console.ShouldChange = True + Console_Interpreters() End Sub Public Sub GTN_GenerateNumber() diff --git a/ShiftOS-TheRevival/TerminalApplications/External/TerminalExternalApps.vb b/ShiftOS-TheRevival/TerminalApplications/External/TerminalExternalApps.vb index 24384e3..3148ded 100644 --- a/ShiftOS-TheRevival/TerminalApplications/External/TerminalExternalApps.vb +++ b/ShiftOS-TheRevival/TerminalApplications/External/TerminalExternalApps.vb @@ -24,10 +24,6 @@ Module TerminalExternalApps 'Strings.OnceInfo(5) = Terminal.TrackPos 'Terminal.TrackPos = Nothing End If - If Console.ShouldChange = True Then - Console.ChangeInterpreter = True - Console.ShouldChange = False - End If End Sub diff --git a/ShiftOS-TheRevival/TerminalApplications/External/Textpad/App_TextPad.vb b/ShiftOS-TheRevival/TerminalApplications/External/Textpad/App_TextPad.vb index efe68f4..bf4b9ba 100644 --- a/ShiftOS-TheRevival/TerminalApplications/External/Textpad/App_TextPad.vb +++ b/ShiftOS-TheRevival/TerminalApplications/External/Textpad/App_TextPad.vb @@ -16,6 +16,8 @@ Module App_TextPad 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 + Console.ShouldChange = True + Console_Interpreters() TextRebind() End Sub |