little work on the next window manager

3 files changed, 12 insertions, 9 deletions

diff --git a/ShiftOS-TheRevival/MainForms/Applications/Console.Designer.vb b/ShiftOS-TheRevival/MainForms/Applications/Console.Designer.vb
index 4ecd5b5..6675930 100644
--- a/ShiftOS-TheRevival/MainForms/Applications/Console.Designer.vb
+++ b/ShiftOS-TheRevival/MainForms/Applications/Console.Designer.vb
@@ -29,7 +29,7 @@ Partial Class Console
         Me.InfoBarTimer = New System.Windows.Forms.Timer(Me.components)
         Me.ToolBar = New System.Windows.Forms.TextBox()
         Me.ShortcutHandler = New System.ComponentModel.BackgroundWorker()
-        Me.DuWMHandle = New System.Windows.Forms.Timer(Me.components)
+        Me.ConsoleFontHandle = New System.Windows.Forms.Timer(Me.components)
         Me.SuspendLayout()
         '
         'TextBox1
@@ -81,7 +81,7 @@ Partial Class Console
         Me.ToolBar.TabIndex = 1
         Me.ToolBar.Visible = False
         '
-        'DuWMHandle
+        'ConsoleFontHandle
         '
         '
         'Console
@@ -109,5 +109,5 @@ Partial Class Console
     Friend WithEvents InfoBarTimer As Timer
     Friend WithEvents ToolBar As TextBox
     Public WithEvents ShortcutHandler As System.ComponentModel.BackgroundWorker
-    Friend WithEvents DuWMHandle As Timer
+    Friend WithEvents ConsoleFontHandle As Timer
 End Class
diff --git a/ShiftOS-TheRevival/MainForms/Applications/Console.resx b/ShiftOS-TheRevival/MainForms/Applications/Console.resx
index eedeb82..6122f07 100644
--- a/ShiftOS-TheRevival/MainForms/Applications/Console.resx
+++ b/ShiftOS-TheRevival/MainForms/Applications/Console.resx
@@ -126,7 +126,7 @@
   <metadata name="ShortcutHandler.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>274, 17</value>
   </metadata>
-  <metadata name="DuWMHandle.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="ConsoleFontHandle.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>415, 17</value>
   </metadata>
 </root>
\ No newline at end of file
diff --git a/ShiftOS-TheRevival/MainForms/Applications/Console.vb b/ShiftOS-TheRevival/MainForms/Applications/Console.vb
index 8e34957..00eaea0 100644
--- a/ShiftOS-TheRevival/MainForms/Applications/Console.vb
+++ b/ShiftOS-TheRevival/MainForms/Applications/Console.vb
@@ -22,9 +22,7 @@ Public Class Console
         With ShortcutHandler
             .WorkerSupportsCancellation = True
         End With
-        'MsgBox("Full!")
         Console_Full()
-        'MsgBox("Initialize!")
         InitializeTerminal()
     End Sub
 
@@ -227,7 +225,7 @@ Public Class Console
         If Strings.OnceInfo(0) = "Yes" Then
             InfoBar.Text = InfoBar.Text & " root |"
         Else
-            InfoBar.Text = InfoBar.Text & " user |"
+            InfoBar.Text = InfoBar.Text & " " & Strings.ComputerInfo(1) & " |"
         End If
         InfoBar.Text = InfoBar.Text & " " & CurrentInterpreter & " |"
         InfoBar.Text = InfoBar.Text & " " & Strings.ComputerInfo(2) & " CP |"
@@ -238,7 +236,12 @@ Public Class Console
 
     End Sub
 
-    Private Sub DuWMHandle_Tick(sender As Object, e As EventArgs) Handles DuWMHandle.Tick
-
+    Private Sub ConsoleFontHandle_Tick(sender As Object, e As EventArgs) Handles ConsoleFontHandle.Tick
+        If InfoBar.Font IsNot GUISCustomizations.GUIConsoleFont Then
+            InfoBar.Font = GUISCustomizations.GUIConsoleFont
+        End If
+        If ToolBar.Font IsNot GUISCustomizations.GUIConsoleFont Then
+            ToolBar.Font = GUISCustomizations.GUIConsoleFont
+        End If
     End Sub
 End Class
\ No newline at end of file