diff --git a/shiftos_next.v12.suo b/shiftos_next.v12.suo
index 0726f15..85df75b 100644
Binary files a/shiftos_next.v12.suo and b/shiftos_next.v12.suo differ
diff --git a/shiftos_next/APIs/API.vb b/shiftos_next/APIs/API.vb
index d3a70fe..af6474d 100644
--- a/shiftos_next/APIs/API.vb
+++ b/shiftos_next/APIs/API.vb
@@ -73,6 +73,8 @@
Public Sub OpenProgram(progtoopen As String)
Select Case progtoopen
+ Case "shifter", "skin", "shift"
+ Shifter.Show()
Case "shiftorium", "packages", "pacman", "code shop"
shiftorium_cmd.Show()
Case "files", "fileskimmer", "file skimmer", "fs", "file browser"
@@ -108,7 +110,8 @@
Else
AddLine("close: Invalid program """ & progtoclose & """.")
End If
-
+ Case "shifter", "skin", "shift"
+ Shifter.Hide()
Case Else
AddLine("close: Invalid program """ & progtoclose & """.")
End Select
diff --git a/shiftos_next/APIs/Skins.vb b/shiftos_next/APIs/Skins.vb
new file mode 100644
index 0000000..7b87a5c
--- /dev/null
+++ b/shiftos_next/APIs/Skins.vb
@@ -0,0 +1,53 @@
+Module Skins
+ '
+ ' This module allows for skinning. Simply that.
+ '
+
+#Region "Basic Window Manager"
+ Public titlebarcolor As Color = Color.Gray
+ Public titlebartextcolor As Color = Color.White
+ Public desktopbackcolor As Color = Color.Black
+ Public newterminalbuttonbackcolor As Color = Color.Black
+ Public newterminalbuttontextcolor As Color = Color.White
+
+ 'Load Skin from Save File
+
+ Public Sub loadskindata()
+ Try
+ Dim loadlines() As String = IO.File.ReadAllLines(bwmskin + "data.bsk")
+ titlebarcolor = Color.FromArgb(loadlines(0))
+ titlebartextcolor = Color.FromArgb(loadlines(1))
+ desktopbackcolor = Color.FromArgb(loadlines(2))
+ newterminalbuttonbackcolor = Color.FromArgb(loadlines(3))
+ newterminalbuttontextcolor = Color.FromArgb(loadlines(4))
+ BasicWM.Desktop.Redraw()
+ Catch ex As Exception
+ saveskindata()
+ loadskindata()
+ End Try
+
+
+ End Sub
+
+ 'Save to save data
+
+ Public Sub saveskindata()
+ Dim savelines(200) As String
+ savelines(0) = titlebarcolor.ToArgb
+ savelines(1) = titlebartextcolor.ToArgb
+ savelines(2) = desktopbackcolor.ToArgb
+ savelines(3) = newterminalbuttonbackcolor.ToArgb
+ savelines(4) = newterminalbuttontextcolor.ToArgb
+ Try
+ IO.File.WriteAllLines(bwmskin + "data.bsk", savelines)
+ Catch ex As Exception
+ IO.Directory.CreateDirectory(bwmskin)
+ IO.File.WriteAllLines(bwmskin + "data.bsk", savelines)
+ End Try
+ BasicWM.Desktop.Redraw()
+ End Sub
+
+#End Region
+
+
+End Module
diff --git a/shiftos_next/APIs/filesystem.vb b/shiftos_next/APIs/filesystem.vb
index 61e8053..edce1c3 100644
--- a/shiftos_next/APIs/filesystem.vb
+++ b/shiftos_next/APIs/filesystem.vb
@@ -12,6 +12,9 @@
Public systemdir As String = root + "\Shiftum42\"
Public drivers As String = systemdir + "Drivers\"
+ Public skindir As String = systemdir + "Skins\"
+
+ Public bwmskin As String = skindir + "BWM\"
Public save As String = drivers + "HDD.dri"
diff --git a/shiftos_next/BWM User Controls/Titlebar.vb b/shiftos_next/BWM User Controls/Titlebar.vb
index 2d4e6e6..549b129 100644
--- a/shiftos_next/BWM User Controls/Titlebar.vb
+++ b/shiftos_next/BWM User Controls/Titlebar.vb
@@ -1,5 +1,7 @@
Public Class Titlebar
+ Friend WithEvents tmrcheckskin As New Timer
+
Public Property AppName As String
Set(value As String)
lbtitle.Text = value
@@ -13,7 +15,9 @@
Private Sub Titlebar_Load(sender As Object, e As EventArgs) Handles Me.Load
Me.Dock = DockStyle.Top
- Me.BringToFront()
+ Me.SendToBack()
+ tmrcheckskin.Interval = 200
+ tmrcheckskin.Start()
End Sub
Private Sub titlebar_MouseDown(sender As Object, e As MouseEventArgs) Handles Me.MouseDown, lbtitle.MouseDown
@@ -46,4 +50,21 @@
End If
End Sub
+ Public Sub shiftorium_special()
+ If boughtbasicwm = True Then
+ lbtitle.TextAlign = ContentAlignment.MiddleLeft
+ lbtitle.BackColor = Color.Gray
+ ParentForm.TopMost = True
+ ParentForm.WindowState = FormWindowState.Normal
+ Else
+ lbtitle.TextAlign = ContentAlignment.MiddleCenter
+ lbtitle.BackColor = Color.Black
+ ParentForm.WindowState = FormWindowState.Maximized
+ End If
+ End Sub
+
+ Private Sub tmrcheckskin_Tick(sender As Object, e As EventArgs) Handles tmrcheckskin.Tick
+ lbtitle.BackColor = titlebarcolor
+ lbtitle.ForeColor = titlebartextcolor
+ End Sub
End Class
diff --git a/shiftos_next/BWM and CMD Apps/Shifter.Designer.vb b/shiftos_next/BWM and CMD Apps/Shifter.Designer.vb
new file mode 100644
index 0000000..4fce358
--- /dev/null
+++ b/shiftos_next/BWM and CMD Apps/Shifter.Designer.vb
@@ -0,0 +1,201 @@
+ _
+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()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Shifter))
+ Me.titlebar = New shiftos_next.Titlebar()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.btntitletext = New System.Windows.Forms.Button()
+ Me.btndeskbackcolor = New System.Windows.Forms.Button()
+ Me.btntitlebackcolor = New System.Windows.Forms.Button()
+ Me.btnnttext = New System.Windows.Forms.Button()
+ Me.btnntback = New System.Windows.Forms.Button()
+ Me.btnapply = New System.Windows.Forms.Button()
+ Me.SuspendLayout()
+ '
+ 'titlebar
+ '
+ Me.titlebar.AppName = "Shifter - v1.0"
+ Me.titlebar.Dock = System.Windows.Forms.DockStyle.Top
+ Me.titlebar.Font = New System.Drawing.Font("Courier New", 8.25!)
+ Me.titlebar.ForeColor = System.Drawing.Color.White
+ Me.titlebar.Location = New System.Drawing.Point(0, 0)
+ Me.titlebar.Name = "titlebar"
+ Me.titlebar.Size = New System.Drawing.Size(420, 34)
+ Me.titlebar.TabIndex = 0
+ '
+ 'Label1
+ '
+ Me.Label1.Location = New System.Drawing.Point(13, 51)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(395, 91)
+ Me.Label1.TabIndex = 1
+ Me.Label1.Text = resources.GetString("Label1.Text")
+ '
+ 'Label2
+ '
+ Me.Label2.AutoSize = True
+ Me.Label2.Location = New System.Drawing.Point(13, 167)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(147, 14)
+ Me.Label2.TabIndex = 2
+ Me.Label2.Text = "Titlebar Text Color:"
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = True
+ Me.Label3.Location = New System.Drawing.Point(13, 196)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(189, 14)
+ Me.Label3.TabIndex = 3
+ Me.Label3.Text = "Titlebar Background Color:"
+ '
+ 'Label4
+ '
+ Me.Label4.AutoSize = True
+ Me.Label4.Location = New System.Drawing.Point(211, 167)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(105, 14)
+ Me.Label4.TabIndex = 4
+ Me.Label4.Text = "Desktop Color:"
+ '
+ 'Label5
+ '
+ Me.Label5.AutoSize = True
+ Me.Label5.Location = New System.Drawing.Point(13, 229)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(238, 14)
+ Me.Label5.TabIndex = 5
+ Me.Label5.Text = """New Terminal"" button text color:"
+ '
+ 'Label6
+ '
+ Me.Label6.AutoSize = True
+ Me.Label6.Location = New System.Drawing.Point(13, 261)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(280, 14)
+ Me.Label6.TabIndex = 6
+ Me.Label6.Text = """New Terminal"" button background color:"
+ '
+ 'btntitletext
+ '
+ Me.btntitletext.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btntitletext.Location = New System.Drawing.Point(166, 163)
+ Me.btntitletext.Name = "btntitletext"
+ Me.btntitletext.Size = New System.Drawing.Size(25, 23)
+ Me.btntitletext.TabIndex = 7
+ Me.btntitletext.UseVisualStyleBackColor = True
+ '
+ 'btndeskbackcolor
+ '
+ Me.btndeskbackcolor.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btndeskbackcolor.Location = New System.Drawing.Point(322, 163)
+ Me.btndeskbackcolor.Name = "btndeskbackcolor"
+ Me.btndeskbackcolor.Size = New System.Drawing.Size(25, 23)
+ Me.btndeskbackcolor.TabIndex = 8
+ Me.btndeskbackcolor.UseVisualStyleBackColor = True
+ '
+ 'btntitlebackcolor
+ '
+ Me.btntitlebackcolor.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btntitlebackcolor.Location = New System.Drawing.Point(208, 192)
+ Me.btntitlebackcolor.Name = "btntitlebackcolor"
+ Me.btntitlebackcolor.Size = New System.Drawing.Size(25, 23)
+ Me.btntitlebackcolor.TabIndex = 9
+ Me.btntitlebackcolor.UseVisualStyleBackColor = True
+ '
+ 'btnnttext
+ '
+ Me.btnnttext.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnnttext.Location = New System.Drawing.Point(257, 225)
+ Me.btnnttext.Name = "btnnttext"
+ Me.btnnttext.Size = New System.Drawing.Size(25, 23)
+ Me.btnnttext.TabIndex = 10
+ Me.btnnttext.UseVisualStyleBackColor = True
+ '
+ 'btnntback
+ '
+ Me.btnntback.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnntback.Location = New System.Drawing.Point(299, 257)
+ Me.btnntback.Name = "btnntback"
+ Me.btnntback.Size = New System.Drawing.Size(25, 23)
+ Me.btnntback.TabIndex = 11
+ Me.btnntback.UseVisualStyleBackColor = True
+ '
+ 'btnapply
+ '
+ Me.btnapply.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnapply.Location = New System.Drawing.Point(333, 312)
+ Me.btnapply.Name = "btnapply"
+ Me.btnapply.Size = New System.Drawing.Size(75, 23)
+ Me.btnapply.TabIndex = 12
+ Me.btnapply.Text = "Apply"
+ Me.btnapply.UseVisualStyleBackColor = True
+ '
+ 'Shifter
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 14.0!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.BackColor = System.Drawing.Color.Black
+ Me.ClientSize = New System.Drawing.Size(420, 347)
+ Me.Controls.Add(Me.btnapply)
+ Me.Controls.Add(Me.btnntback)
+ Me.Controls.Add(Me.btnnttext)
+ Me.Controls.Add(Me.btntitlebackcolor)
+ Me.Controls.Add(Me.btndeskbackcolor)
+ Me.Controls.Add(Me.btntitletext)
+ Me.Controls.Add(Me.Label6)
+ Me.Controls.Add(Me.Label5)
+ Me.Controls.Add(Me.Label4)
+ Me.Controls.Add(Me.Label3)
+ Me.Controls.Add(Me.Label2)
+ Me.Controls.Add(Me.Label1)
+ Me.Controls.Add(Me.titlebar)
+ Me.Font = New System.Drawing.Font("Courier New", 8.25!)
+ Me.ForeColor = System.Drawing.Color.White
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
+ Me.Name = "Shifter"
+ Me.Text = "Shifter"
+ Me.ResumeLayout(False)
+ Me.PerformLayout()
+
+ End Sub
+ Friend WithEvents titlebar As shiftos_next.Titlebar
+ Friend WithEvents Label1 As System.Windows.Forms.Label
+ Friend WithEvents Label2 As System.Windows.Forms.Label
+ Friend WithEvents Label3 As System.Windows.Forms.Label
+ Friend WithEvents Label4 As System.Windows.Forms.Label
+ Friend WithEvents Label5 As System.Windows.Forms.Label
+ Friend WithEvents Label6 As System.Windows.Forms.Label
+ Friend WithEvents btntitletext As System.Windows.Forms.Button
+ Friend WithEvents btndeskbackcolor As System.Windows.Forms.Button
+ Friend WithEvents btntitlebackcolor As System.Windows.Forms.Button
+ Friend WithEvents btnnttext As System.Windows.Forms.Button
+ Friend WithEvents btnntback As System.Windows.Forms.Button
+ Friend WithEvents btnapply As System.Windows.Forms.Button
+End Class
diff --git a/shiftos_next/BWM and CMD Apps/Shifter.resx b/shiftos_next/BWM and CMD Apps/Shifter.resx
new file mode 100644
index 0000000..b5156d8
--- /dev/null
+++ b/shiftos_next/BWM and CMD Apps/Shifter.resx
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+ Shifter
+
+The Shifter allows you to customize the desktop environment by setting different colors and layout options. The Shifter's ability depends on what the desktop environment allows the Shifter to customize.
+
+
\ No newline at end of file
diff --git a/shiftos_next/BWM and CMD Apps/Shifter.vb b/shiftos_next/BWM and CMD Apps/Shifter.vb
new file mode 100644
index 0000000..bb85cec
--- /dev/null
+++ b/shiftos_next/BWM and CMD Apps/Shifter.vb
@@ -0,0 +1,42 @@
+Public Class Shifter
+
+ Dim cp As Integer
+
+ Private Sub btntitletext_Click(sender As Object, e As EventArgs) Handles btntitletext.Click, btntitlebackcolor.Click, btndeskbackcolor.Click, btnntback.Click, btnnttext.Click
+ BasicWM.ColorPicker.oldcolor = sender.BackColor
+ BasicWM.ColorPicker.ShowDialog()
+ sender.BackColor = BasicWM.ColorPicker.Color
+ Dim random As New Random()
+ Dim cptoadd As Integer = random.Next(1, 5)
+ cp += cptoadd
+ End Sub
+
+ Public Sub loadsettings()
+ btntitletext.BackColor = titlebartextcolor
+ btntitlebackcolor.BackColor = titlebarcolor
+ btndeskbackcolor.BackColor = desktopbackcolor
+ btnntback.BackColor = newterminalbuttonbackcolor
+ btnnttext.BackColor = newterminalbuttontextcolor
+ End Sub
+
+ Private Sub btnapply_Click(sender As Object, e As EventArgs) Handles btnapply.Click
+ 'Store data in Skinning Engine
+ titlebartextcolor = btntitletext.BackColor
+ titlebarcolor = btntitlebackcolor.BackColor
+ desktopbackcolor = btndeskbackcolor.BackColor
+ newterminalbuttonbackcolor = btnntback.BackColor
+ newterminalbuttontextcolor = btnnttext.BackColor
+ 'Save to save file
+ saveskindata()
+ 'By now, the skin has been applied, so we'll tell the user how many codepoints they've earned.
+ AddCP(cp)
+ basicwm_infobox.showinfo("Shifter - Skin applied", "The skin has been applied to the desktop environment. You have earned " & cp & " Codepoints.")
+ End Sub
+
+ Private Sub Shifter_Load(sender As Object, e As EventArgs) Handles Me.Load
+ loadsettings()
+ Me.TopMost = True
+ Me.Left = (Screen.PrimaryScreen.Bounds.Width - Me.Width) / 2
+ Me.Top = (Screen.PrimaryScreen.Bounds.Height - Me.Height) / 2
+ End Sub
+End Class
\ No newline at end of file
diff --git a/shiftos_next/BWM and CMD Apps/basicwm_infobox.Designer.vb b/shiftos_next/BWM and CMD Apps/basicwm_infobox.Designer.vb
index 000d75f..eac4349 100644
--- a/shiftos_next/BWM and CMD Apps/basicwm_infobox.Designer.vb
+++ b/shiftos_next/BWM and CMD Apps/basicwm_infobox.Designer.vb
@@ -22,34 +22,12 @@ Partial Class basicwm_infobox
'Do not modify it using the code editor.
_
Private Sub InitializeComponent()
- Me.Panel1 = New System.Windows.Forms.Panel()
- Me.lbtitle = New System.Windows.Forms.Label()
Me.btnok = New System.Windows.Forms.Button()
Me.lbmessage = New System.Windows.Forms.Label()
Me.txtuserinput = New System.Windows.Forms.TextBox()
- Me.Panel1.SuspendLayout()
+ Me.Titlebar = New shiftos_next.Titlebar()
Me.SuspendLayout()
'
- 'Panel1
- '
- Me.Panel1.BackColor = System.Drawing.Color.Gray
- Me.Panel1.Controls.Add(Me.lbtitle)
- Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
- Me.Panel1.Location = New System.Drawing.Point(0, 0)
- Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(433, 30)
- Me.Panel1.TabIndex = 0
- '
- 'lbtitle
- '
- Me.lbtitle.Dock = System.Windows.Forms.DockStyle.Fill
- Me.lbtitle.Location = New System.Drawing.Point(0, 0)
- Me.lbtitle.Name = "lbtitle"
- Me.lbtitle.Size = New System.Drawing.Size(433, 30)
- Me.lbtitle.TabIndex = 0
- Me.lbtitle.Text = "I am a hacker."
- Me.lbtitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
- '
'btnok
'
Me.btnok.Dock = System.Windows.Forms.DockStyle.Bottom
@@ -65,9 +43,9 @@ Partial Class basicwm_infobox
'lbmessage
'
Me.lbmessage.Dock = System.Windows.Forms.DockStyle.Fill
- Me.lbmessage.Location = New System.Drawing.Point(0, 30)
+ Me.lbmessage.Location = New System.Drawing.Point(0, 0)
Me.lbmessage.Name = "lbmessage"
- Me.lbmessage.Size = New System.Drawing.Size(433, 183)
+ Me.lbmessage.Size = New System.Drawing.Size(433, 213)
Me.lbmessage.TabIndex = 1
Me.lbmessage.Text = "I am already viewing my computer logs of that interview. Soon, I'll know everythi" & _
"ng there is to know about that banana making factory."
@@ -86,6 +64,17 @@ Partial Class basicwm_infobox
Me.txtuserinput.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
Me.txtuserinput.WordWrap = False
'
+ 'Titlebar
+ '
+ Me.Titlebar.AppName = "Infobox"
+ Me.Titlebar.Dock = System.Windows.Forms.DockStyle.Top
+ Me.Titlebar.Font = New System.Drawing.Font("Courier New", 8.25!)
+ Me.Titlebar.ForeColor = System.Drawing.Color.White
+ Me.Titlebar.Location = New System.Drawing.Point(0, 0)
+ Me.Titlebar.Name = "Titlebar"
+ Me.Titlebar.Size = New System.Drawing.Size(433, 32)
+ Me.Titlebar.TabIndex = 3
+ '
'basicwm_infobox
'
Me.AcceptButton = Me.btnok
@@ -93,23 +82,21 @@ Partial Class basicwm_infobox
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.Black
Me.ClientSize = New System.Drawing.Size(433, 257)
+ Me.Controls.Add(Me.Titlebar)
Me.Controls.Add(Me.txtuserinput)
Me.Controls.Add(Me.lbmessage)
Me.Controls.Add(Me.btnok)
- Me.Controls.Add(Me.Panel1)
Me.Font = New System.Drawing.Font("Courier New", 8.25!)
Me.ForeColor = System.Drawing.Color.White
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
Me.Name = "basicwm_infobox"
Me.Text = "basicwm_infobox"
- Me.Panel1.ResumeLayout(False)
Me.ResumeLayout(False)
Me.PerformLayout()
End Sub
- Friend WithEvents Panel1 As System.Windows.Forms.Panel
- Friend WithEvents lbtitle As System.Windows.Forms.Label
Friend WithEvents btnok As System.Windows.Forms.Button
Friend WithEvents lbmessage As System.Windows.Forms.Label
Friend WithEvents txtuserinput As System.Windows.Forms.TextBox
+ Friend WithEvents Titlebar As shiftos_next.Titlebar
End Class
diff --git a/shiftos_next/BWM and CMD Apps/basicwm_infobox.vb b/shiftos_next/BWM and CMD Apps/basicwm_infobox.vb
index e4ffa55..aed56eb 100644
--- a/shiftos_next/BWM and CMD Apps/basicwm_infobox.vb
+++ b/shiftos_next/BWM and CMD Apps/basicwm_infobox.vb
@@ -3,7 +3,8 @@
Public userinput As String
Public Sub showinfo(title As String, message As String, Optional showtextbox As Boolean = False)
- lbtitle.Text = title
+ Titlebar.AppName = title
+ Titlebar.shiftorium_special()
lbmessage.Text = message
btnok.Text = "> OK <"
txtuserinput.Visible = showtextbox
diff --git a/shiftos_next/BWM and CMD Apps/shiftorium_cmd.Designer.vb b/shiftos_next/BWM and CMD Apps/shiftorium_cmd.Designer.vb
index 78c1ad7..b6d228b 100644
--- a/shiftos_next/BWM and CMD Apps/shiftorium_cmd.Designer.vb
+++ b/shiftos_next/BWM and CMD Apps/shiftorium_cmd.Designer.vb
@@ -22,8 +22,8 @@ Partial Class shiftorium_cmd
'Do not modify it using the code editor.
_
Private Sub InitializeComponent()
+ Me.components = New System.ComponentModel.Container()
Me.pnltop = New System.Windows.Forms.Panel()
- Me.lbtitle = New System.Windows.Forms.Label()
Me.pnlbottom = New System.Windows.Forms.Panel()
Me.lbcodepoints = New System.Windows.Forms.Label()
Me.lbcontrols = New System.Windows.Forms.Label()
@@ -34,6 +34,8 @@ Partial Class shiftorium_cmd
Me.lbdescription = New System.Windows.Forms.Label()
Me.lbitemname = New System.Windows.Forms.Label()
Me.lbitems = New System.Windows.Forms.ListBox()
+ Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
+ Me.Titlebar1 = New shiftos_next.Titlebar()
Me.pnltop.SuspendLayout()
Me.pnlbottom.SuspendLayout()
Me.pnldetails.SuspendLayout()
@@ -42,23 +44,13 @@ Partial Class shiftorium_cmd
'
'pnltop
'
- Me.pnltop.Controls.Add(Me.lbtitle)
+ Me.pnltop.Controls.Add(Me.Titlebar1)
Me.pnltop.Dock = System.Windows.Forms.DockStyle.Top
Me.pnltop.Location = New System.Drawing.Point(0, 0)
Me.pnltop.Name = "pnltop"
Me.pnltop.Size = New System.Drawing.Size(1007, 30)
Me.pnltop.TabIndex = 0
'
- 'lbtitle
- '
- Me.lbtitle.Dock = System.Windows.Forms.DockStyle.Fill
- Me.lbtitle.Location = New System.Drawing.Point(0, 0)
- Me.lbtitle.Name = "lbtitle"
- Me.lbtitle.Size = New System.Drawing.Size(1007, 30)
- Me.lbtitle.TabIndex = 0
- Me.lbtitle.Text = "SHIFTORIUM"
- Me.lbtitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
- '
'pnlbottom
'
Me.pnlbottom.Controls.Add(Me.lbcodepoints)
@@ -167,6 +159,17 @@ Partial Class shiftorium_cmd
Me.lbitems.Size = New System.Drawing.Size(1007, 335)
Me.lbitems.TabIndex = 3
'
+ 'Titlebar1
+ '
+ Me.Titlebar1.AppName = "Shiftorium"
+ Me.Titlebar1.Dock = System.Windows.Forms.DockStyle.Top
+ Me.Titlebar1.Font = New System.Drawing.Font("Courier New", 8.25!)
+ Me.Titlebar1.ForeColor = System.Drawing.Color.White
+ Me.Titlebar1.Location = New System.Drawing.Point(0, 0)
+ Me.Titlebar1.Name = "Titlebar1"
+ Me.Titlebar1.Size = New System.Drawing.Size(1007, 32)
+ Me.Titlebar1.TabIndex = 0
+ '
'shiftorium_cmd
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 14.0!)
@@ -191,7 +194,6 @@ Partial Class shiftorium_cmd
End Sub
Friend WithEvents pnltop As System.Windows.Forms.Panel
- Friend WithEvents lbtitle As System.Windows.Forms.Label
Friend WithEvents pnlbottom As System.Windows.Forms.Panel
Friend WithEvents lbcodepoints As System.Windows.Forms.Label
Friend WithEvents lbcontrols As System.Windows.Forms.Label
@@ -202,4 +204,6 @@ Partial Class shiftorium_cmd
Friend WithEvents lbprice As System.Windows.Forms.Label
Friend WithEvents lbdescription As System.Windows.Forms.Label
Friend WithEvents lbitemname As System.Windows.Forms.Label
+ Friend WithEvents Titlebar1 As shiftos_next.Titlebar
+ Friend WithEvents Timer1 As System.Windows.Forms.Timer
End Class
diff --git a/shiftos_next/BWM and CMD Apps/shiftorium_cmd.resx b/shiftos_next/BWM and CMD Apps/shiftorium_cmd.resx
index 1af7de1..d0d99f4 100644
--- a/shiftos_next/BWM and CMD Apps/shiftorium_cmd.resx
+++ b/shiftos_next/BWM and CMD Apps/shiftorium_cmd.resx
@@ -117,4 +117,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 17, 17
+
\ No newline at end of file
diff --git a/shiftos_next/BWM and CMD Apps/shiftorium_cmd.vb b/shiftos_next/BWM and CMD Apps/shiftorium_cmd.vb
index ba9b840..5fe11da 100644
--- a/shiftos_next/BWM and CMD Apps/shiftorium_cmd.vb
+++ b/shiftos_next/BWM and CMD Apps/shiftorium_cmd.vb
@@ -8,20 +8,7 @@
lbprice.Hide()
btnbuy.Hide()
lbcodepoints.Text = "Codepoints: " & codepoints
- If boughtbasicwm = True Then
- lbtitle.TextAlign = ContentAlignment.MiddleLeft
- lbtitle.Text = "Shiftorium" 'To make it sentence-case, rather than UPPERCASE.
- lbtitle.BackColor = Color.Gray
- Me.WindowState = FormWindowState.Normal
- Me.Left = (Screen.PrimaryScreen.Bounds.Width - Me.Width) / 2
- Me.Top = (Screen.PrimaryScreen.Bounds.Height - Me.Height) / 2
- Me.TopMost = True
- Else
- lbtitle.TextAlign = ContentAlignment.MiddleCenter
- lbtitle.Text = "SHIFTORIUM"
- lbtitle.BackColor = Color.Black
- Me.WindowState = FormWindowState.Maximized
- End If
+ Titlebar1.shiftorium_special()
End Sub
Public Sub determineitems()
diff --git a/shiftos_next/Desktop Environments/BWMDesktop.vb b/shiftos_next/Desktop Environments/BWMDesktop.vb
index 07841a5..a3790b5 100644
--- a/shiftos_next/Desktop Environments/BWMDesktop.vb
+++ b/shiftos_next/Desktop Environments/BWMDesktop.vb
@@ -16,6 +16,12 @@
End If
End Sub
+ Public Sub Redraw()
+ btnnewterminal.ForeColor = newterminalbuttontextcolor
+ btnnewterminal.BackColor = newterminalbuttonbackcolor
+ Me.BackColor = desktopbackcolor
+ End Sub
+
Private Sub Desktop_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Terminal.Close()
Me.WindowState = FormWindowState.Maximized
@@ -24,6 +30,7 @@
term.TopMost = True
term.Show()
openterminals += 1
+ loadskindata()
End Sub
End Class
End Namespace
\ No newline at end of file
diff --git a/shiftos_next/bin/Debug/shiftos_next.exe b/shiftos_next/bin/Debug/shiftos_next.exe
index cea38f3..8139db3 100644
Binary files a/shiftos_next/bin/Debug/shiftos_next.exe and b/shiftos_next/bin/Debug/shiftos_next.exe differ
diff --git a/shiftos_next/bin/Debug/shiftos_next.pdb b/shiftos_next/bin/Debug/shiftos_next.pdb
index 683dcab..177c865 100644
Binary files a/shiftos_next/bin/Debug/shiftos_next.pdb and b/shiftos_next/bin/Debug/shiftos_next.pdb differ
diff --git a/shiftos_next/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/shiftos_next/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index d8cd611..79049e5 100644
Binary files a/shiftos_next/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/shiftos_next/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/shiftos_next/obj/Debug/shiftos_next.Shifter.resources b/shiftos_next/obj/Debug/shiftos_next.Shifter.resources
new file mode 100644
index 0000000..fa34ad7
Binary files /dev/null and b/shiftos_next/obj/Debug/shiftos_next.Shifter.resources differ
diff --git a/shiftos_next/obj/Debug/shiftos_next.exe b/shiftos_next/obj/Debug/shiftos_next.exe
index cea38f3..8139db3 100644
Binary files a/shiftos_next/obj/Debug/shiftos_next.exe and b/shiftos_next/obj/Debug/shiftos_next.exe differ
diff --git a/shiftos_next/obj/Debug/shiftos_next.pdb b/shiftos_next/obj/Debug/shiftos_next.pdb
index 683dcab..177c865 100644
Binary files a/shiftos_next/obj/Debug/shiftos_next.pdb and b/shiftos_next/obj/Debug/shiftos_next.pdb differ
diff --git a/shiftos_next/obj/Debug/shiftos_next.vbproj.FileListAbsolute.txt b/shiftos_next/obj/Debug/shiftos_next.vbproj.FileListAbsolute.txt
index 59066c9..0841ad8 100644
--- a/shiftos_next/obj/Debug/shiftos_next.vbproj.FileListAbsolute.txt
+++ b/shiftos_next/obj/Debug/shiftos_next.vbproj.FileListAbsolute.txt
@@ -44,3 +44,4 @@ C:\Users\Michael\Documents\GitHub\shiftos-next\shiftos_next\bin\Debug\shiftos_ne
C:\Users\Michael\Documents\GitHub\shiftos-next\shiftos_next\bin\Debug\shiftos_next.pdb
C:\Users\Michael\Documents\GitHub\shiftos-next\shiftos_next\bin\Debug\shiftos_next.xml
C:\Users\Michael\Documents\GitHub\shiftos-next\shiftos_next\obj\Debug\shiftos_next.Titlebar.resources
+C:\Users\Michael\Documents\GitHub\shiftos-next\shiftos_next\obj\Debug\shiftos_next.Shifter.resources
diff --git a/shiftos_next/obj/Debug/shiftos_next.vbproj.GenerateResource.Cache b/shiftos_next/obj/Debug/shiftos_next.vbproj.GenerateResource.Cache
index 8f96502..c645f46 100644
Binary files a/shiftos_next/obj/Debug/shiftos_next.vbproj.GenerateResource.Cache and b/shiftos_next/obj/Debug/shiftos_next.vbproj.GenerateResource.Cache differ
diff --git a/shiftos_next/shiftos_next.vbproj b/shiftos_next/shiftos_next.vbproj
index d327d3b..db76ab6 100644
--- a/shiftos_next/shiftos_next.vbproj
+++ b/shiftos_next/shiftos_next.vbproj
@@ -71,6 +71,13 @@
+
+
+ Shifter.vb
+
+
+ Form
+
basicwm_infobox.vb
@@ -151,6 +158,9 @@
basicwm_infobox.vb
+
+ Shifter.vb
+
Titlebar.vb