diff --git a/RPFTool.sln b/RPFTool.sln
index f87c938..1bbac06 100644
--- a/RPFTool.sln
+++ b/RPFTool.sln
@@ -1,13 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32526.322
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RPFTool", "RPFTool\RPFTool.csproj", "{E2C27E34-2FCA-4DB0-AE38-35BEBDFC54A2}"
EndProject
Global
- GlobalSection(SubversionScc) = preSolution
- Svn-Managed = True
- Manager = AnkhSVN - Subversion Support for Visual Studio
- EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -31,4 +29,11 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {9A16FEFC-76DA-4259-BD4E-373173186F40}
+ EndGlobalSection
+ GlobalSection(SubversionScc) = preSolution
+ Svn-Managed = True
+ Manager = AnkhSVN - Subversion Support for Visual Studio
+ EndGlobalSection
EndGlobal
diff --git a/RPFTool/Program.cs b/RPFTool/Program.cs
index b88e8b2..0ab2ecb 100644
--- a/RPFTool/Program.cs
+++ b/RPFTool/Program.cs
@@ -14,7 +14,7 @@ namespace RPFTool
static void Main()
{
Application.EnableVisualStyles();
- Application.SetCompatibleTextRenderingDefault(false);
+ Application.SetCompatibleTextRenderingDefault(true);
DevExpress.Skins.SkinManager.EnableFormSkins();
DevExpress.UserSkins.BonusSkins.Register();
diff --git a/RPFTool/Properties/licenses.licx b/RPFTool/Properties/licenses.licx
index b8fbd64..eea9bc2 100644
--- a/RPFTool/Properties/licenses.licx
+++ b/RPFTool/Properties/licenses.licx
@@ -1,6 +1,4 @@
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v12.2, Version=12.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v12.2, Version=12.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v12.2, Version=12.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v12.2, Version=12.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.Registration.LicenseHelper, DevExpress.Registration, Version=12.2.4.0, Culture=neutral, PublicKeyToken=940cfcde86f32efd
-DXAddin.Connect, DXAddin, Version=1.0.9.9, Culture=neutral, PublicKeyToken=1bade7d244b1b328
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/RPFTool/Properties/licenses.licx.bak b/RPFTool/Properties/licenses.licx.bak
new file mode 100644
index 0000000..3c6e464
--- /dev/null
+++ b/RPFTool/Properties/licenses.licx.bak
@@ -0,0 +1,6 @@
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v12.2, Version=12.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v12.2, Version=12.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v12.2, Version=12.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v12.2, Version=12.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.Registration.LicenseHelper, DevExpress.Registration, Version=12.2.4.0, Culture=neutral, PublicKeyToken=940cfcde86f32efd
+DXAddin.Connect, DXAddin, Version=1.0.9.9, Culture=neutral, PublicKeyToken=1bade7d244b1b328
diff --git a/RPFTool/RPFTool.csproj b/RPFTool/RPFTool.csproj
index 7fa9442..9170046 100644
--- a/RPFTool/RPFTool.csproj
+++ b/RPFTool/RPFTool.csproj
@@ -6,11 +6,11 @@
8.0.30703
2.0
{E2C27E34-2FCA-4DB0-AE38-35BEBDFC54A2}
- WinExe
+ Exe
Properties
RPFTool
RPFTool
- v4.5
+ v4.5.2
2.0
@@ -56,13 +56,21 @@
rpf.ico
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -79,7 +87,9 @@
-
+
+ Form
+
aboutform.cs
@@ -186,25 +196,35 @@
Code
-
+
+ Form
+
DownloadForm.cs
-
+
+ Form
+
Extracting.cs
-
+
+ Form
+
gameSelection.cs
-
+
+ Form
+
mainForm.cs
-
+
+ Form
+
Loader.cs
@@ -358,27 +378,39 @@
-
+
+ Form
+
Saving.cs
-
+
+ Form
+
xscView.cs
-
+
+ Form
+
StringsView.cs
-
+
+ Form
+
TextureView.cs
-
+
+ Form
+
TextView.cs
-
+
+ Form
+
xscViewV7.cs
diff --git a/RPFTool/RPFTool.csproj.bak b/RPFTool/RPFTool.csproj.bak
index 3b3ea13..05371df 100644
--- a/RPFTool/RPFTool.csproj.bak
+++ b/RPFTool/RPFTool.csproj.bak
@@ -10,7 +10,7 @@
Properties
RPFTool
RPFTool
- v4.5
+ v4.5.2
2.0
@@ -43,6 +43,7 @@
DEBUG;TRACE
prompt
4
+ true
pdbonly
@@ -56,12 +57,13 @@
rpf.ico
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -74,11 +76,10 @@
+
-
- Form
-
+
aboutform.cs
@@ -185,35 +186,25 @@
Code
-
- Form
-
+
DownloadForm.cs
-
- Form
-
+
Extracting.cs
-
- Form
-
+
gameSelection.cs
-
- Form
-
+
mainForm.cs
-
- Form
-
+
Loader.cs
@@ -315,6 +306,7 @@
+
@@ -322,12 +314,14 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
Code
@@ -347,6 +341,13 @@
+
+
+
+
+
+
+
@@ -356,18 +357,31 @@
-
- Form
-
+
+
Saving.cs
-
- Form
+
+
+ xscView.cs
-
+
+
+ StringsView.cs
+
+
+
TextureView.cs
+
+
+ TextView.cs
+
+
+
+ xscViewV7.cs
+
aboutform.cs
@@ -398,9 +412,18 @@
Saving.cs
-
+
+ xscView.cs
+
+
TextureView.cs
+
+ TextView.cs
+
+
+ xscViewV7.cs
+
Always
@@ -445,8 +468,11 @@
+
+
+
- Always
+ PreserveNewest
diff --git a/RPFTool/bin/Release/Keys.ini b/RPFTool/bin/Release/Keys.ini
deleted file mode 100644
index 7370550..0000000
--- a/RPFTool/bin/Release/Keys.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[Keys]
-RDR=
-MP3=
-MC=
-GTAV=
diff --git a/RPFTool/bin/Release/xcompress32.dll b/RPFTool/bin/Release/xcompress32.dll
deleted file mode 100644
index 2e22c63..0000000
Binary files a/RPFTool/bin/Release/xcompress32.dll and /dev/null differ
diff --git a/RPFTool/mainForm.Designer.cs b/RPFTool/mainForm.Designer.cs
index 49afa45..5a5514c 100644
--- a/RPFTool/mainForm.Designer.cs
+++ b/RPFTool/mainForm.Designer.cs
@@ -114,10 +114,11 @@
this.filelistview.Dock = System.Windows.Forms.DockStyle.Fill;
this.filelistview.FullRowSelect = true;
this.filelistview.HeaderUsesThemes = false;
+ this.filelistview.HideSelection = false;
this.filelistview.HighlightBackgroundColor = System.Drawing.Color.Black;
this.filelistview.HighlightForegroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(234)))), ((int)(((byte)(234)))), ((int)(((byte)(234)))));
this.filelistview.HotItemStyle = this.hotItemStyle1;
- this.filelistview.Location = new System.Drawing.Point(0, 22);
+ this.filelistview.Location = new System.Drawing.Point(0, 24);
this.filelistview.Name = "filelistview";
this.filelistview.ShowGroups = false;
this.filelistview.Size = new System.Drawing.Size(867, 545);
@@ -158,34 +159,34 @@
this.btn_goto,
this.btn_delete});
this.popupMenu.Name = "popupMenu";
- this.popupMenu.Size = new System.Drawing.Size(153, 92);
+ this.popupMenu.Size = new System.Drawing.Size(144, 92);
this.popupMenu.Opening += new System.ComponentModel.CancelEventHandler(this.popupMenu_Opening);
//
// btn_extract
//
this.btn_extract.Name = "btn_extract";
- this.btn_extract.Size = new System.Drawing.Size(152, 22);
+ this.btn_extract.Size = new System.Drawing.Size(143, 22);
this.btn_extract.Text = "Extract";
this.btn_extract.Click += new System.EventHandler(this.btn_extract_Click);
//
// btn_replace
//
this.btn_replace.Name = "btn_replace";
- this.btn_replace.Size = new System.Drawing.Size(152, 22);
+ this.btn_replace.Size = new System.Drawing.Size(143, 22);
this.btn_replace.Text = "Replace";
this.btn_replace.Click += new System.EventHandler(this.btn_replace_Click);
//
// btn_goto
//
this.btn_goto.Name = "btn_goto";
- this.btn_goto.Size = new System.Drawing.Size(152, 22);
+ this.btn_goto.Size = new System.Drawing.Size(143, 22);
this.btn_goto.Text = "Go to Location";
this.btn_goto.Click += new System.EventHandler(this.btn_goto_Click);
//
// btn_delete
//
this.btn_delete.Name = "btn_delete";
- this.btn_delete.Size = new System.Drawing.Size(152, 22);
+ this.btn_delete.Size = new System.Drawing.Size(143, 22);
this.btn_delete.Text = "Delete";
this.btn_delete.Click += new System.EventHandler(this.btn_delete_Click);
//
@@ -335,15 +336,14 @@
this.barStaticItem1.Caption = "Search";
this.barStaticItem1.Id = 22;
this.barStaticItem1.Name = "barStaticItem1";
- this.barStaticItem1.TextAlignment = System.Drawing.StringAlignment.Near;
//
// tb_search
//
this.tb_search.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
this.tb_search.Edit = this.tb_searchEdit;
+ this.tb_search.EditWidth = 171;
this.tb_search.Id = 21;
this.tb_search.Name = "tb_search";
- this.tb_search.Width = 171;
//
// tb_searchEdit
//
@@ -356,27 +356,31 @@
this.barDockControlTop.CausesValidation = false;
this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
- this.barDockControlTop.Size = new System.Drawing.Size(867, 22);
+ this.barDockControlTop.Manager = this.barManager;
+ this.barDockControlTop.Size = new System.Drawing.Size(867, 24);
//
// barDockControlBottom
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 567);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 569);
+ this.barDockControlBottom.Manager = this.barManager;
this.barDockControlBottom.Size = new System.Drawing.Size(867, 0);
//
// barDockControlLeft
//
this.barDockControlLeft.CausesValidation = false;
this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
- this.barDockControlLeft.Location = new System.Drawing.Point(0, 22);
+ this.barDockControlLeft.Location = new System.Drawing.Point(0, 24);
+ this.barDockControlLeft.Manager = this.barManager;
this.barDockControlLeft.Size = new System.Drawing.Size(0, 545);
//
// barDockControlRight
//
this.barDockControlRight.CausesValidation = false;
this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
- this.barDockControlRight.Location = new System.Drawing.Point(867, 22);
+ this.barDockControlRight.Location = new System.Drawing.Point(867, 24);
+ this.barDockControlRight.Manager = this.barManager;
this.barDockControlRight.Size = new System.Drawing.Size(0, 545);
//
// barButtonItem2
@@ -429,6 +433,7 @@
this.barDockControl5.CausesValidation = false;
this.barDockControl5.Dock = System.Windows.Forms.DockStyle.Right;
this.barDockControl5.Location = new System.Drawing.Point(0, 0);
+ this.barDockControl5.Manager = null;
this.barDockControl5.Size = new System.Drawing.Size(0, 0);
//
// barDockControl4
@@ -436,6 +441,7 @@
this.barDockControl4.CausesValidation = false;
this.barDockControl4.Dock = System.Windows.Forms.DockStyle.Left;
this.barDockControl4.Location = new System.Drawing.Point(0, 0);
+ this.barDockControl4.Manager = null;
this.barDockControl4.Size = new System.Drawing.Size(0, 0);
//
// barDockControl6
@@ -443,6 +449,7 @@
this.barDockControl6.CausesValidation = false;
this.barDockControl6.Dock = System.Windows.Forms.DockStyle.Right;
this.barDockControl6.Location = new System.Drawing.Point(0, 0);
+ this.barDockControl6.Manager = null;
this.barDockControl6.Size = new System.Drawing.Size(0, 0);
//
// barDockControl3
@@ -450,6 +457,7 @@
this.barDockControl3.CausesValidation = false;
this.barDockControl3.Dock = System.Windows.Forms.DockStyle.Bottom;
this.barDockControl3.Location = new System.Drawing.Point(0, 0);
+ this.barDockControl3.Manager = null;
this.barDockControl3.Size = new System.Drawing.Size(0, 0);
//
// barDockControl7
@@ -457,6 +465,7 @@
this.barDockControl7.CausesValidation = false;
this.barDockControl7.Dock = System.Windows.Forms.DockStyle.Left;
this.barDockControl7.Location = new System.Drawing.Point(0, 0);
+ this.barDockControl7.Manager = null;
this.barDockControl7.Size = new System.Drawing.Size(0, 0);
//
// barDockControl8
@@ -464,6 +473,7 @@
this.barDockControl8.CausesValidation = false;
this.barDockControl8.Dock = System.Windows.Forms.DockStyle.Right;
this.barDockControl8.Location = new System.Drawing.Point(0, 0);
+ this.barDockControl8.Manager = null;
this.barDockControl8.Size = new System.Drawing.Size(0, 0);
//
// barDockControl2
@@ -471,6 +481,7 @@
this.barDockControl2.CausesValidation = false;
this.barDockControl2.Dock = System.Windows.Forms.DockStyle.Top;
this.barDockControl2.Location = new System.Drawing.Point(0, 0);
+ this.barDockControl2.Manager = null;
this.barDockControl2.Size = new System.Drawing.Size(0, 0);
//
// barDockControl9
@@ -478,6 +489,7 @@
this.barDockControl9.CausesValidation = false;
this.barDockControl9.Dock = System.Windows.Forms.DockStyle.Bottom;
this.barDockControl9.Location = new System.Drawing.Point(0, 0);
+ this.barDockControl9.Manager = null;
this.barDockControl9.Size = new System.Drawing.Size(0, 0);
//
// barDockControl10
@@ -485,6 +497,7 @@
this.barDockControl10.CausesValidation = false;
this.barDockControl10.Dock = System.Windows.Forms.DockStyle.Left;
this.barDockControl10.Location = new System.Drawing.Point(0, 0);
+ this.barDockControl10.Manager = null;
this.barDockControl10.Size = new System.Drawing.Size(0, 0);
//
// barDockControl11
@@ -492,6 +505,7 @@
this.barDockControl11.CausesValidation = false;
this.barDockControl11.Dock = System.Windows.Forms.DockStyle.Right;
this.barDockControl11.Location = new System.Drawing.Point(0, 0);
+ this.barDockControl11.Manager = null;
this.barDockControl11.Size = new System.Drawing.Size(0, 0);
//
// bar1
@@ -538,28 +552,32 @@
this.barDockControl15.CausesValidation = false;
this.barDockControl15.Dock = System.Windows.Forms.DockStyle.Top;
this.barDockControl15.Location = new System.Drawing.Point(0, 0);
+ this.barDockControl15.Manager = this.barManager2;
this.barDockControl15.Size = new System.Drawing.Size(867, 0);
//
// barDockControl16
//
this.barDockControl16.CausesValidation = false;
this.barDockControl16.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControl16.Location = new System.Drawing.Point(0, 567);
- this.barDockControl16.Size = new System.Drawing.Size(867, 23);
+ this.barDockControl16.Location = new System.Drawing.Point(0, 569);
+ this.barDockControl16.Manager = this.barManager2;
+ this.barDockControl16.Size = new System.Drawing.Size(867, 21);
//
// barDockControl17
//
this.barDockControl17.CausesValidation = false;
this.barDockControl17.Dock = System.Windows.Forms.DockStyle.Left;
this.barDockControl17.Location = new System.Drawing.Point(0, 0);
- this.barDockControl17.Size = new System.Drawing.Size(0, 567);
+ this.barDockControl17.Manager = this.barManager2;
+ this.barDockControl17.Size = new System.Drawing.Size(0, 569);
//
// barDockControl18
//
this.barDockControl18.CausesValidation = false;
this.barDockControl18.Dock = System.Windows.Forms.DockStyle.Right;
this.barDockControl18.Location = new System.Drawing.Point(867, 0);
- this.barDockControl18.Size = new System.Drawing.Size(0, 567);
+ this.barDockControl18.Manager = this.barManager2;
+ this.barDockControl18.Size = new System.Drawing.Size(0, 569);
//
// barManager2
//
@@ -589,7 +607,6 @@
//
// barButtonItem1
//
- this.barButtonItem1.Id = -1;
this.barButtonItem1.Name = "barButtonItem1";
//
// mainForm
@@ -606,7 +623,7 @@
this.Controls.Add(this.barDockControl18);
this.Controls.Add(this.barDockControl16);
this.Controls.Add(this.barDockControl15);
- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.IconOptions.Icon = ((System.Drawing.Icon)(resources.GetObject("mainForm.IconOptions.Icon")));
this.KeyPreview = true;
this.LookAndFeel.SkinName = "Sharp";
this.LookAndFeel.UseDefaultLookAndFeel = false;
@@ -622,6 +639,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.barManager2)).EndInit();
this.ResumeLayout(false);
+ this.PerformLayout();
}
diff --git a/RPFTool/mainForm.resx b/RPFTool/mainForm.resx
index 36dd0f5..b2ef76a 100644
--- a/RPFTool/mainForm.resx
+++ b/RPFTool/mainForm.resx
@@ -126,8 +126,11 @@
17, 17
+
+ 491, 17
+
-
+
AAABAAUAAAAAAAEAIAAWMgAAVgAAADAwAAABACAAqCUAAGwyAAAgIAAAAQAgAKgQAAAUWAAAGBgAAAEA
IACICQAAvGgAABAQAAABACAAaAQAAERyAACJUE5HDQoaCgAAAA1JSERSAAABAAAAAQAIBgAAAFxyqGYA
@@ -638,9 +641,6 @@
AAAAAAAAAAAAAAAAAAAAAAAAAAA=
-
- 491, 17
-
608, 17