diff --git a/shiftos_next.v12.suo b/shiftos_next.v12.suo index 445680b..02dcfeb 100644 Binary files a/shiftos_next.v12.suo and b/shiftos_next.v12.suo differ diff --git a/shiftos_next/API.vb b/shiftos_next/API.vb index 16cb502..0b37667 100644 --- a/shiftos_next/API.vb +++ b/shiftos_next/API.vb @@ -1,7 +1,117 @@ Module API 'Terminal - Public txtterm As TextBox = Terminal.txtterm + Public txtterm As TextBox = Terminal.terminaltext + + Public Function SetColorbasic(colorname As String) + Dim element As Color + Select Case colorname + Case "black" + AddLine("Error! Black and black don't go too well...") + Case "white" + element = Color.White + Case "gray" + If boughtgray Then + element = Color.Gray + Else + AddLine("Error! Unsupported color.") + End If + Case "red" + If boughtred Then + element = Color.Red + Else + AddLine("Error! Unsupported color.") + End If + Case "green" + If boughtgreen Then + element = Color.Green + Else + AddLine("Error! Unsupported color.") + End If + Case "blue" + If boughtblue Then + element = Color.Blue + Else + AddLine("Error! Unsupported color.") + End If + Case "yellow" + If boughtyellow Then + element = Color.Yellow + Else + AddLine("Error! Unsupported color.") + End If + Case "orange" + If boughtorange Then + element = Color.Orange + Else + AddLine("Error! Unsupported color.") + End If + Case "pink" + If boughtpink Then + element = Color.Pink + Else + AddLine("Error! Unsupported color.") + End If + Case "purple" + If boughtpurple Then + element = Color.Purple + Else + AddLine("Error! Unsupported color.") + End If + Case "brown" + If boughtbrown Then + element = Color.Brown + Else + AddLine("Error! Unsupported color.") + End If + Case Else + AddLine("Error! Unsupported color, check 'colors' for a list of supported colors.") + End Select + Return element + End Function + + Public Sub OpenProgram(progtoopen As String) + Select Case progtoopen + Case "shiftorium", "packages", "pacman", "code shop" + shiftorium_cmd.Show() + Case "files", "fileskimmer", "file skimmer", "fs", "file browser" + If boughtfileskimmer = True Then + file_skimmer.Show() + Else + AddLine("open: Invalid program """ & progtoopen & """.") + End If + Case "textpad", "text", "notepad" + If boughttextpad = True Then + TextPad.Show() + Else + AddLine("open: Invalid program """ & progtoopen & """.") + End If + Case Else + AddLine("open: Invalid program """ & progtoopen & """.") + End Select + End Sub + + Public Sub closeprogram(progtoclose As String) + Select Case progtoclose + Case "shiftorium", "packages", "pacman", "code shop" + shiftorium_cmd.Hide() + Case "files", "fileskimmer", "file skimmer", "fs", "file browser" + If boughtfileskimmer = True Then + file_skimmer.Hide() + Else + AddLine("close: Invalid program """ & progtoclose & """.") + End If + Case "textpad", "text", "notepad" + If boughttextpad = True Then + TextPad.Hide() + Else + AddLine("close: Invalid program """ & progtoclose & """.") + End If + + Case Else + AddLine("close: Invalid program """ & progtoclose & """.") + End Select + End Sub Public Sub wrongcommand() AddLine("Invalid command! Type ""help"" for a list of commands.") @@ -89,6 +199,7 @@ Public Sub SelectBottom() txtterm.Select(txtterm.Text.Length, 0) + txtterm.ScrollToCaret() End Sub End Module diff --git a/shiftos_next/BWMDesktop.Designer.vb b/shiftos_next/BWMDesktop.Designer.vb new file mode 100644 index 0000000..3f4ca4e --- /dev/null +++ b/shiftos_next/BWMDesktop.Designer.vb @@ -0,0 +1,56 @@ +Namespace BasicWM + _ + Partial Class Desktop + 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.btnnewterminal = New System.Windows.Forms.Button() + Me.SuspendLayout() + ' + 'btnnewterminal + ' + Me.btnnewterminal.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnnewterminal.Location = New System.Drawing.Point(12, 12) + Me.btnnewterminal.Name = "btnnewterminal" + Me.btnnewterminal.Size = New System.Drawing.Size(105, 23) + Me.btnnewterminal.TabIndex = 0 + Me.btnnewterminal.Text = "New Terminal" + Me.btnnewterminal.UseVisualStyleBackColor = True + ' + 'Desktop + ' + 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(535, 286) + Me.Controls.Add(Me.btnnewterminal) + 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 = "Desktop" + Me.Text = "BWMDesktop" + Me.ResumeLayout(False) + + End Sub + Friend WithEvents btnnewterminal As System.Windows.Forms.Button + End Class +End Namespace \ No newline at end of file diff --git a/shiftos_next/BWMDesktop.resx b/shiftos_next/BWMDesktop.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/shiftos_next/BWMDesktop.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_next/BWMDesktop.vb b/shiftos_next/BWMDesktop.vb new file mode 100644 index 0000000..07841a5 --- /dev/null +++ b/shiftos_next/BWMDesktop.vb @@ -0,0 +1,29 @@ +Namespace BasicWM + Public Class Desktop + + Public openterminals As Integer = 0 + + Private Sub btnnewterminal_Click(sender As Object, e As EventArgs) Handles btnnewterminal.Click + If openterminals = 3 Then + AddLine("The maximum ammount of Terminal windows are open.") + AddLine(username + "@" + osname + " " & Terminal.currentdir.ToLower.Replace("c:\shiftos", "~") & "$> ") + Else + Dim term As New Terminal + term.StartPosition = FormStartPosition.CenterParent + term.TopMost = True + term.Show() + openterminals += 1 + End If + End Sub + + Private Sub Desktop_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Terminal.Close() + Me.WindowState = FormWindowState.Maximized + Dim term As New Terminal + term.StartPosition = FormStartPosition.CenterParent + term.TopMost = True + term.Show() + openterminals += 1 + End Sub + End Class +End Namespace \ No newline at end of file diff --git a/shiftos_next/ColorPicker.Designer.vb b/shiftos_next/ColorPicker.Designer.vb new file mode 100644 index 0000000..9aa95ad --- /dev/null +++ b/shiftos_next/ColorPicker.Designer.vb @@ -0,0 +1,273 @@ +Namespace BasicWM + _ + Partial Class ColorPicker + 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.pnltop = New System.Windows.Forms.Panel() + Me.lbtitle = New System.Windows.Forms.Label() + Me.pnlcolors = New System.Windows.Forms.FlowLayoutPanel() + Me.btnwhite = New System.Windows.Forms.Button() + Me.btnblack = New System.Windows.Forms.Button() + Me.btngray = New System.Windows.Forms.Button() + Me.btnred = New System.Windows.Forms.Button() + Me.btngreen = New System.Windows.Forms.Button() + Me.btnblue = New System.Windows.Forms.Button() + Me.btnyellow = New System.Windows.Forms.Button() + Me.btnorange = New System.Windows.Forms.Button() + Me.btnpink = New System.Windows.Forms.Button() + Me.btnpurple = New System.Windows.Forms.Button() + Me.btnbrown = New System.Windows.Forms.Button() + Me.btnok = New System.Windows.Forms.Button() + Me.lbselectedcolor = New System.Windows.Forms.Label() + Me.btncancel = New System.Windows.Forms.Button() + Me.pnltop.SuspendLayout() + Me.pnlcolors.SuspendLayout() + Me.SuspendLayout() + ' + 'pnltop + ' + Me.pnltop.BackColor = System.Drawing.Color.Gray + Me.pnltop.Controls.Add(Me.lbtitle) + 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(362, 30) + Me.pnltop.TabIndex = 0 + ' + 'lbtitle + ' + Me.lbtitle.AutoSize = True + Me.lbtitle.Location = New System.Drawing.Point(12, 9) + Me.lbtitle.Name = "lbtitle" + Me.lbtitle.Size = New System.Drawing.Size(91, 14) + Me.lbtitle.TabIndex = 0 + Me.lbtitle.Text = "Color Picker" + ' + 'pnlcolors + ' + Me.pnlcolors.Controls.Add(Me.btnwhite) + Me.pnlcolors.Controls.Add(Me.btnblack) + Me.pnlcolors.Controls.Add(Me.btngray) + Me.pnlcolors.Controls.Add(Me.btnred) + Me.pnlcolors.Controls.Add(Me.btngreen) + Me.pnlcolors.Controls.Add(Me.btnblue) + Me.pnlcolors.Controls.Add(Me.btnyellow) + Me.pnlcolors.Controls.Add(Me.btnorange) + Me.pnlcolors.Controls.Add(Me.btnpink) + Me.pnlcolors.Controls.Add(Me.btnpurple) + Me.pnlcolors.Controls.Add(Me.btnbrown) + Me.pnlcolors.Location = New System.Drawing.Point(15, 65) + Me.pnlcolors.Name = "pnlcolors" + Me.pnlcolors.Size = New System.Drawing.Size(335, 177) + Me.pnlcolors.TabIndex = 1 + ' + 'btnwhite + ' + Me.btnwhite.BackColor = System.Drawing.Color.White + Me.btnwhite.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnwhite.Location = New System.Drawing.Point(3, 3) + Me.btnwhite.Name = "btnwhite" + Me.btnwhite.Size = New System.Drawing.Size(26, 23) + Me.btnwhite.TabIndex = 0 + Me.btnwhite.UseVisualStyleBackColor = False + ' + 'btnblack + ' + Me.btnblack.BackColor = System.Drawing.Color.Black + Me.btnblack.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnblack.Location = New System.Drawing.Point(35, 3) + Me.btnblack.Name = "btnblack" + Me.btnblack.Size = New System.Drawing.Size(26, 23) + Me.btnblack.TabIndex = 1 + Me.btnblack.UseVisualStyleBackColor = False + ' + 'btngray + ' + Me.btngray.BackColor = System.Drawing.Color.Gray + Me.btngray.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btngray.Location = New System.Drawing.Point(67, 3) + Me.btngray.Name = "btngray" + Me.btngray.Size = New System.Drawing.Size(26, 23) + Me.btngray.TabIndex = 2 + Me.btngray.UseVisualStyleBackColor = False + Me.btngray.Visible = False + ' + 'btnred + ' + Me.btnred.BackColor = System.Drawing.Color.Red + Me.btnred.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnred.Location = New System.Drawing.Point(99, 3) + Me.btnred.Name = "btnred" + Me.btnred.Size = New System.Drawing.Size(26, 23) + Me.btnred.TabIndex = 3 + Me.btnred.UseVisualStyleBackColor = False + Me.btnred.Visible = False + ' + 'btngreen + ' + Me.btngreen.BackColor = System.Drawing.Color.Green + Me.btngreen.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btngreen.Location = New System.Drawing.Point(131, 3) + Me.btngreen.Name = "btngreen" + Me.btngreen.Size = New System.Drawing.Size(26, 23) + Me.btngreen.TabIndex = 4 + Me.btngreen.UseVisualStyleBackColor = False + Me.btngreen.Visible = False + ' + 'btnblue + ' + Me.btnblue.BackColor = System.Drawing.Color.Blue + Me.btnblue.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnblue.Location = New System.Drawing.Point(163, 3) + Me.btnblue.Name = "btnblue" + Me.btnblue.Size = New System.Drawing.Size(26, 23) + Me.btnblue.TabIndex = 5 + Me.btnblue.UseVisualStyleBackColor = False + Me.btnblue.Visible = False + ' + 'btnyellow + ' + Me.btnyellow.BackColor = System.Drawing.Color.Yellow + Me.btnyellow.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnyellow.Location = New System.Drawing.Point(195, 3) + Me.btnyellow.Name = "btnyellow" + Me.btnyellow.Size = New System.Drawing.Size(26, 23) + Me.btnyellow.TabIndex = 6 + Me.btnyellow.UseVisualStyleBackColor = False + Me.btnyellow.Visible = False + ' + 'btnorange + ' + Me.btnorange.BackColor = System.Drawing.Color.Orange + Me.btnorange.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnorange.Location = New System.Drawing.Point(227, 3) + Me.btnorange.Name = "btnorange" + Me.btnorange.Size = New System.Drawing.Size(26, 23) + Me.btnorange.TabIndex = 7 + Me.btnorange.UseVisualStyleBackColor = False + Me.btnorange.Visible = False + ' + 'btnpink + ' + Me.btnpink.BackColor = System.Drawing.Color.Pink + Me.btnpink.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnpink.Location = New System.Drawing.Point(259, 3) + Me.btnpink.Name = "btnpink" + Me.btnpink.Size = New System.Drawing.Size(26, 23) + Me.btnpink.TabIndex = 8 + Me.btnpink.UseVisualStyleBackColor = False + Me.btnpink.Visible = False + ' + 'btnpurple + ' + Me.btnpurple.BackColor = System.Drawing.Color.Purple + Me.btnpurple.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnpurple.Location = New System.Drawing.Point(291, 3) + Me.btnpurple.Name = "btnpurple" + Me.btnpurple.Size = New System.Drawing.Size(26, 23) + Me.btnpurple.TabIndex = 9 + Me.btnpurple.UseVisualStyleBackColor = False + Me.btnpurple.Visible = False + ' + 'btnbrown + ' + Me.btnbrown.BackColor = System.Drawing.Color.Brown + Me.btnbrown.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnbrown.Location = New System.Drawing.Point(3, 32) + Me.btnbrown.Name = "btnbrown" + Me.btnbrown.Size = New System.Drawing.Size(26, 23) + Me.btnbrown.TabIndex = 10 + Me.btnbrown.UseVisualStyleBackColor = False + Me.btnbrown.Visible = False + ' + 'btnok + ' + Me.btnok.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnok.Location = New System.Drawing.Point(275, 245) + Me.btnok.Name = "btnok" + Me.btnok.Size = New System.Drawing.Size(75, 23) + Me.btnok.TabIndex = 2 + Me.btnok.Text = "OK" + Me.btnok.UseVisualStyleBackColor = True + ' + 'lbselectedcolor + ' + Me.lbselectedcolor.AutoSize = True + Me.lbselectedcolor.Location = New System.Drawing.Point(12, 249) + Me.lbselectedcolor.Name = "lbselectedcolor" + Me.lbselectedcolor.Size = New System.Drawing.Size(154, 14) + Me.lbselectedcolor.TabIndex = 3 + Me.lbselectedcolor.Text = "Selected Color: White" + ' + 'btncancel + ' + Me.btncancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btncancel.Location = New System.Drawing.Point(194, 245) + Me.btncancel.Name = "btncancel" + Me.btncancel.Size = New System.Drawing.Size(75, 23) + Me.btncancel.TabIndex = 4 + Me.btncancel.Text = "Cancel" + Me.btncancel.UseVisualStyleBackColor = True + ' + 'ColorPicker + ' + 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(362, 280) + Me.Controls.Add(Me.btncancel) + Me.Controls.Add(Me.lbselectedcolor) + Me.Controls.Add(Me.btnok) + Me.Controls.Add(Me.pnlcolors) + Me.Controls.Add(Me.pnltop) + 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 = "ColorPicker" + Me.Text = "ColorPicker" + Me.pnltop.ResumeLayout(False) + Me.pnltop.PerformLayout() + Me.pnlcolors.ResumeLayout(False) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents pnltop As System.Windows.Forms.Panel + Friend WithEvents lbtitle As System.Windows.Forms.Label + Friend WithEvents pnlcolors As System.Windows.Forms.FlowLayoutPanel + Friend WithEvents btnwhite As System.Windows.Forms.Button + Friend WithEvents btnblack As System.Windows.Forms.Button + Friend WithEvents btngray As System.Windows.Forms.Button + Friend WithEvents btnred As System.Windows.Forms.Button + Friend WithEvents btngreen As System.Windows.Forms.Button + Friend WithEvents btnblue As System.Windows.Forms.Button + Friend WithEvents btnyellow As System.Windows.Forms.Button + Friend WithEvents btnorange As System.Windows.Forms.Button + Friend WithEvents btnpink As System.Windows.Forms.Button + Friend WithEvents btnpurple As System.Windows.Forms.Button + Friend WithEvents btnbrown As System.Windows.Forms.Button + Friend WithEvents btnok As System.Windows.Forms.Button + Friend WithEvents lbselectedcolor As System.Windows.Forms.Label + Friend WithEvents btncancel As System.Windows.Forms.Button + End Class +End Namespace \ No newline at end of file diff --git a/shiftos_next/ColorPicker.resx b/shiftos_next/ColorPicker.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/shiftos_next/ColorPicker.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_next/ColorPicker.vb b/shiftos_next/ColorPicker.vb new file mode 100644 index 0000000..d569c65 --- /dev/null +++ b/shiftos_next/ColorPicker.vb @@ -0,0 +1,38 @@ +Namespace BasicWM + Public Class ColorPicker + + Public Color As Color + Public oldcolor As Color + + Private Sub btnwhite_Click(sender As Object, e As EventArgs) Handles btnwhite.Click, btnblack.Click, btngray.Click, btnred.Click, btngreen.Click, btnblue.Click, btnyellow.Click, btnorange.Click, btnpink.Click, btnpurple.Click, btnbrown.Click + Color = sender.backcolor + lbselectedcolor.Text = "Selected color: " & Color.ToKnownColor.ToString + End Sub + + Private Sub btnok_Click(sender As Object, e As EventArgs) Handles btnok.Click + Me.Close() + End Sub + + Private Sub btncancel_Click(sender As Object, e As EventArgs) Handles btncancel.Click + Color = oldcolor + Me.Close() + End Sub + + Private Sub ColorPicker_Load(sender As Object, e As EventArgs) Handles MyBase.Load + loadcolors() + End Sub + + + Public Sub loadcolors() + If boughtgray Then btngray.Show() + If boughtred Then btnred.Show() + If boughtgreen Then btngreen.Show() + If boughtblue Then btnblue.Show() + If boughtyellow Then btnyellow.Show() + If boughtorange Then btnorange.Show() + If boughtpink Then btnpink.Show() + If boughtpurple Then btnpurple.Show() + If boughtbrown Then btnbrown.Show() + End Sub + End Class +End Namespace \ No newline at end of file diff --git a/shiftos_next/Hijack.vb b/shiftos_next/Hijack.vb index 9604ae1..b182254 100644 --- a/shiftos_next/Hijack.vb +++ b/shiftos_next/Hijack.vb @@ -4,7 +4,7 @@ Imports System.Text Imports System.Net.Mail Public Class HijackScreen - Public actualshiftversion As String = "0.0.8" + Public actualshiftversion As String = "NEXT 0.0.1" Dim newgame As Boolean = True Dim tcount As Integer = 0 Dim rtext As String @@ -35,11 +35,16 @@ Public Class HijackScreen If IO.File.ReadAllText("C:/ShiftOS/Shiftum42/HDAccess.sft") = actualshiftversion Then conversationtimer.Start() needtoclose = True - Terminal.Show() + loadgame() + If boughtbasicwm = True Then + BasicWM.Desktop.Show() + Else + Terminal.Show() + End If Else - oldversion = IO.File.ReadAllText("C:/ShiftOS/Shiftum42/HDAccess.sft") + oldversion = IO.File.ReadAllText(systemdir + "HDAccess.sft") upgraded = True - System.IO.Directory.Delete("C:/ShiftOS/", True) + System.IO.Directory.Delete(root, True) BackgroundWorker1.RunWorkerAsync() conversationtimer.Start() hackeffecttimer.Start() diff --git a/shiftos_next/Terminal.Designer.vb b/shiftos_next/Terminal.Designer.vb index 0ad2b94..7509fc4 100644 --- a/shiftos_next/Terminal.Designer.vb +++ b/shiftos_next/Terminal.Designer.vb @@ -23,41 +23,72 @@ Partial Class Terminal _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Me.txtterm = New System.Windows.Forms.TextBox() + Me.terminaltext = New System.Windows.Forms.TextBox() Me.tmrfirstuse = New System.Windows.Forms.Timer(Me.components) + Me.pnltop = New System.Windows.Forms.Panel() + Me.lbtitle = New System.Windows.Forms.Label() + Me.pnltop.SuspendLayout() Me.SuspendLayout() ' - 'txtterm + 'terminaltext ' - Me.txtterm.BackColor = System.Drawing.Color.Black - Me.txtterm.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtterm.Cursor = System.Windows.Forms.Cursors.IBeam - Me.txtterm.Dock = System.Windows.Forms.DockStyle.Fill - Me.txtterm.Font = New System.Drawing.Font("Courier New", 8.25!) - Me.txtterm.ForeColor = System.Drawing.Color.White - Me.txtterm.Location = New System.Drawing.Point(0, 0) - Me.txtterm.Multiline = True - Me.txtterm.Name = "txtterm" - Me.txtterm.Size = New System.Drawing.Size(635, 418) - Me.txtterm.TabIndex = 0 - Me.txtterm.Text = "ShiftOS Beta 1.0" + Me.terminaltext.BackColor = System.Drawing.Color.Black + Me.terminaltext.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.terminaltext.Cursor = System.Windows.Forms.Cursors.IBeam + Me.terminaltext.Dock = System.Windows.Forms.DockStyle.Fill + Me.terminaltext.Font = New System.Drawing.Font("Courier New", 8.25!) + Me.terminaltext.ForeColor = System.Drawing.Color.White + Me.terminaltext.Location = New System.Drawing.Point(0, 30) + Me.terminaltext.Multiline = True + Me.terminaltext.Name = "terminaltext" + Me.terminaltext.Size = New System.Drawing.Size(635, 388) + Me.terminaltext.TabIndex = 0 + Me.terminaltext.Text = "ShiftOS Beta 1.0" ' 'tmrfirstuse ' Me.tmrfirstuse.Interval = 5000 ' + 'pnltop + ' + Me.pnltop.BackColor = System.Drawing.Color.Gray + Me.pnltop.Controls.Add(Me.lbtitle) + Me.pnltop.Dock = System.Windows.Forms.DockStyle.Top + Me.pnltop.Font = New System.Drawing.Font("Courier New", 8.25!) + Me.pnltop.ForeColor = System.Drawing.Color.White + Me.pnltop.Location = New System.Drawing.Point(0, 0) + Me.pnltop.Name = "pnltop" + Me.pnltop.Size = New System.Drawing.Size(635, 30) + Me.pnltop.TabIndex = 1 + ' + 'lbtitle + ' + Me.lbtitle.AutoSize = True + Me.lbtitle.Location = New System.Drawing.Point(12, 9) + Me.lbtitle.Name = "lbtitle" + Me.lbtitle.Size = New System.Drawing.Size(63, 14) + Me.lbtitle.TabIndex = 0 + Me.lbtitle.Text = "Terminal" + ' 'Terminal ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(635, 418) - Me.Controls.Add(Me.txtterm) + Me.Controls.Add(Me.terminaltext) + Me.Controls.Add(Me.pnltop) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Name = "Terminal" Me.Text = "Terminal" + Me.WindowState = System.Windows.Forms.FormWindowState.Maximized + Me.pnltop.ResumeLayout(False) + Me.pnltop.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents txtterm As System.Windows.Forms.TextBox + Friend WithEvents terminaltext As System.Windows.Forms.TextBox Friend WithEvents tmrfirstuse As System.Windows.Forms.Timer + Friend WithEvents pnltop As System.Windows.Forms.Panel + Friend WithEvents lbtitle As System.Windows.Forms.Label End Class diff --git a/shiftos_next/Terminal.vb b/shiftos_next/Terminal.vb index a4d5304..50df6bc 100644 --- a/shiftos_next/Terminal.vb +++ b/shiftos_next/Terminal.vb @@ -4,10 +4,28 @@ Public prompttoupdatesave As Boolean = False Dim trackpos As Integer = 0 + Private Sub Terminal_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing + If BasicWM.Desktop.openterminals > 0 Then BasicWM.Desktop.openterminals -= 1 + End Sub + + Private Sub Terminal_GotFocus(sender As Object, e As EventArgs) Handles terminaltext.GotFocus + API.txtterm = Me.terminaltext + End Sub + + + Public Sub terminal_Innitiate(sender As Object, e As EventArgs) Handles MyBase.Load Me.FormBorderStyle = Windows.Forms.FormBorderStyle.None - Me.WindowState = FormWindowState.Maximized - loadgame() + API.txtterm = Me.terminaltext + If boughtbasicwm = True Then + pnltop.Show() + Me.WindowState = FormWindowState.Normal + Me.Left = (Screen.PrimaryScreen.Bounds.Width - Me.Width) / 2 + Me.Top = (Screen.PrimaryScreen.Bounds.Height - Me.Height) / 2 + Else + pnltop.Hide() + Me.WindowState = FormWindowState.Maximized + End If AddLine(username + "@" + osname + " " & currentdir.ToLower.Replace("c:\shiftos", "~") & "$> ") SelectBottom() If prompttoupdatesave = True Then @@ -17,6 +35,8 @@ + + Public Sub Interpret(command As String) command = command.ToLower If command Like "help" Then @@ -86,116 +106,58 @@ End If Case "textcolor" If boughtterminalsettextcolor Then - Select Case args(2) - Case "black" - AddLine("Error! Black and black don't go too well...") - Case "white" - txtterm.ForeColor = Color.White - Case "gray" - If boughtgray Then - txtterm.ForeColor = Color.Gray - Else - AddLine("Error! Unsupported color.") - End If - Case "red" - If boughtred Then - txtterm.ForeColor = Color.Red - Else - AddLine("Error! Unsupported color.") - End If - Case "green" - If boughtgreen Then - txtterm.ForeColor = Color.Green - Else - AddLine("Error! Unsupported color.") - End If - Case "blue" - If boughtblue Then - txtterm.ForeColor = Color.Blue - Else - AddLine("Error! Unsupported color.") - End If - Case "yellow" - If boughtyellow Then - txtterm.ForeColor = Color.Yellow - Else - AddLine("Error! Unsupported color.") - End If - Case "orange" - If boughtorange Then - txtterm.ForeColor = Color.Orange - Else - AddLine("Error! Unsupported color.") - End If - Case "pink" - If boughtpink Then - txtterm.ForeColor = Color.Pink - Else - AddLine("Error! Unsupported color.") - End If - Case "purple" - If boughtpurple Then - txtterm.ForeColor = Color.Purple - Else - AddLine("Error! Unsupported color.") - End If - Case "brown" - If boughtbrown Then - txtterm.ForeColor = Color.Brown - Else - AddLine("Error! Unsupported color.") - End If - Case Else - AddLine("Error! Unsupported color, check 'colors' for a list of supported colors.") - End Select + terminaltext.ForeColor = SetColorbasic(args(2)) End If Case Else AddLine("set: No valid setting node in configuration file for """ & args(1) & """.") End Select + ElseIf command = "05tray" Then + AddLine("500 Codepoints have been added.") + AddCP(500) ElseIf command Like "open *" Then Dim progtoopen As String = command.Replace("open ", "") - Select Case progtoopen - Case "shiftorium", "packages", "pacman", "code shop" - shiftorium_cmd.Show() - Case "files", "fileskimmer", "file skimmer", "fs", "file browser" - If boughtfileskimmer = True Then - file_skimmer.Show() - Else - AddLine("open: Invalid program """ & progtoopen & """.") - End If - Case "textpad", "text", "notepad" - If boughttextpad = True Then - TextPad.Show() - Else - AddLine("open: Invalid program """ & progtoopen & """.") - End If - Case Else - AddLine("open: Invalid program """ & progtoopen & """.") - End Select - ElseIf command Like "shutdown" Then - savegame() - Me.Close() - ElseIf command Like "math*" Then - mathquiz = True - changeinterpreter() - ElseIf command Like "guess the number" Or command Like "guess" Then - guessthenumber = True - changeinterpreter() - ElseIf command Like "code*" Or command = "code points" Then - AddLine("You have " & codepoints & " Codepoints.") - ElseIf command = "colors" Then - showterminalcolors() - ElseIf command Like "" Then - 'This is here to make it so that the Terminal doesn't say "Wrong Command" if the user doesn't input anything. - Else - If IO.File.Exists(currentdir + "\" + command) Then - OpenFile(currentdir + "\" + command) - ElseIf IO.File.Exists(command) Then - OpenFile(command) + OpenProgram(progtoopen) + ElseIf command Like "close *" Then + Dim progtoclose As String = command.Replace("close ", "") + If progtoclose = "terminal" Then + If boughtbasicwm = True Then + Me.Close() + Else + AddLine("close: Cannot close the Terminal!") + End If Else - wrongcommand() + closeprogram(progtoclose) + End If + ElseIf command Like "shutdown" Then + savegame() + Application.Exit() + ElseIf command Like "math*" Then + mathquiz = True + changeinterpreter() + ElseIf command Like "guess the number" Or command Like "guess" Then + guessthenumber = True + changeinterpreter() + ElseIf command Like "code*" Or command = "code points" Then + AddLine("You have " & codepoints & " Codepoints.") + ElseIf command Like "bwm" Then + If boughtbasicwm = True Then + BasicWM.Desktop.Show() + Else + wrongcommand() + End If + ElseIf command = "colors" Then + showterminalcolors() + ElseIf command Like "" Then + 'This is here to make it so that the Terminal doesn't say "Wrong Command" if the user doesn't input anything. + Else + If IO.File.Exists(currentdir + "\" + command) Then + openfile(currentdir + "\" + command) + ElseIf IO.File.Exists(command) Then + openfile(command) + Else + wrongcommand() + End If End If - End If End Sub @@ -207,32 +169,32 @@ Dim firstuseconversation As Integer = 0 Private Sub tmrfirstuse_Tick(sender As Object, e As EventArgs) Handles tmrfirstuse.Tick - Select Case firstuseconversation - Case 0 - txtterm.ReadOnly = True - AddLine("IP Address 170.245.12.80 is connecting as ""DevX"".") - Case 1 - AddLine("DevX: It seems my updates have completly installed.") - Case 2 - AddLine("DevX: Unfortunately, due to your hard drive being formatted, you have lost all your data.") - Case 3 - AddLine("DevX: However, Don't worry! I've added some pretty cool features to the Terminal to make up for this.") - Case 4 - AddLine("DevX: I can't tell you much, except for ""Type Help for a list of commands"".") - Case 5 - AddLine("DevX: I've got to go, but I'll contact you as I develop more updates; and you test the OS.") - Case 6 - AddLine("User ""DevX"" has disconnected.") - Case 7 - txtterm.ResetText() - AddLine("user@shiftos ~$> ") - txtterm.ReadOnly = False - tmrfirstuse.Stop() - End Select - firstuseconversation += 1 + Select Case firstuseconversation + Case 0 + terminaltext.ReadOnly = True + AddLine("IP Address 170.245.12.80 is connecting as ""DevX"".") + Case 1 + AddLine("DevX: It seems my updates have completly installed.") + Case 2 + AddLine("DevX: Unfortunately, due to your hard drive being formatted, you have lost all your data.") + Case 3 + AddLine("DevX: However, Don't worry! I've added some pretty cool features to the Terminal to make up for this.") + Case 4 + AddLine("DevX: I can't tell you much, except for ""Type Help for a list of commands"".") + Case 5 + AddLine("DevX: I've got to go, but I'll contact you as I develop more updates; and you test the OS.") + Case 6 + AddLine("User ""DevX"" has disconnected.") + Case 7 + terminaltext.ResetText() + AddLine("user@shiftos ~$> ") + terminaltext.ReadOnly = False + tmrfirstuse.Stop() + End Select + firstuseconversation += 1 End Sub - Private Sub txtterm_KeyDown(sender As Object, e As KeyEventArgs) Handles txtterm.KeyDown + Private Sub txtterm_KeyDown(sender As Object, e As KeyEventArgs) Handles terminaltext.KeyDown If prompttoupdatesave = False Then Select Case e.KeyCode @@ -249,7 +211,7 @@ Case Keys.RWin trackpos = trackpos - 1 Case Keys.Right - If txtterm.SelectionStart = txtterm.TextLength Then + If terminaltext.SelectionStart = terminaltext.TextLength Then trackpos = trackpos - 1 End If Case Keys.Left @@ -270,8 +232,8 @@ If e.KeyCode = Keys.Enter Then e.SuppressKeyPress = True If mathquiz = True Then - Dim question As String = txtterm.Lines(txtterm.Lines.Length - 2) - Dim answer As String = txtterm.Lines(txtterm.Lines.Length - 1).Replace("> ", "") + Dim question As String = terminaltext.Lines(terminaltext.Lines.Length - 2) + Dim answer As String = terminaltext.Lines(terminaltext.Lines.Length - 1).Replace("> ", "") If answer = "exit" Then mathquiz = False AddLine(username + "@" + osname + " " & currentdir.ToLower.Replace("c:\shiftos", "~") & "$> ") @@ -284,7 +246,7 @@ AddLine("> ") End If ElseIf guessthenumber = True Then - Dim answer As String = txtterm.Lines(txtterm.Lines.Length - 1).Replace("> ", "") + Dim answer As String = terminaltext.Lines(terminaltext.Lines.Length - 1).Replace("> ", "") If answer = "exit" Then guessthenumber = False AddLine(username + "@" + osname + " " & currentdir.ToLower.Replace("c:\shiftos", "~") & "$> ") @@ -297,35 +259,35 @@ AddLine("> ") End If Else - Dim command As String = txtterm.Lines(txtterm.Lines.Length - 1).Replace(username + "@" + osname + " " & currentdir.ToLower.Replace("c:\shiftos", "~") & "$> ", "").ToLower + Dim command As String = terminaltext.Lines(terminaltext.Lines.Length - 1).Replace(username + "@" + osname + " " & currentdir.ToLower.Replace("c:\shiftos", "~") & "$> ", "").ToLower Interpret(command) If mathquiz Or guessthenumber Then AddLine("> ") Else If command = "clear" Then - txtterm.Text = username + "@" + osname + " " & currentdir.ToLower.Replace("c:\shiftos", "~") & "$> " - txtterm.Select(txtterm.Text.Length, 0) + terminaltext.Text = username + "@" + osname + " " & currentdir.ToLower.Replace("c:\shiftos", "~") & "$> " + terminaltext.Select(terminaltext.Text.Length, 0) Else AddLine(username + "@" + osname + " " & currentdir.ToLower.Replace("c:\shiftos", "~") & "$> ") - txtterm.Select(txtterm.Text.Length, 0) + terminaltext.Select(terminaltext.Text.Length, 0) End If End If - End If - trackpos = 0 + End If + trackpos = 0 Else - If e.KeyCode = Keys.Back Then - Else - trackpos = trackpos + 1 - End If + If e.KeyCode = Keys.Back Then + Else + trackpos = trackpos + 1 + End If End If If e.KeyCode = Keys.Back Then If trackpos < 1 Then e.SuppressKeyPress = True Else - If txtterm.SelectedText.Length < 1 Then + If terminaltext.SelectedText.Length < 1 Then trackpos = trackpos - 1 Else e.SuppressKeyPress = True diff --git a/shiftos_next/TextPad.Designer.vb b/shiftos_next/TextPad.Designer.vb index 93057b3..2db0d56 100644 --- a/shiftos_next/TextPad.Designer.vb +++ b/shiftos_next/TextPad.Designer.vb @@ -24,31 +24,34 @@ Partial Class TextPad Private Sub InitializeComponent() Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() Me.FileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.EditToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.NewToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.OpenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SaveToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ExitToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.EditToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CutToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PasteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.UndoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.RedoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.SelectAllToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ReplaceToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() - Me.FindToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SelectAllToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() + Me.FindToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ReplaceToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.txtfilebody = New System.Windows.Forms.RichTextBox() + Me.lbtitle = New System.Windows.Forms.Label() + Me.pnltop = New System.Windows.Forms.Panel() Me.MenuStrip1.SuspendLayout() + Me.pnltop.SuspendLayout() Me.SuspendLayout() ' 'MenuStrip1 ' Me.MenuStrip1.Font = New System.Drawing.Font("Courier New", 8.25!) Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FileToolStripMenuItem, Me.EditToolStripMenuItem}) - Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) + Me.MenuStrip1.Location = New System.Drawing.Point(0, 30) Me.MenuStrip1.Name = "MenuStrip1" Me.MenuStrip1.Size = New System.Drawing.Size(652, 24) Me.MenuStrip1.TabIndex = 0 @@ -61,6 +64,30 @@ Partial Class TextPad Me.FileToolStripMenuItem.Size = New System.Drawing.Size(47, 20) Me.FileToolStripMenuItem.Text = "File" ' + 'NewToolStripMenuItem + ' + Me.NewToolStripMenuItem.Name = "NewToolStripMenuItem" + Me.NewToolStripMenuItem.Size = New System.Drawing.Size(102, 22) + Me.NewToolStripMenuItem.Text = "New" + ' + 'OpenToolStripMenuItem + ' + Me.OpenToolStripMenuItem.Name = "OpenToolStripMenuItem" + Me.OpenToolStripMenuItem.Size = New System.Drawing.Size(102, 22) + Me.OpenToolStripMenuItem.Text = "Open" + ' + 'SaveToolStripMenuItem + ' + Me.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem" + Me.SaveToolStripMenuItem.Size = New System.Drawing.Size(102, 22) + Me.SaveToolStripMenuItem.Text = "Save" + ' + 'ExitToolStripMenuItem + ' + Me.ExitToolStripMenuItem.Name = "ExitToolStripMenuItem" + Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(102, 22) + Me.ExitToolStripMenuItem.Text = "Exit" + ' 'EditToolStripMenuItem ' Me.EditToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CutToolStripMenuItem, Me.CopyToolStripMenuItem, Me.PasteToolStripMenuItem, Me.ToolStripSeparator2, Me.UndoToolStripMenuItem, Me.RedoToolStripMenuItem, Me.ToolStripSeparator1, Me.SelectAllToolStripMenuItem, Me.ToolStripSeparator3, Me.FindToolStripMenuItem, Me.ReplaceToolStripMenuItem}) @@ -68,93 +95,69 @@ Partial Class TextPad Me.EditToolStripMenuItem.Size = New System.Drawing.Size(47, 20) Me.EditToolStripMenuItem.Text = "Edit" ' - 'NewToolStripMenuItem - ' - Me.NewToolStripMenuItem.Name = "NewToolStripMenuItem" - Me.NewToolStripMenuItem.Size = New System.Drawing.Size(152, 22) - Me.NewToolStripMenuItem.Text = "New" - ' - 'OpenToolStripMenuItem - ' - Me.OpenToolStripMenuItem.Name = "OpenToolStripMenuItem" - Me.OpenToolStripMenuItem.Size = New System.Drawing.Size(152, 22) - Me.OpenToolStripMenuItem.Text = "Open" - ' - 'SaveToolStripMenuItem - ' - Me.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem" - Me.SaveToolStripMenuItem.Size = New System.Drawing.Size(152, 22) - Me.SaveToolStripMenuItem.Text = "Save" - ' - 'ExitToolStripMenuItem - ' - Me.ExitToolStripMenuItem.Name = "ExitToolStripMenuItem" - Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(152, 22) - Me.ExitToolStripMenuItem.Text = "Exit" - ' 'CutToolStripMenuItem ' Me.CutToolStripMenuItem.Name = "CutToolStripMenuItem" - Me.CutToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.CutToolStripMenuItem.Size = New System.Drawing.Size(144, 22) Me.CutToolStripMenuItem.Text = "Cut" ' 'CopyToolStripMenuItem ' Me.CopyToolStripMenuItem.Name = "CopyToolStripMenuItem" - Me.CopyToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.CopyToolStripMenuItem.Size = New System.Drawing.Size(144, 22) Me.CopyToolStripMenuItem.Text = "Copy" ' 'PasteToolStripMenuItem ' Me.PasteToolStripMenuItem.Name = "PasteToolStripMenuItem" - Me.PasteToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.PasteToolStripMenuItem.Size = New System.Drawing.Size(144, 22) Me.PasteToolStripMenuItem.Text = "Paste" ' + 'ToolStripSeparator2 + ' + Me.ToolStripSeparator2.Name = "ToolStripSeparator2" + Me.ToolStripSeparator2.Size = New System.Drawing.Size(141, 6) + ' 'UndoToolStripMenuItem ' Me.UndoToolStripMenuItem.Name = "UndoToolStripMenuItem" - Me.UndoToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.UndoToolStripMenuItem.Size = New System.Drawing.Size(144, 22) Me.UndoToolStripMenuItem.Text = "Undo" ' 'RedoToolStripMenuItem ' Me.RedoToolStripMenuItem.Name = "RedoToolStripMenuItem" - Me.RedoToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.RedoToolStripMenuItem.Size = New System.Drawing.Size(144, 22) Me.RedoToolStripMenuItem.Text = "Redo" ' - 'SelectAllToolStripMenuItem - ' - Me.SelectAllToolStripMenuItem.Name = "SelectAllToolStripMenuItem" - Me.SelectAllToolStripMenuItem.Size = New System.Drawing.Size(152, 22) - Me.SelectAllToolStripMenuItem.Text = "Select All" - ' - 'ReplaceToolStripMenuItem - ' - Me.ReplaceToolStripMenuItem.Name = "ReplaceToolStripMenuItem" - Me.ReplaceToolStripMenuItem.Size = New System.Drawing.Size(152, 22) - Me.ReplaceToolStripMenuItem.Text = "Replace" - ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(149, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(141, 6) ' - 'ToolStripSeparator2 + 'SelectAllToolStripMenuItem ' - Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(149, 6) - ' - 'FindToolStripMenuItem - ' - Me.FindToolStripMenuItem.Name = "FindToolStripMenuItem" - Me.FindToolStripMenuItem.Size = New System.Drawing.Size(152, 22) - Me.FindToolStripMenuItem.Text = "Find" - Me.FindToolStripMenuItem.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.SelectAllToolStripMenuItem.Name = "SelectAllToolStripMenuItem" + Me.SelectAllToolStripMenuItem.Size = New System.Drawing.Size(144, 22) + Me.SelectAllToolStripMenuItem.Text = "Select All" ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(149, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(141, 6) + ' + 'FindToolStripMenuItem + ' + Me.FindToolStripMenuItem.Name = "FindToolStripMenuItem" + Me.FindToolStripMenuItem.Size = New System.Drawing.Size(144, 22) + Me.FindToolStripMenuItem.Text = "Find" + Me.FindToolStripMenuItem.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'ReplaceToolStripMenuItem + ' + Me.ReplaceToolStripMenuItem.Name = "ReplaceToolStripMenuItem" + Me.ReplaceToolStripMenuItem.Size = New System.Drawing.Size(144, 22) + Me.ReplaceToolStripMenuItem.Text = "Replace" ' 'txtfilebody ' @@ -162,12 +165,31 @@ Partial Class TextPad Me.txtfilebody.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtfilebody.Dock = System.Windows.Forms.DockStyle.Fill Me.txtfilebody.ForeColor = System.Drawing.Color.White - Me.txtfilebody.Location = New System.Drawing.Point(0, 24) + Me.txtfilebody.Location = New System.Drawing.Point(0, 54) Me.txtfilebody.Name = "txtfilebody" - Me.txtfilebody.Size = New System.Drawing.Size(652, 293) + Me.txtfilebody.Size = New System.Drawing.Size(652, 263) Me.txtfilebody.TabIndex = 1 Me.txtfilebody.Text = "" ' + 'lbtitle + ' + Me.lbtitle.AutoSize = True + Me.lbtitle.Location = New System.Drawing.Point(12, 9) + Me.lbtitle.Name = "lbtitle" + Me.lbtitle.Size = New System.Drawing.Size(56, 14) + Me.lbtitle.TabIndex = 0 + Me.lbtitle.Text = "TextPad" + ' + 'pnltop + ' + Me.pnltop.BackColor = System.Drawing.Color.Gray + Me.pnltop.Controls.Add(Me.lbtitle) + 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(652, 30) + Me.pnltop.TabIndex = 2 + ' 'TextPad ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 14.0!) @@ -176,6 +198,7 @@ Partial Class TextPad Me.ClientSize = New System.Drawing.Size(652, 317) Me.Controls.Add(Me.txtfilebody) Me.Controls.Add(Me.MenuStrip1) + Me.Controls.Add(Me.pnltop) Me.Font = New System.Drawing.Font("Courier New", 8.25!) Me.ForeColor = System.Drawing.Color.White Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None @@ -184,6 +207,8 @@ Partial Class TextPad Me.Text = "TextPad" Me.MenuStrip1.ResumeLayout(False) Me.MenuStrip1.PerformLayout() + Me.pnltop.ResumeLayout(False) + Me.pnltop.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -207,4 +232,6 @@ Partial Class TextPad Friend WithEvents FindToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ReplaceToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents txtfilebody As System.Windows.Forms.RichTextBox + Friend WithEvents lbtitle As System.Windows.Forms.Label + Friend WithEvents pnltop As System.Windows.Forms.Panel End Class diff --git a/shiftos_next/TextPad.vb b/shiftos_next/TextPad.vb index a7d0906..f0b956c 100644 --- a/shiftos_next/TextPad.vb +++ b/shiftos_next/TextPad.vb @@ -1,5 +1,6 @@ Public Class TextPad + Private Sub OpenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OpenToolStripMenuItem.Click file_skimmer.mode = "open" file_skimmer.application = "textpad" @@ -60,6 +61,17 @@ MenuStrip1.Renderer = New basicwm_renderer() setupmenufonts() Me.WindowState = FormWindowState.Maximized + If boughtbasicwm = True Then + pnltop.Show() + 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 + pnltop.Hide() + Me.WindowState = FormWindowState.Maximized + Me.TopMost = False + End If End Sub Public Sub setupmenufonts() diff --git a/shiftos_next/bin/Debug/shiftos_next.exe b/shiftos_next/bin/Debug/shiftos_next.exe index cc05bb7..27ace56 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 0461de9..6d8f810 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/bin/Debug/shiftos_next.vshost.exe.manifest b/shiftos_next/bin/Debug/shiftos_next.vshost.exe.manifest deleted file mode 100644 index 061c9ca..0000000 --- a/shiftos_next/bin/Debug/shiftos_next.vshost.exe.manifest +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/shiftos_next/file skimmer.Designer.vb b/shiftos_next/file skimmer.Designer.vb index fdfd9ca..506ce1b 100644 --- a/shiftos_next/file skimmer.Designer.vb +++ b/shiftos_next/file skimmer.Designer.vb @@ -36,18 +36,21 @@ Partial Class file_skimmer Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel() Me.lbcurrentdir = New System.Windows.Forms.ToolStripLabel() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() + Me.btnnewfolder = New System.Windows.Forms.ToolStripButton() + Me.btndelete = New System.Windows.Forms.ToolStripButton() Me.lvfiles = New System.Windows.Forms.ListView() Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.btnnewfolder = New System.Windows.Forms.ToolStripButton() - Me.btndelete = New System.Windows.Forms.ToolStripButton() Me.pnlsave = New System.Windows.Forms.Panel() - Me.btnsave = New System.Windows.Forms.Button() - Me.Label1 = New System.Windows.Forms.Label() Me.txtfilename = New System.Windows.Forms.TextBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.btnsave = New System.Windows.Forms.Button() + Me.lbtitle = New System.Windows.Forms.Label() + Me.pnltop = New System.Windows.Forms.Panel() Me.topmenu.SuspendLayout() Me.tools.SuspendLayout() Me.pnlsave.SuspendLayout() + Me.pnltop.SuspendLayout() Me.SuspendLayout() ' 'topmenu @@ -56,7 +59,7 @@ Partial Class file_skimmer Me.topmenu.Font = New System.Drawing.Font("Courier New", 8.25!) Me.topmenu.ForeColor = System.Drawing.Color.White Me.topmenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FileToolStripMenuItem, Me.AboutToolStripMenuItem}) - Me.topmenu.Location = New System.Drawing.Point(0, 0) + Me.topmenu.Location = New System.Drawing.Point(0, 30) Me.topmenu.Name = "topmenu" Me.topmenu.Size = New System.Drawing.Size(591, 24) Me.topmenu.TabIndex = 0 @@ -118,7 +121,7 @@ Partial Class file_skimmer Me.tools.Font = New System.Drawing.Font("Courier New", 8.25!) Me.tools.ForeColor = System.Drawing.Color.White Me.tools.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabel1, Me.lbcurrentdir, Me.ToolStripSeparator1, Me.btnnewfolder, Me.btndelete}) - Me.tools.Location = New System.Drawing.Point(0, 24) + Me.tools.Location = New System.Drawing.Point(0, 54) Me.tools.Name = "tools" Me.tools.Size = New System.Drawing.Size(591, 25) Me.tools.TabIndex = 1 @@ -141,20 +144,6 @@ Partial Class file_skimmer Me.ToolStripSeparator1.Name = "ToolStripSeparator1" Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25) ' - 'lvfiles - ' - Me.lvfiles.BackColor = System.Drawing.Color.Black - Me.lvfiles.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.lvfiles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2}) - Me.lvfiles.Dock = System.Windows.Forms.DockStyle.Fill - Me.lvfiles.ForeColor = System.Drawing.Color.White - Me.lvfiles.Location = New System.Drawing.Point(0, 49) - Me.lvfiles.Name = "lvfiles" - Me.lvfiles.Size = New System.Drawing.Size(591, 281) - Me.lvfiles.TabIndex = 3 - Me.lvfiles.UseCompatibleStateImageBehavior = False - Me.lvfiles.View = System.Windows.Forms.View.Tile - ' 'btnnewfolder ' Me.btnnewfolder.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text @@ -173,6 +162,20 @@ Partial Class file_skimmer Me.btndelete.Size = New System.Drawing.Size(53, 22) Me.btndelete.Text = "Delete" ' + 'lvfiles + ' + Me.lvfiles.BackColor = System.Drawing.Color.Black + Me.lvfiles.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.lvfiles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2}) + Me.lvfiles.Dock = System.Windows.Forms.DockStyle.Fill + Me.lvfiles.ForeColor = System.Drawing.Color.White + Me.lvfiles.Location = New System.Drawing.Point(0, 79) + Me.lvfiles.Name = "lvfiles" + Me.lvfiles.Size = New System.Drawing.Size(591, 251) + Me.lvfiles.TabIndex = 3 + Me.lvfiles.UseCompatibleStateImageBehavior = False + Me.lvfiles.View = System.Windows.Forms.View.Tile + ' 'pnlsave ' Me.pnlsave.Controls.Add(Me.txtfilename) @@ -184,6 +187,24 @@ Partial Class file_skimmer Me.pnlsave.Size = New System.Drawing.Size(591, 30) Me.pnlsave.TabIndex = 4 ' + 'txtfilename + ' + Me.txtfilename.BackColor = System.Drawing.Color.Black + Me.txtfilename.ForeColor = System.Drawing.Color.White + Me.txtfilename.Location = New System.Drawing.Point(86, 5) + Me.txtfilename.Name = "txtfilename" + Me.txtfilename.Size = New System.Drawing.Size(421, 20) + Me.txtfilename.TabIndex = 2 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(3, 8) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(77, 14) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "File Name:" + ' 'btnsave ' Me.btnsave.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -195,23 +216,24 @@ Partial Class file_skimmer Me.btnsave.Text = "Save" Me.btnsave.UseVisualStyleBackColor = True ' - 'Label1 + 'lbtitle ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(3, 8) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(77, 14) - Me.Label1.TabIndex = 1 - Me.Label1.Text = "File Name:" + Me.lbtitle.AutoSize = True + Me.lbtitle.Location = New System.Drawing.Point(12, 9) + Me.lbtitle.Name = "lbtitle" + Me.lbtitle.Size = New System.Drawing.Size(91, 14) + Me.lbtitle.TabIndex = 0 + Me.lbtitle.Text = "File Skimmer" ' - 'txtfilename + 'pnltop ' - Me.txtfilename.BackColor = System.Drawing.Color.Black - Me.txtfilename.ForeColor = System.Drawing.Color.White - Me.txtfilename.Location = New System.Drawing.Point(86, 5) - Me.txtfilename.Name = "txtfilename" - Me.txtfilename.Size = New System.Drawing.Size(421, 20) - Me.txtfilename.TabIndex = 2 + Me.pnltop.BackColor = System.Drawing.Color.Gray + Me.pnltop.Controls.Add(Me.lbtitle) + 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(591, 30) + Me.pnltop.TabIndex = 5 ' 'file_skimmer ' @@ -224,6 +246,7 @@ Partial Class file_skimmer Me.Controls.Add(Me.pnlsave) Me.Controls.Add(Me.tools) Me.Controls.Add(Me.topmenu) + Me.Controls.Add(Me.pnltop) Me.Font = New System.Drawing.Font("Courier New", 8.25!) Me.ForeColor = System.Drawing.Color.White Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None @@ -237,6 +260,8 @@ Partial Class file_skimmer Me.tools.PerformLayout() Me.pnlsave.ResumeLayout(False) Me.pnlsave.PerformLayout() + Me.pnltop.ResumeLayout(False) + Me.pnltop.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -263,4 +288,6 @@ Partial Class file_skimmer Friend WithEvents txtfilename As System.Windows.Forms.TextBox Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents btnsave As System.Windows.Forms.Button + Friend WithEvents lbtitle As System.Windows.Forms.Label + Friend WithEvents pnltop As System.Windows.Forms.Panel End Class diff --git a/shiftos_next/file skimmer.vb b/shiftos_next/file skimmer.vb index 3e3e726..3ca3602 100644 --- a/shiftos_next/file skimmer.vb +++ b/shiftos_next/file skimmer.vb @@ -1,5 +1,7 @@ Public Class file_skimmer + + Public mode As String Public application As String 'The application sending either an open or save mode. Public currentdir As String = home @@ -88,7 +90,7 @@ End If Else If mode = "open" Then - Select Case application + Select Case Application Case "textpad" Dim sr As New IO.StreamReader(lvfiles.SelectedItems(0).Tag.ToString) TextPad.txtfilebody.Text = sr.ReadToEnd() @@ -98,7 +100,7 @@ Else OpenFile(lvfiles.SelectedItems(0).Tag) End If - End If + End If Catch End Try End Sub @@ -121,6 +123,17 @@ Else pnlsave.Visible = False End If + If boughtbasicwm = True Then + pnltop.Show() + 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 + pnltop.Hide() + Me.WindowState = FormWindowState.Maximized + Me.TopMost = False + End If End Sub Private Sub ExitSessionToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExitSessionToolStripMenuItem.Click @@ -160,7 +173,7 @@ If IO.Directory.Exists(currentdir + "\" + txtfilename.Text) Then basicwm_infobox.showinfo("Invalid File Name", "You can't save a file ontop of a directory with the same name!") Else - Select Case application + Select Case Application Case "textpad" Dim sw As New IO.StreamWriter(currentdir + "\" + txtfilename.Text) sw.Write(TextPad.txtfilebody.Text) diff --git a/shiftos_next/obj/Debug/shiftos_next.BasicWM.ColorPicker.resources b/shiftos_next/obj/Debug/shiftos_next.BasicWM.ColorPicker.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/shiftos_next/obj/Debug/shiftos_next.BasicWM.ColorPicker.resources differ diff --git a/shiftos_next/obj/Debug/shiftos_next.BasicWM.Desktop.resources b/shiftos_next/obj/Debug/shiftos_next.BasicWM.Desktop.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/shiftos_next/obj/Debug/shiftos_next.BasicWM.Desktop.resources differ diff --git a/shiftos_next/obj/Debug/shiftos_next.exe b/shiftos_next/obj/Debug/shiftos_next.exe index cc05bb7..27ace56 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 0461de9..6d8f810 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 78890ae..715ab56 100644 --- a/shiftos_next/obj/Debug/shiftos_next.vbproj.FileListAbsolute.txt +++ b/shiftos_next/obj/Debug/shiftos_next.vbproj.FileListAbsolute.txt @@ -14,6 +14,8 @@ C:\Users\The Ultimate Hacker\Documents\shiftos-next\shiftos_next\bin\Debug\shift C:\Users\The Ultimate Hacker\Documents\shiftos-next\shiftos_next\bin\Debug\shiftos_next.pdb C:\Users\The Ultimate Hacker\Documents\shiftos-next\shiftos_next\bin\Debug\shiftos_next.xml C:\Users\The Ultimate Hacker\Documents\shiftos-next\shiftos_next\obj\Debug\shiftos_next.basicwm_infobox.resources +C:\Users\The Ultimate Hacker\Documents\shiftos-next\shiftos_next\obj\Debug\shiftos_next.BasicWM.Desktop.resources +C:\Users\The Ultimate Hacker\Documents\shiftos-next\shiftos_next\obj\Debug\shiftos_next.BasicWM.ColorPicker.resources C:\Users\The Ultimate Hacker\Documents\shiftos-next\shiftos_next\obj\Debug\shiftos_next.file_skimmer.resources C:\Users\The Ultimate Hacker\Documents\shiftos-next\shiftos_next\obj\Debug\shiftos_next.HijackScreen.resources C:\Users\The Ultimate Hacker\Documents\shiftos-next\shiftos_next\obj\Debug\shiftos_next.Resources.resources diff --git a/shiftos_next/obj/Debug/shiftos_next.vbproj.GenerateResource.Cache b/shiftos_next/obj/Debug/shiftos_next.vbproj.GenerateResource.Cache index 53bfdde..f1c2fd0 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/saveengine.vb b/shiftos_next/saveengine.vb index 84d734d..2c49cbd 100644 --- a/shiftos_next/saveengine.vb +++ b/shiftos_next/saveengine.vb @@ -12,7 +12,7 @@ Public boughtbasicsettings As Boolean = False Public boughtbasicgui As Boolean = False Public boughtterminalsettextcolor As Boolean = False - + Public boughtbasicwm As Boolean = False ' ' OLD SHIFTOS UPGRADES: These upgrades may be useful, so I've added them. @@ -292,7 +292,7 @@ If boughtbasicsettings = True Then savelines(86) = 11 Else savelines(86) = 10 If boughtbasicgui = True Then savelines(87) = 11 Else savelines(87) = 10 If boughtterminalsettextcolor = True Then savelines(88) = 11 Else savelines(88) = 10 - + If boughtbasicwm = True Then savelines(89) = 11 Else savelines(89) = 10 'Large gap in file. Add new features here. @@ -494,7 +494,7 @@ If loadlines(86) = 11 Then boughtbasicsettings = True Else boughtbasicsettings = False If loadlines(87) = 11 Then boughtbasicgui = True Else boughtbasicgui = False If loadlines(88) = 11 Then boughtterminalsettextcolor = True Else boughtterminalsettextcolor = False - + If loadlines(89) = 11 Then boughtbasicwm = True Else boughtbasicwm = False diff --git a/shiftos_next/shiftorium_cmd.Designer.vb b/shiftos_next/shiftorium_cmd.Designer.vb index 62015ea..78c1ad7 100644 --- a/shiftos_next/shiftorium_cmd.Designer.vb +++ b/shiftos_next/shiftorium_cmd.Designer.vb @@ -23,17 +23,17 @@ Partial Class shiftorium_cmd _ Private Sub InitializeComponent() Me.pnltop = New System.Windows.Forms.Panel() - Me.Label1 = New System.Windows.Forms.Label() + 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() Me.pnldetails = New System.Windows.Forms.Panel() - Me.lbitems = New System.Windows.Forms.ListBox() - Me.lbitemname = New System.Windows.Forms.Label() - Me.lbdescription = New System.Windows.Forms.Label() Me.pnlbuy = New System.Windows.Forms.Panel() - Me.lbprice = New System.Windows.Forms.Label() Me.btnbuy = New System.Windows.Forms.Button() + Me.lbprice = New System.Windows.Forms.Label() + Me.lbdescription = New System.Windows.Forms.Label() + Me.lbitemname = New System.Windows.Forms.Label() + Me.lbitems = New System.Windows.Forms.ListBox() Me.pnltop.SuspendLayout() Me.pnlbottom.SuspendLayout() Me.pnldetails.SuspendLayout() @@ -42,22 +42,22 @@ Partial Class shiftorium_cmd ' 'pnltop ' - Me.pnltop.Controls.Add(Me.Label1) + Me.pnltop.Controls.Add(Me.lbtitle) 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 ' - 'Label1 + 'lbtitle ' - Me.Label1.Dock = System.Windows.Forms.DockStyle.Fill - Me.Label1.Location = New System.Drawing.Point(0, 0) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(1007, 30) - Me.Label1.TabIndex = 0 - Me.Label1.Text = "SHIFTORIUM" - Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + 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 ' @@ -100,28 +100,37 @@ Partial Class shiftorium_cmd Me.pnldetails.Size = New System.Drawing.Size(1007, 205) Me.pnldetails.TabIndex = 2 ' - 'lbitems + 'pnlbuy ' - Me.lbitems.BackColor = System.Drawing.Color.Black - Me.lbitems.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.lbitems.Dock = System.Windows.Forms.DockStyle.Fill - Me.lbitems.ForeColor = System.Drawing.Color.White - Me.lbitems.FormattingEnabled = True - Me.lbitems.ItemHeight = 14 - Me.lbitems.Location = New System.Drawing.Point(0, 235) - Me.lbitems.Name = "lbitems" - Me.lbitems.Size = New System.Drawing.Size(1007, 335) - Me.lbitems.TabIndex = 3 + Me.pnlbuy.Controls.Add(Me.btnbuy) + Me.pnlbuy.Controls.Add(Me.lbprice) + Me.pnlbuy.Dock = System.Windows.Forms.DockStyle.Bottom + Me.pnlbuy.Location = New System.Drawing.Point(0, 176) + Me.pnlbuy.Name = "pnlbuy" + Me.pnlbuy.Size = New System.Drawing.Size(1007, 29) + Me.pnlbuy.TabIndex = 2 ' - 'lbitemname + 'btnbuy ' - Me.lbitemname.Dock = System.Windows.Forms.DockStyle.Top - Me.lbitemname.Location = New System.Drawing.Point(0, 0) - Me.lbitemname.Name = "lbitemname" - Me.lbitemname.Size = New System.Drawing.Size(1007, 28) - Me.lbitemname.TabIndex = 0 - Me.lbitemname.Text = "Welcome to the Shiftorium!" - Me.lbitemname.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.btnbuy.Dock = System.Windows.Forms.DockStyle.Fill + Me.btnbuy.FlatAppearance.BorderSize = 0 + Me.btnbuy.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnbuy.Location = New System.Drawing.Point(815, 0) + Me.btnbuy.Name = "btnbuy" + Me.btnbuy.Size = New System.Drawing.Size(192, 29) + Me.btnbuy.TabIndex = 1 + Me.btnbuy.Text = "Press SPACE to buy" + Me.btnbuy.UseVisualStyleBackColor = True + ' + 'lbprice + ' + Me.lbprice.Dock = System.Windows.Forms.DockStyle.Left + Me.lbprice.Location = New System.Drawing.Point(0, 0) + Me.lbprice.Name = "lbprice" + Me.lbprice.Size = New System.Drawing.Size(815, 29) + Me.lbprice.TabIndex = 0 + Me.lbprice.Text = "This item costs {0} Codepoints." + Me.lbprice.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'lbdescription ' @@ -135,37 +144,28 @@ Partial Class shiftorium_cmd "n desktop environments." Me.lbdescription.TextAlign = System.Drawing.ContentAlignment.MiddleCenter ' - 'pnlbuy + 'lbitemname ' - Me.pnlbuy.Controls.Add(Me.btnbuy) - Me.pnlbuy.Controls.Add(Me.lbprice) - Me.pnlbuy.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlbuy.Location = New System.Drawing.Point(0, 176) - Me.pnlbuy.Name = "pnlbuy" - Me.pnlbuy.Size = New System.Drawing.Size(1007, 29) - Me.pnlbuy.TabIndex = 2 + Me.lbitemname.Dock = System.Windows.Forms.DockStyle.Top + Me.lbitemname.Location = New System.Drawing.Point(0, 0) + Me.lbitemname.Name = "lbitemname" + Me.lbitemname.Size = New System.Drawing.Size(1007, 28) + Me.lbitemname.TabIndex = 0 + Me.lbitemname.Text = "Welcome to the Shiftorium!" + Me.lbitemname.TextAlign = System.Drawing.ContentAlignment.MiddleCenter ' - 'lbprice + 'lbitems ' - Me.lbprice.Dock = System.Windows.Forms.DockStyle.Left - Me.lbprice.Location = New System.Drawing.Point(0, 0) - Me.lbprice.Name = "lbprice" - Me.lbprice.Size = New System.Drawing.Size(815, 29) - Me.lbprice.TabIndex = 0 - Me.lbprice.Text = "This item costs {0} Codepoints." - Me.lbprice.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - ' - 'btnbuy - ' - Me.btnbuy.Dock = System.Windows.Forms.DockStyle.Fill - Me.btnbuy.FlatAppearance.BorderSize = 0 - Me.btnbuy.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnbuy.Location = New System.Drawing.Point(815, 0) - Me.btnbuy.Name = "btnbuy" - Me.btnbuy.Size = New System.Drawing.Size(192, 29) - Me.btnbuy.TabIndex = 1 - Me.btnbuy.Text = "Press SPACE to buy" - Me.btnbuy.UseVisualStyleBackColor = True + Me.lbitems.BackColor = System.Drawing.Color.Black + Me.lbitems.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.lbitems.Dock = System.Windows.Forms.DockStyle.Fill + Me.lbitems.ForeColor = System.Drawing.Color.White + Me.lbitems.FormattingEnabled = True + Me.lbitems.ItemHeight = 14 + Me.lbitems.Location = New System.Drawing.Point(0, 235) + Me.lbitems.Name = "lbitems" + Me.lbitems.Size = New System.Drawing.Size(1007, 335) + Me.lbitems.TabIndex = 3 ' 'shiftorium_cmd ' @@ -191,7 +191,7 @@ Partial Class shiftorium_cmd End Sub Friend WithEvents pnltop As System.Windows.Forms.Panel - Friend WithEvents Label1 As System.Windows.Forms.Label + 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 diff --git a/shiftos_next/shiftorium_cmd.vb b/shiftos_next/shiftorium_cmd.vb index 2a19b4e..9999279 100644 --- a/shiftos_next/shiftorium_cmd.vb +++ b/shiftos_next/shiftorium_cmd.vb @@ -1,5 +1,6 @@ Public Class shiftorium_cmd + Public Sub shiftorium_load(s As Object, e As EventArgs) Handles MyBase.Load listboxtoaddto = lbitems determineitems() @@ -7,6 +8,20 @@ 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 End Sub Public Sub determineitems() @@ -33,6 +48,13 @@ If boughttextpad = False Then AddItem("Textpad", 50) End If + If boughttextpad = True And boughtfileskimmer = True Then + If boughtbasicwm = False Then + AddItem("Basic Window Manager", 100) + Else + 'Placeholder + End If + End If End If End If If boughtgray = False Then @@ -69,6 +91,7 @@ lbitems.SelectedIndex -= 1 End If Case Keys.Enter + handleitemdescription("Basic Window Manager - 100 CP", "Fullscreen applications, well, suck. You can't get any work done outside of that app without closing it, and can't even view the Terminal. This upgrade changes that. We've found a way to use the Basic GUI server to create a simple window manager. It allows multiple windows on the screen, and up to 3 Terminal windows at once.") handleitemdescription("Textpad - 50 CP", "Hmmmmm... What was I gonna do on Sunday? Oh yeah! I have to get that website written for my buddy. Better write that down before I forget... " & vbNewLine & vbNewLine & "Textpad allows you to create text documents. Handy if you need to write something down!") handleitemdescription("FS Delete - 15 CP", "Alright, What's this unused document doing on my PC? I don't need this. I must delete it. With this upgrade, you can delete files in the File Skimmer.") handleitemdescription("FS New Folder - 15 CP", "Well, we can view the files on our computer, but we don't have the ability to create directories in the GUI... yet. Upgrade today, and you will be able to.") @@ -80,6 +103,7 @@ handleitemdescription("Custom Username - 10 CP", "Hello, user! Isn't that wierd that that's all we know you as? Buy this upgrade to change yourr name from ""user"" to anything you want!") handleitemdescription("Basic Terminal Settings - 5 CP", "Ever wanted to customize the terminal to act the way you'd like it to? This upgrade is for you. You won't be able to use it until you buy settings, but hey! The command is there.") Case Keys.Space + handlebuy("Basic Window Manager - 100 CP", boughtbasicwm, "Awesome! Just exit the Shiftorium and type ""bwm"" into the Terminal, and away we go. Future sessions will not require typing ""bwm"".") handlebuy("Textpad - 50 CP", boughttextpad, "Great. Now our computer is a bit more useful than before...") handlebuy("FS Delete - 15 CP", boughtfileskimmerdelete, "There. I can finally destroy that evil document that's been taking up 3/4 of my hard drive. Just right-click a file and click 'Delete' to delete a file.") handlebuy("FS New Folder - 15 CP", boughtfileskimmernewfolder, "Awesome. You can now create new folders in the File Skimmer!") @@ -159,4 +183,5 @@ End If End Sub + End Class \ No newline at end of file diff --git a/shiftos_next/shiftos_next.vbproj b/shiftos_next/shiftos_next.vbproj index 92a3fa7..ce0ebfb 100644 --- a/shiftos_next/shiftos_next.vbproj +++ b/shiftos_next/shiftos_next.vbproj @@ -79,6 +79,18 @@ Form + + BWMDesktop.vb + + + Form + + + ColorPicker.vb + + + Form + file skimmer.vb @@ -133,6 +145,12 @@ basicwm_infobox.vb + + BWMDesktop.vb + + + ColorPicker.vb + file skimmer.vb diff --git a/shiftos_next/shiftos_next.vbproj.user b/shiftos_next/shiftos_next.vbproj.user index a4a6cdf..fe7dc22 100644 --- a/shiftos_next/shiftos_next.vbproj.user +++ b/shiftos_next/shiftos_next.vbproj.user @@ -1,6 +1,6 @@  - ProjectFiles + ShowAllFiles \ No newline at end of file