Merge remote-tracking branch 'origin/master'

Conflicts:
	ShiftOS/skins.vb

ShiftOS/File Skimmer.vb

@@ -589,16 +589,28 @@ Public Class File_Skimmer
                 infobox.textinfo = "Unable to move into a higher directory due to error reading the requested folder on the drive." & Environment.NewLine & Environment.NewLine & "You can only enter directories formatted in the ShiftOS file system (ShiftFS)"
                 infobox.Show()
             Else
-                Dim endloop As Boolean = False
+                Dim directoryInfo As System.IO.DirectoryInfo
-                lbllocation.Text = lbllocation.Text.Substring(0, lbllocation.Text.Length - 1)
+                directoryInfo = System.IO.Directory.GetParent(lbllocation.Text)
+                If (directoryInfo.FullName = "C:\") Then Dim errerror As String = "an error" Else lbllocation.Text = directoryInfo.FullName
+
+                'Dim endloop As Boolean = False
+                'lbllocation.Text = lbllocation.Text.Substring(0, lbllocation.Text.Length - 1)
+
+                'While endloop = False
+                '    Try
+                '        If lbllocation.Text.Substring(lbllocation.Text.Length - 1) = "/" Then
+                '            endloop = True
+                '        Else
+                '            lbllocation.Text = lbllocation.Text.Substring(0, lbllocation.Text.Length - 1)
+                '        End If
+                '    Catch
+                '        infobox.title = "File Skimmer - Error!"
+                '        infobox.textinfo = "Unable to move into a higher directory due to error reading the requested folder on the drive." & Environment.NewLine & Environment.NewLine & "An error occured going up"
+                '        infobox.Show()
+                '    End Try
+                'End While
+
 
-                While endloop = False
-                    If lbllocation.Text.Substring(lbllocation.Text.Length - 1) = "/" Then
-                        endloop = True
-                    Else
-                        lbllocation.Text = lbllocation.Text.Substring(0, lbllocation.Text.Length - 1)
-                    End If
-                End While
                 showcontents()
             End If
         Else

ShiftOS/Paths.vb

@@ -11,8 +11,9 @@
     '      Download Manager Data - Paths.dnldata - Not sure what this does
     '    Save Data - Paths.savedata - The game has it's save file in here
     '      Skin Directory - Paths.skindir - Self explanatory.
-    '        Loaded Skin Directory - Paths.loadedSkin - Where the contents of .skn files are extracted to.
+    '        Loaded Skin Directory - Paths.loadedskin - Where the contents of .skn files are extracted to.
     '          Sound Directory - Paths.sounddir - Where sound files (such as Infobox chime) are stored, coming soon.
+    '        Current Skin Directory - Paths.currentskin - ??????????
     '    Home Directory - Paths.home - This is the folder that contains all the user's files
     '      Desktop - Paths.desktop - All the files that appear on your desktop should be stored here
     '      Documents - Paths.documents - The documents folder is where the user puts their documents
@@ -39,6 +40,7 @@
     Public skindir As String = savedata & "Skins\"
 
     Public loadedskin As String = skindir & "Loaded\"
+    Public currentskin As String = skindir & "Current\"
 
     Public sounddir As String = loadedskin & "Sound Files\"
 

ShiftOS/ShiftOSDesktop.vb

@@ -1588,9 +1588,9 @@
             boughtadvapplauncher = False
         End Try
         Viruses.startactiveviruses()
-        If IO.File.Exists(ShiftOSPath + "Shiftum42\Skins\Current\skindata.dat") Then loadcurrentskin()
+        If IO.File.Exists(Paths.loadedskin & "skindata.dat") Then loadcurrentskin() ' FIXME (ShiftOSPath + "Shiftum42\Skins\Current\skindata.dat")
-        If My.Computer.FileSystem.DirectoryExists(ShiftOSPath + "Shiftum42\Icons") Then setupicons()
+        If My.Computer.FileSystem.DirectoryExists(Paths.savedata & "Icons") Then setupicons()
-        If IO.File.Exists(ShiftOSPath & "SoftwareData\DownloadManager\Downloadhistory.lst") Then downloadmanagerhistory = IO.File.ReadAllText(ShiftOSPath & "SoftwareData\DownloadManager\Downloadhistory.lst")
+        If IO.File.Exists(Paths.dnldata & "Downloadhistory.lst") Then downloadmanagerhistory = IO.File.ReadAllText(ShiftOSPath & "\SoftwareData\DownloadManager\Downloadhistory.lst")
     End Sub
 
     Private Sub ShiftOSDesktop_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -1599,7 +1599,7 @@
             savegame()
         Else
             loadgame()
-            Terminal.runterminalfile(ShiftOSPath + "Shiftum42\autorun.trm")
+            Terminal.runterminalfile(ShiftOSPath + "\Shiftum42\autorun.trm")
         End If
 
         If Not My.Computer.FileSystem.DirectoryExists(ShiftOSPath + "\SoftwareData\AdvStart\Recent") Then
@@ -1617,7 +1617,7 @@
     End Sub
 
     Public Sub loadcurrentskin()
-        skinlines = IO.File.ReadAllLines(ShiftOSPath + "Shiftum42\Skins\Current\skindata.dat")
+        skinlines = IO.File.ReadAllLines(Paths.loadedskin & "skindata.dat")
         titlebarcolour = Color.FromArgb(skinlines(0))
         windowbordercolour = Color.FromArgb(skinlines(1))
         windowbordersize = skinlines(2)
@@ -1811,8 +1811,8 @@
         If Labyrinth.Visible Then Labyrinth.setupall()
         If VirusScanner.Visible Then VirusScanner.setupall()
         If terminalfullscreen = False Then Terminal.setupall()
-        If Not My.Computer.FileSystem.DirectoryExists(ShiftOSPath & "/Home/Desktop") Then
+        If Not My.Computer.FileSystem.DirectoryExists(ShiftOSPath & "\Home\Desktop") Then
-            IO.Directory.CreateDirectory(ShiftOSPath & "/Home/Desktop")
+            IO.Directory.CreateDirectory(ShiftOSPath & "\Home\Desktop")
         End If
         'Desktop Icons
         If unitymode = False Then
@@ -4098,14 +4098,14 @@
     'End Sub
 
     Public Sub setupiconprocess(ByVal location As String, ByRef imagetochange As Image)
-        If IO.File.Exists(ShiftOSPath + "Shiftum42\Icons\" & location & ".pic") Then
+        If IO.File.Exists(ShiftOSPath + "\Shiftum42\Icons\" & location & ".pic") Then
-            imagetochange = GetImage(ShiftOSPath + "Shiftum42\Icons\" & location & ".pic")
+            imagetochange = GetImage(ShiftOSPath + "\Shiftum42\Icons\" & location & ".pic")
         End If
     End Sub
 
     Public Sub setupicons()
 
-        iconmanagericondatalines = IO.File.ReadAllLines(ShiftOSPath + "Shiftum42\Icons\icondata.dat")
+        iconmanagericondatalines = IO.File.ReadAllLines(ShiftOSPath + "\Shiftum42\Icons\icondata.dat")
         titlebariconsize = iconmanagericondatalines(0)
         panelbuttoniconsize = iconmanagericondatalines(1)
         launchericonsize = iconmanagericondatalines(2)
@@ -4725,7 +4725,7 @@
             desktopicons.LargeImageList = File_Skimmer.ImageList1
             desktopicons.SmallImageList = File_Skimmer.ImageList1
 
-            Dim dir As New IO.DirectoryInfo("C:\ShiftOS\Home\Desktop")
+            Dim dir As New IO.DirectoryInfo(Paths.desktop)
             Dim files As IO.FileInfo() = dir.GetFiles()
             Dim file As IO.FileInfo
             Dim folders As IO.DirectoryInfo() = dir.GetDirectories()
@@ -4770,7 +4770,7 @@
         lvadvplaces.SmallImageList = File_Skimmer.ImageList1
         lvadvplaces.LargeImageList = File_Skimmer.ImageList1
 
-        For Each folder In My.Computer.FileSystem.GetDirectories("C:\ShiftOS\Home")
+        For Each folder In My.Computer.FileSystem.GetDirectories(Paths.home)
             Dim placeinfo As New IO.DirectoryInfo(folder)
             Dim place As New ListViewItem
             place.Text = placeinfo.Name
@@ -4781,7 +4781,7 @@
         lvadvfiles.Items.Clear()
         lvadvfiles.LargeImageList = File_Skimmer.ImageList1
         lvadvfiles.SmallImageList = File_Skimmer.ImageList1
-        For Each File In My.Computer.FileSystem.GetFiles("C:\ShiftOS\SoftwareData\AdvStart\Recent")
+        For Each File In My.Computer.FileSystem.GetFiles(Paths.advdata & "Recent")
             Dim fileinfo As New IO.FileInfo(File)
             Dim item As New ListViewItem
             item.Text = fileinfo.Name
@@ -5214,7 +5214,9 @@
     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.
+        '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()
@@ -5229,6 +5231,6 @@
                 pnladvapplauncher.Location = New Point(0, Me.Height - desktoppanel.Height - pnladvapplauncher.Height)
         End Select
         refreshIcons()
-        End If
+        'End If
     End Sub
 End Class