From cafb8463b1e8b555d5d4fc87bbe5f37b264a3eef Mon Sep 17 00:00:00 2001 From: Fierelier Date: Fri, 10 Jun 2022 19:34:08 +0200 Subject: [PATCH] Update --- RPFTool.sln | 15 ++-- RPFTool/Program.cs | 2 +- RPFTool/Properties/licenses.licx | 10 ++- RPFTool/Properties/licenses.licx.bak | 6 ++ RPFTool/RPFTool.csproj | 72 +++++++++++++------ RPFTool/RPFTool.csproj.bak | 104 +++++++++++++++++---------- RPFTool/bin/Release/Keys.ini | 5 -- RPFTool/bin/Release/xcompress32.dll | Bin 33280 -> 0 bytes RPFTool/mainForm.Designer.cs | 54 +++++++++----- RPFTool/mainForm.resx | 8 +-- 10 files changed, 178 insertions(+), 98 deletions(-) create mode 100644 RPFTool/Properties/licenses.licx.bak delete mode 100644 RPFTool/bin/Release/Keys.ini delete mode 100644 RPFTool/bin/Release/xcompress32.dll 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 2e22c63237da7b48176ffe3798c5e8a9072b5d86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33280 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 17, 17 + + 491, 17 + - + AAABAAUAAAAAAAEAIAAWMgAAVgAAADAwAAABACAAqCUAAGwyAAAgIAAAAQAgAKgQAAAUWAAAGBgAAAEA IACICQAAvGgAABAQAAABACAAaAQAAERyAACJUE5HDQoaCgAAAA1JSERSAAABAAAAAQAIBgAAAFxyqGYA @@ -638,9 +641,6 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAA= - - 491, 17 - 608, 17