diff options
Diffstat (limited to 'ShiftOS-TheRevival/MainForms/DesktopEnvironment')
4 files changed, 41 insertions, 1 deletions
diff --git a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb index ac5d776..54f7a80 100644 --- a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb +++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb @@ -22,14 +22,30 @@ Partial Class Desktop 'Do not modify it using the code editor. <System.Diagnostics.DebuggerStepThrough()> _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Me.Button1 = New System.Windows.Forms.Button() + Me.DuWM = New System.Windows.Forms.Timer(Me.components) Me.SuspendLayout() ' + 'Button1 + ' + Me.Button1.BackColor = System.Drawing.Color.Black + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Location = New System.Drawing.Point(12, 12) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(75, 23) + Me.Button1.TabIndex = 0 + Me.Button1.Text = "term" + Me.Button1.UseVisualStyleBackColor = False + ' 'Desktop ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.Red + Me.BackgroundImage = Global.ShiftOS_TheRevival.My.Resources.Resources.MenuBanner1 Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.Button1) Me.ForeColor = System.Drawing.Color.White Me.Name = "Desktop" Me.ShowIcon = False @@ -40,4 +56,7 @@ Partial Class Desktop Me.ResumeLayout(False) End Sub + + Friend WithEvents Button1 As Button + Friend WithEvents DuWM As Timer End Class diff --git a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.resx b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.resx index 1af7de1..ed37e73 100644 --- a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.resx +++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.resx @@ -117,4 +117,7 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + <metadata name="DuWM.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>17, 17</value> + </metadata> </root>
\ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.vb b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.vb index 4ddf223..853bb8a 100644 --- a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.vb +++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.vb @@ -1,3 +1,17 @@ Public Class Desktop + Private Sub Desktop_Load(sender As Object, e As EventArgs) Handles MyBase.Load + End Sub + + Private Sub Desktop_KeyPress(sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles MyBase.KeyDown + If e.KeyCode = Keys.T AndAlso Keys.Control Then + MsgBox("dangit") + DuWM_FirstWindowSet(Console) + End If + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + 'DuWM_FirstWindowSet(Console) + DuWM_SingleWindowSet(Console) + End Sub End Class
\ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb index cbf8cbb..dd3ff8d 100644 --- a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb +++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb @@ -1,9 +1,12 @@ Module DesktopManager Public Sub StartX() Desktop.Show() - Desktop.TopMost = False Desktop.FormBorderStyle = FormBorderStyle.None Desktop.WindowState = FormWindowState.Maximized + Desktop.TopMost = False + IsConsoleParent = False + OnlyOne = True + Console.Close() Cursor.Show() End Sub @@ -11,5 +14,6 @@ Desktop.Close() Cursor.Hide() Console_Full() + IsConsoleParent = True End Sub End Module |