diff --git a/FModel/PAKWindow.Designer.cs b/FModel/PAKWindow.Designer.cs
index 1613a67e..f5589e15 100644
--- a/FModel/PAKWindow.Designer.cs
+++ b/FModel/PAKWindow.Designer.cs
@@ -34,6 +34,8 @@
this.LoadButton = new FModel.SplitButton();
this.LoadContext = new System.Windows.Forms.ContextMenuStrip(this.components);
this.loadAllPAKsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.backupCurrentPAKsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.enablePAKsDiffToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AESKeyLabel = new System.Windows.Forms.Label();
@@ -45,9 +47,9 @@
this.ItemIconPictureBox = new System.Windows.Forms.PictureBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.scintilla1 = new ScintillaNET.Scintilla();
- this.SaveImageButton = new FModel.SplitButton();
+ this.OpenImageButton = new FModel.SplitButton();
this.ImageContext = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.OpenImageTS = new System.Windows.Forms.ToolStripMenuItem();
+ this.ImageSaveTS = new System.Windows.Forms.ToolStripMenuItem();
this.ExtractAssetButton = new FModel.SplitButton();
this.ExtractAsset = new System.Windows.Forms.ContextMenuStrip(this.components);
this.LoadDataTS = new System.Windows.Forms.ToolStripMenuItem();
@@ -57,8 +59,6 @@
this.ConsoleRichTextBox = new System.Windows.Forms.RichTextBox();
this.FilterLabel = new System.Windows.Forms.Label();
this.FilterTextBox = new System.Windows.Forms.TextBox();
- this.backupCurrentPAKsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.enablePAKsDiffToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.groupBox1.SuspendLayout();
this.LoadContext.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ItemIconPictureBox)).BeginInit();
@@ -102,7 +102,7 @@
this.toolStripSeparator3,
this.optionsToolStripMenuItem});
this.LoadContext.Name = "LoadContext";
- this.LoadContext.Size = new System.Drawing.Size(186, 120);
+ this.LoadContext.Size = new System.Drawing.Size(186, 98);
//
// loadAllPAKsToolStripMenuItem
//
@@ -112,6 +112,23 @@
this.loadAllPAKsToolStripMenuItem.Text = "Load All PAKs";
this.loadAllPAKsToolStripMenuItem.Click += new System.EventHandler(this.loadAllPAKsToolStripMenuItem_Click);
//
+ // backupCurrentPAKsToolStripMenuItem
+ //
+ this.backupCurrentPAKsToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.backupCurrentPAKsToolStripMenuItem.Name = "backupCurrentPAKsToolStripMenuItem";
+ this.backupCurrentPAKsToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
+ this.backupCurrentPAKsToolStripMenuItem.Text = "Backup Current PAKs";
+ this.backupCurrentPAKsToolStripMenuItem.Click += new System.EventHandler(this.backupCurrentPAKsToolStripMenuItem_Click);
+ //
+ // enablePAKsDiffToolStripMenuItem
+ //
+ this.enablePAKsDiffToolStripMenuItem.CheckOnClick = true;
+ this.enablePAKsDiffToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.enablePAKsDiffToolStripMenuItem.Name = "enablePAKsDiffToolStripMenuItem";
+ this.enablePAKsDiffToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
+ this.enablePAKsDiffToolStripMenuItem.Text = "Enable PAKs Diff";
+ this.enablePAKsDiffToolStripMenuItem.CheckedChanged += new System.EventHandler(this.enablePAKsDiffToolStripMenuItem_CheckedChanged);
+ //
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
@@ -193,7 +210,7 @@
// groupBox2
//
this.groupBox2.Controls.Add(this.scintilla1);
- this.groupBox2.Controls.Add(this.SaveImageButton);
+ this.groupBox2.Controls.Add(this.OpenImageButton);
this.groupBox2.Controls.Add(this.ExtractAssetButton);
this.groupBox2.Controls.Add(this.ConsoleRichTextBox);
this.groupBox2.Controls.Add(this.ItemIconPictureBox);
@@ -213,33 +230,33 @@
this.scintilla1.Size = new System.Drawing.Size(560, 350);
this.scintilla1.TabIndex = 12;
//
- // SaveImageButton
+ // OpenImageButton
//
- this.SaveImageButton.Location = new System.Drawing.Point(810, 635);
- this.SaveImageButton.Menu = this.ImageContext;
- this.SaveImageButton.Name = "SaveImageButton";
- this.SaveImageButton.Size = new System.Drawing.Size(112, 23);
- this.SaveImageButton.TabIndex = 11;
- this.SaveImageButton.Text = " Save Image";
- this.SaveImageButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.SaveImageButton.UseVisualStyleBackColor = true;
- this.SaveImageButton.Click += new System.EventHandler(this.SaveImageButton_Click);
+ this.OpenImageButton.Location = new System.Drawing.Point(810, 635);
+ this.OpenImageButton.Menu = this.ImageContext;
+ this.OpenImageButton.Name = "OpenImageButton";
+ this.OpenImageButton.Size = new System.Drawing.Size(112, 23);
+ this.OpenImageButton.TabIndex = 11;
+ this.OpenImageButton.Text = " Open Image";
+ this.OpenImageButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.OpenImageButton.UseVisualStyleBackColor = true;
+ this.OpenImageButton.Click += new System.EventHandler(this.OpenImageButton_Click);
//
// ImageContext
//
this.ImageContext.ImageScalingSize = new System.Drawing.Size(18, 18);
this.ImageContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.OpenImageTS});
+ this.ImageSaveTS});
this.ImageContext.Name = "ImageContext";
- this.ImageContext.Size = new System.Drawing.Size(140, 26);
+ this.ImageContext.Size = new System.Drawing.Size(181, 48);
//
- // OpenImageTS
+ // ImageSaveTS
//
- this.OpenImageTS.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
- this.OpenImageTS.Name = "OpenImageTS";
- this.OpenImageTS.Size = new System.Drawing.Size(139, 22);
- this.OpenImageTS.Text = "Open Image";
- this.OpenImageTS.Click += new System.EventHandler(this.OpenImageTS_Click);
+ this.ImageSaveTS.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.ImageSaveTS.Name = "ImageSaveTS";
+ this.ImageSaveTS.Size = new System.Drawing.Size(180, 22);
+ this.ImageSaveTS.Text = "Save Image";
+ this.ImageSaveTS.Click += new System.EventHandler(this.ImageSaveTS_Click);
//
// ExtractAssetButton
//
@@ -322,23 +339,6 @@
this.FilterTextBox.TabIndex = 5;
this.FilterTextBox.TextChanged += new System.EventHandler(this.FilterTextBox_TextChanged);
//
- // backupCurrentPAKsToolStripMenuItem
- //
- this.backupCurrentPAKsToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
- this.backupCurrentPAKsToolStripMenuItem.Name = "backupCurrentPAKsToolStripMenuItem";
- this.backupCurrentPAKsToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
- this.backupCurrentPAKsToolStripMenuItem.Text = "Backup Current PAKs";
- this.backupCurrentPAKsToolStripMenuItem.Click += new System.EventHandler(this.backupCurrentPAKsToolStripMenuItem_Click);
- //
- // enablePAKsDiffToolStripMenuItem
- //
- this.enablePAKsDiffToolStripMenuItem.CheckOnClick = true;
- this.enablePAKsDiffToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
- this.enablePAKsDiffToolStripMenuItem.Name = "enablePAKsDiffToolStripMenuItem";
- this.enablePAKsDiffToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
- this.enablePAKsDiffToolStripMenuItem.Text = "Enable PAKs Diff";
- this.enablePAKsDiffToolStripMenuItem.CheckedChanged += new System.EventHandler(this.enablePAKsDiffToolStripMenuItem_CheckedChanged);
- //
// PAKWindow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -387,8 +387,8 @@
private System.Windows.Forms.ContextMenuStrip ExtractAsset;
private System.Windows.Forms.ToolStripMenuItem LoadDataTS;
private System.Windows.Forms.ContextMenuStrip ImageContext;
- private System.Windows.Forms.ToolStripMenuItem OpenImageTS;
- private SplitButton SaveImageButton;
+ private System.Windows.Forms.ToolStripMenuItem ImageSaveTS;
+ private SplitButton OpenImageButton;
private System.Windows.Forms.ToolStripMenuItem SaveImageTS;
private SplitButton LoadButton;
private System.Windows.Forms.ContextMenuStrip LoadContext;
diff --git a/FModel/PAKWindow.cs b/FModel/PAKWindow.cs
index 6c7f55d0..822d96dd 100644
--- a/FModel/PAKWindow.cs
+++ b/FModel/PAKWindow.cs
@@ -101,9 +101,11 @@ namespace FModel
fileopener.Start();
}
+ string BackupFilename = string.Empty;
private void PAKWindow_Load(object sender, EventArgs e)
{
bool connection = IsInternetAvailable();
+ BackupFilename = "\\FortniteGame_" + DateTime.Now.ToString("MMddyyyy") + ".txt";
SetTreeViewTheme(PAKTreeView.Handle);
Properties.Settings.Default.ExtractAndSerialize = true; //SERIALIZE BY DEFAULT
@@ -206,7 +208,7 @@ namespace FModel
}
ExtractAssetButton.Enabled = false;
- SaveImageButton.Enabled = false;
+ OpenImageButton.Enabled = false;
fontLength = Properties.Resources.BurbankBigCondensed_Bold.Length;
fontdata = Properties.Resources.BurbankBigCondensed_Bold;
@@ -321,7 +323,7 @@ namespace FModel
if (!File.Exists(docPath + "\\" + PAKsComboBox.SelectedItem + ".txt"))
{
- AppendText("✗ ", Color.Red);
+ AppendText("✗", Color.Red);
AppendText(" Can't read ", Color.Black);
AppendText(PAKsComboBox.SelectedItem.ToString(), Color.SteelBlue);
AppendText(" with this key", Color.Black, true);
@@ -366,7 +368,7 @@ namespace FModel
});
if (!File.Exists(docPath + "\\" + currentPAK + ".txt"))
{
- AppendText("✗ ", Color.Red);
+ AppendText("✗", Color.Red);
AppendText(" Can't read ", Color.Black);
AppendText(currentPAK, Color.SteelBlue);
AppendText(" with this key", Color.Black, true);
@@ -410,6 +412,19 @@ namespace FModel
}
}
}
+ if (currentPAK == "pakchunk0_s1-WindowsClient.pak" || currentPAK == "pakchunk0_s4-WindowsClient.pak" || currentPAK == "pakchunk0_s6-WindowsClient.pak" || currentPAK == "pakchunk0_s7-WindowsClient.pak" || currentPAK == "pakchunk1-WindowsClient.pak" || currentPAK == "pakchunk1_s1-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/Content/\"", Color.Black, true);
+ if (currentPAK == "pakchunk0_s2-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/Content/Characters/Player/\"", Color.Black, true);
+ if (currentPAK == "pakchunk0_s3-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/Content/Characters/Player/Male/\"", Color.Black, true);
+ if (currentPAK == "pakchunk0_s5-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/Content/Environments/\"", Color.Black, true);
+ if (currentPAK == "pakchunk0_s8-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/\"", Color.Black, true);
+ if (currentPAK == "pakchunk5-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/Content/L10N/fr/\"", Color.Black, true);
+
File.AppendAllLines(docPath + "\\FortnitePAKs.txt", arr);
File.Delete(docPath + "\\" + currentPAK + ".txt");
}
@@ -459,7 +474,7 @@ namespace FModel
});
if (!File.Exists(docPath + "\\" + currentPAK + ".txt"))
{
- AppendText("✗ ", Color.Red);
+ AppendText("✗", Color.Red);
AppendText(" Can't read ", Color.Black);
AppendText(currentPAK, Color.SteelBlue);
AppendText(" with this key", Color.Black, true);
@@ -503,6 +518,19 @@ namespace FModel
}
}
}
+ if (currentPAK == "pakchunk0_s1-WindowsClient.pak" || currentPAK == "pakchunk0_s4-WindowsClient.pak" || currentPAK == "pakchunk0_s6-WindowsClient.pak" || currentPAK == "pakchunk0_s7-WindowsClient.pak" || currentPAK == "pakchunk1-WindowsClient.pak" || currentPAK == "pakchunk1_s1-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/Content/\"", Color.Black, true);
+ if (currentPAK == "pakchunk0_s2-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/Content/Characters/Player/\"", Color.Black, true);
+ if (currentPAK == "pakchunk0_s3-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/Content/Characters/Player/Male/\"", Color.Black, true);
+ if (currentPAK == "pakchunk0_s5-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/Content/Environments/\"", Color.Black, true);
+ if (currentPAK == "pakchunk0_s8-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/\"", Color.Black, true);
+ if (currentPAK == "pakchunk5-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/Content/L10N/fr/\"", Color.Black, true);
+
File.AppendAllLines(docPath + "\\FortnitePAKs.txt", arr);
File.Delete(docPath + "\\" + currentPAK + ".txt");
}
@@ -571,140 +599,55 @@ namespace FModel
});
if (!File.Exists(docPath + "\\" + currentPAK + ".txt"))
{
- AppendText("✗ ", Color.Red);
+ AppendText("✗", Color.Red);
AppendText(" Can't read ", Color.Black);
AppendText(currentPAK, Color.SteelBlue);
AppendText(" with this key", Color.Black, true);
}
else
{
- if (!File.Exists(docPath + "\\FortnitePAKs_Temp.txt"))
+ if (!File.Exists(docPath + BackupFilename))
{
- File.Create(docPath + "\\FortnitePAKs_Temp.txt").Dispose();
+ File.Create(docPath + BackupFilename).Dispose();
}
string[] arr = File.ReadAllLines(docPath + "\\" + currentPAK + ".txt");
for (int ii = 0; ii < arr.Length; ii++)
{
- string filename = arr[ii].Substring(arr[ii].LastIndexOf("/") + 1);
- if (filename.Contains(".uasset") || filename.Contains(".uexp") || filename.Contains(".ubulk"))
- {
- if (!AllPAKsDict.ContainsKey(filename.Substring(0, filename.LastIndexOf("."))))
- {
- AllPAKsDict.Add(filename.Substring(0, filename.LastIndexOf(".")), currentPAK);
- }
- }
- else
- {
- if (!AllPAKsDict.ContainsKey(filename))
- {
- AllPAKsDict.Add(filename, currentPAK);
- }
- }
+ if (currentPAK == "pakchunk0_s1-WindowsClient.pak" || currentPAK == "pakchunk0_s4-WindowsClient.pak" || currentPAK == "pakchunk0_s6-WindowsClient.pak" || currentPAK == "pakchunk0_s7-WindowsClient.pak" || currentPAK == "pakchunk1-WindowsClient.pak" || currentPAK == "pakchunk1_s1-WindowsClient.pak")
+ arr[ii] = "FortniteGame/Content/" + arr[ii];
+ if (currentPAK == "pakchunk0_s2-WindowsClient.pak")
+ arr[ii] = "FortniteGame/Content/Characters/Player/" + arr[ii];
+ if (currentPAK == "pakchunk0_s3-WindowsClient.pak")
+ arr[ii] = "FortniteGame/Content/Characters/Player/Male/" + arr[ii];
+ if (currentPAK == "pakchunk0_s5-WindowsClient.pak")
+ arr[ii] = "FortniteGame/Content/Environments/" + arr[ii];
+ if (currentPAK == "pakchunk0_s8-WindowsClient.pak")
+ arr[ii] = "FortniteGame/" + arr[ii];
+ if (currentPAK == "pakchunk5-WindowsClient.pak")
+ arr[ii] = "FortniteGame/Content/L10N/fr/" + arr[ii];
}
- File.AppendAllText(docPath + "\\FortnitePAKs_Temp.txt", File.ReadAllText(docPath + "\\" + currentPAK + ".txt"));
+ if (currentPAK == "pakchunk0_s1-WindowsClient.pak" || currentPAK == "pakchunk0_s4-WindowsClient.pak" || currentPAK == "pakchunk0_s6-WindowsClient.pak" || currentPAK == "pakchunk0_s7-WindowsClient.pak" || currentPAK == "pakchunk1-WindowsClient.pak" || currentPAK == "pakchunk1_s1-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/Content/\"", Color.Black, true);
+ if (currentPAK == "pakchunk0_s2-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/Content/Characters/Player/\"", Color.Black, true);
+ if (currentPAK == "pakchunk0_s3-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/Content/Characters/Player/Male/\"", Color.Black, true);
+ if (currentPAK == "pakchunk0_s5-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/Content/Environments/\"", Color.Black, true);
+ if (currentPAK == "pakchunk0_s8-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/\"", Color.Black, true);
+ if (currentPAK == "pakchunk5-WindowsClient.pak")
+ AppendText("mount point: \"/FortniteGame/Content/L10N/fr/\"", Color.Black, true);
+
+ File.AppendAllLines(docPath + BackupFilename, arr);
File.Delete(docPath + "\\" + currentPAK + ".txt");
}
}
}
- if (File.Exists(docPath + "\\FortnitePAKs_Temp.txt"))
- {
- string[] arr = File.ReadAllLines(docPath + "\\FortnitePAKs_Temp.txt");
- File.Delete(docPath + "\\FortnitePAKs_Temp.txt");
- AppendText("Fixing paths... Please wait ", Color.Black, true);
- await Task.Run(() => {
- for (int i = 0; i < arr.Length; i++)
- {
- if (arr[i].StartsWith("Athena") ||
- arr[i].StartsWith("Balance") ||
- arr[i].StartsWith("Characters") ||
- arr[i].StartsWith("Banners") ||
- arr[i].StartsWith("Building") ||
- arr[i].StartsWith("Blueprints") ||
- arr[i].StartsWith("ArtTools") ||
- arr[i].StartsWith("Catalog") ||
- arr[i].StartsWith("Animation") ||
- arr[i].StartsWith("Effects") ||
- arr[i].StartsWith("Environments") ||
- arr[i].StartsWith("Characters") ||
- arr[i].StartsWith("CharClasses") ||
- arr[i].StartsWith("ContentCreationTools") ||
- arr[i].StartsWith("DeathPenalty") ||
- arr[i].StartsWith("CollectionBook") ||
- arr[i].StartsWith("CommandConsole") ||
- arr[i].StartsWith("Creative") ||
- arr[i].StartsWith("DeployableBases") ||
- arr[i].StartsWith("GameplayCueNotifies") ||
- arr[i].StartsWith("Items") ||
- arr[i].StartsWith("Missions") ||
- arr[i].StartsWith("GameplayEffectTemplates") ||
- arr[i].StartsWith("Heroes") ||
- arr[i].StartsWith("GameplayCurves") ||
- arr[i].StartsWith("Packages") ||
- arr[i].StartsWith("FortressPhysicalMaterials") ||
- arr[i].StartsWith("Expeditions") ||
- arr[i].StartsWith("Gamepad") ||
- arr[i].StartsWith("Gadgets") ||
- arr[i].StartsWith("Macros") ||
- arr[i].StartsWith("Maps") ||
- arr[i].StartsWith("Frontend") ||
- arr[i].StartsWith("Playgrounds") ||
- arr[i].StartsWith("Playsets") ||
- arr[i].StartsWith("Movies") ||
- arr[i].StartsWith("L10N") ||
- arr[i].StartsWith("ImpostorBaker") ||
- arr[i].StartsWith("Marketing") ||
- arr[i].StartsWith("Marketing_Screenshots") ||
- arr[i].StartsWith("Sounds") ||
- arr[i].StartsWith("UI") ||
- arr[i].StartsWith("Quests") ||
- arr[i].StartsWith("VisualThreatManager") ||
- arr[i].StartsWith("Weapons") ||
- arr[i].StartsWith("WaterAndWind") ||
- arr[i].StartsWith("Tools") ||
- arr[i].StartsWith("Vehicles") ||
- arr[i].StartsWith("PvP") ||
- arr[i].StartsWith("Spectating") ||
- arr[i].StartsWith("TheOutpost") ||
- arr[i].StartsWith("TimeOfDay") ||
- arr[i].StartsWith("Research") ||
- arr[i].StartsWith("Relics") ||
- arr[i].StartsWith("Slate") ||
- arr[i].StartsWith("TheKeep") ||
- arr[i].StartsWith("FrontEnd") ||
- arr[i].StartsWith("AIDirector") ||
- arr[i].StartsWith("AI") ||
- arr[i].StartsWith("Abilities") ||
- arr[i].StartsWith("Accessories") ||
- arr[i].StartsWith("WorldTiles") ||
- arr[i].StartsWith("Widgets"))
- {
- arr[i] = "FortniteGame/Content/" + arr[i];
- }
- if (arr[i].StartsWith("Content") || arr[i].StartsWith("Plugins"))
- {
- arr[i] = "FortniteGame/" + arr[i];
- }
- if (arr[i].StartsWith("Female") || arr[i].StartsWith("Male"))
- {
- arr[i] = "FortniteGame/Content/Characters/Player/" + arr[i];
- }
- if (arr[i].StartsWith("Male_Avg_Base") || arr[i].StartsWith("Medium") || arr[i].StartsWith("LegacyAssets") || arr[i].StartsWith("Large"))
- {
- arr[i] = "FortniteGame/Content/Characters/Player/Male/" + arr[i];
- }
- if (arr[i].StartsWith("Props") || arr[i].StartsWith("Sets") || arr[i].StartsWith("Prototype"))
- {
- arr[i] = "FortniteGame/Content/Environments/" + arr[i];
- }
- }
- });
- string filename = "\\FortniteGame_" + DateTime.Now.ToString("MMddyyyy") + ".txt";
- File.WriteAllLines(docPath + filename, arr);
- AppendText("✔ ", Color.Green);
- AppendText("Backup successfully created with path ", Color.Black);
- AppendText(docPath + filename, Color.DarkRed, true);
- }
+ AppendText("✔ ", Color.Green);
+ AppendText("Backup successfully created with path ", Color.Black);
+ AppendText(docPath + BackupFilename, Color.DarkRed, true);
LoadButton.Enabled = true;
stopWatch.Stop();
@@ -1148,7 +1091,7 @@ namespace FModel
}
ExtractAssetButton.Enabled = false;
- SaveImageButton.Enabled = false;
+ OpenImageButton.Enabled = false;
for (int i = 0; i < SelectedArray.Length; i++)
{
currentItem = SelectedArray[i].ToString();
@@ -3099,7 +3042,7 @@ namespace FModel
}
}
ExtractAssetButton.Enabled = true;
- SaveImageButton.Enabled = true;
+ OpenImageButton.Enabled = true;
SelectedArray = null;
stopWatch.Stop();
@@ -3108,7 +3051,26 @@ namespace FModel
AppendText("\nTime elapsed: " + elapsedTime, Color.Green, true, HorizontalAlignment.Right);
}
- private void SaveImageButton_Click(object sender, EventArgs e)
+ private void OpenImageButton_Click(object sender, EventArgs e)
+ {
+ if (ItemIconPictureBox.Image != null)
+ {
+ var newForm = new Form();
+
+ PictureBox pb = new PictureBox();
+ pb.Dock = DockStyle.Fill;
+ pb.Image = ItemIconPictureBox.Image;
+ pb.SizeMode = PictureBoxSizeMode.Zoom;
+
+ newForm.Size = ItemIconPictureBox.Image.Size;
+ newForm.Icon = Properties.Resources.FNTools_Logo_Icon;
+ newForm.Text = currentItem;
+ newForm.StartPosition = FormStartPosition.CenterScreen;
+ newForm.Controls.Add(pb);
+ newForm.Show();
+ }
+ }
+ private void ImageSaveTS_Click(object sender, EventArgs e)
{
if (ItemIconPictureBox.Image != null)
{
@@ -3141,25 +3103,6 @@ namespace FModel
}
}
}
- private void OpenImageTS_Click(object sender, EventArgs e)
- {
- if (ItemIconPictureBox.Image != null)
- {
- var newForm = new Form();
-
- PictureBox pb = new PictureBox();
- pb.Dock = DockStyle.Fill;
- pb.Image = ItemIconPictureBox.Image;
- pb.SizeMode = PictureBoxSizeMode.Zoom;
-
- newForm.Size = ItemIconPictureBox.Image.Size;
- newForm.Icon = Properties.Resources.FNTools_Logo_Icon;
- newForm.Text = currentItem;
- newForm.StartPosition = FormStartPosition.CenterScreen;
- newForm.Controls.Add(pb);
- newForm.Show();
- }
- }
private void mergeGeneratedImagesToolStripMenuItem_Click(object sender, EventArgs e)
{
diff --git a/FModel/PAKWindow.resx b/FModel/PAKWindow.resx
index 44d80bd3..c35e8fa9 100644
--- a/FModel/PAKWindow.resx
+++ b/FModel/PAKWindow.resx
@@ -117,6 +117,9 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ True
+
277, 17
@@ -131,7 +134,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACc
- BwAAAk1TRnQBSQFMAgEBAgEAAWABAAFgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ BwAAAk1TRnQBSQFMAgEBAgEAAWgBAAFoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA