diff --git a/PCK-Studio/Controls/PckEditor.cs b/PCK-Studio/Controls/PckEditor.cs
index 596185a1..edd22280 100644
--- a/PCK-Studio/Controls/PckEditor.cs
+++ b/PCK-Studio/Controls/PckEditor.cs
@@ -1580,7 +1580,7 @@ namespace PckStudio.Controls
public void Close()
{
- if (_wasModified &&
+ if ((_wasModified || _isTemplateFile) &&
MessageBox.Show("Save PCK?", _isTemplateFile ? "Unsaved PCK" : "Modified PCK",
MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
{
diff --git a/PCK-Studio/MainForm.Designer.cs b/PCK-Studio/MainForm.Designer.cs
index cc6dd50f..2acae255 100644
--- a/PCK-Studio/MainForm.Designer.cs
+++ b/PCK-Studio/MainForm.Designer.cs
@@ -841,10 +841,10 @@
// StartPage
//
this.StartPage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18)))));
- this.StartPage.Controls.Add(this.label5);
- this.StartPage.Controls.Add(this.pckOpen);
this.StartPage.Controls.Add(this.labelVersion);
+ this.StartPage.Controls.Add(this.label5);
this.StartPage.Controls.Add(this.ChangelogRichTextBox);
+ this.StartPage.Controls.Add(this.pckOpen);
this.StartPage.ForeColor = System.Drawing.Color.Transparent;
this.StartPage.HorizontalScrollbarBarColor = true;
this.StartPage.HorizontalScrollbarHighlightOnWheel = false;
diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs
index dd1d7a73..91e5ce98 100644
--- a/PCK-Studio/MainForm.cs
+++ b/PCK-Studio/MainForm.cs
@@ -385,8 +385,8 @@ namespace PckStudio
private void RemoveOpenFile(TabPage page)
{
- var kv = openFiles.First((kv) => kv.Value == page);
- if (kv.Key != default && kv.Value != default)
+ var kv = openFiles.FirstOrDefault((kv) => kv.Value == page);
+ if (kv.Key != null && kv.Value != null)
{
openFiles.Remove(kv.Key);
}
@@ -610,7 +610,7 @@ namespace PckStudio
private void saveToolStripMenuItem_Click(object sender, EventArgs e)
{
- if (tabControl.SelectedTab is IPckEditor editor)
+ if (TryGetEditor(out var editor))
{
editor.Save();
}
@@ -618,7 +618,7 @@ namespace PckStudio
private void saveAsToolStripMenuItem_Click(object sender, EventArgs e)
{
- if (tabControl.SelectedTab is IPckEditor editor)
+ if (TryGetEditor(out var editor))
{
editor.SaveAs();
}
@@ -821,6 +821,9 @@ namespace PckStudio
{
closeToolStripMenuItem.Visible = tabControl.SelectedIndex > 0;
closeAllToolStripMenuItem.Visible = tabControl.SelectedIndex == 0 && tabControl.TabCount > 1;
+ saveAsToolStripMenuItem.Visible = tabControl.SelectedIndex > 0;
+ saveToolStripMenuItem.Visible = tabControl.SelectedIndex > 0;
+
if (tabControl.TabPages.Count == 1)
{
diff --git a/PCK-Studio/MainForm.resx b/PCK-Studio/MainForm.resx
index 1c52625b..07f82b64 100644
--- a/PCK-Studio/MainForm.resx
+++ b/PCK-Studio/MainForm.resx
@@ -141,6 +141,29 @@
116, 17
+
+ 158, 224
+
+
+ contextMenuPCKEntries
+
+
+ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAAA3SURBVDhPY/j/
+ /z9FGKsgGIsCKWSMTQ0QYxUE45FmALpiYvFwMgAbxqIYG8YqCMajBhCJ/zMAAPGwpV/Xje8RAAAAAElF
+ TkSuQmCC
+
+
+
+ 157, 22
+
+
+ Create
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -229,19 +252,20 @@
EntityMaterials.bin
-
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAAA3SURBVDhPY/j/
- /z9FGKsgGIsCKWSMTQ0QYxUE45FmALpiYvFwMgAbxqIYG8YqCMajBhCJ/zMAAPGwpV/Xje8RAAAAAElF
+ vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAABzSURBVDhPpYzB
+ DQAhCARp4hr3Txu254WTjYRb9cEmk/BgRjBVHTv85Twmgt77PcJEYIFrhIkAgWOEiSAGthEmgtbaD9fW
+ mBgpB4xywCgFxiMf5YDdrq3l5wjEjKtzTARMNlydY2IGot2ureVnRjkQmZbICyCi7XU5cfqKAAAAAElF
TkSuQmCC
-
+
157, 22
-
- Create
+
+ Import
@@ -295,20 +319,11 @@
Add File
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAABzSURBVDhPpYzB
- DQAhCARp4hr3Txu254WTjYRb9cEmk/BgRjBVHTv85Twmgt77PcJEYIFrhIkAgWOEiSAGthEmgtbaD9fW
- mBgpB4xywCgFxiMf5YDdrq3l5wjEjKtzTARMNlydY2IGot2ureVnRjkQmZbICyCi7XU5cfqKAAAAAElF
- TkSuQmCC
-
-
-
+
157, 22
-
- Import
+
+ Export
186, 22
@@ -316,11 +331,11 @@
Export as 3DS Texture
-
+
157, 22
-
- Export
+
+ Set File Type
222, 22
@@ -394,11 +409,11 @@
Entity Materials File (.BIN)
-
+
157, 22
-
- Set File Type
+
+ Misc. Functions
210, 22
@@ -418,12 +433,6 @@
Correct Skin Decimals
-
- 157, 22
-
-
- Misc. Functions
-
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -489,15 +498,6 @@
Delete
-
- 158, 224
-
-
- contextMenuPCKEntries
-
-
- System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
17, 17
@@ -507,6 +507,53 @@
None
+
+ 20, 3
+
+
+ 237, 24
+
+
+ 2
+
+
+ menuStrip1
+
+
+ menuStrip
+
+
+ System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 2
+
+
+ 37, 20
+
+
+ File
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADuSURBVFhH7ZbB
+ CsMgEERDbv5A/v83e2jNTmCKGdegJk0heHgUn7vrKBQyxRj/iivJPM9WMTWjc45wJeAwhAghVJEG1nkl
+ XNkziLCvtteXphFCfQ08nOi+4kvTeFL1NfBQ/BLuefjS9NkAADOwPnpNX14UADBEaV4mNnkygN34Y/1v
+ AgeWZXll9So2eTLAEVm9ik2a7g1Qgn9t9bvFV/4gAOZdHgB1RPeUEeAZAeBr0d4R4JIACuqI7ikjwDMD
+ tDACNAfo/Sou0fQ9wGKvoQfO8i61W6SkTXi+XtLLgOwcFSna3It3c+LKO3HlfcRpBa3JBjU5E8DiAAAA
+ AElFTkSuQmCC
+
+
+
+ 186, 22
+
+
+ New
+
151, 22
@@ -525,23 +572,6 @@
Mash-Up Pack
-
-
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADuSURBVFhH7ZbB
- CsMgEERDbv5A/v83e2jNTmCKGdegJk0heHgUn7vrKBQyxRj/iivJPM9WMTWjc45wJeAwhAghVJEG1nkl
- XNkziLCvtteXphFCfQ08nOi+4kvTeFL1NfBQ/BLuefjS9NkAADOwPnpNX14UADBEaV4mNnkygN34Y/1v
- AgeWZXll9So2eTLAEVm9ik2a7g1Qgn9t9bvFV/4gAOZdHgB1RPeUEeAZAeBr0d4R4JIACuqI7ikjwDMD
- tDACNAfo/Sou0fQ9wGKvoQfO8i61W6SkTXi+XtLLgOwcFSna3It3c+LKO3HlfcRpBa3JBjU5E8DiAAAA
- AElFTkSuQmCC
-
-
-
- 186, 22
-
-
- New
-
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -573,12 +603,6 @@
Extract
-
- 160, 22
-
-
- Full box support
-
186, 22
@@ -588,8 +612,11 @@
False
-
- False
+
+ 160, 22
+
+
+ Full box support
@@ -610,7 +637,7 @@
Save
-
+
False
@@ -632,6 +659,9 @@
Save As
+
+ False
+
186, 22
@@ -650,11 +680,11 @@
False
-
- 37, 20
+
+ 39, 20
-
- File
+
+ Edit
False
@@ -700,11 +730,11 @@
Convert to Bedrock
-
- 39, 20
+
+ 46, 20
-
- Edit
+
+ Tools
195, 22
@@ -718,6 +748,12 @@
Pck Manager
+
+ 195, 22
+
+
+ Audio Converter
+
145, 22
@@ -730,17 +766,11 @@
Binka -> Wav
-
- 195, 22
+
+ 63, 20
-
- Audio Converter
-
-
- 46, 20
-
-
- Tools
+
+ More
212, 22
@@ -878,11 +908,11 @@
Trello Board
-
- 63, 20
+
+ 44, 20
-
- More
+
+ Help
@@ -1356,6 +1386,20 @@
178, 6
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAKdJREFUOE+1
+ jzEKwzAQBNUEXKQIBOwifcgTUvkDbt2p9qP0Ev1E31FYkVXOx2FLRRYWi7NnTnZ/z/MxZPY7aguhbZlq
+ myQafL+ubRINshCwnO0kFqi3HkpwWOf7DkC1RBfvx9slV4ElscqbxBiz9/4nwOBIQjCEUL7FswhwDYAp
+ JVMiN0oYs/ILiCXRIGHOwVQBoiXsKSgjJdzaBMpQ0g3KEOoG++PcBx9PFJGNjU4vAAAAAElFTkSuQmCC
+
+
+
+ 181, 22
+
+
+ Tutorials
+
iVBORw0KGgoAAAANSUhEUgAACOAAAAaoCAYAAAAgNTafAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -19092,19 +19136,11 @@
How PCKs work
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAKdJREFUOE+1
- jzEKwzAQBNUEXKQIBOwifcgTUvkDbt2p9qP0Ev1E31FYkVXOx2FLRRYWi7NnTnZ/z/MxZPY7aguhbZlq
- myQafL+ubRINshCwnO0kFqi3HkpwWOf7DkC1RBfvx9slV4ElscqbxBiz9/4nwOBIQjCEUL7FswhwDYAp
- JVMiN0oYs/ILiCXRIGHOwVQBoiXsKSgjJdzaBMpQ0g3KEOoG++PcBx9PFJGNjU4vAAAAAElFTkSuQmCC
-
-
-
+
181, 22
-
- Tutorials
+
+ Buy a coffee
253, 22
@@ -19124,12 +19160,6 @@
For MattNL (Other Developer)
-
- 181, 22
-
-
- Buy a coffee
-
178, 6
@@ -21172,39 +21202,32 @@
Settings
-
- 44, 20
-
-
- Help
-
-
- 20, 3
-
-
- 237, 24
-
-
- 2
-
-
- menuStrip1
-
-
- menuStrip
-
-
- System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 2
-
298, 17
+
+ 182, 92
+
+
+ contextMenuMetaTree
+
+
+ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABSSURBVDhP5c0x
+ DsAgDENRxt7/wmkNSpRGf0CCCZAegxNMM7MlGMp3dIU6dxhKf/QMNxRogeQC8ivw5Vn7C0heJlFA+kL5
+ jWAohxRkde4wnGftBS90axNmphIGAAAAAElFTkSuQmCC
+
+
+
+ 181, 22
+
+
+ Add Entry
+
160, 22
@@ -21223,20 +21246,6 @@
Add ANIM Entry
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABSSURBVDhP5c0x
- DsAgDENRxt7/wmkNSpRGf0CCCZAegxNMM7MlGMp3dIU6dxhKf/QMNxRogeQC8ivw5Vn7C0heJlFA+kL5
- jWAohxRkde4wnGftBS90axNmphIGAAAAAElFTkSuQmCC
-
-
-
- 181, 22
-
-
- Add Entry
-
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -21272,15 +21281,6 @@
Edit All Entries
-
- 182, 92
-
-
- contextMenuMetaTree
-
-
- System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
0, 0
@@ -21326,6 +21326,36 @@
MetroFramework.Controls.MetroCheckBox, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+ True
+
+
+ False
+
+
+ 18, 11
+
+
+ 116, 19
+
+
+ 11
+
+
+ PCK Studio: 1.3.3.7
+
+
+ labelVersion
+
+
+ MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ StartPage
+
+
+ 0
+
Top, Right
@@ -21357,7 +21387,40 @@
StartPage
- 2
+ 3
+
+
+ Right
+
+
+ Segoe UI, 8.25pt
+
+
+ 566, 0
+
+
+ 0, 50, 30, 30
+
+
+ 450, 558
+
+
+ 22
+
+
+
+
+
+ ChangelogRichTextBox
+
+
+ System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ StartPage
+
+
+ 4
None
@@ -22374,66 +22437,6 @@
StartPage
- 3
-
-
- True
-
-
- 18, 11
-
-
- 116, 19
-
-
- 11
-
-
- PCK Studio: 1.3.3.7
-
-
- labelVersion
-
-
- MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
-
- StartPage
-
-
- 4
-
-
- Right
-
-
- Segoe UI, 8.25pt
-
-
- 566, 0
-
-
- 0, 50, 30, 30
-
-
- 450, 558
-
-
- 22
-
-
-
-
-
- ChangelogRichTextBox
-
-
- System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- StartPage
-
-
5