Skip to content

Commit cee1606

Browse files
committed
[v15.6] Many fixes and some PS5 PKG changes
- Removed remaining old .NET Framework 4.8 files Fixes : - Input Dialog for PS3 WebMAN MOD features & FTP actions - Possible freeze when trying to extract an archive - Changing FTP port in "Settings" menu not saving correctly - FTP Browser rework (Download progress somehow broken...) - "More settings" not shown in "Settings" menu - PS5PKGViewer crash when selecting any retail PKG Added : - New "Use pkgdec5" option for the PS5 PKG Extractor - BIN selection for the BIN/CUE Converter is now back - Automatically sets the BIN file if it's in the same folder and uses the same file name
1 parent 0ee32a3 commit cee1606

30 files changed

+1090
-1187
lines changed

LatestBuild.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
15.5.1
1+
15.6.0

PS Multi Tools/App.config

Lines changed: 0 additions & 58 deletions
This file was deleted.

PS Multi Tools/Application.xaml.vb

Lines changed: 0 additions & 6 deletions
This file was deleted.

PS Multi Tools/AssemblyInfo.vb

Lines changed: 0 additions & 11 deletions
This file was deleted.

PS Multi Tools/Classes/PKGDecryptor.vb

Lines changed: 221 additions & 2 deletions
Large diffs are not rendered by default.

PS Multi Tools/Classes/Structures.vb

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,69 @@ Public Class Structures
527527
End Property
528528
End Structure
529529

530+
Public Structure FTPListViewItem
531+
Private _FileOrDirName As String
532+
Private _FileOrDirType As String
533+
Private _FileOrDirLastModified As String
534+
Private _FileOrDirPermissions As String
535+
Private _FileOrDirOwner As String
536+
Private _FileOrDirSize As String
537+
538+
Public Property FileOrDirName As String
539+
Get
540+
Return _FileOrDirName
541+
End Get
542+
Set
543+
_FileOrDirName = Value
544+
End Set
545+
End Property
546+
547+
Public Property FileOrDirType As String
548+
Get
549+
Return _FileOrDirType
550+
End Get
551+
Set
552+
_FileOrDirType = Value
553+
End Set
554+
End Property
555+
556+
Public Property FileOrDirSize As String
557+
Get
558+
Return _FileOrDirSize
559+
End Get
560+
Set
561+
_FileOrDirSize = Value
562+
End Set
563+
End Property
564+
565+
Public Property FileOrDirLastModified As String
566+
Get
567+
Return _FileOrDirLastModified
568+
End Get
569+
Set
570+
_FileOrDirLastModified = Value
571+
End Set
572+
End Property
573+
574+
Public Property FileOrDirPermissions As String
575+
Get
576+
Return _FileOrDirPermissions
577+
End Get
578+
Set
579+
_FileOrDirPermissions = Value
580+
End Set
581+
End Property
582+
583+
Public Property FileOrDirOwner As String
584+
Get
585+
Return _FileOrDirOwner
586+
End Get
587+
Set
588+
_FileOrDirOwner = Value
589+
End Set
590+
End Property
591+
End Structure
592+
530593
End Class
531594

532595
Public Class PS5ParamClass

PS Multi Tools/Dialogs/CopyWindow.xaml.vb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ Public Class CopyWindow
1818
End Structure
1919

2020
Private Sub CopyWindow_ContentRendered(sender As Object, e As EventArgs) Handles Me.ContentRendered
21-
2221
If GameIcon IsNot Nothing Then
2322
GameIconImage.Source = GameIcon
2423
End If

PS Multi Tools/Dialogs/Downloader.xaml.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ Public Class Downloader
237237
Using ArchiveExtractor As New Process()
238238
ArchiveExtractor.StartInfo.FileName = Environment.CurrentDirectory + "\Tools\7z.exe"
239239
ArchiveExtractor.StartInfo.Arguments = "x """ + Environment.CurrentDirectory + "\Downloads\" + DownloadFileName + """" +
240-
" -o""" + Environment.CurrentDirectory + "\Downloads\" + """"
240+
" -o""" + Environment.CurrentDirectory + "\Downloads\" + """ -y"
241241
ArchiveExtractor.StartInfo.UseShellExecute = False
242242
ArchiveExtractor.StartInfo.CreateNoWindow = True
243243
ArchiveExtractor.Start()

