From 3f387f7460b49ed12d906c932bf3a3156d3bd025 Mon Sep 17 00:00:00 2001 From: EverythingWindows Date: Tue, 22 Nov 2022 13:08:06 +0700 Subject: [PATCH] more refined DuWM --- ShiftOS-TheRevival/API/TerminalAPI.vb | 2 +- .../Applications/Console.Designer.vb | 1 + .../Applications/Shifter.Designer.vb | 83 --------- .../MainForms/Applications/Shifter.vb | 17 -- .../DuWM_Shifter_Desktop.Designer.vb | 79 +++++++++ .../Categories/DuWM_Shifter_Desktop.resx} | 0 .../DuWM/Categories/DuWM_Shifter_Desktop.vb | 9 + .../Shifter/DuWM/DuWM_Shifter.Designer.vb | 160 ++++++++++++++++++ .../Shifter/DuWM/DuWM_Shifter.resx | 120 +++++++++++++ .../Applications/Shifter/DuWM/DuWM_Shifter.vb | 35 ++++ .../DuWM_WindowContainer.Designer.vb | 1 + ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj | 19 ++- .../Internal/Com_Colors.vb | 2 +- 13 files changed, 421 insertions(+), 107 deletions(-) delete mode 100644 ShiftOS-TheRevival/MainForms/Applications/Shifter.Designer.vb delete mode 100644 ShiftOS-TheRevival/MainForms/Applications/Shifter.vb create mode 100644 ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_Desktop.Designer.vb rename ShiftOS-TheRevival/MainForms/Applications/{Shifter.resx => Shifter/DuWM/Categories/DuWM_Shifter_Desktop.resx} (100%) create mode 100644 ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_Desktop.vb create mode 100644 ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.Designer.vb create mode 100644 ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.resx create mode 100644 ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.vb diff --git a/ShiftOS-TheRevival/API/TerminalAPI.vb b/ShiftOS-TheRevival/API/TerminalAPI.vb index 69f77db..6b3a0d0 100644 --- a/ShiftOS-TheRevival/API/TerminalAPI.vb +++ b/ShiftOS-TheRevival/API/TerminalAPI.vb @@ -287,7 +287,7 @@ Module TerminalAPI 'DuWM_SecondWindowSet(Shifter) 'Console.Close() 'DuWM_FirstWindowSet(Console) - DuWM_NewProcess(Shifter) + DuWM_NewProcess(DuWM_Shifter) Case "stopg" If IsStartG = True Then StopG() diff --git a/ShiftOS-TheRevival/MainForms/Applications/Console.Designer.vb b/ShiftOS-TheRevival/MainForms/Applications/Console.Designer.vb index 861f2ec..79bd379 100644 --- a/ShiftOS-TheRevival/MainForms/Applications/Console.Designer.vb +++ b/ShiftOS-TheRevival/MainForms/Applications/Console.Designer.vb @@ -97,6 +97,7 @@ Partial Class Console Me.Name = "Console" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Terminal" + Me.TopMost = True Me.ResumeLayout(False) Me.PerformLayout() diff --git a/ShiftOS-TheRevival/MainForms/Applications/Shifter.Designer.vb b/ShiftOS-TheRevival/MainForms/Applications/Shifter.Designer.vb deleted file mode 100644 index 873752c..0000000 --- a/ShiftOS-TheRevival/MainForms/Applications/Shifter.Designer.vb +++ /dev/null @@ -1,83 +0,0 @@ - -Partial Class Shifter - Inherits System.Windows.Forms.Form - - 'Form overrides dispose to clean up the component list. - - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - - Private Sub InitializeComponent() - Me.Label1 = New System.Windows.Forms.Label() - Me.Button1 = New System.Windows.Forms.Button() - Me.Label2 = New System.Windows.Forms.Label() - Me.SuspendLayout() - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Font = New System.Drawing.Font("Segoe UI", 24.0!, System.Drawing.FontStyle.Bold) - Me.Label1.Location = New System.Drawing.Point(12, 9) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(131, 45) - Me.Label1.TabIndex = 0 - Me.Label1.Text = "Shifter!" - ' - 'Button1 - ' - Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Location = New System.Drawing.Point(713, 415) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(75, 23) - Me.Button1.TabIndex = 1 - Me.Button1.Text = "Close" - Me.Button1.UseVisualStyleBackColor = True - ' - 'Label2 - ' - Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(17, 64) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(69, 13) - Me.Label2.TabIndex = 2 - Me.Label2.Text = "no desktop :(" - ' - 'Shifter - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(800, 450) - Me.Controls.Add(Me.Label2) - Me.Controls.Add(Me.Button1) - Me.Controls.Add(Me.Label1) - Me.ForeColor = System.Drawing.Color.Black - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None - Me.Name = "Shifter" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Shifter" - Me.TopMost = True - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - - Friend WithEvents Label1 As Label - Friend WithEvents Button1 As Button - Friend WithEvents Label2 As Label -End Class diff --git a/ShiftOS-TheRevival/MainForms/Applications/Shifter.vb b/ShiftOS-TheRevival/MainForms/Applications/Shifter.vb deleted file mode 100644 index 4613ee1..0000000 --- a/ShiftOS-TheRevival/MainForms/Applications/Shifter.vb +++ /dev/null @@ -1,17 +0,0 @@ -Public Class Shifter - Public DuWM_PID As Integer 'DuWM Process ID - - Private Sub Shifter_Load(sender As Object, e As EventArgs) Handles MyBase.Load - - End Sub - - Private Sub DuWM_Tick(sender As Object, e As EventArgs) - If Strings.ProcessID(DuWM_PID) = 0 Then - Close() - End If - End Sub - - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click - Close() - End Sub -End Class \ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_Desktop.Designer.vb b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_Desktop.Designer.vb new file mode 100644 index 0000000..849c215 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_Desktop.Designer.vb @@ -0,0 +1,79 @@ + _ +Partial Class DuWM_Shifter_Desktop + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.lbl_Title = New System.Windows.Forms.Label() + Me.cmb_DesktopColor = New System.Windows.Forms.ComboBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.SuspendLayout() + ' + 'lbl_Title + ' + Me.lbl_Title.AutoSize = True + Me.lbl_Title.Font = New System.Drawing.Font("Segoe UI", 24.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle)) + Me.lbl_Title.Location = New System.Drawing.Point(11, 10) + Me.lbl_Title.Name = "lbl_Title" + Me.lbl_Title.Size = New System.Drawing.Size(142, 45) + Me.lbl_Title.TabIndex = 0 + Me.lbl_Title.Text = "Desktop" + ' + 'cmb_DesktopColor + ' + Me.cmb_DesktopColor.Font = New System.Drawing.Font("Segoe UI", 12.0!) + Me.cmb_DesktopColor.FormattingEnabled = True + Me.cmb_DesktopColor.Items.AddRange(New Object() {"Black", "Dark Gray", "Light Gray", "Red", "Dark Red", "Green", "Light Green", "Blue", "Dark Blue", "Yellow", "Dark Yellow", "Purple", "Light Purple", "Aqua", "Light Aqua", "White"}) + Me.cmb_DesktopColor.Location = New System.Drawing.Point(156, 91) + Me.cmb_DesktopColor.Name = "cmb_DesktopColor" + Me.cmb_DesktopColor.Size = New System.Drawing.Size(121, 29) + Me.cmb_DesktopColor.TabIndex = 1 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Segoe UI", 12.0!) + Me.Label1.ForeColor = System.Drawing.Color.Black + Me.Label1.Location = New System.Drawing.Point(15, 94) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(135, 21) + Me.Label1.TabIndex = 2 + Me.Label1.Text = "Background Color" + ' + 'DuWM_Shifter_Desktop + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.cmb_DesktopColor) + Me.Controls.Add(Me.lbl_Title) + Me.Name = "DuWM_Shifter_Desktop" + Me.Size = New System.Drawing.Size(640, 480) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents lbl_Title As Label + Friend WithEvents cmb_DesktopColor As ComboBox + Friend WithEvents Label1 As Label +End Class diff --git a/ShiftOS-TheRevival/MainForms/Applications/Shifter.resx b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_Desktop.resx similarity index 100% rename from ShiftOS-TheRevival/MainForms/Applications/Shifter.resx rename to ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_Desktop.resx diff --git a/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_Desktop.vb b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_Desktop.vb new file mode 100644 index 0000000..b2c458f --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_Desktop.vb @@ -0,0 +1,9 @@ +Public Class DuWM_Shifter_Desktop + Private Sub DuWM_Shifter_Desktop_Load(sender As Object, e As EventArgs) Handles MyBase.Load + CheckAvailability() + End Sub + + Private Sub CheckAvailability() + + End Sub +End Class diff --git a/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.Designer.vb b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.Designer.vb new file mode 100644 index 0000000..a117dfc --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.Designer.vb @@ -0,0 +1,160 @@ + +Partial Class DuWM_Shifter + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + + Private Sub InitializeComponent() + Me.pnl_LeftPane = New System.Windows.Forms.Panel() + Me.lst_Features = New System.Windows.Forms.ListBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.pnl_Options = New System.Windows.Forms.Panel() + Me.Button3 = New System.Windows.Forms.Button() + Me.btn_Close = New System.Windows.Forms.Button() + Me.Button1 = New System.Windows.Forms.Button() + Me.pnl_Content = New System.Windows.Forms.Panel() + Me.pnl_LeftPane.SuspendLayout() + Me.pnl_Options.SuspendLayout() + Me.SuspendLayout() + ' + 'pnl_LeftPane + ' + Me.pnl_LeftPane.Controls.Add(Me.lst_Features) + Me.pnl_LeftPane.Controls.Add(Me.Label1) + Me.pnl_LeftPane.Dock = System.Windows.Forms.DockStyle.Left + Me.pnl_LeftPane.Location = New System.Drawing.Point(0, 0) + Me.pnl_LeftPane.Name = "pnl_LeftPane" + Me.pnl_LeftPane.Size = New System.Drawing.Size(200, 450) + Me.pnl_LeftPane.TabIndex = 0 + ' + 'lst_Features + ' + Me.lst_Features.BackColor = System.Drawing.Color.Silver + Me.lst_Features.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.lst_Features.Dock = System.Windows.Forms.DockStyle.Bottom + Me.lst_Features.Font = New System.Drawing.Font("Segoe UI", 12.0!) + Me.lst_Features.FormattingEnabled = True + Me.lst_Features.ItemHeight = 21 + Me.lst_Features.Items.AddRange(New Object() {"Desktop", "About"}) + Me.lst_Features.Location = New System.Drawing.Point(0, 51) + Me.lst_Features.Name = "lst_Features" + Me.lst_Features.Size = New System.Drawing.Size(200, 399) + Me.lst_Features.TabIndex = 1 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Segoe UI", 24.0!, System.Drawing.FontStyle.Bold) + Me.Label1.Location = New System.Drawing.Point(12, 3) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(121, 45) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "Shifter" + ' + 'pnl_Options + ' + Me.pnl_Options.BackColor = System.Drawing.Color.Black + Me.pnl_Options.Controls.Add(Me.Button3) + Me.pnl_Options.Controls.Add(Me.btn_Close) + Me.pnl_Options.Controls.Add(Me.Button1) + Me.pnl_Options.Dock = System.Windows.Forms.DockStyle.Bottom + Me.pnl_Options.Location = New System.Drawing.Point(200, 405) + Me.pnl_Options.Name = "pnl_Options" + Me.pnl_Options.Size = New System.Drawing.Size(600, 45) + Me.pnl_Options.TabIndex = 1 + ' + 'Button3 + ' + Me.Button3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button3.ForeColor = System.Drawing.Color.White + Me.Button3.Location = New System.Drawing.Point(351, 10) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(75, 23) + Me.Button3.TabIndex = 2 + Me.Button3.Text = "OK" + Me.Button3.UseVisualStyleBackColor = True + ' + 'btn_Close + ' + Me.btn_Close.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btn_Close.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btn_Close.ForeColor = System.Drawing.Color.White + Me.btn_Close.Location = New System.Drawing.Point(432, 10) + Me.btn_Close.Name = "btn_Close" + Me.btn_Close.Size = New System.Drawing.Size(75, 23) + Me.btn_Close.TabIndex = 1 + Me.btn_Close.Text = "Cancel" + Me.btn_Close.UseVisualStyleBackColor = True + ' + 'Button1 + ' + Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.ForeColor = System.Drawing.Color.White + Me.Button1.Location = New System.Drawing.Point(513, 10) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(75, 23) + Me.Button1.TabIndex = 0 + Me.Button1.Text = "Apply" + Me.Button1.UseVisualStyleBackColor = True + ' + 'pnl_Content + ' + Me.pnl_Content.AllowDrop = True + Me.pnl_Content.Dock = System.Windows.Forms.DockStyle.Fill + Me.pnl_Content.Location = New System.Drawing.Point(200, 0) + Me.pnl_Content.Name = "pnl_Content" + Me.pnl_Content.Size = New System.Drawing.Size(600, 405) + Me.pnl_Content.TabIndex = 2 + ' + 'DuWM_Shifter + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackColor = System.Drawing.Color.White + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.pnl_Content) + Me.Controls.Add(Me.pnl_Options) + Me.Controls.Add(Me.pnl_LeftPane) + Me.ForeColor = System.Drawing.Color.Black + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None + Me.Name = "DuWM_Shifter" + Me.ShowIcon = False + Me.ShowInTaskbar = False + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Shifter" + Me.TopMost = True + Me.pnl_LeftPane.ResumeLayout(False) + Me.pnl_LeftPane.PerformLayout() + Me.pnl_Options.ResumeLayout(False) + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents pnl_LeftPane As Panel + Friend WithEvents Label1 As Label + Friend WithEvents lst_Features As ListBox + Friend WithEvents pnl_Options As Panel + Friend WithEvents Button3 As Button + Friend WithEvents btn_Close As Button + Friend WithEvents Button1 As Button + Friend WithEvents pnl_Content As Panel +End Class diff --git a/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.resx b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.vb b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.vb new file mode 100644 index 0000000..fdd9ba2 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.vb @@ -0,0 +1,35 @@ +Public Class DuWM_Shifter + Private PrevHeight As Integer = Height + Private PrevWidth As Integer = Width + Private FeatureGap As Integer = 450 - 400 + Private ChildFeature As UserControl + + Private Sub Shifter_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btn_Close.Click + Close() + End Sub + + Private Sub DuWM_Shifter_Resize(sender As Object, e As EventArgs) Handles MyBase.Resize + Dim WidthRatio As Double = (Width / PrevWidth) + Dim HeightRatio As Double = (Height / PrevHeight) + lst_Features.Height = Height - FeatureGap + PrevHeight = Height + PrevWidth = Width + End Sub + + Private Sub lst_Features_SelectedIndexChanged(sender As Object, e As EventArgs) Handles lst_Features.SelectedIndexChanged + Select Case lst_Features.SelectedItem + Case "Desktop" + Dim Shifter_Desktop As New DuWM_Shifter_Desktop + Shifter_Desktop.Size = pnl_Content.Size + pnl_Content.Controls.Clear() + pnl_Content.Controls.Add(Shifter_Desktop) + Case "About" + pnl_Content.Controls.Clear() + MsgBox("Aboot") + End Select + End Sub +End Class \ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/WindowManager/DualWindowManager/DuWM_WindowContainer.Designer.vb b/ShiftOS-TheRevival/MainForms/WindowManager/DualWindowManager/DuWM_WindowContainer.Designer.vb index e6b186c..b0d305b 100644 --- a/ShiftOS-TheRevival/MainForms/WindowManager/DualWindowManager/DuWM_WindowContainer.Designer.vb +++ b/ShiftOS-TheRevival/MainForms/WindowManager/DualWindowManager/DuWM_WindowContainer.Designer.vb @@ -58,6 +58,7 @@ Partial Class DuWM_WindowContainer Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Name = "DuWM_WindowContainer" Me.Text = "DuWM_WindowContainer" + Me.TopMost = True Me.ResumeLayout(False) End Sub diff --git a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj index 6a76b8e..ad795ca 100644 --- a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj +++ b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj @@ -98,10 +98,16 @@ - - Shifter.vb + + DuWM_Shifter_Desktop.vb - + + UserControl + + + DuWM_Shifter.vb + + Form @@ -239,8 +245,11 @@ - - Shifter.vb + + DuWM_Shifter_Desktop.vb + + + DuWM_Shifter.vb BugSlap.vb diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Colors.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Colors.vb index 867bdcc..6cd200e 100644 --- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Colors.vb +++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Colors.vb @@ -34,7 +34,7 @@ End If If Strings.AvailableFeature(15) = "1" Then NewLine("5 = Purple D = Light Purple") - NewLine("6 = Yellow E = Yellow") + NewLine("6 = Yellow E = Dark Yellow") Else NewLine("5 = ??? D = ???") NewLine("6 = ??? E = ???")