diff --git a/ShiftOS/Colour Picker.vb b/ShiftOS/Colour Picker.vb
index ee4676c..e1c3065 100644
--- a/ShiftOS/Colour Picker.vb
+++ b/ShiftOS/Colour Picker.vb
@@ -1762,6 +1762,10 @@
Shifter.shifterskinimages(6) = ""
Shifter.shifterskinimages(7) = ""
Shifter.shifterskinimages(8) = ""
+ Case "Username Panel Background"
+ Shifter.usernamebgcolor = pnlnewcolour.BackColor
+ Case "Shutdown Button Background"
+ Shifter.powerpanelbgcolor = pnlnewcolour.BackColor
Case "App Launcher Button Colour"
Shifter.applauncherbuttoncolour = pnlnewcolour.BackColor
If Shifter.skinapplauncherbutton(0) Is Nothing Then Else Shifter.skinapplauncherbutton(0).Dispose()
diff --git a/ShiftOS/Graphic Picker.vb b/ShiftOS/Graphic Picker.vb
index 6be6615..7752f46 100644
--- a/ShiftOS/Graphic Picker.vb
+++ b/ShiftOS/Graphic Picker.vb
@@ -14,7 +14,7 @@
Public imagelocations(2) As String
Dim skinimages(100) As String
Dim firstrun As Boolean = True
-
+#Region "Template Code"
Private Sub Template_Load(sender As Object, e As EventArgs) Handles MyBase.Load
justopened = True
Me.Left = (Screen.PrimaryScreen.Bounds.Width - Me.Width) / 2
@@ -29,7 +29,7 @@
ShiftOSDesktop.setpanelbuttonappearnce(ShiftOSDesktop.pnlpanelbuttongraphicpicker, ShiftOSDesktop.tbgraphicpickericon, ShiftOSDesktop.tbgraphicpickertext, True)
ShiftOSDesktop.programsopen = ShiftOSDesktop.programsopen + 1
- Array.Copy(Shifter.shifterskinimages, skinimages, skinimages.Length)
+ Array.Copy(Shifter.shifterskinimages, skinimages, Shifter.shifterskinimages.Length)
'For a = 0 To skinimages.Length - 1
' skinimages(a) = Shifter.shifterskinimages(a).Clone
'Next
@@ -394,12 +394,17 @@
End Sub
'end of general setup
+#End Region
Private Sub setupgraphics()
lblobjecttoskin.Text = graphictochange
picgraphic.Dock = DockStyle.None
Select Case graphictochange
+ Case "Shutdown Button Background"
+ setpreviewsizes(Shifter.startWidth, Shifter.startHeight, Shifter.skinshutdownbutton, Shifter.pwrbglayout, 51, 52, 53)
+ Case "Username Panel Background"
+ setpreviewsizes(Shifter.startWidth, Shifter.startHeight, Shifter.skinuserpanel, Shifter.usrbglayout, 48, 49, 50)
Case "Close Button"
setpreviewsizes(Shifter.closebuttonwidth, Shifter.closebuttonheight, Shifter.skinclosebutton, Shifter.skinclosebuttonstyle, 0, 1, 2)
Case "Title Bar"
@@ -439,6 +444,14 @@
Private Sub btnapply_Click(sender As Object, e As EventArgs) Handles btnapply.Click
Select Case graphictochange
+ Case "Shutdown Button Background"
+ Array.Copy(images, Shifter.skinshutdownbutton, Shifter.pwrbglayout)
+ Shifter.skinshutdownbutton(0) = Image.FromFile(imagelocations(0).Clone)
+ Shifter.pwrbglayout = imagestyle
+ Case "Username Panel Background"
+ Array.Copy(images, Shifter.skinuserpanel, Shifter.usrbglayout)
+ Shifter.skinuserpanel(0) = Image.FromFile(imagelocations(0).Clone)
+ Shifter.usrbglayout = imagestyle
Case "Close Button"
Array.Copy(images, Shifter.skinclosebutton, Shifter.skinclosebutton.Length)
Shifter.shifterskinimages(0) = imagelocations(0).Clone
diff --git a/ShiftOS/Helper.vb b/ShiftOS/Helper.vb
index 167665c..29799eb 100644
--- a/ShiftOS/Helper.vb
+++ b/ShiftOS/Helper.vb
@@ -6,4 +6,11 @@
Public Sub setCP(points As Integer) 'Set the CP
ShiftOSDesktop.codepoints = points
End Sub
+
+ Public Sub removeCP(points As Integer)
+ ShiftOSDesktop.codepoints = ShiftOSDesktop.codepoints - points
+ End Sub
+ Public Sub playSound(path As String, playMode As AudioPlayMode)
+ My.Computer.Audio.Play(path, playMode)
+ End Sub
End Class
diff --git a/ShiftOS/ShiftOSDesktop.Designer.vb b/ShiftOS/ShiftOSDesktop.Designer.vb
index edc4d5e..a1fd4cf 100644
--- a/ShiftOS/ShiftOSDesktop.Designer.vb
+++ b/ShiftOS/ShiftOSDesktop.Designer.vb
@@ -163,7 +163,7 @@ Partial Class ShiftOSDesktop
Me.WebBrowserToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.VideoplayerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.VirusScannerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+ Me.unitySeperator = New System.Windows.Forms.ToolStripSeparator()
Me.UnityToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShutdownToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.timepanel = New System.Windows.Forms.Panel()
@@ -198,7 +198,7 @@ Partial Class ShiftOSDesktop
Me.pnladvmain = New System.Windows.Forms.Panel()
Me.tscadvmainframe = New System.Windows.Forms.ToolStripContainer()
Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
- Me.ToolStripButton1 = New System.Windows.Forms.ToolStripDropDownButton()
+ Me.allPrograms = New System.Windows.Forms.ToolStripDropDownButton()
Me.UtilitiesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.TerminalToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.FileSkimmerToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
@@ -1654,7 +1654,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.ShiftnetToolStripMenuItem, Me.ShiftoriumToolStripMenuItem, Me.SkinLoaderToolStripMenuItem, Me.SkinShifterToolStripMenuItem, Me.SnakeyToolStripMenuItem, Me.sysinfoToolStripMenuItem, Me.TerminalToolStripMenuItem, Me.TextPadToolStripMenuItem, Me.WebBrowserToolStripMenuItem, Me.VideoplayerToolStripMenuItem, Me.VirusScannerToolStripMenuItem, Me.ToolStripSeparator1, Me.UnityToolStripMenuItem, Me.ShutdownToolStripMenuItem})
+ 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.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)
@@ -1847,12 +1847,12 @@ Partial Class ShiftOSDesktop
Me.VirusScannerToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
Me.VirusScannerToolStripMenuItem.Text = "Virus Scanner"
'
- 'ToolStripSeparator1
+ 'unitySeperator
'
- Me.ToolStripSeparator1.BackColor = System.Drawing.Color.Transparent
- Me.ToolStripSeparator1.ForeColor = System.Drawing.Color.White
- Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(211, 6)
+ Me.unitySeperator.BackColor = System.Drawing.Color.Transparent
+ Me.unitySeperator.ForeColor = System.Drawing.Color.White
+ Me.unitySeperator.Name = "unitySeperator"
+ Me.unitySeperator.Size = New System.Drawing.Size(211, 6)
'
'UnityToolStripMenuItem
'
@@ -2102,27 +2102,27 @@ Partial Class ShiftOSDesktop
'
Me.ToolStrip1.Dock = System.Windows.Forms.DockStyle.None
Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
- Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton1})
+ Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.allPrograms})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
Me.ToolStrip1.Size = New System.Drawing.Size(184, 25)
Me.ToolStrip1.Stretch = True
Me.ToolStrip1.TabIndex = 0
'
- 'ToolStripButton1
+ 'allPrograms
'
- Me.ToolStripButton1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UtilitiesToolStripMenuItem, Me.SettingsToolStripMenuItem, Me.InternetToolStripMenuItem, Me.GamesToolStripMenuItem, Me.AccessoriesToolStripMenuItem})
- Me.ToolStripButton1.Image = Global.ShiftOS.My.Resources.Resources.iconFileSkimmer
- Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripButton1.Name = "ToolStripButton1"
- Me.ToolStripButton1.Size = New System.Drawing.Size(104, 22)
- Me.ToolStripButton1.Text = "All Programs"
+ Me.allPrograms.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UtilitiesToolStripMenuItem, Me.SettingsToolStripMenuItem, Me.InternetToolStripMenuItem, Me.GamesToolStripMenuItem, Me.AccessoriesToolStripMenuItem})
+ Me.allPrograms.Image = Global.ShiftOS.My.Resources.Resources.iconFileSkimmer
+ Me.allPrograms.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.allPrograms.Name = "allPrograms"
+ Me.allPrograms.Size = New System.Drawing.Size(104, 22)
+ Me.allPrograms.Text = "All Programs"
'
'UtilitiesToolStripMenuItem
'
Me.UtilitiesToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TerminalToolStripMenuItem1, Me.FileSkimmerToolStripMenuItem1, Me.SystemInformationToolStripMenuItem})
Me.UtilitiesToolStripMenuItem.Name = "UtilitiesToolStripMenuItem"
- Me.UtilitiesToolStripMenuItem.Size = New System.Drawing.Size(135, 22)
+ Me.UtilitiesToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.UtilitiesToolStripMenuItem.Text = "Utilities"
'
'TerminalToolStripMenuItem1
@@ -2147,7 +2147,7 @@ Partial Class ShiftOSDesktop
'
Me.SettingsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ShifterToolStripMenuItem1, Me.SkinLoaderToolStripMenuItem1, Me.SkinShifterToolStripMenuItem1, Me.IconManagerToolStripMenuItem1, Me.NameChangerToolStripMenuItem1})
Me.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"
- Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(135, 22)
+ Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.SettingsToolStripMenuItem.Text = "Settings"
'
'ShifterToolStripMenuItem1
@@ -2184,7 +2184,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.InternetToolStripMenuItem.Name = "InternetToolStripMenuItem"
- Me.InternetToolStripMenuItem.Size = New System.Drawing.Size(135, 22)
+ Me.InternetToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.InternetToolStripMenuItem.Text = "Internet"
'
'ShiftnetToolStripMenuItem1
@@ -2245,7 +2245,7 @@ Partial Class ShiftOSDesktop
'
Me.GamesToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DodgeToolStripMenuItem1, Me.SnakeyToolStripMenuItem1, Me.PongToolStripMenuItem1, Me.KnowledgeInputToolStripMenuItem1, Me.LabyrinthToolStripMenuItem})
Me.GamesToolStripMenuItem.Name = "GamesToolStripMenuItem"
- Me.GamesToolStripMenuItem.Size = New System.Drawing.Size(135, 22)
+ Me.GamesToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.GamesToolStripMenuItem.Text = "Games"
'
'DodgeToolStripMenuItem1
@@ -2282,7 +2282,7 @@ Partial Class ShiftOSDesktop
'
Me.AccessoriesToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ArtpadToolStripMenuItem1, Me.TextpadToolStripMenuItem1, Me.OrcWriteToolStripMenuItem1, Me.AudioPlayerToolStripMenuItem1, Me.VideoPlayerToolStripMenuItem1, Me.ClockToolStripMenuItem1, Me.CalculatorToolStripMenuItem1})
Me.AccessoriesToolStripMenuItem.Name = "AccessoriesToolStripMenuItem"
- Me.AccessoriesToolStripMenuItem.Size = New System.Drawing.Size(135, 22)
+ Me.AccessoriesToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.AccessoriesToolStripMenuItem.Text = "Accessories"
'
'ArtpadToolStripMenuItem1
@@ -2556,7 +2556,7 @@ Partial Class ShiftOSDesktop
Friend WithEvents ShiftoriumToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents ClockToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents TerminalToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
+ Friend WithEvents unitySeperator As System.Windows.Forms.ToolStripSeparator
Friend WithEvents ShutdownToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents paneltimetext As System.Windows.Forms.Label
Friend WithEvents clocktick As System.Windows.Forms.Timer
@@ -2724,7 +2724,7 @@ Partial Class ShiftOSDesktop
Friend WithEvents pnladvmain As System.Windows.Forms.Panel
Friend WithEvents tscadvmainframe As System.Windows.Forms.ToolStripContainer
Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip
- Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripDropDownButton
+ Friend WithEvents allPrograms As System.Windows.Forms.ToolStripDropDownButton
Friend WithEvents UtilitiesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents TerminalToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents FileSkimmerToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
diff --git a/ShiftOS/ShiftOSDesktop.vb b/ShiftOS/ShiftOSDesktop.vb
index 063cd03..8a8276a 100644
--- a/ShiftOS/ShiftOSDesktop.vb
+++ b/ShiftOS/ShiftOSDesktop.vb
@@ -1993,8 +1993,26 @@
'DevX's Advanced App Launcher Skin Code
+ For Each item In allPrograms.DropDownItems 'Clever way of adding proper font to All Programs, where each subitem of each item is skinned. This uses the default App Launcher skinning system, so you could
+ 'indeed rip an entire XP skin, as this engine is also used by the Desktop++ Right-click menu.
+ item.ForeColor = Skins.launcheritemcolour
+ item.Font = New Font(Skins.launcheritemfont, Skins.launcheritemsize, Skins.launcheritemstyle)
+ For Each subitem In item.DropDownItems
+ subitem.ForeColor = Skins.launcheritemcolour
+ subitem.Font = New Font(Skins.launcheritemfont, Skins.launcheritemsize, Skins.launcheritemstyle)
+ Next
+ Next
+
+
lbuser.Font = New Font(Skins.usernamefont, Skins.usernamefontsize, Skins.usernamefontstyle)
lbuser.ForeColor = Skins.usernametextcolor
+ lbuser.BackColor = Skins.userNamePanelBackgroundColor
+ If IsNothing(Skins.userNamePanelBackground) Then lbuser.BackgroundImage = Nothing Else lbuser.BackgroundImage = Skins.userNamePanelBackground
+ lbuser.BackgroundImageLayout = Skins.usrPanelBackgroundLayout
+ btnadvshutdown.BackColor = Skins.powerPanelBackgroundColor
+ If IsNothing(Skins.powerPanelBackgroundImage) Then btnadvshutdown.BackgroundImage = Nothing Else btnadvshutdown.BackgroundImage = Skins.powerPanelBackgroundImage
+ btnadvshutdown.BackgroundImageLayout = Skins.pwrPanelBackgroundLayout
+
If Skins.recentIconsHorizontal = True Then
lvadvfiles.Alignment = ListViewAlignment.Top
lvadvfiles.View = View.LargeIcon
@@ -2039,13 +2057,13 @@
'Desktop++ Skin Code
ContextMenuStrip1.ForeColor = Skins.launcheritemcolour
ContextMenuStrip1.Font = New Font(Skins.launcheritemfont, Skins.launcheritemsize, Skins.launcheritemstyle)
- For Each Item In NewToolStripMenuItem.DropDownItems
- Item.ForeColor = Skins.launcheritemcolour
- Item.Font = New Font(Skins.launcheritemfont, Skins.launcheritemsize, Skins.launcheritemstyle)
+ For Each item In NewToolStripMenuItem.DropDownItems
+ item.ForeColor = Skins.launcheritemcolour
+ item.Font = New Font(Skins.launcheritemfont, Skins.launcheritemsize, Skins.launcheritemstyle)
Next
- For Each Item In TileViewToolStripMenuItem.DropDownItems
- Item.ForeColor = Skins.launcheritemcolour
- Item.Font = New Font(Skins.launcheritemfont, Skins.launcheritemsize, Skins.launcheritemstyle)
+ For Each item In TileViewToolStripMenuItem.DropDownItems
+ item.ForeColor = Skins.launcheritemcolour
+ item.Font = New Font(Skins.launcheritemfont, Skins.launcheritemsize, Skins.launcheritemstyle)
Next
'End Desktop++ Code
@@ -2329,18 +2347,18 @@
If boughtapplaunchershutdown = True Then
ShutdownToolStripMenuItem.Visible = True
- ToolStripSeparator1.Visible = True
+ unitySeperator.Visible = True
If boughtshutdownicon = True Then
ShutdownToolStripMenuItem.Image = shutdowniconlauncher
End If
Else
ShutdownToolStripMenuItem.Visible = False
- ToolStripSeparator1.Visible = False
+ unitySeperator.Visible = False
End If
If boughtunitymodetoggle = True Then
UnityToolStripMenuItem.Visible = True
- ToolStripSeparator1.Visible = True
+ unitySeperator.Visible = True
If boughtunitytoggleicon = True Then
UnityToolStripMenuItem.Image = unitytoggleiconlauncher
End If
@@ -2363,6 +2381,13 @@
setuppanelbuttons()
ApplicationsToolStripMenuItem.BackColor = Skins.applauncherbuttoncolour
+ 'Fixes an AL bug with ADVAL
+
+ If Skins.useClassicAppLauncher = False Then
+ For Each item In ApplicationsToolStripMenuItem.DropDownItems
+ item.Visible = False
+ Next
+ End If
End Sub
@@ -5077,6 +5102,7 @@
hideStart()
Else
infobox.showinfo("Error", "Could not find app 'Pong'.")
+ End If
End Sub
Private Sub KnowledgeInputToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles KnowledgeInputToolStripMenuItem1.Click
@@ -5188,8 +5214,8 @@
End Sub
Private Sub ApplicationsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ApplicationsToolStripMenuItem.Click
- If boughtadvapplauncher = False Then
- ApplicationsToolStripMenuItem.DropDownItems.Clear()
+ 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
@@ -5202,7 +5228,7 @@
Case "Bottom"
pnladvapplauncher.Location = New Point(0, Me.Height - desktoppanel.Height - pnladvapplauncher.Height)
End Select
- setupdesktop()
+ refreshIcons()
End If
End Sub
End Class
\ No newline at end of file
diff --git a/ShiftOS/Shifter.resx b/ShiftOS/Shifter.resx
index 129a7a4..d1df8e2 100644
--- a/ShiftOS/Shifter.resx
+++ b/ShiftOS/Shifter.resx
@@ -142,9 +142,6 @@ The basic process of modifying your ShiftOS interface is very simple. You first
680, 17
-
- 680, 17
-
Welcome to the desktop settings panel. Here you can modify the appearance of the controls that are displayed on your desktop. Just select a sub option to the left to get started!
diff --git a/ShiftOS/Shifter.vb b/ShiftOS/Shifter.vb
index bee2b97..dcf1092 100644
--- a/ShiftOS/Shifter.vb
+++ b/ShiftOS/Shifter.vb
@@ -119,6 +119,8 @@
Public skinpanelbuttonstyle As ImageLayout = ImageLayout.Stretch
Public skinminimizebutton(2) As Image
Public skinminimizebuttonstyle As ImageLayout = ImageLayout.Stretch
+ Public skinuserpanel(2) As Image
+ Public skinshutdownbutton(2) As Image
Public customizationtimepoints As Integer
Public customizationsdone As Integer
@@ -127,6 +129,8 @@
'DevX's ADV. App Launcher
+ Public startWidth As Integer = Skins.startWidth
+ Public startHeight As Integer = Skins.startHeight
Public usernametextcolor As Color = Skins.usernametextcolor
Public shutdowntextcolor As Color = Skins.shutdownTextColor
Public usernamebgcolor As Color = Skins.userNamePanelBackgroundColor
@@ -623,6 +627,9 @@
launcheritemfont.Text = Skins.launcheritemfont
icontextcolor = Skins.icontextcolor
+ skinuserpanel(0) = userNamePanelBackground
+ skinshutdownbutton(0) = powerpanelbgimage
+
'Uncomment when I (The Ultimate Hacker) have gotten the Shiftnet Download for
'Desktop++ Done:
@@ -1446,8 +1453,19 @@
Skins.usernamefont = usernamefont
Skins.usernamefontsize = usernamefontsize
Skins.usernamefontstyle = usernamefontstyle
-
-
+ Skins.userNamePanelBackgroundColor = usernamebgcolor
+ Try
+ Skins.userNamePanelBackground = skinuserpanel(0)
+ Catch
+ Skins.userNamePanelBackground = Nothing
+ End Try
+ Skins.powerPanelBackgroundColor = powerpanelbgcolor
+ Try
+ Skins.powerPanelBackgroundImage = skinshutdownbutton(0)
+ Catch
+ Skins.powerPanelBackgroundImage = Nothing
+ End Try
+ Skins.pwrPanelBackgroundLayout = pwrbglayout
' APPLY
Skins.saveskinfiles(True)
'windows resize fix
@@ -3206,4 +3224,39 @@
End Sub
+ Private Sub btnaalusrpnlbg_Click(sender As Object, e As MouseEventArgs) Handles btnaalusrpnlbg.MouseDown
+ If e.Button = Windows.Forms.MouseButtons.Right Then
+ Graphic_Picker.graphictochange = "Username Panel Background"
+ Graphic_Picker.ShowDialog()
+ Try
+ btnaalusrpnlbg.BackgroundImage = skinuserpanel(0)
+ Catch
+ btnaalusrpnlbg.BackgroundImage = Nothing
+ End Try
+ btnaalusrpnlbg.BackgroundImageLayout = usrbglayout
+ Else
+ Colour_Picker.colourtochange = "Username Panel Background"
+ Colour_Picker.oldcolour = usernamebgcolor
+ Colour_Picker.ShowDialog()
+ btnaalusrpnlbg.BackColor = usernamebgcolor
+ End If
+ End Sub
+
+ Private Sub btnaalpwrpnlbg_Click(sender As Object, e As MouseEventArgs) Handles btnaalpwrpnlbg.MouseDown
+ If e.Button = Windows.Forms.MouseButtons.Right Then
+ Graphic_Picker.graphictochange = "Shutdown Button Background"
+ Graphic_Picker.ShowDialog()
+ Try
+ btnaalpwrpnlbg.BackgroundImage = skinshutdownbutton(0)
+ Catch
+ btnaalpwrpnlbg.BackgroundImage = Nothing
+ End Try
+ btnaalpwrpnlbg.BackgroundImageLayout = usrbglayout
+ Else
+ Colour_Picker.colourtochange = "Shutdown Button Background"
+ Colour_Picker.oldcolour = powerpanelbgcolor
+ Colour_Picker.ShowDialog()
+ btnaalpwrpnlbg.BackColor = usernamebgcolor
+ End If
+ End Sub
End Class
\ No newline at end of file
diff --git a/ShiftOS/skins.vb b/ShiftOS/skins.vb
index ef2f9f1..8473fdf 100644
--- a/ShiftOS/skins.vb
+++ b/ShiftOS/skins.vb
@@ -170,7 +170,7 @@ Module Skins
Public shutdownTextStyle As FontStyle = FontStyle.Italic
Public usrPanelBackgroundLayout As ImageLayout = ImageLayout.Stretch
Public pwrPanelBackgroundLayout As ImageLayout = ImageLayout.Stretch
-
+ Public useClassicAppLauncher As Boolean = True
Private Function GetImage(ByVal fileName As String) As Bitmap
Dim ret As Bitmap
@@ -195,7 +195,7 @@ Module Skins
userNamePanelBackground = GetImage(savepath + "Shiftum42\Skins\Loaded\userbar")
End If
If File.Exists(savepath + "Shiftum42\Skins\Loaded\powerbar") Then
- userNamePanelBackground = GetImage(savepath + "Shiftum42\Skins\Loaded\powerbar")
+ powerPanelBackgroundImage = GetImage(savepath + "Shiftum42\Skins\Loaded\powerbar")
End If
If File.Exists(savepath + "Shiftum42\Skins\Loaded\titlebar") Then
titlebar = GetImage(savepath + "Shiftum42\Skins\Loaded\titlebar")
@@ -419,11 +419,11 @@ Module Skins
If loaddata(117) = "" Then startHeight = 526 Else startHeight = loaddata(117)
If loaddata(118) = "" Then startWidth = 320 Else startWidth = loaddata(118)
If loaddata(119) = "" Then shutdownstring = "Shut Down ShiftOS" Else shutdownstring = loaddata(119)
- If loaddata(120) = "" Then userNamePosition = "Middle, Right" Else userNamePosition = loaddata(200)
- If loaddata(121) = "" Then recentIconsHorizontal = False Else recentIconsHorizontal = loaddata(201)
- If loaddata(122) = "" Then usernametextcolor = Color.White Else usernametextcolor = Color.FromArgb(loaddata(202))
- If loaddata(123) = "" Then usernamefont = "Trebuchet MS" Else usernamefont = loaddata(203)
- If loaddata(124) = "" Then usernamefontsize = 12 Else usernamefontsize = loaddata(204)
+ If loaddata(120) = "" Then userNamePosition = "Middle, Right" Else userNamePosition = loaddata(120)
+ If loaddata(121) = "" Then recentIconsHorizontal = False Else recentIconsHorizontal = loaddata(121)
+ If loaddata(122) = "" Then usernametextcolor = Color.White Else usernametextcolor = Color.FromArgb(loaddata(122))
+ If loaddata(123) = "" Then usernamefont = "Trebuchet MS" Else usernamefont = loaddata(123)
+ If loaddata(124) = "" Then usernamefontsize = 12 Else usernamefontsize = loaddata(124)
If loaddata(125) = "" Then usernamefontstyle = FontStyle.Bold Else usernamefontstyle = loaddata(125)
If loaddata(126) = "" Then userNamePanelBackgroundColor = Color.Gray Else userNamePanelBackgroundColor = Color.FromArgb(loaddata(126))
If loaddata(127) = "" Then powerPanelBackgroundColor = Color.Gray Else powerPanelBackgroundColor = Color.FromArgb(loaddata(127))
@@ -433,7 +433,7 @@ Module Skins
If loaddata(131) = "" Then shutdownTextStyle = FontStyle.Italic Else shutdownTextStyle = loaddata(132)
If loaddata(132) = "" Then usrPanelBackgroundLayout = ImageLayout.Stretch Else usrPanelBackgroundLayout = loaddata(132)
If loaddata(133) = "" Then pwrPanelBackgroundLayout = ImageLayout.Stretch Else pwrPanelBackgroundLayout = loaddata(133)
-
+ If loaddata(134) = "" Then useClassicAppLauncher = False Else useClassicAppLauncher = loaddata(134)
Else
setupdefaults()
@@ -633,6 +633,7 @@ Module Skins
savedata(131) = shutdownTextStyle
savedata(132) = usrPanelBackgroundLayout
savedata(133) = pwrPanelBackgroundLayout
+ savedata(134) = useClassicAppLauncher
' End of skin data text was at line 110, if adding future items, check for "End of skin data" on line 110
savedata(200) = "End of skin data"