Changed from Environment.NewLine to dedicated NewLine module thoroughly, Fixing a bug on always asks for update, Slowly migrating from full Terminal-dependant to Console-based

1 files changed, 22 insertions, 22 deletions

diff --git a/ShiftOS-TheRevival/MainForms/DirectoryManagements.vb b/ShiftOS-TheRevival/MainForms/DirectoryManagements.vb
index 4179e6f..1ab684d 100644
--- a/ShiftOS-TheRevival/MainForms/DirectoryManagements.vb
+++ b/ShiftOS-TheRevival/MainForms/DirectoryManagements.vb
@@ -1,13 +1,13 @@
 Module DirectoryManagements
     Dim spaces As String
     Public Sub TerminalDirectories(TheDirectory As String)
-        Terminal.Pseudodir = TheDirectory.Replace(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\ShiftFS", "!")
-        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Contents of " & Terminal.Pseudodir & Environment.NewLine
-        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "[DIR]     0 KB ."
-        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "[DIR]     0 KB .."
+        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 .."
         For Each Dir As String In IO.Directory.GetDirectories(TheDirectory)
             Dim dirinf As New IO.DirectoryInfo(Dir)
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "[DIR]     0 KB " & dirinf.Name
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.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,50 +33,50 @@
             End Select
             Select Case thesize
                 Case 1
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & spaces & filsize & " KB " & filinf.Name
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & spaces & filsize & " KB " & filinf.Name
                 Case 2
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & spaces & filsize & " MB " & filinf.Name
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & spaces & filsize & " MB " & filinf.Name
                 Case 3
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & spaces & filsize & " GB " & filinf.Name
+                    Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & spaces & filsize & " GB " & filinf.Name
             End Select
         Next
     End Sub
 
     Public Sub NavigateDir(TheDirectory As String)
         If TheDirectory = ".." Then
-            If Terminal.CurrentDirectory = Strings.OnceInfo(1) Then
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "!\"
+            If Console.CurrentDirectory = Strings.OnceInfo(1) Then
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "!\"
             Else
-                Terminal.CurrentDirectory = IO.Directory.GetParent(Terminal.CurrentDirectory).ToString
+                Console.CurrentDirectory = IO.Directory.GetParent(Console.CurrentDirectory).ToString
             End If
         Else
-            If IO.Directory.Exists(Terminal.CurrentDirectory + "\" + TheDirectory) Then
-                Terminal.CurrentDirectory = Terminal.CurrentDirectory & "\" & TheDirectory
+            If IO.Directory.Exists(Console.CurrentDirectory + "\" + TheDirectory) Then
+                Console.CurrentDirectory = Console.CurrentDirectory & "\" & TheDirectory
             ElseIf IO.Directory.Exists(TheDirectory) Then
-                Terminal.CurrentDirectory = TheDirectory
+                Console.CurrentDirectory = TheDirectory
             Else
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "The directory is not exist!"
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "The directory is not exist!"
             End If
         End If
     End Sub
 
     Public Sub CreateDir(TheDirectory As String)
-        If IO.Directory.Exists(Terminal.CurrentDirectory + "\" + TheDirectory) Then
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Directory is already exists!"
+        If IO.Directory.Exists(Console.CurrentDirectory + "\" + TheDirectory) Then
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Directory is already exists!"
         Else
-            IO.Directory.CreateDirectory(Terminal.CurrentDirectory + "\" + TheDirectory)
+            IO.Directory.CreateDirectory(Console.CurrentDirectory + "\" + TheDirectory)
         End If
     End Sub
 
     Public Sub RemoveDir(TheDirectory As String)
-        If IO.Directory.Exists(Terminal.CurrentDirectory + "\" + TheDirectory) Then
+        If IO.Directory.Exists(Console.CurrentDirectory + "\" + TheDirectory) Then
             Try
-                IO.Directory.Delete(Terminal.CurrentDirectory + "\" + TheDirectory)
+                IO.Directory.Delete(Console.CurrentDirectory + "\" + TheDirectory)
             Catch ex As Exception
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ex.Message
+                Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ex.Message
             End Try
         Else
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "The directory is not exists!"
+            Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "The directory is not exists!"
         End If
     End Sub
 End Module