aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS/ShiftOSDesktop.vb
diff options
context:
space:
mode:
authorpfg github <[email protected]>2015-03-16 07:34:26 -0700
committerpfg github <[email protected]>2015-03-16 07:34:26 -0700
commit3fbfbbdb0e9bfe2a9c6c0b79b873189a1bc96314 (patch)
tree614bc4b471ed9b2d91626c03cbb3f20a4f1894ee /ShiftOS/ShiftOSDesktop.vb
parentafbd2926d0d336cb608d40490c1188baf88d623d (diff)
downloadshiftos-3fbfbbdb0e9bfe2a9c6c0b79b873189a1bc96314.tar.gz
shiftos-3fbfbbdb0e9bfe2a9c6c0b79b873189a1bc96314.tar.bz2
shiftos-3fbfbbdb0e9bfe2a9c6c0b79b873189a1bc96314.zip
commented if statememt and fixed the build conflict. There is a tutorial in the dev room on how to fix them
Diffstat (limited to 'ShiftOS/ShiftOSDesktop.vb')
-rw-r--r--ShiftOS/ShiftOSDesktop.vb36
1 files changed, 19 insertions, 17 deletions
diff --git a/ShiftOS/ShiftOSDesktop.vb b/ShiftOS/ShiftOSDesktop.vb
index d0e19ef..51ba848 100644
--- a/ShiftOS/ShiftOSDesktop.vb
+++ b/ShiftOS/ShiftOSDesktop.vb
@@ -2390,7 +2390,7 @@
End If
End Sub
-
+
Public Sub setuppanelbuttons()
If boughtpanelbuttons Then
@@ -5214,21 +5214,23 @@
End Sub
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.
- 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
+ '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()
+ 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
End Class \ No newline at end of file