diff --git a/PCK-Studio/MainForm.Designer.cs b/PCK-Studio/MainForm.Designer.cs index 200cc6d7..c099f9dc 100644 --- a/PCK-Studio/MainForm.Designer.cs +++ b/PCK-Studio/MainForm.Designer.cs @@ -65,9 +65,7 @@ this.cloneFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.renameFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.replaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.moveUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.deleteFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.moveDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -116,6 +114,7 @@ this.addEntryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.addMultipleEntriesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.deleteEntryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.editAllEntriesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.tabControl = new MetroFramework.Controls.MetroTabControl(); this.openTab = new MetroFramework.Controls.MetroTabPage(); @@ -139,7 +138,6 @@ this.imageList = new System.Windows.Forms.ImageList(this.components); this.pictureBoxImagePreview = new PckStudio.PictureBoxWithInterpolationMode(); this.LittleEndianCheckBox = new MetroFramework.Controls.MetroCheckBox(); - this.editAllEntriesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.contextMenuPCKEntries.SuspendLayout(); this.menuStrip.SuspendLayout(); this.contextMenuMetaTree.SuspendLayout(); @@ -165,9 +163,7 @@ this.cloneFileToolStripMenuItem, this.renameFileToolStripMenuItem, this.replaceToolStripMenuItem, - this.moveUpToolStripMenuItem, - this.deleteFileToolStripMenuItem, - this.moveDownToolStripMenuItem}); + this.deleteFileToolStripMenuItem}); this.contextMenuPCKEntries.Name = "contextMenuStrip1"; resources.ApplyResources(this.contextMenuPCKEntries, "contextMenuPCKEntries"); // @@ -389,24 +385,12 @@ this.replaceToolStripMenuItem.Name = "replaceToolStripMenuItem"; this.replaceToolStripMenuItem.Click += new System.EventHandler(this.replaceToolStripMenuItem_Click); // - // moveUpToolStripMenuItem - // - resources.ApplyResources(this.moveUpToolStripMenuItem, "moveUpToolStripMenuItem"); - this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; - this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.moveUpToolStripMenuItem_Click); - // // deleteFileToolStripMenuItem // resources.ApplyResources(this.deleteFileToolStripMenuItem, "deleteFileToolStripMenuItem"); this.deleteFileToolStripMenuItem.Name = "deleteFileToolStripMenuItem"; this.deleteFileToolStripMenuItem.Click += new System.EventHandler(this.deleteFileToolStripMenuItem_Click); // - // moveDownToolStripMenuItem - // - resources.ApplyResources(this.moveDownToolStripMenuItem, "moveDownToolStripMenuItem"); - this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; - this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.moveDownToolStripMenuItem_Click); - // // menuStrip // resources.ApplyResources(this.menuStrip, "menuStrip"); @@ -749,6 +733,12 @@ this.deleteEntryToolStripMenuItem.Name = "deleteEntryToolStripMenuItem"; this.deleteEntryToolStripMenuItem.Click += new System.EventHandler(this.deleteEntryToolStripMenuItem_Click); // + // editAllEntriesToolStripMenuItem + // + this.editAllEntriesToolStripMenuItem.Name = "editAllEntriesToolStripMenuItem"; + resources.ApplyResources(this.editAllEntriesToolStripMenuItem, "editAllEntriesToolStripMenuItem"); + this.editAllEntriesToolStripMenuItem.Click += new System.EventHandler(this.editAllEntriesToolStripMenuItem_Click); + // // pictureBox2 // resources.ApplyResources(this.pictureBox2, "pictureBox2"); @@ -1026,12 +1016,6 @@ this.LittleEndianCheckBox.Theme = MetroFramework.MetroThemeStyle.Dark; this.LittleEndianCheckBox.UseSelectable = true; // - // editAllEntriesToolStripMenuItem - // - this.editAllEntriesToolStripMenuItem.Name = "editAllEntriesToolStripMenuItem"; - resources.ApplyResources(this.editAllEntriesToolStripMenuItem, "editAllEntriesToolStripMenuItem"); - this.editAllEntriesToolStripMenuItem.Click += new System.EventHandler(this.editAllEntriesToolStripMenuItem_Click); - // // MainForm // this.ApplyImageInvert = true; @@ -1083,8 +1067,6 @@ private System.Windows.Forms.ContextMenuStrip contextMenuMetaTree; private System.Windows.Forms.ToolStripMenuItem addEntryToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem deleteEntryToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem moveUpToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem moveDownToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem metaToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem addMultipleEntriesToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem newToolStripMenuItem; diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index e7a989ad..a8e05f87 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -1107,76 +1107,6 @@ namespace PckStudio } } - private void moveUpToolStripMenuItem_Click(object sender, EventArgs e) - { - if (treeViewMain.SelectedNode == null) return; - - //if (treeViewMain.SelectedNode.Tag is PCKFile.FileData) - //{ - // PCKFile.FileData file = treeViewMain.SelectedNode.Tag as PCKFile.FileData; - // int file_index = currentPCK.Files.IndexOf(file); - // currentPCK.Files.Swap(file_index, file_index - 1); - // saved = false; - //} - //return; - - TreeNode node = (TreeNode)treeViewMain.SelectedNode.Clone(); - - if (treeViewMain.SelectedNode.Parent == null) - { - if (treeViewMain.SelectedNode.PrevNode == null) return; - treeViewMain.Nodes.Insert(treeViewMain.SelectedNode.PrevNode.Index, node); - treeViewMain.SelectedNode.Remove(); - } - else - { - if (treeViewMain.SelectedNode.PrevNode == null) return; - treeViewMain.SelectedNode.Parent.Nodes.Insert(treeViewMain.SelectedNode.PrevNode.Index, node); - //removes node because a clone was inserted into its new index - treeViewMain.SelectedNode.Remove(); - } - treeViewMain.SelectedNode = node; - - if (IsSubPCKNode(node.FullPath)) RebuildSubPCK(node); - BuildMainTreeView(); - saved = false; - } - - private void moveDownToolStripMenuItem_Click(object sender, EventArgs e) - { - if (treeViewMain.SelectedNode == null) return; - - //if (treeViewMain.SelectedNode.Tag is PCKFile.FileData) - //{ - // PCKFile.FileData file = treeViewMain.SelectedNode.Tag as PCKFile.FileData; - // int file_index = currentPCK.Files.IndexOf(file); - // currentPCK.Files.Swap(file_index, file_index + 1); - // saved = false; - //} - //return; - - TreeNode node = (TreeNode)treeViewMain.SelectedNode.Clone(); - if (treeViewMain.SelectedNode.Parent == null) - { - if (treeViewMain.SelectedNode.NextNode == null) return; - treeViewMain.Nodes.Insert(treeViewMain.SelectedNode.NextNode.Index + 1, node); - //removes node because a clone was inserted into its new index - treeViewMain.SelectedNode.Remove(); - } - else - { - if (treeViewMain.SelectedNode.NextNode == null) return; - treeViewMain.SelectedNode.Parent.Nodes.Insert(treeViewMain.SelectedNode.NextNode.Index + 1, node); - //removes node because a clone was inserted into its new index - treeViewMain.SelectedNode.Remove(); - } - treeViewMain.SelectedNode = node; - - if (IsSubPCKNode(node.FullPath)) RebuildSubPCK(node); - BuildMainTreeView(); - saved = false; - } - #region drag and drop for main tree node public static void getChildren(List Nodes, TreeNode Node) diff --git a/PCK-Studio/MainForm.resx b/PCK-Studio/MainForm.resx index 0296ba3c..8c4240de 100644 --- a/PCK-Studio/MainForm.resx +++ b/PCK-Studio/MainForm.resx @@ -130,7 +130,7 @@ - 167, 22 + 180, 22 Folder @@ -152,7 +152,7 @@ - 167, 22 + 180, 22 Skin @@ -174,7 +174,7 @@ - 167, 22 + 180, 22 Animated Texture @@ -188,19 +188,19 @@ - 167, 22 + 180, 22 Audio.pck - 167, 22 + 180, 22 Colours.col - 167, 22 + 180, 22 Skins.pck @@ -214,7 +214,7 @@ - 157, 22 + 180, 22 Create @@ -275,7 +275,7 @@ - 157, 22 + 180, 22 Import @@ -287,7 +287,7 @@ Export as 3DS Texture - 157, 22 + 180, 22 Export @@ -365,7 +365,7 @@ Entity Materials File (.BIN) - 157, 22 + 180, 22 Set File Type @@ -389,7 +389,7 @@ Correct Skin Decimals - 157, 22 + 180, 22 Misc. Functions @@ -404,13 +404,13 @@ - 157, 22 + 180, 22 Extract - 157, 22 + 180, 22 Clone @@ -423,7 +423,7 @@ - 157, 22 + 180, 22 Rename @@ -439,26 +439,11 @@ - 157, 22 + 180, 22 Replace - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABxSURBVDhPnY7B - DYAwDMQyWvdfKhCkk1pfKCoPPzDnqJGZr4wxsqCfaWVRYdy/i92RVs7x1xETXSy6I8vHLhY8chSL+chx - LHTkVyyeVk8RHBHbm0BAbG8CAbG9CQTE9iYQENubQEBsbwIBsb0JBGTdZ1yetvognHnUhQAAAABJRU5E - rkJggg== - - - - 157, 22 - - - Move Up - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -469,28 +454,13 @@ - 157, 22 + 180, 22 Delete - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAAB3SURBVDhPnY4B - CsAgDAN9mv//VLcIBZtTcRNOMOSCLSIK79G1BX0EJjjoIzDBQR+BCQ76CExw0EdggoM+AhMc9BGY4KDf - e0fpluFq5c+InPGD/MqXkZTLgLgZmWVRBsRpxGVRHslqZCULBMk8spPFMkwknuSIaA+fA/og+1pHjwAA - AABJRU5ErkJggg== - - - - 157, 22 - - - Move Down - - 158, 268 + 181, 246 contextMenuPCKEntries @@ -28642,7 +28612,7 @@ Edit All Entries - 182, 114 + 182, 92 contextMenuMetaTree @@ -33696,24 +33666,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - moveUpToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - deleteFileToolStripMenuItem System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - moveDownToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - fileToolStripMenuItem @@ -33990,18 +33948,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - imageList - - - System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - editAllEntriesToolStripMenuItem System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + imageList + + + System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + MainForm