mirror of
https://github.com/TheUltimateHacker/ShiftOS.git
synced 2025-01-22 16:12:14 +00:00
Last-Minute Commit for Alpha 1
This commit adds last-minute bugfixes and features such as a new Terminal command to turn the Advanced App Launcher on or off. It also fixes a skinning bug with Catalyst's classic App Launcher menu item.
This commit is contained in:
TheUltimateHacker
parent
850716b2a8
commit
7529ee9b32
3 changed files with 50 additions and 29 deletions
20
ShiftOS/ShiftOSDesktop.Designer.vb
generated
20
ShiftOS/ShiftOSDesktop.Designer.vb
generated
|
|
@ -155,6 +155,7 @@ Partial Class ShiftOSDesktop
|
|||
Me.orcwriteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.PongToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ShifterToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.CatalystToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ShiftnetToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ShiftoriumToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.SkinLoaderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
|
|
@ -244,7 +245,6 @@ Partial Class ShiftOSDesktop
|
|||
Me.btnadvshutdown = New System.Windows.Forms.Button()
|
||||
Me.pnladvtopbar = New System.Windows.Forms.Panel()
|
||||
Me.lbuser = New System.Windows.Forms.Label()
|
||||
Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.desktoppanel.SuspendLayout()
|
||||
Me.pnlpanelbuttonholder.SuspendLayout()
|
||||
Me.pnlpanelbuttonclock.SuspendLayout()
|
||||
|
|
@ -1697,7 +1697,7 @@ Partial Class ShiftOSDesktop
|
|||
Me.ApplicationsToolStripMenuItem.AutoSize = False
|
||||
Me.ApplicationsToolStripMenuItem.BackColor = System.Drawing.Color.Transparent
|
||||
Me.ApplicationsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
|
||||
Me.ApplicationsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ArtpadToolStripMenuItem, Me.AudioplayerToolStripMenuItem, Me.BitnoteDiggerToolStripMenuItem, Me.BitnoteWalletToolStripMenuItem, Me.CalculatorToolStripMenuItem, Me.ClockToolStripMenuItem, Me.DodgeToolStripMenuItem, Me.downloadmanagerToolStripMenuItem, Me.FileSkimmerToolStripMenuItem, Me.FloodGateToolStripMenuItem, Me.IconManagerToolStripMenuItem, Me.InstallerToolStripMenuItem, Me.KnowledgeInputToolStripMenuItem, Me.MazeToolStripMenuItem, Me.NameChangerToolStripMenuItem, Me.orcwriteToolStripMenuItem, Me.PongToolStripMenuItem, Me.ShifterToolStripMenuItem, Me.ToolStripMenuItem1, Me.ShiftnetToolStripMenuItem, Me.ShiftoriumToolStripMenuItem, Me.SkinLoaderToolStripMenuItem, Me.SkinShifterToolStripMenuItem, Me.SnakeyToolStripMenuItem, Me.sysinfoToolStripMenuItem, Me.TerminalToolStripMenuItem, Me.TextPadToolStripMenuItem, Me.WebBrowserToolStripMenuItem, Me.VideoplayerToolStripMenuItem, Me.VirusScannerToolStripMenuItem, Me.unitySeperator, Me.UnityToolStripMenuItem, Me.ShutdownToolStripMenuItem})
|
||||
Me.ApplicationsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ArtpadToolStripMenuItem, Me.AudioplayerToolStripMenuItem, Me.BitnoteDiggerToolStripMenuItem, Me.BitnoteWalletToolStripMenuItem, Me.CalculatorToolStripMenuItem, Me.CatalystToolStripMenuItem1, Me.ClockToolStripMenuItem, Me.DodgeToolStripMenuItem, Me.downloadmanagerToolStripMenuItem, Me.FileSkimmerToolStripMenuItem, Me.FloodGateToolStripMenuItem, Me.IconManagerToolStripMenuItem, Me.InstallerToolStripMenuItem, Me.KnowledgeInputToolStripMenuItem, Me.MazeToolStripMenuItem, Me.NameChangerToolStripMenuItem, Me.orcwriteToolStripMenuItem, Me.PongToolStripMenuItem, Me.ShifterToolStripMenuItem, Me.ShiftnetToolStripMenuItem, Me.ShiftoriumToolStripMenuItem, Me.SkinLoaderToolStripMenuItem, Me.SkinShifterToolStripMenuItem, Me.SnakeyToolStripMenuItem, Me.sysinfoToolStripMenuItem, Me.TerminalToolStripMenuItem, Me.TextPadToolStripMenuItem, Me.WebBrowserToolStripMenuItem, Me.VideoplayerToolStripMenuItem, Me.VirusScannerToolStripMenuItem, Me.unitySeperator, Me.UnityToolStripMenuItem, Me.ShutdownToolStripMenuItem})
|
||||
Me.ApplicationsToolStripMenuItem.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.749999!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.ApplicationsToolStripMenuItem.Name = "ApplicationsToolStripMenuItem"
|
||||
Me.ApplicationsToolStripMenuItem.Padding = New System.Windows.Forms.Padding(2, 0, 2, 0)
|
||||
|
|
@ -1820,6 +1820,12 @@ Partial Class ShiftOSDesktop
|
|||
Me.ShifterToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
|
||||
Me.ShifterToolStripMenuItem.Text = "Shifter"
|
||||
'
|
||||
'CatalystToolStripMenuItem1
|
||||
'
|
||||
Me.CatalystToolStripMenuItem1.Name = "CatalystToolStripMenuItem1"
|
||||
Me.CatalystToolStripMenuItem1.Size = New System.Drawing.Size(214, 22)
|
||||
Me.CatalystToolStripMenuItem1.Text = "Catalyst"
|
||||
'
|
||||
'ShiftnetToolStripMenuItem
|
||||
'
|
||||
Me.ShiftnetToolStripMenuItem.Name = "ShiftnetToolStripMenuItem"
|
||||
|
|
@ -2227,7 +2233,7 @@ Partial Class ShiftOSDesktop
|
|||
'
|
||||
Me.InternetToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ShiftnetToolStripMenuItem1, Me.ShiftoriumToolStripMenuItem1, Me.WebBrowserToolStripMenuItem1, Me.DownloadManagerToolStripMenuItem1, Me.InstallerToolStripMenuItem1, Me.BitnoteDiggerToolStripMenuItem1, Me.BitnoteWalletToolStripMenuItem1, Me.FloodGateManagerToolStripMenuItem, Me.VirusScannerToolStripMenuItem1, Me.CatalystToolStripMenuItem})
|
||||
Me.InternetToolStripMenuItem.Name = "InternetToolStripMenuItem"
|
||||
Me.InternetToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
|
||||
Me.InternetToolStripMenuItem.Size = New System.Drawing.Size(135, 22)
|
||||
Me.InternetToolStripMenuItem.Text = "Internet"
|
||||
'
|
||||
'ShiftnetToolStripMenuItem1
|
||||
|
|
@ -2453,12 +2459,6 @@ Partial Class ShiftOSDesktop
|
|||
Me.lbuser.Text = "Username"
|
||||
Me.lbuser.TextAlign = System.Drawing.ContentAlignment.MiddleRight
|
||||
'
|
||||
'ToolStripMenuItem1
|
||||
'
|
||||
Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
|
||||
Me.ToolStripMenuItem1.Size = New System.Drawing.Size(214, 22)
|
||||
Me.ToolStripMenuItem1.Text = "Catalyst"
|
||||
'
|
||||
'ShiftOSDesktop
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
|
|
@ -2828,5 +2828,5 @@ Partial Class ShiftOSDesktop
|
|||
Friend WithEvents tbcatalysticon As System.Windows.Forms.PictureBox
|
||||
Friend WithEvents lbcatalystname As System.Windows.Forms.Label
|
||||
Friend WithEvents CatalystToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
|
||||
Friend WithEvents ToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
|
||||
Friend WithEvents CatalystToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
|
||||
End Class
|
||||
|
|
|
|||
|
|
@ -1911,6 +1911,9 @@
|
|||
TextPadToolStripMenuItem.Text = textpadname
|
||||
SkinLoaderToolStripMenuItem.Text = skinloadername
|
||||
ArtpadToolStripMenuItem.Text = artpadname
|
||||
CatalystToolStripMenuItem1.Text = catalystname
|
||||
CatalystToolStripMenuItem1.ForeColor = Skins.launcheritemcolour
|
||||
CatalystToolStripMenuItem1.Font = New Font(Skins.launcheritemfont, Skins.launcheritemsize, Skins.launcheritemstyle)
|
||||
CalculatorToolStripMenuItem.Text = calculatorname
|
||||
AudioplayerToolStripMenuItem.Text = audioplayername
|
||||
WebBrowserToolStripMenuItem.Text = webbrowsername
|
||||
|
|
@ -2384,10 +2387,14 @@
|
|||
ApplicationsToolStripMenuItem.BackColor = Skins.applauncherbuttoncolour
|
||||
'Fixes an AL bug with ADVAL
|
||||
|
||||
If Skins.useClassicAppLauncher = False Then
|
||||
If boughtadvapplauncher = True Then
|
||||
For Each item In ApplicationsToolStripMenuItem.DropDownItems
|
||||
item.Visible = False
|
||||
Next
|
||||
Else
|
||||
For Each item In ApplicationsToolStripMenuItem.DropDownItems
|
||||
item.Visible = True
|
||||
Next
|
||||
End If
|
||||
End Sub
|
||||
|
||||
|
|
@ -5221,24 +5228,22 @@
|
|||
End Sub
|
||||
|
||||
Private Sub ApplicationsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ApplicationsToolStripMenuItem.Click
|
||||
'boughtadvapplauncher = True
|
||||
'Skins.useClassicAppLauncher = True
|
||||
'If boughtadvapplauncher = False And Skins.useClassicAppLauncher = False Then 'Change false to true when the ability to buy the Advanced App Launcher from the Shiftnet is finished.
|
||||
ApplicationsToolStripMenuItem.HideDropDown()
|
||||
If pnladvapplauncher.Visible = False Then
|
||||
pnladvapplauncher.Show()
|
||||
Else
|
||||
pnladvapplauncher.Hide()
|
||||
If boughtadvapplauncher = True Then
|
||||
ApplicationsToolStripMenuItem.HideDropDown()
|
||||
If pnladvapplauncher.Visible = False Then
|
||||
pnladvapplauncher.Show()
|
||||
Else
|
||||
pnladvapplauncher.Hide()
|
||||
End If
|
||||
lbuser.Text = username
|
||||
Select Case Skins.desktoppanelposition
|
||||
Case "Top"
|
||||
pnladvapplauncher.Location = New Point(0, desktoppanel.Height)
|
||||
Case "Bottom"
|
||||
pnladvapplauncher.Location = New Point(0, Me.Height - desktoppanel.Height - pnladvapplauncher.Height)
|
||||
End Select
|
||||
refreshIcons()
|
||||
End If
|
||||
lbuser.Text = username
|
||||
Select Case Skins.desktoppanelposition
|
||||
Case "Top"
|
||||
pnladvapplauncher.Location = New Point(0, desktoppanel.Height)
|
||||
Case "Bottom"
|
||||
pnladvapplauncher.Location = New Point(0, Me.Height - desktoppanel.Height - pnladvapplauncher.Height)
|
||||
End Select
|
||||
refreshIcons()
|
||||
'End If
|
||||
End Sub
|
||||
|
||||
Private Sub StartFixer(sender As Object, e As MouseEventArgs) Handles desktopicons.MouseDown, pnlpanelbuttonholder.MouseDown
|
||||
|
|
@ -5250,7 +5255,7 @@
|
|||
Catalyst_Main.TopMost = True
|
||||
End Sub
|
||||
|
||||
Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem1.Click
|
||||
Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles CatalystToolStripMenuItem1.Click
|
||||
Catalyst_Main.Show()
|
||||
Catalyst_Main.TopMost = True
|
||||
End Sub
|
||||
|
|
|
|||
|
|
@ -584,6 +584,7 @@ Public Class Terminal
|
|||
If command Like "speak_infobox ""*"" ""*""" Then
|
||||
Dim findwords() As String = command.Split("""")
|
||||
Helper.speakInfoBox(findwords(1), findwords(3))
|
||||
further = False
|
||||
End If
|
||||
If command Like "speak ""*""" Then
|
||||
Dim findwords() As String = command.Split("""")
|
||||
|
|
@ -955,6 +956,17 @@ Public Class Terminal
|
|||
|
||||
If further = True Then
|
||||
Select Case command
|
||||
Case "adv app launcher on"
|
||||
ShiftOSDesktop.boughtadvapplauncher = True
|
||||
ShiftOSDesktop.savegame()
|
||||
ShiftOSDesktop.setupdesktop()
|
||||
WriteLine("Advanced App Launcher has been turned on successfully. Use ""adv app launcher off"" to turn it off again.")
|
||||
Case "adv app launcher off"
|
||||
ShiftOSDesktop.boughtadvapplauncher = False
|
||||
ShiftOSDesktop.savegame()
|
||||
ShiftOSDesktop.setupdesktop()
|
||||
WriteLine("Advanced App Launcher has been turned off. Use ""adv app launcher on"" to turn it on again.")
|
||||
|
||||
Case "clear"
|
||||
txtterm.Text = ""
|
||||
Case "time"
|
||||
|
|
@ -1778,4 +1790,8 @@ Public Class Terminal
|
|||
shiftnetstorylinetiming = shiftnetstorylinetiming + 1
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Public Sub WriteLine(text As String)
|
||||
txtterm.Text = txtterm.Text + vbNewLine + text
|
||||
End Sub
|
||||
End Class
|
||||
Loading…
Reference in a new issue