PS Multi Tools/Dialogs/InputDialog.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:local="clr-namespace:PS_Multi_Tools"
77
mc:Ignorable="d"
8-
Title="Please enter a new value" Height="130" Width="340" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" ThemeMode="System">
8+
Title="Please enter a new value" Height="150" Width="340" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" ThemeMode="System">
99
<Grid>
10-
<TextBox x:Name="NewValueTextBox" HorizontalAlignment="Left" Margin="8,34,0,0" VerticalAlignment="Top" Width="300"/>
10+
<TextBox x:Name="NewValueTextBox" HorizontalAlignment="Left" Margin="10,34,0,0" VerticalAlignment="Top" Width="300"/>
1111
<TextBlock x:Name="InputDialogTitleTextBlock" HorizontalAlignment="Left" Margin="10,10,0,0" Text="Enter a new value :" VerticalAlignment="Top" FontSize="14"/>
12-
<Button x:Name="ConfirmButton" Content="Confirm" HorizontalAlignment="Left" Margin="208,65,0,0" VerticalAlignment="Top" Width="100"/>
12+
<Button x:Name="ConfirmButton" Content="Confirm" HorizontalAlignment="Left" Margin="210,66,0,0" VerticalAlignment="Top" Width="100"/>
1313

1414
</Grid>
1515
</Window>
Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,15 @@
1-
Imports System.ComponentModel
2-
Imports System.Runtime.CompilerServices
3-
4-
Public Class InputDialog
5-
6-
Implements INotifyPropertyChanged
7-
8-
Public Event PropertyChanged As PropertyChangedEventHandler Implements INotifyPropertyChanged.PropertyChanged
9-
10-
Protected Sub NotifyPropertyChanged(<CallerMemberName> Optional propertyName As String = "")
11-
RaiseEvent PropertyChanged(Me, New PropertyChangedEventArgs(propertyName))
12-
End Sub
13-
14-
Private _InputDialogTitleTextBlock_Text As String
15-
Private _NewValueTextBox_Text As String
16-
Private _ConfirmButton_Text As String
17-
18-
Public Property InputDialogTitleTextBlock_Text As String
19-
Get
20-
Return _InputDialogTitleTextBlock_Text
21-
End Get
22-
Set
23-
_InputDialogTitleTextBlock_Text = Value
24-
NotifyPropertyChanged(NameOf(InputDialogTitleTextBlock_Text))
25-
End Set
26-
End Property
27-
28-
Public Property NewValueTextBox_Text As String
29-
Get
30-
Return _NewValueTextBox_Text
31-
End Get
32-
Set
33-
_NewValueTextBox_Text = Value
34-
NotifyPropertyChanged(NameOf(NewValueTextBox_Text))
35-
End Set
36-
End Property
37-
38-
Public Property ConfirmButton_Text As String
39-
Get
40-
Return _ConfirmButton_Text
41-
End Get
42-
Set
43-
_ConfirmButton_Text = Value
44-
NotifyPropertyChanged(NameOf(ConfirmButton_Text))
45-
End Set
46-
End Property
1+
Public Class InputDialog
472

483
Private Sub ConfirmButton_Click(sender As Object, e As RoutedEventArgs) Handles ConfirmButton.Click
49-
NewValueTextBox_Text = NewValueTextBox.Text
50-
514
DialogResult = True
525
Close()
536
End Sub
547

55-
Private Sub InputDialog_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
56-
InputDialogTitleTextBlock.Text = InputDialogTitleTextBlock_Text
57-
NewValueTextBox.Text = NewValueTextBox_Text
58-
ConfirmButton.Content = ConfirmButton_Text
59-
End Sub
60-
618
Private Sub NewValueTextBox_KeyDown(sender As Object, e As KeyEventArgs) Handles NewValueTextBox.KeyDown
629
If e.Key = Key.Enter Or e.Key = Key.Return Then
63-
NewValueTextBox_Text = NewValueTextBox.Text
64-
6510
DialogResult = True
6611
Close()
6712
End If
6813
End Sub
14+
6915
End Class

0 commit comments

Comments
 (0)