From f180c619066728b414e574f20ee62af7d5466f6b Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Sun, 22 Jan 2012 18:38:13 -0500 Subject: [PATCH] Mono compatibility improvements. --- About.Designer.cs | 3 +- About.cs | 1 - About.resx | 40 ++++++- EditValue.cs | 1 - Find.cs | 1 - Form1.Designer.cs | 193 +++++++++++++++---------------- Form1.cs | 50 +++++--- Form1.resx | 171 ++++++++++++++++++++++++--- NBTExplorer.csproj | 51 ++------ Properties/AssemblyInfo.cs | 4 +- Properties/Resources.Designer.cs | 70 ----------- Properties/Resources.resx | 35 +----- Properties/Settings.Designer.cs | 26 ----- Properties/Settings.settings | 7 -- app.config | 3 + 15 files changed, 335 insertions(+), 321 deletions(-) delete mode 100644 Properties/Settings.Designer.cs delete mode 100644 Properties/Settings.settings create mode 100644 app.config diff --git a/About.Designer.cs b/About.Designer.cs index 7ce49f2..fe3a962 100644 --- a/About.Designer.cs +++ b/About.Designer.cs @@ -27,6 +27,7 @@ /// private void InitializeComponent () { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(About)); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -47,7 +48,7 @@ // // pictureBox1 // - this.pictureBox1.Image = global::NBTExplorer.Properties.Resources.Dead_Bush; + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); this.pictureBox1.Location = new System.Drawing.Point(12, 12); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(78, 78); diff --git a/About.cs b/About.cs index 279e5cf..0853c5d 100644 --- a/About.cs +++ b/About.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.Data; using System.Drawing; using System.Text; using System.Windows.Forms; diff --git a/About.resx b/About.resx index 1af7de1..c94e8d0 100644 --- a/About.resx +++ b/About.resx @@ -112,9 +112,45 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 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 + + \ No newline at end of file diff --git a/EditValue.cs b/EditValue.cs index 29fead5..6fe4888 100644 --- a/EditValue.cs +++ b/EditValue.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.Data; using System.Drawing; using System.Text; using System.Windows.Forms; diff --git a/Find.cs b/Find.cs index 0f45d2a..3226d83 100644 --- a/Find.cs +++ b/Find.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.Data; using System.Drawing; using System.Text; using System.Windows.Forms; diff --git a/Form1.Designer.cs b/Form1.Designer.cs index fe0c6ef..041cb42 100644 --- a/Form1.Designer.cs +++ b/Form1.Designer.cs @@ -33,6 +33,7 @@ this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.openFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openMinecraftSaveFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); @@ -42,9 +43,6 @@ this.findNextToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer(); - this.statusStrip1 = new System.Windows.Forms.StatusStrip(); - this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this._nodeTree = new System.Windows.Forms.TreeView(); this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); @@ -68,17 +66,16 @@ this._buttonAddTagCompound = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this._buttonFindNext = new System.Windows.Forms.ToolStripButton(); - this._nodeContainerContext = new System.Windows.Forms.ContextMenuStrip(this.components); - this.openSubTreeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openMinecraftSaveFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.BottomToolStripPanel = new System.Windows.Forms.ToolStripPanel(); + this.TopToolStripPanel = new System.Windows.Forms.ToolStripPanel(); + this.RightToolStripPanel = new System.Windows.Forms.ToolStripPanel(); + this.LeftToolStripPanel = new System.Windows.Forms.ToolStripPanel(); + this.ContentPanel = new System.Windows.Forms.ToolStripContentPanel(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.menuStrip1.SuspendLayout(); - this.toolStripContainer1.ContentPanel.SuspendLayout(); - this.toolStripContainer1.TopToolStripPanel.SuspendLayout(); - this.toolStripContainer1.SuspendLayout(); - this.statusStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); - this._nodeContainerContext.SuspendLayout(); + this.statusStrip1.SuspendLayout(); this.SuspendLayout(); // // menuStrip1 @@ -109,7 +106,7 @@ // // openToolStripMenuItem // - this.openToolStripMenuItem.Image = global::NBTExplorer.Properties.Resources.folder_open_document; + this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image"))); this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.openToolStripMenuItem.Size = new System.Drawing.Size(223, 22); @@ -118,7 +115,7 @@ // // openFolderToolStripMenuItem // - this.openFolderToolStripMenuItem.Image = global::NBTExplorer.Properties.Resources.folder_open; + this.openFolderToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openFolderToolStripMenuItem.Image"))); this.openFolderToolStripMenuItem.Name = "openFolderToolStripMenuItem"; this.openFolderToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.O))); @@ -126,6 +123,13 @@ this.openFolderToolStripMenuItem.Text = "Open &Folder..."; this.openFolderToolStripMenuItem.Click += new System.EventHandler(this.openFolderToolStripMenuItem_Click); // + // openMinecraftSaveFolderToolStripMenuItem + // + this.openMinecraftSaveFolderToolStripMenuItem.Name = "openMinecraftSaveFolderToolStripMenuItem"; + this.openMinecraftSaveFolderToolStripMenuItem.Size = new System.Drawing.Size(223, 22); + this.openMinecraftSaveFolderToolStripMenuItem.Text = "Open &Minecraft Save Folder"; + this.openMinecraftSaveFolderToolStripMenuItem.Click += new System.EventHandler(this.openMinecraftSaveFolderToolStripMenuItem_Click); + // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; @@ -133,7 +137,7 @@ // // saveToolStripMenuItem // - this.saveToolStripMenuItem.Image = global::NBTExplorer.Properties.Resources.disk; + this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.saveToolStripMenuItem.Size = new System.Drawing.Size(223, 22); @@ -147,7 +151,7 @@ // // exitToolStripMenuItem // - this.exitToolStripMenuItem.Image = global::NBTExplorer.Properties.Resources.door; + this.exitToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("exitToolStripMenuItem.Image"))); this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); this.exitToolStripMenuItem.Size = new System.Drawing.Size(223, 22); @@ -165,7 +169,7 @@ // // findToolStripMenuItem // - this.findToolStripMenuItem.Image = global::NBTExplorer.Properties.Resources.binocular; + this.findToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("findToolStripMenuItem.Image"))); this.findToolStripMenuItem.Name = "findToolStripMenuItem"; this.findToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); this.findToolStripMenuItem.Size = new System.Drawing.Size(146, 22); @@ -174,7 +178,7 @@ // // findNextToolStripMenuItem // - this.findNextToolStripMenuItem.Image = global::NBTExplorer.Properties.Resources.binocular__arrow; + this.findNextToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("findNextToolStripMenuItem.Image"))); this.findNextToolStripMenuItem.Name = "findNextToolStripMenuItem"; this.findNextToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3; this.findNextToolStripMenuItem.Size = new System.Drawing.Size(146, 22); @@ -191,61 +195,26 @@ // // aboutToolStripMenuItem // - this.aboutToolStripMenuItem.Image = global::NBTExplorer.Properties.Resources.information_frame; + this.aboutToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("aboutToolStripMenuItem.Image"))); this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; this.aboutToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F1; this.aboutToolStripMenuItem.Size = new System.Drawing.Size(126, 22); this.aboutToolStripMenuItem.Text = "&About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // - // toolStripContainer1 - // - // - // toolStripContainer1.ContentPanel - // - this.toolStripContainer1.ContentPanel.Controls.Add(this.statusStrip1); - this.toolStripContainer1.ContentPanel.Controls.Add(this._nodeTree); - this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(562, 351); - this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.toolStripContainer1.Location = new System.Drawing.Point(0, 24); - this.toolStripContainer1.Name = "toolStripContainer1"; - this.toolStripContainer1.Size = new System.Drawing.Size(562, 376); - this.toolStripContainer1.TabIndex = 1; - this.toolStripContainer1.Text = "toolStripContainer1"; - // - // toolStripContainer1.TopToolStripPanel - // - this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.toolStrip1); - // - // statusStrip1 - // - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripStatusLabel1}); - this.statusStrip1.Location = new System.Drawing.Point(0, 329); - this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(562, 22); - this.statusStrip1.SizingGrip = false; - this.statusStrip1.TabIndex = 1; - this.statusStrip1.Text = "statusStrip1"; - this.statusStrip1.Visible = false; - // - // toolStripStatusLabel1 - // - this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(547, 17); - this.toolStripStatusLabel1.Spring = true; - this.toolStripStatusLabel1.Text = "Please wait..."; - // // _nodeTree // this._nodeTree.AllowDrop = true; - this._nodeTree.Dock = System.Windows.Forms.DockStyle.Fill; + this._nodeTree.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this._nodeTree.ImageIndex = 0; this._nodeTree.ImageList = this.imageList1; - this._nodeTree.Location = new System.Drawing.Point(0, 0); + this._nodeTree.Location = new System.Drawing.Point(0, 49); + this._nodeTree.Margin = new System.Windows.Forms.Padding(0); this._nodeTree.Name = "_nodeTree"; this._nodeTree.SelectedImageIndex = 0; - this._nodeTree.Size = new System.Drawing.Size(562, 351); + this._nodeTree.Size = new System.Drawing.Size(562, 350); this._nodeTree.TabIndex = 0; this._nodeTree.DragDrop += new System.Windows.Forms.DragEventHandler(this._nodeTree_DragDrop); this._nodeTree.DragEnter += new System.Windows.Forms.DragEventHandler(this._nodeTree_DragEnter); @@ -271,7 +240,6 @@ // // toolStrip1 // - this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this._buttonOpen, this._buttonOpenFolder, @@ -293,7 +261,7 @@ this._buttonAddTagCompound, this.toolStripSeparator5, this._buttonFindNext}); - this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Location = new System.Drawing.Point(0, 24); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(562, 25); this.toolStrip1.Stretch = true; @@ -312,7 +280,7 @@ // _buttonOpenFolder // this._buttonOpenFolder.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this._buttonOpenFolder.Image = global::NBTExplorer.Properties.Resources.folder_open; + this._buttonOpenFolder.Image = ((System.Drawing.Image)(resources.GetObject("_buttonOpenFolder.Image"))); this._buttonOpenFolder.ImageTransparentColor = System.Drawing.Color.Magenta; this._buttonOpenFolder.Name = "_buttonOpenFolder"; this._buttonOpenFolder.Size = new System.Drawing.Size(23, 22); @@ -477,49 +445,76 @@ // _buttonFindNext // this._buttonFindNext.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this._buttonFindNext.Image = global::NBTExplorer.Properties.Resources.binocular__arrow; + this._buttonFindNext.Image = ((System.Drawing.Image)(resources.GetObject("_buttonFindNext.Image"))); this._buttonFindNext.ImageTransparentColor = System.Drawing.Color.Magenta; this._buttonFindNext.Name = "_buttonFindNext"; this._buttonFindNext.Size = new System.Drawing.Size(23, 22); this._buttonFindNext.Text = "Find / Find Next"; this._buttonFindNext.Click += new System.EventHandler(this._buttonFindNext_Click); // - // _nodeContainerContext + // BottomToolStripPanel // - this._nodeContainerContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.openSubTreeToolStripMenuItem, - this.saveItemToolStripMenuItem}); - this._nodeContainerContext.Name = "contextMenuStrip1"; - this._nodeContainerContext.Size = new System.Drawing.Size(180, 48); + this.BottomToolStripPanel.Location = new System.Drawing.Point(0, 0); + this.BottomToolStripPanel.Name = "BottomToolStripPanel"; + this.BottomToolStripPanel.Orientation = System.Windows.Forms.Orientation.Horizontal; + this.BottomToolStripPanel.RowMargin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.BottomToolStripPanel.Size = new System.Drawing.Size(0, 0); // - // openSubTreeToolStripMenuItem + // TopToolStripPanel // - this.openSubTreeToolStripMenuItem.Image = global::NBTExplorer.Properties.Resources.folder_open; - this.openSubTreeToolStripMenuItem.Name = "openSubTreeToolStripMenuItem"; - this.openSubTreeToolStripMenuItem.Size = new System.Drawing.Size(179, 22); - this.openSubTreeToolStripMenuItem.Text = "Open Node As Root"; + this.TopToolStripPanel.Location = new System.Drawing.Point(0, 0); + this.TopToolStripPanel.Name = "TopToolStripPanel"; + this.TopToolStripPanel.Orientation = System.Windows.Forms.Orientation.Horizontal; + this.TopToolStripPanel.RowMargin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.TopToolStripPanel.Size = new System.Drawing.Size(0, 0); // - // saveItemToolStripMenuItem + // RightToolStripPanel // - this.saveItemToolStripMenuItem.Image = global::NBTExplorer.Properties.Resources.disk; - this.saveItemToolStripMenuItem.Name = "saveItemToolStripMenuItem"; - this.saveItemToolStripMenuItem.Size = new System.Drawing.Size(179, 22); - this.saveItemToolStripMenuItem.Text = "Save Node"; + this.RightToolStripPanel.Location = new System.Drawing.Point(0, 0); + this.RightToolStripPanel.Name = "RightToolStripPanel"; + this.RightToolStripPanel.Orientation = System.Windows.Forms.Orientation.Horizontal; + this.RightToolStripPanel.RowMargin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.RightToolStripPanel.Size = new System.Drawing.Size(0, 0); // - // openMinecraftSaveFolderToolStripMenuItem + // LeftToolStripPanel // - this.openMinecraftSaveFolderToolStripMenuItem.Name = "openMinecraftSaveFolderToolStripMenuItem"; - this.openMinecraftSaveFolderToolStripMenuItem.Size = new System.Drawing.Size(223, 22); - this.openMinecraftSaveFolderToolStripMenuItem.Text = "Open &Minecraft Save Folder"; - this.openMinecraftSaveFolderToolStripMenuItem.Click += new System.EventHandler(this.openMinecraftSaveFolderToolStripMenuItem_Click); + this.LeftToolStripPanel.Location = new System.Drawing.Point(0, 0); + this.LeftToolStripPanel.Name = "LeftToolStripPanel"; + this.LeftToolStripPanel.Orientation = System.Windows.Forms.Orientation.Horizontal; + this.LeftToolStripPanel.RowMargin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.LeftToolStripPanel.Size = new System.Drawing.Size(0, 0); + // + // ContentPanel + // + this.ContentPanel.Size = new System.Drawing.Size(562, 376); + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabel1}); + this.statusStrip1.Location = new System.Drawing.Point(0, 401); + this.statusStrip1.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(562, 22); + this.statusStrip1.TabIndex = 1; + this.statusStrip1.Text = "statusStrip1"; + // + // toolStripStatusLabel1 + // + this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; + this.toolStripStatusLabel1.Size = new System.Drawing.Size(516, 17); + this.toolStripStatusLabel1.Spring = true; + this.toolStripStatusLabel1.Click += new System.EventHandler(this.toolStripStatusLabel1_Click); // // Form1 // this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(562, 400); - this.Controls.Add(this.toolStripContainer1); + this.ClientSize = new System.Drawing.Size(562, 423); + this.Controls.Add(this.statusStrip1); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this._nodeTree); this.Controls.Add(this.menuStrip1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; @@ -527,17 +522,10 @@ this.Text = "NBTExplorer"; this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); - this.toolStripContainer1.ContentPanel.ResumeLayout(false); - this.toolStripContainer1.ContentPanel.PerformLayout(); - this.toolStripContainer1.TopToolStripPanel.ResumeLayout(false); - this.toolStripContainer1.TopToolStripPanel.PerformLayout(); - this.toolStripContainer1.ResumeLayout(false); - this.toolStripContainer1.PerformLayout(); - this.statusStrip1.ResumeLayout(false); - this.statusStrip1.PerformLayout(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); - this._nodeContainerContext.ResumeLayout(false); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -549,7 +537,6 @@ private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem searchToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; - private System.Windows.Forms.ToolStripContainer toolStripContainer1; private System.Windows.Forms.TreeView _nodeTree; private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.ToolStripButton _buttonOpen; @@ -573,9 +560,6 @@ private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem openFolderToolStripMenuItem; - private System.Windows.Forms.ContextMenuStrip _nodeContainerContext; - private System.Windows.Forms.ToolStripMenuItem openSubTreeToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem saveItemToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; @@ -584,10 +568,15 @@ private System.Windows.Forms.ToolStripMenuItem findNextToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; private System.Windows.Forms.ToolStripButton _buttonFindNext; - private System.Windows.Forms.StatusStrip statusStrip1; - private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; private System.Windows.Forms.ToolStripButton _buttonOpenFolder; private System.Windows.Forms.ToolStripMenuItem openMinecraftSaveFolderToolStripMenuItem; + private System.Windows.Forms.ToolStripPanel BottomToolStripPanel; + private System.Windows.Forms.ToolStripPanel TopToolStripPanel; + private System.Windows.Forms.ToolStripPanel RightToolStripPanel; + private System.Windows.Forms.ToolStripPanel LeftToolStripPanel; + private System.Windows.Forms.ToolStripContentPanel ContentPanel; + private System.Windows.Forms.StatusStrip statusStrip1; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; } } diff --git a/Form1.cs b/Form1.cs index aee1cdb..1a69958 100644 --- a/Form1.cs +++ b/Form1.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.Data; using System.Drawing; using System.Text; using System.Windows.Forms; @@ -308,11 +307,11 @@ namespace NBTExplorer node.Nodes.Clear(); - foreach (string dirpath in Directory.EnumerateDirectories(data.Path)) { + foreach (string dirpath in Directory.GetDirectories(data.Path)) { node.Nodes.Add(CreateLazyDirectory(dirpath, node)); } - foreach (string filepath in Directory.EnumerateFiles(data.Path)) { + foreach (string filepath in Directory.GetFiles(data.Path)) { TryLoadFile(node.Nodes, filepath); } @@ -509,15 +508,27 @@ namespace NBTExplorer public void OpenMinecraftDir () { - string path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData); - path = Path.Combine(path, ".minecraft"); - path = Path.Combine(path, "saves"); + try { + string path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData); + path = Path.Combine(path, ".minecraft"); + path = Path.Combine(path, "saves"); - if (!Directory.Exists(path)) { - path = Environment.GetFolderPath(Environment.SpecialFolder.MyComputer); + if (!Directory.Exists(path)) { + path = Environment.GetFolderPath(Environment.SpecialFolder.MyComputer); + } + + OpenDirectory(path); + } + catch (Exception) { + MessageBox.Show("Could not open default Minecraft save directory"); + try { + OpenDirectory(Directory.GetCurrentDirectory()); + } + catch (Exception) { + MessageBox.Show("Could not open current directory, this tool is probably not compatible with your platform."); + Application.Exit(); + } } - - OpenDirectory(path); } public void LoadDirectory (string path) @@ -534,11 +545,11 @@ namespace NBTExplorer { TreeNode root = new TreeNode(name, 10, 10); - foreach (string dirpath in Directory.EnumerateDirectories(path)) { + foreach (string dirpath in Directory.GetDirectories(path)) { root.Nodes.Add(CreateLazyDirectory(dirpath, root)); } - foreach (string filepath in Directory.EnumerateFiles(path)) { + foreach (string filepath in Directory.GetFiles(path)) { TryLoadFile(root.Nodes, filepath); } @@ -554,7 +565,7 @@ namespace NBTExplorer return; } - if (Path.GetExtension(path) == ".dat") { + if (Path.GetExtension(path) == ".dat" || Path.GetExtension(path) == ".schematic") { try { NBTFile file = new NBTFile(path); NbtTree tree = new NbtTree(); @@ -1072,7 +1083,7 @@ namespace NBTExplorer private void exitToolStripMenuItem_Click (object sender, EventArgs e) { - Application.Exit(); + Close(); } private TreeNode _rootSearchNode; @@ -1103,7 +1114,7 @@ namespace NBTExplorer if (_search == null) return; - statusStrip1.Visible = true; + toolStripStatusLabel1.Text = "Please wait..."; Application.DoEvents(); _nodeTree.SelectedNode = null; @@ -1116,13 +1127,13 @@ namespace NBTExplorer } } - statusStrip1.Visible = false; + toolStripStatusLabel1.Text = ""; MessageBox.Show("End of results"); _search = null; } - statusStrip1.Visible = false; + toolStripStatusLabel1.Text = ""; } private IEnumerable FindNode (TreeNode node) @@ -1218,6 +1229,11 @@ namespace NBTExplorer { OpenMinecraftDir(); } + + private void toolStripStatusLabel1_Click (object sender, EventArgs e) + { + + } } public class TagKey : IComparable diff --git a/Form1.resx b/Form1.resx index 80c9a63..9bccf8b 100644 --- a/Form1.resx +++ b/Form1.resx @@ -112,18 +112,130 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 - - 527, 17 - - + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACkklEQVQ4T43SX0hTURzA8d9b + 9O/BHjPowfZkRgTRgxVFJgrBRKT2kJWjEsUsKyprtZyumdoSZ86hGdU0LUOTsJXGahCYthIUs6au/fPf + nJvzOvfXX+ccusINgg584Hfhni/ncC8MqACoL+WQQ5T8pxx+H/STzX+UcpZynPl4CmeNJ5Ebuo0xRyPi + 5BOh2RYk75fy+6BPCTwlLrzEFe8LDNpr0dNXiG+1h/DdG7VAT68GO8vi69Ql+6FKvg/gU9kqVWy+DaMz + eibmfY7mjnPo9HhwiuPQQdj8fnxlMqFSnmrIlMlEGcXFACbFqoqouwUjk48ZOn9uleKwxYLfRkdx3O3G + kakpbO7uRrrI5jxCBEY58O5Fpp9iyPGQobPpkQS/j42xyKTPxyIavX6VKD1dBj03gVcdcjVhwFrP0NnY + eBR/TEywyBy5Ah+hJ6HXSSsqKgDDDeDVLtsakLPUMnTu1WWixWplEe/SkiDiWFzElIKCQnh9DXjawIQW + /aPVDJ0NdWIct9lYZGF5WRCZDgTwQG7uBei8ArwG7mcN+oYrGTp31xxBKwnQCBcMCiLz5HmvVHoRFMcA + 2i8xTf4RNXoGVQydu+6noc1uZ5FAOCyI+Mnznuzsy0DXrSyAZ+dB7xuqQLdZwdC5ozIV7Q4HiwQjEUGE + I4FdEgk5P8BaYpPuLHR5B8mv3C9nvOQU7XdT0Ol0skgkGhVElkhwu1hMviFAHLEtPxXq31fv9o8b8sJz + Awqc/6rE1jsH0eVyoZOIraxglAjHYhgisRCZ45OTy9kV6Dq8A0B3BjK0p0HXdn3LB3Nz5q+rWWvs60Qi + zYbExIqNSUmqv61PSMgXBMhm0EgB1CdgZ9VxkJVJ4AF5YSux+R/ifgP/44T3ShVnvwAAAABJRU5ErkJg + gg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAAI/SURBVDhPjdJPSJNxGAfw5xYd6+hZJIhCkm5d8hBeIq/9 + AftDgRcPHQzEqVPn5sRcNptjuVjZYlkUFZZpusQIFf+h2Zwuc0NJl5vatub+fXufB1e8DKTBhz1s3+f7 + vr+Xl2jvM2GgK+MG0v4Pzmb3/n6PNVFDZMmAdfdlbAyVITJbh3TgPrD2UG3DCc7mFHxuJB22nyMT7kHc + 34HN0QosuEqQWepUwaoDnM0pGGkkfTrkQmq9W6TDTzHjKMb2jAlJ7z2kFy0iE3gAzuYUDGvJmAo6kVxz + CJ6nuk7BP6IXKaWEpf12cDanYKiGWpM/HmE30CV4/mQ+iZVhnUh4zCK1bANncwr6NWTaXbUjttwpeHab + TmDZ3SDi8+0i4bOCs30aKlKVvKsi8+8VGyKLZsHzQGshfINaEZsziV1+FpkMOK8qeFNJltg3C3Y8JsHz + 2+ZjWPpQJ6KzbSK+0IFQNArOqwpeVpIt4m3H1lyL4Pm17ii8A7Xi10yriH29C18wCM6rCp7dJPvO/G1s + TusFzy/qj8DzXiO2p1pE9MsdnB7NgPOqAmcFdW/NGhGcqBc899QUwNNXLbYmjSKiHON4bwSczxYcVIbD + 1uv0KjytvMpjtSKs3IVLU4BF5fZZ9ghR5UFy9loxnVX2eJcOKfLLz1Bnv6lox9dbnvg5Xo/QpA7NFyh8 + 6xyNsJZLNJjFWd7Z2/13EusNKrVcJeuTqjz3+OPS780X6aPyb15JPh3IeXH2+6GtjAqVq1U3nad2Jbfv + 8h/ayQIkRwIF8QAAAABJRU5ErkJggg== + + + + + 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 + WupUAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAC5klEQVQ4T12OX0iTURjGD4kM + 8y4JCYqQbJZkLhWElStG08lybm5q/k/TajCM/ANOlmmBaEQEqeGFDBd4ITNNIRC0LaXc0vmp6edQYzrN + C0WvvH/63tOM6MDv4/ne9/kdDsvNzWUGg4Hl5eUxk8nEzGbz6fz8fJUEnfthKKtoRx3qkkMu/4QvkEnL + jPr6+iav17u0t7eH3d1dDuWZmZmlurq6JupIF8j+v0BmNBpzHA5HPwnvR1bR+GoBOqufQ9k5LGJnZxt9 + fX391JUukPEX6PV64qa0cAaDQZTbZnG3eR21bw7R0HOE+u4jWF8foKBpje82NtbR29vrJIdcptPpYq1W + q31zM4jiRi8qX4Tw6OU+ch6v4PhQftCxh9KWP51AIACLxWInl2m1WrXb/Xm52+lDXsMKKtpCMNQFoHno + /3sBZZoV24O4U7uIrv4ZjI2NLpPLNBpNKT2rxu5BeWsQWRaBo67+Drn2Ay5oXEjIHkF85hBHdW+ad+fm + ZkEuU6vVVkEQcL1kAiVPf+JWlQ8K0yQuZo9KpTn4/X7Eaz9K/2OclPxJ3p2enga5TKVS1VIxvXAcOU9W + kGhwI0E/CblunMuiKPJMM+Kq+QvvejwekMuUSmWlICygrGEcqmoBiWYf55JhisuhUIjn4/kV81fe9Xim + QC5LT0/PGhx0rXa+8+BagRupFQEkFUsvMc9y+eDggGeaEZdzJ9DR7YbD4Vwll6WlpZ0xGk3t8/PLuF0x + huRCH1Iqt5BU9IPLh4eHPCsqtpBo8vKOz7cAg8HYTi5TKBQsOTlZ29Ly3LW4uI4bhS6cz/yExCIRiqpf + HMo0o50grMFub3ORQy6LjY1lcXFxUXK5vNRmax0WxR109nyDvnoIp1K7OJRpJorbsNmeDVOXHHLpnJA4 + KZPJzsbExJQplRlvBwZGN9bW9vEvNKMddaTuOXLCLouQQoyEXCIlMjJSHRUVVRMdHd0s0RGmmWa0o45E + QtiJ+A2+oxJO8d3MEAAAAABJRU5ErkJggg== + + + 237, 17 @@ -131,7 +243,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADW - LgAAAk1TRnQBSQFMAgEBDgEAAaABAAGgAQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA + LgAAAk1TRnQBSQFMAgEBDgEAAcABAAHAAQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABQAMAAQEBAAEYBgABMBIAA/wD+SH4A/kD/AMAA/0D+SH4A/kD/WMAAZYBqQG8AVwBhAGuAVwBhAGu AVwBhAGuAVwBhAGuAVwBhAGuAVwBhAGuAVwBhAGuAVwBhAGuAVwBhAGuAVwBhAGuAVwBhAGuAVwBhAGu AVwBhAGuAZYBqQG8AwACzwHLArkBsAK5AbACuQGwArkBsAK5AbACuQGwArkBsAK5AbACuQGwArkBsAK5 @@ -333,10 +445,9 @@ AQMBwAEDAcABAwHAAQMBwAEDAcABAwHAAQcBwAEHAcABBwHAAQcBwAEPAcABDwHAAQ8BwAEPCw== - + 132, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -352,6 +463,22 @@ PC5BghQ8mZVVwYAkmrxQQTpGW9IC1qHC6MZ0NTa/atBXdw5utxsuWmJ3F3FaNJFAhGIROsvS07WSr9FQ QLL1SmJ4Xi77MNlz6Zfq8gHHIbm87XBKSsPR1NT6vzsil9/c90+wC8355FRjHlHXXCUP6fIETfaPkn4D qvVdCMceSq0AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAI/SURBVDhPjdJPSJNxGAfw5xYd6+hZJIhCjG5d8hBewq5S + YH8o8OKhww7i1E2n07FcazbH0rBsYRZF/zXTJYtw4j9mNp3LfyjpclPb1nR/vr3PgyteBtLgwx627/N9 + 39/LS7T/GTPSlVEj6f4HZ7N7f7+9jVQfnTdi3X0ZG0PliPrqkF65B6w9UNtwgbM5BV8ayIDtZ8hEepFY + bsPmSCVme0qQmW9XwWoXOJtT4GmgpnS4B6n1bpGOPMFUVzG2pyxIzt1FOmAXmZX74GxOwbCOWlIhF5Jr + XYLniY4zWPY0iZRSwtLLneBsTsFQDZmTPx5id6VD8PzZdhpLwwax57eJ1IITnM0p+KAly+5qJ+IL7YJn + t6UIC+56kZixir2gA5zt09IpVcn7KrL9XnIiGrAJngfMhQgO6kR82iJ2+VlkMuC8quC1huzx73bs+C2C + 53fNJzD/sU7EfK0iMduGcCwGzqsKXmjIGZ2zYmvaJHh+ZTiOuYFa8WvKLOLf7iAYCoHzqoKnN6lzZ+YW + NiebBM/P9cfg79eK7QmTiH29jbMjGXBeVeCqpO4tXwtCY3rBc29NAfx91WJrvEVElWOcfBsF57MFh5Xh + qOM6vYxMKq+yt1ZElLvo0RYgoNw+yx4hpjxIzl4rpvPKHu/SEUV+xTlq77cU7QTfVOz9HNUjPG6AsYwi + mlLyMNMlGsziLO/s7/47ieMGXbBfJcfjqjy391HpYvNF+qT8m1eST4dyXpyDfmgtp0LlatWNZWRVcgcu + /wHVUwIbjC1jGAAAAABJRU5ErkJggg== @@ -517,15 +644,31 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFySURBVDhPY2CgBthfz8CyP4kl40AiczcM19sxnEHGyHIg tSA9cLv3xrErn6rWXPp+T+f/d7s7wHh2hikKhomD1IDUgvTADdiVwOx+c4r3EWQDlpc4/ofhJYV2cINB - akBqQXrgBuyIZ8m9vyz7wbPNDf9heEuj338YXlftARcHyYPUgvTADdgawzz11fHlf//fXfUfhu+uKgcy + akBqQXrgBuyIZ8m9vyz7wbPNDf9heEuj338YXlftARcHyYPUgvTADdgawzz12eHlf//fXfUfhu+uKgcy IfjMzDS4OEgepBakB27A5ijmGT8vzf//+cRUON7dEfofhjc3+KLIgdSC9MAN2BDFPPvbudn/PxyZCMcg zavKXcCGLCt2QJEDqQXpgRuwOoJ5/qeT0/6/2d8DxyDNID6MRpYDqQXpgRuwPIx58btD/f9f7monCoPU gvTADVgSwrjsFTDun25tIgqD1IL0wA2YH8C4+smWxv8PN9QShUFqQXrgBkzxZNzxYF31//trq4jCILUg - PTAD5FKNGee1uTAeJQWD9AANkAMZwg/E4kAsRSIG6QHppQwAAOQ03Wz0/VCVAAAAAElFTkSuQmCC + PTAD5FKNGee1uTAeJQWD9AANkAMZwg/E4kAsRSIG6QHppQwAALl83Vwm3NeKAAAAAElFTkSuQmCC - - 347, 17 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJPSURBVDhPhVJfaFJxFFbRHhSnOMYgeomNCOpNiOlANK/h + GqX4f/O6XLpcotf/SWbYKHHQWxFjPQRBQQ/byxiNwEqSeohG9hAMRkH0h6LXHqI9fP3ORbfbGnXh43d+ + 5/vOd88958pkkkcul88xLNEpzVP8L25by0TL5XIZWq22uduAcsSRZjcn3hlxdWBgYJ3jONDJcLsnpFjK + kfYvE5ZcqdfrKBQKyGQKMBgMHSmIK5cvQBCy1MXKXgartVoNkQgPrzcMo9GIbDYrgmLiYrEYPJ4AGazu + ZbBWrVYxOTkBs9ksFknhcDgQjUbhcnnJYO0PA5a4rtfrN+j7e0UulwvJZFIExZTnOLt4kpZqpNNvVioV + 9u0CfD4fTCYzdDrdphR+vx/pdBrxeJxhlrrY2RS7tIrFIqamePYWDuPjfmg0mvdsdSMEikulEpvBWYyN + OeF0usmgJe2gncvlEA5PwGazMYEHarX6Q09AcT6fZzM4A/ulB7DPNMigLTV4IQgCQqEALBYLHA4XVCrV + p56A4kwmI27IfK3F8AyDo6FNqcHLVCqF6emoOINgkCeDLyQ4Uu8sDmeWfo3OPYbpShPHLj/CwmdgWFj+ + cbT+mu/9hR2r1Qq7/fj2FpRK5Tcihy62X934CCTfApE3OyhsAMT1uniXSCTA8zxbmZv9SCEoFIrvRBpO + zy/2B25uHT5/H4dm72Fo5i5GngOG4K2f/e6G2MEBhocMX6VgQ3rC7kZCNxZ5zcn5LYLqoPVpt1bWRy9i + GGTY/z/sO7VwR3Wica5b0/cbkKkn5snWqfQAAAAASUVORK5CYII= + + + + 527, 17 diff --git a/NBTExplorer.csproj b/NBTExplorer.csproj index c1b0390..b76ba6c 100644 --- a/NBTExplorer.csproj +++ b/NBTExplorer.csproj @@ -10,8 +10,9 @@ Properties NBTExplorer NBTExplorer - v4.0 - Client + v2.0 + + 512 @@ -37,15 +38,13 @@ dead_bush.ico - - ..\Substrate\SubstrateCS\bin\Release\NET4\Substrate.dll + + False + ..\Substrate\SubstrateCS\bin\Release\NET2\Substrate.dll - - - @@ -85,6 +84,7 @@ Form1.cs + Designer ResXFileCodeGenerator @@ -97,46 +97,9 @@ True - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - -