shiftos-archive/ShiftOS
1
0
Fork 0
mirror of https://github.com/TheUltimateHacker/ShiftOS.git synced 2025-01-22 16:12:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

commented if statememt and fixed the build conflict. There is a tutorial in the dev room on how to fix them

Browse source
This commit is contained in:
pfg github 2015-03-16 07:34:26 -07:00
parent afbd2926d0
commit 3fbfbbdb0e
2 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ShiftOS/ShiftOSDesktop.vb
View file

@ -5214,7 +5214,9 @@
End Sub End Sub
Private Sub ApplicationsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ApplicationsToolStripMenuItem.Click Private Sub ApplicationsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ApplicationsToolStripMenuItem.Click
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. '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() ApplicationsToolStripMenuItem.HideDropDown()
If pnladvapplauncher.Visible = False Then If pnladvapplauncher.Visible = False Then
pnladvapplauncher.Show() pnladvapplauncher.Show()
@ -5229,6 +5231,6 @@
pnladvapplauncher.Location = New Point(0, Me.Height - desktoppanel.Height - pnladvapplauncher.Height) pnladvapplauncher.Location = New Point(0, Me.Height - desktoppanel.Height - pnladvapplauncher.Height)
End Select End Select
refreshIcons() refreshIcons()
End If 'End If
End Sub End Sub
End Class End Class

8
ShiftOS/skins.vb
View file

@ -420,13 +420,6 @@ Module Skins
If loaddata(117) = "" Then startHeight = 526 Else startHeight = loaddata(117) If loaddata(117) = "" Then startHeight = 526 Else startHeight = loaddata(117)
If loaddata(118) = "" Then startWidth = 320 Else startWidth = loaddata(118) If loaddata(118) = "" Then startWidth = 320 Else startWidth = loaddata(118)
If loaddata(119) = "" Then shutdownstring = "Shut Down ShiftOS" Else shutdownstring = loaddata(119) If loaddata(119) = "" Then shutdownstring = "Shut Down ShiftOS" Else shutdownstring = loaddata(119)
<<<<<<< HEAD
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(120) = "" Then userNamePosition = "Middle, Right" Else userNamePosition = loaddata(200) If loaddata(120) = "" Then userNamePosition = "Middle, Right" Else userNamePosition = loaddata(200)
Try Try
If loaddata(121) = "" Then recentIconsHorizontal = False Else recentIconsHorizontal = loaddata(201) If loaddata(121) = "" Then recentIconsHorizontal = False Else recentIconsHorizontal = loaddata(201)
@ -439,7 +432,6 @@ Module Skins
recentIconsHorizontal = False recentIconsHorizontal = False
usernamefontsize = 12 usernamefontsize = 12
End Try End Try
>>>>>>> origin/master
If loaddata(125) = "" Then usernamefontstyle = FontStyle.Bold Else usernamefontstyle = loaddata(125) 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(126) = "" Then userNamePanelBackgroundColor = Color.Gray Else userNamePanelBackgroundColor = Color.FromArgb(loaddata(126))
If loaddata(127) = "" Then powerPanelBackgroundColor = Color.Gray Else powerPanelBackgroundColor = Color.FromArgb(loaddata(127)) If loaddata(127) = "" Then powerPanelBackgroundColor = Color.Gray Else powerPanelBackgroundColor = Color.FromArgb(loaddata(127))