mirror of
https://github.com/TheUltimateHacker/ShiftOS.git
synced 2025-01-22 16:12:14 +00:00
Huge bug fixes
This commit fixes some major bugs, atleast I hope so, that caused ShiftOS to be unplayable. The bugs I'm talking about are the inability to find the xulrunner, MichaelsMovableControls.dll, and SkyBound.Gecko.dll files. I also fixed a minor bug where when .smf files are loaded in the File Skimmer or Desktop, the modloader would read the code rather than opening the file.
This commit is contained in:
TheUltimateHacker
parent
ecb1dbd33a
commit
3519e197a2
2 changed files with 152 additions and 212 deletions
|
|
@ -623,23 +623,18 @@ Public Class File_Skimmer
|
||||||
End If
|
End If
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
'Used for Desktop.
|
|
||||||
Public Sub OpenFile(path As String)
|
Public Sub OpenFile(path As String)
|
||||||
'Check if file exists
|
'Check if selected item is a file or folder. It it's a folder check its extension
|
||||||
If My.Computer.FileSystem.FileExists(path) Or My.Computer.FileSystem.DirectoryExists(path) Then
|
|
||||||
|
|
||||||
'Check if selected item is a file or folder. It it's a file check its extention
|
|
||||||
|
|
||||||
If path Like "*.owd" Then
|
If path Like "*.owd" Then
|
||||||
If ShiftOSDesktop.installedorcwrite = True Then
|
If ShiftOSDesktop.boughtorcwrite = True Then
|
||||||
Dim sr As New IO.StreamReader(path)
|
Dim sr As New IO.StreamReader(Path)
|
||||||
OrcWrite.RichTextBox1.Rtf = sr.ReadToEnd()
|
OrcWrite.RichTextBox1.Rtf = sr.ReadToEnd()
|
||||||
sr.Close()
|
sr.Close()
|
||||||
OrcWrite.Show()
|
OrcWrite.Show()
|
||||||
OrcWrite.TopMost = True
|
OrcWrite.TopMost = True
|
||||||
Else
|
Else
|
||||||
infobox.showinfo("Application Not Found", "ShiftOS could not find an application able to open .owd files.")
|
infobox.showinfo("Application Not Found", "ShiftOS could not find an application able the open .owd files.")
|
||||||
End If
|
End If
|
||||||
ElseIf path Like "*.txt" Then
|
ElseIf path Like "*.txt" Then
|
||||||
If TextPad.needtosave = False Then
|
If TextPad.needtosave = False Then
|
||||||
|
|
@ -698,41 +693,6 @@ Public Class File_Skimmer
|
||||||
Dim i As String = sr.ReadLine
|
Dim i As String = sr.ReadLine
|
||||||
Skin_Loader.loadingsknversion = sr.ReadLine
|
Skin_Loader.loadingsknversion = sr.ReadLine
|
||||||
sr.Close()
|
sr.Close()
|
||||||
|
|
||||||
ElseIf path Like "*.smf" Then
|
|
||||||
NewAPI.OpenModFile(path)
|
|
||||||
|
|
||||||
ElseIf path Like "*.saa" Then
|
|
||||||
File_Crypt.DecryptFile(path & "\" & path, ShiftOSDesktop.ShiftOSPath + "Shiftum42\Drivers\HDD.dri", ShiftOSDesktop.sSecretKey)
|
|
||||||
Dim sr As StreamReader = New StreamReader(ShiftOSDesktop.ShiftOSPath + "Shiftum42\Drivers\HDD.dri")
|
|
||||||
Dim apptoopen As String = sr.ReadLine()
|
|
||||||
sr.Close()
|
|
||||||
Select Case apptoopen.ToLower
|
|
||||||
'Case "program name"
|
|
||||||
' Check requirements and open program
|
|
||||||
Case "dodge"
|
|
||||||
Dodge.Show()
|
|
||||||
Case "web browser"
|
|
||||||
If ShiftOSDesktop.boughtanycolour4 = True Then Web_Browser.Show() Else infobox.showinfo("Error", "The requirements for " & path & " are not meet. Please buy limitless colours.")
|
|
||||||
Case "b1n0t3 h4ck"
|
|
||||||
Randomize()
|
|
||||||
Dim VirusChoice As Integer = CInt(Math.Ceiling(Rnd() * 4))
|
|
||||||
If VirusChoice = 1 Then
|
|
||||||
Viruses.zerogravity = True
|
|
||||||
Viruses.zerogravitythreatlevel = CInt(Math.Floor((4) * Rnd())) + 1
|
|
||||||
Viruses.setupzerovirus()
|
|
||||||
ElseIf VirusChoice = 2 Then
|
|
||||||
Viruses.beeper = True
|
|
||||||
Viruses.beeperthreatlevel = CInt(Math.Floor((4) * Rnd())) + 1
|
|
||||||
Viruses.setupbeepervirus()
|
|
||||||
ElseIf VirusChoice = 3 Then
|
|
||||||
Viruses.mousetrap = True
|
|
||||||
Viruses.mousetrapthreatlevel = CInt(Math.Floor((4) * Rnd())) + 1
|
|
||||||
Viruses.setupmousetrapvirus()
|
|
||||||
ElseIf VirusChoice = 4 Then
|
|
||||||
Viruses.ThePlague = True
|
|
||||||
Viruses.theplaguethreatlevel = CInt(Math.Floor((4) * Rnd())) + 1
|
|
||||||
Viruses.setuptheplague()
|
|
||||||
End If
|
End If
|
||||||
If Skin_Loader.loadingsknversion = "2.0 disposal-free skinning" Then
|
If Skin_Loader.loadingsknversion = "2.0 disposal-free skinning" Then
|
||||||
Skin_Loader.setuppreview2_0()
|
Skin_Loader.setuppreview2_0()
|
||||||
|
|
@ -849,12 +809,12 @@ Public Class File_Skimmer
|
||||||
Installer.Show()
|
Installer.Show()
|
||||||
Installer.txtfilepath.Text = (path)
|
Installer.txtfilepath.Text = (path)
|
||||||
ElseIf path Like "*.smf" Then
|
ElseIf path Like "*.smf" Then
|
||||||
NewAPI.UseCode(path)
|
NewAPI.OpenModFile(path)
|
||||||
ElseIf path Like "*.trm" Then
|
ElseIf path Like "*.trm" Then
|
||||||
Terminal.Show()
|
Terminal.Show()
|
||||||
Terminal.runterminalfile(path)
|
Terminal.runterminalfile(path)
|
||||||
ElseIf path Like "*.sct" Then
|
ElseIf path Like "*.sct" Then
|
||||||
Dim sr As New IO.StreamReader(path)
|
Dim sr As New IO.StreamReader(Path)
|
||||||
Dim relayPath As String = sr.ReadToEnd()
|
Dim relayPath As String = sr.ReadToEnd()
|
||||||
sr.Close()
|
sr.Close()
|
||||||
OpenFile(relayPath)
|
OpenFile(relayPath)
|
||||||
|
|
@ -871,27 +831,8 @@ Public Class File_Skimmer
|
||||||
infobox.textinfo = "You do not have unity mode"
|
infobox.textinfo = "You do not have unity mode"
|
||||||
infobox.Show()
|
infobox.Show()
|
||||||
End If
|
End If
|
||||||
Case Else
|
End If
|
||||||
infobox.title = "Corrupt file"
|
|
||||||
infobox.textinfo = "The stand alone application '" & path & "' seems to be corrupt and is unable to run properly."
|
|
||||||
infobox.Show()
|
|
||||||
End Select
|
|
||||||
ElseIf path Like "*.stp" Then
|
|
||||||
Installer.Show()
|
|
||||||
Installer.txtfilepath.Text = (path)
|
|
||||||
ElseIf path Like "*.trm" Then
|
|
||||||
Terminal.Show()
|
|
||||||
Terminal.runterminalfile(path)
|
|
||||||
ElseIf path Like "*.sct" Then
|
|
||||||
Dim sr As New IO.StreamReader(path)
|
|
||||||
Dim relayPath As String = sr.ReadToEnd()
|
|
||||||
sr.Close()
|
|
||||||
OpenFile(relayPath)
|
|
||||||
ElseIf path Like "*.bat" Then
|
|
||||||
If (ShiftOSDesktop.unitymode) Then
|
|
||||||
Shell(path)
|
|
||||||
Else
|
Else
|
||||||
|
|
||||||
If My.Computer.FileSystem.DirectoryExists(path) Then
|
If My.Computer.FileSystem.DirectoryExists(path) Then
|
||||||
lbllocation.Text = path
|
lbllocation.Text = path
|
||||||
showcontents()
|
showcontents()
|
||||||
|
|
@ -902,7 +843,6 @@ Public Class File_Skimmer
|
||||||
End If
|
End If
|
||||||
|
|
||||||
End If
|
End If
|
||||||
End If
|
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
Private Sub lbfiles_MouseClick(ByVal sender As System.Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles lvfiles.MouseClick
|
Private Sub lbfiles_MouseClick(ByVal sender As System.Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles lvfiles.MouseClick
|
||||||
|
|
|
||||||
|
|
@ -86,10 +86,10 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="MichaelsMovableControlSuite">
|
<Reference Include="MichaelsMovableControlSuite">
|
||||||
<HintPath>..\..\..\MovableControls\MichaelsMovableControlSuite\MichaelsMovableControlSuite\bin\Debug\MichaelsMovableControlSuite.dll</HintPath>
|
<HintPath>bin\debug\MichaelsMovableControlSuite.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Skybound.Gecko">
|
<Reference Include="Skybound.Gecko">
|
||||||
<HintPath>..\..\..\OrcWeb\OrcWeb\OrcWeb\Skybound.Gecko.dll</HintPath>
|
<HintPath>bin\debug\Skybound.Gecko.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Data" />
|
<Reference Include="System.Data" />
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue