Skip to content

Commit

Permalink
More PS5 features and some fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@SvenGDK
SvenGDK committed Jan 1, 2024
1 parent 9ceffa0 commit 8a501ff
Show file tree
Hide file tree
Showing 175 changed files with 137,244 additions and 104 deletions.
16 changes: 16 additions & 0 deletions PS Multi Tools/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,22 @@
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="FluentFTP" publicKeyToken="f4af092b1d8df44f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-49.0.1.0" newVersion="49.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="WinSCPnet" publicKeyToken="2271ec4a3c56d0bf" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.14.0.13797" newVersion="1.14.0.13797" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Web.WebView2.Wpf" publicKeyToken="2a8ab48044d2601e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.2210.55" newVersion="1.0.2210.55" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Web.WebView2.Core" publicKeyToken="2a8ab48044d2601e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.2210.55" newVersion="1.0.2210.55" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<entityFramework>
Expand Down
12 changes: 11 additions & 1 deletion PS Multi Tools/Classes/PS5Game.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
Private _FRGameTitle As String
Private _GameBackgroundImageBrush As ImageBrush
Private _GameSoundFile As String
Private _IsCompatibleFW As String 'Not used yet
Private _IsCompatibleFW As String
Private _DecFilesIncluded As String
Private _GameContentIDs As String

Public Property GameTitle As String
Get
Expand Down Expand Up @@ -201,6 +202,15 @@
End Set
End Property

Public Property GameContentIDs As String
Get
Return _GameContentIDs
End Get
Set
_GameContentIDs = Value
End Set
End Property

Public Shared Function GetGameRegion(GameID As String) As String
If GameID.StartsWith("PPSA") Then
Return "NA / Europe"
Expand Down
51 changes: 51 additions & 0 deletions PS Multi Tools/Classes/Structures.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,4 +412,55 @@ Public Class Structures
Public Property LocalizedParameters As LocalizedParameters
End Class

Public Enum AssetType
Video
Audio
Image
Font
End Enum

Public Structure AssetListViewItem
Private _AssetFileName As String
Private _AssetFilePath As String
Private _Type As AssetType
Private _Icon As ImageSource

Public Property AssetFileName As String
Get
Return _AssetFileName
End Get
Set
_AssetFileName = Value
End Set
End Property

Public Property AssetFilePath As String
Get
Return _AssetFilePath
End Get
Set
_AssetFilePath = Value
End Set
End Property

Public Property Type As AssetType
Get
Return _Type
End Get
Set
_Type = Value
End Set
End Property

Public Property Icon As ImageSource
Get
Return _Icon
End Get
Set
_Icon = Value
End Set
End Property

End Structure

End Class
56 changes: 55 additions & 1 deletion PS Multi Tools/Classes/Utils.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Imports System.Globalization
Imports System.IO
Imports System.Net
Imports System.Net.NetworkInformation
Imports System.Runtime.InteropServices
Imports System.Text
Imports System.Threading
Imports PS4_Tools.RCO

Public Class Utils

Expand Down Expand Up @@ -323,3 +323,57 @@ Public Class Utils
End Function

End Class

Namespace INI

''' <summary>
''' Create a New INI file to store or load data
''' </summary>
Public Class IniFile
Public path As String

<DllImport("kernel32")>
Private Shared Function WritePrivateProfileString(section As String, key As String, val As String, filePath As String) As Long
End Function

<DllImport("kernel32")>
Private Shared Function GetPrivateProfileString(section As String, key As String, def As String, retVal As StringBuilder, size As Integer, filePath As String) As Integer
End Function

''' <summary>
''' INIFile Constructor.
''' </summary>
''' <PARAM name="INIPath"></PARAM>
Public Sub New(INIPath As String)
path = INIPath
End Sub
''' <summary>
''' Write Data to the INI File
''' </summary>
''' <PARAM name="Section"></PARAM>
''' Section name
''' <PARAM name="Key"></PARAM>
''' Key Name
''' <PARAM name="Value"></PARAM>
''' Value Name
Public Sub IniWriteValue(Section As String, Key As String, Value As String)
WritePrivateProfileString(Section, Key, Value, path)
End Sub

''' <summary>
''' Read Data Value From the Ini File
''' </summary>
''' <PARAM name="Section"></PARAM>
''' <PARAM name="Key"></PARAM>
''' <PARAM name="Path"></PARAM>
''' <returns></returns>
Public Function IniReadValue(Section As String, Key As String) As String
Dim temp As New StringBuilder(255)
Dim i As Integer = GetPrivateProfileString(Section, Key, "", temp, 255, path)
Return temp.ToString()

End Function

End Class

End Namespace
Binary file added PS Multi Tools/Images/Assets-icon.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added PS Multi Tools/Images/Font-File.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added PS Multi Tools/Images/Image-File.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added PS Multi Tools/Images/Movie-File.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added PS Multi Tools/Images/Music-File.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added PS Multi Tools/Images/Pause-icon.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions PS Multi Tools/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Imports System.Windows
<Assembly: AssemblyDescription("Backup manager for PS1, PS2, PSX, PS3, PS4, PS5, PSP & PS Vita, containing homebrews, firmwares & tools.")>
<Assembly: AssemblyCompany("SvenGDK")>
<Assembly: AssemblyProduct("PS Multi Tools")>
<Assembly: AssemblyCopyright("Copyright © SvenGDK 2011-2023")>
<Assembly: AssemblyCopyright("Copyright © SvenGDK 2011-2024")>
<Assembly: AssemblyTrademark("SvenGDK")>
<Assembly: ComVisible(False)>

Expand Down Expand Up @@ -55,5 +55,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("13.4.0.0")>
<Assembly: AssemblyFileVersion("13.4.0.0")>
<Assembly: AssemblyVersion("13.5.0.0")>
<Assembly: AssemblyFileVersion("13.5.0.0")>
21 changes: 10 additions & 11 deletions PS Multi Tools/NewMainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,23 @@
mc:Ignorable="d"
Title="PS Multi Tools" Height="575" Width="890" Background="#FF434343" ResizeMode="CanMinimize" WindowStartupLocation="CenterScreen">
<Grid>

<TextBlock HorizontalAlignment="Center" Margin="0,29,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="White" Text="Welcome to PS Multi Tools" FontSize="36" FontWeight="Bold"/>

<Image x:Name="PS1Image" HorizontalAlignment="Left" Height="84" Margin="39,116,0,0" VerticalAlignment="Top" Width="84" Source="/Images/PS1.png" Cursor="Hand"/>
<Image x:Name="PS2Image" HorizontalAlignment="Left" Height="84" Margin="162,116,0,0" VerticalAlignment="Top" Width="84" Source="/Images/PS2.png" Cursor="Hand"/>
<Image x:Name="PS3Image" HorizontalAlignment="Left" Height="84" Margin="287,116,0,0" VerticalAlignment="Top" Width="84" Source="/Images/PS3.png" Cursor="Hand"/>
<Image x:Name="PS4Image" HorizontalAlignment="Center" Height="84" Margin="0,116,0,0" VerticalAlignment="Top" Width="84" Source="/Images/ps4.png" Cursor="Hand"/>
<Image x:Name="PS4Image" HorizontalAlignment="Left" Height="84" Margin="403,116,0,0" VerticalAlignment="Top" Width="84" Source="/Images/ps4.png" Cursor="Hand"/>
<Image x:Name="PS5Image" HorizontalAlignment="Left" Height="84" Margin="516,112,0,0" VerticalAlignment="Top" Width="84" Source="/Images/PS5.png" Cursor="Hand"/>
<Image x:Name="PSPImage" HorizontalAlignment="Left" Height="92" Margin="629,108,0,0" VerticalAlignment="Top" Width="92" Source="/Images/psp.png" Cursor="Hand"/>
<Image x:Name="PSVImage" HorizontalAlignment="Left" Height="92" Margin="752,133,0,0" VerticalAlignment="Top" Width="92" Source="/Images/PSV.png" Cursor="Hand"/>

<TextBlock HorizontalAlignment="Left" Margin="66,205,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="White" Text="PS1" FontSize="20" FontFamily="Calibri"/>
<TextBlock HorizontalAlignment="Left" Margin="189,205,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="White" Text="PS2" FontSize="20" FontFamily="Calibri"/>
<TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="White" Text="PS3" FontSize="20" Margin="315,205,0,0" FontFamily="Calibri"/>
<TextBlock HorizontalAlignment="Center" Margin="0,205,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="White" Text="PS4" FontSize="20" FontFamily="Calibri"/>
<TextBlock HorizontalAlignment="Left" Margin="543,205,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="White" Text="PS5" FontSize="20" FontFamily="Calibri"/>
<TextBlock HorizontalAlignment="Left" Margin="660,205,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="White" Text="PSP" FontSize="20" FontFamily="Calibri"/>
<TextBlock HorizontalAlignment="Left" Margin="783,205,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="White" Text="PSV" FontSize="20" FontFamily="Calibri"/>
<TextBlock HorizontalAlignment="Left" Margin="66,205,0,0" VerticalAlignment="Top" Foreground="White" Text="PS1" FontSize="20" FontFamily="Calibri"/>
<TextBlock HorizontalAlignment="Left" Margin="189,205,0,0" VerticalAlignment="Top" Foreground="White" Text="PS2" FontSize="20" FontFamily="Calibri"/>
<TextBlock HorizontalAlignment="Left" Margin="315,205,0,0" VerticalAlignment="Top" Foreground="White" Text="PS3" FontSize="20" FontFamily="Calibri"/>
<TextBlock HorizontalAlignment="Left" Margin="430,205,0,0" VerticalAlignment="Top" Foreground="White" Text="PS4" FontSize="20" FontFamily="Calibri"/>
<TextBlock HorizontalAlignment="Left" Margin="543,205,0,0" VerticalAlignment="Top" Foreground="White" Text="PS5" FontSize="20" FontFamily="Calibri"/>
<TextBlock HorizontalAlignment="Left" Margin="660,205,0,0" VerticalAlignment="Top" Foreground="White" Text="PSP" FontSize="20" FontFamily="Calibri"/>
<TextBlock HorizontalAlignment="Left" Margin="783,205,0,0" VerticalAlignment="Top" Foreground="White" Text="PSV" FontSize="20" FontFamily="Calibri"/>

<!--PS1 Grid-->
<Grid x:Name="PS1Grid" Margin="39,242,46,62" Width="805" Height="230" HorizontalAlignment="Left" VerticalAlignment="Top" Visibility="Hidden">
Expand Down Expand Up @@ -272,8 +271,8 @@
</Grid>

<StatusBar Height="27" VerticalAlignment="Bottom" Background="#FFE2E2E2" FontFamily="Calibri" Foreground="Black" FontSize="14">
<TextBlock x:Name="BuildTextBlock" Text="[Main] PS Multi Tools v13.2 - [DLL] PSMT-Library v1.2" Margin="5,0,0,0"/>
<Button x:Name="CheckUpdatesButton" Content="Check for updates" FontSize="12" Margin="395,0,0,0" Width="100" Height="20"/>
<TextBlock x:Name="BuildTextBlock" Text="[Main] PS Multi Tools v13.5" Margin="5,0,0,0"/>
<Button x:Name="CheckUpdatesButton" Content="Check for updates" FontSize="12" Width="100" Height="20" HorizontalAlignment="Right" Margin="395,0,0,0"/>
</StatusBar>

</Grid>
Expand Down

0 comments on commit 8a501ff

Please sign in to comment.