amethyst/NBTExplorer
1
0
Fork 0
forked from mirrors/NBTExplorer
Code Pull requests Activity

Fix key collision crash in some searches. Add version to About dialog.

Browse source
This commit is contained in:
Justin Aquadro 2014-09-16 02:04:27 -04:00
parent d3e53ac559
commit fc63457d8e
8 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NBTExplorer.Installer/Product.wxs
View file

@ -3,7 +3,7 @@
<Product Id="*" <Product Id="*"
Name="NBTExplorer" Name="NBTExplorer"
Language="1033" Language="1033"
Version="2.7.4.0" Version="2.7.5.0"
Manufacturer="Justin Aquadro" Manufacturer="Justin Aquadro"
UpgradeCode="0bfb1026-21f2-4552-ad71-ca90aae10a25"> UpgradeCode="0bfb1026-21f2-4552-ad71-ca90aae10a25">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" /> <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />

4
NBTExplorer/Properties/AssemblyInfo.cs
View file

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.7.4.0")] [assembly: AssemblyVersion("2.7.5.0")]
[assembly: AssemblyFileVersion("2.7.4.0")] [assembly: AssemblyFileVersion("2.7.5.0")]

5
NBTExplorer/SearchWorker.cs
View file

@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Globalization;
using NBTExplorer.Model; using NBTExplorer.Model;
namespace NBTExplorer namespace NBTExplorer
@ -52,12 +53,12 @@ namespace NBTExplorer
if (SearchName != null) { if (SearchName != null) {
string tagName = node.NodeName; string tagName = node.NodeName;
if (tagName != null) if (tagName != null)
mName = tagName.Contains(SearchName); mName = CultureInfo.InvariantCulture.CompareInfo.IndexOf(tagName, SearchName, CompareOptions.IgnoreCase) >= 0;
} }
if (SearchValue != null) { if (SearchValue != null) {
string tagValue = node.NodeDisplay; string tagValue = node.NodeDisplay;
if (tagValue != null) if (tagValue != null)
mValue = tagValue.Contains(SearchValue); mValue = CultureInfo.InvariantCulture.CompareInfo.IndexOf(tagValue, SearchValue, CompareOptions.IgnoreCase) >= 0;
} }
if (mName && mValue) { if (mName && mValue) {

12
NBTExplorer/Windows/About.Designer.cs generated
View file

@ -35,17 +35,14 @@
// //
// linkLabel1 // linkLabel1
// //
this.linkLabel1.AutoSize = true;
this.linkLabel1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.linkLabel1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.linkLabel1.LinkArea = new System.Windows.Forms.LinkArea(165, 31); this.linkLabel1.LinkArea = new System.Windows.Forms.LinkArea(171, 31);
this.linkLabel1.Location = new System.Drawing.Point(96, 12); this.linkLabel1.Location = new System.Drawing.Point(96, 12);
this.linkLabel1.Name = "linkLabel1"; this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(256, 133); this.linkLabel1.Size = new System.Drawing.Size(272, 133);
this.linkLabel1.TabIndex = 0; this.linkLabel1.TabIndex = 0;
this.linkLabel1.TabStop = true; this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "NBTExplorer\r\nCopyright ©2011-2014 Justin Aquadro\r\n\r\nNBTExplorer is based on NBTEd" + this.linkLabel1.Text = resources.GetString("linkLabel1.Text");
"it by copyboy\r\nFugue icon set: p.yusukekamiyamane.com\r\n\r\nEmail: jaquadro@gmail.c" +
"om\r\nNBTExplorer Github Project Page";
this.linkLabel1.UseCompatibleTextRendering = true; this.linkLabel1.UseCompatibleTextRendering = true;
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
// //
@ -63,7 +60,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(350, 144); this.ClientSize = new System.Drawing.Size(380, 144);
this.Controls.Add(this.pictureBox1); this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.linkLabel1); this.Controls.Add(this.linkLabel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
@ -73,7 +70,6 @@
this.Text = "About NBTExplorer"; this.Text = "About NBTExplorer";
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout();
} }

8
NBTExplorer/Windows/About.cs
View file

@ -7,6 +7,14 @@ namespace NBTExplorer.Windows
public About () public About ()
{ {
InitializeComponent(); InitializeComponent();
int len = linkLabel1.Text.Length;
System.Version version = typeof(About).Assembly.GetName().Version;
linkLabel1.Text = linkLabel1.Text.Replace("{ver}", version.Major + "." + version.Minor + "." + version.Build);
int adj = linkLabel1.Text.Length - len;
linkLabel1.LinkArea = new LinkArea(linkLabel1.LinkArea.Start + adj, linkLabel1.LinkArea.Length);
} }
private void linkLabel1_LinkClicked (object sender, LinkLabelLinkClickedEventArgs e) private void linkLabel1_LinkClicked (object sender, LinkLabelLinkClickedEventArgs e)

10
NBTExplorer/Windows/About.resx
View file

@ -117,6 +117,16 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="linkLabel1.Text" xml:space="preserve">
<value>NBTExplorer {ver}
Copyright ©2011-2014 Justin Aquadro
NBTExplorer is based on NBTEdit by copyboy
Fugue icon set: p.yusukekamiyamane.com
Email: jaquadro@gmail.com
NBTExplorer Github Project Page</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>

2
NBTModel/Data/TagKey.cs
View file

@ -22,7 +22,7 @@ namespace NBTExplorer.Model
if (typeDiff != 0) if (typeDiff != 0)
return typeDiff; return typeDiff;
return String.Compare(x.Name, y.Name, true); return String.Compare(x.Name, y.Name, false);
} }
#endregion #endregion

4
NBTModel/Properties/AssemblyInfo.cs
View file

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.2.0")] [assembly: AssemblyVersion("1.0.3.0")]
[assembly: AssemblyFileVersion("1.0.2.0")] [assembly: AssemblyFileVersion("1.0.3.0")]