From 8f0a884924b8a5aa2df745be3a14317a13337355 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Wed, 17 Oct 2012 00:07:28 +0000
Subject: [PATCH] fix archive chooser keyboard behaviour, and add a feature to
 deduct 16Bytes from the size if it looks like iNES

---
 .../ArchiveChooser.Designer.cs                |  7 ++++---
 BizHawk.MultiClient/ArchiveChooser.cs         | 21 ++++++-------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/BizHawk.MultiClient/ArchiveChooser.Designer.cs b/BizHawk.MultiClient/ArchiveChooser.Designer.cs
index 29a933a41a..fe048b6745 100644
--- a/BizHawk.MultiClient/ArchiveChooser.Designer.cs
+++ b/BizHawk.MultiClient/ArchiveChooser.Designer.cs
@@ -73,8 +73,8 @@
 			// lvMembers
 			// 
 			this.lvMembers.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.colSize,
-            this.colName});
+            this.colName,
+            this.colSize});
 			this.lvMembers.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.lvMembers.FullRowSelect = true;
 			this.lvMembers.GridLines = true;
@@ -85,14 +85,15 @@
 			this.lvMembers.UseCompatibleStateImageBehavior = false;
 			this.lvMembers.View = System.Windows.Forms.View.Details;
 			this.lvMembers.ItemActivate += new System.EventHandler(this.lvMembers_ItemActivate);
-			this.lvMembers.KeyDown += new System.Windows.Forms.KeyEventHandler(this.lvMembers_KeyDown);
 			// 
 			// colSize
 			// 
+			this.colSize.DisplayIndex = 0;
 			this.colSize.Text = "Size";
 			// 
 			// colName
 			// 
+			this.colName.DisplayIndex = 1;
 			this.colName.Text = "Name";
 			this.colName.Width = 409;
 			// 
diff --git a/BizHawk.MultiClient/ArchiveChooser.cs b/BizHawk.MultiClient/ArchiveChooser.cs
index a522c85f75..394b8e539b 100644
--- a/BizHawk.MultiClient/ArchiveChooser.cs
+++ b/BizHawk.MultiClient/ArchiveChooser.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -19,8 +20,11 @@ namespace BizHawk.MultiClient
 				var lvi = new ListViewItem();
 				lvi.Tag = item;
 				lvi.SubItems.Add(new ListViewItem.ListViewSubItem());
-				lvi.Text = Util.FormatFileSize(item.size);
-				lvi.SubItems[1].Text = item.name;
+				lvi.Text = item.name;
+				long size = item.size;
+				if (size % 1024 == 16 && Path.GetExtension(item.name).ToUpper() == ".NES")
+					size -= 16;
+				lvi.SubItems[1].Text = Util.FormatFileSize(size);
 				lvMembers.Items.Add(lvi);
 			}
 
@@ -119,19 +123,6 @@ namespace BizHawk.MultiClient
 			lvMembers.Items[0].Selected = true;
 		}
 
-		private void lvMembers_KeyDown(object sender, KeyEventArgs e)
-		{
-			if (e.KeyCode == Keys.D1) SetItem(1);
-			if (e.KeyCode == Keys.D2) SetItem(2);
-			if (e.KeyCode == Keys.D3) SetItem(3);
-			if (e.KeyCode == Keys.D4) SetItem(4);
-			if (e.KeyCode == Keys.D5) SetItem(5);
-			if (e.KeyCode == Keys.D6) SetItem(6);
-			if (e.KeyCode == Keys.D7) SetItem(7);
-			if (e.KeyCode == Keys.D8) SetItem(8);
-			if (e.KeyCode == Keys.D9) SetItem(9);
-		}
-
 		private void SetItem(int num)
 		{
 			if (num <= lvMembers.Items.Count)