From 764ab6adba66ff061680ab41ae417f5a72dc7625 Mon Sep 17 00:00:00 2001
From: ttp <ttp@users.sourceforge.jp>
Date: Fri, 7 Mar 2008 06:09:01 +0000
Subject: [PATCH] =?utf8?q?AppliAppliStation-GUI,=E6=A4=9C=E7=B4=A2?=
 =?utf8?q?=E3=83=90=E3=83=BC=E3=81=AE=E6=9B=B4=E6=96=B0(Delete=E3=82=AD?=
 =?utf8?q?=E3=83=BC=E3=81=A8=E3=81=8B=E6=8A=BC=E3=81=97=E3=81=9F=E6=99=82?=
 =?utf8?q?=E3=81=AA=E3=81=A9)=E3=81=8C=E3=81=86=E3=81=BE=E3=81=8F=E3=81=84?=
 =?utf8?q?=E3=81=8B=E3=81=AA=E3=81=84=E3=83=90=E3=82=B0=E5=AF=BE=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://localhost/svn/AppliStation/trunk@871 34ed2c89-c49f-4a4b-abdb-c318350108cf
---
 AppliStation/PackageListViewForm.Designer.cs | 13 +++++++------
 AppliStation/PackageListViewForm.cs          | 12 ++++++++----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/AppliStation/PackageListViewForm.Designer.cs b/AppliStation/PackageListViewForm.Designer.cs
index 0a0abfa..cbf6bcb 100644
--- a/AppliStation/PackageListViewForm.Designer.cs
+++ b/AppliStation/PackageListViewForm.Designer.cs
@@ -108,7 +108,7 @@
 									this.searchTextBox});
 			this.packageListFilterToolStrip.Location = new System.Drawing.Point(3, 0);
 			this.packageListFilterToolStrip.Name = "packageListFilterToolStrip";
-			this.packageListFilterToolStrip.Size = new System.Drawing.Size(177, 25);
+			this.packageListFilterToolStrip.Size = new System.Drawing.Size(206, 25);
 			this.packageListFilterToolStrip.TabIndex = 1;
 			// 
 			// packageFilterToolStripDropDownButton
@@ -124,7 +124,7 @@
 			// allPackageFilterToolStripMenuItem
 			// 
 			this.allPackageFilterToolStripMenuItem.Name = "allPackageFilterToolStripMenuItem";
-			this.allPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+			this.allPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
 			this.allPackageFilterToolStripMenuItem.Text = "全て";
 			this.allPackageFilterToolStripMenuItem.ToolTipText = "全てのソフトを表示";
 			this.allPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);
@@ -132,7 +132,7 @@
 			// notInstalledPackageFilterToolStripMenuItem
 			// 
 			this.notInstalledPackageFilterToolStripMenuItem.Name = "notInstalledPackageFilterToolStripMenuItem";
-			this.notInstalledPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+			this.notInstalledPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
 			this.notInstalledPackageFilterToolStripMenuItem.Text = "未インストール";
 			this.notInstalledPackageFilterToolStripMenuItem.ToolTipText = "インストールされていないソフトを表示";
 			this.notInstalledPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);
@@ -140,7 +140,7 @@
 			// installedASPackageFilterToolStripMenuItem
 			// 
 			this.installedASPackageFilterToolStripMenuItem.Name = "installedASPackageFilterToolStripMenuItem";
-			this.installedASPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+			this.installedASPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
 			this.installedASPackageFilterToolStripMenuItem.Text = "AppliStation内";
 			this.installedASPackageFilterToolStripMenuItem.ToolTipText = "AppliStationにインストールされているソフトを表示";
 			this.installedASPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);
@@ -148,7 +148,7 @@
 			// installedSysPackageFilterToolStripMenuItem
 			// 
 			this.installedSysPackageFilterToolStripMenuItem.Name = "installedSysPackageFilterToolStripMenuItem";
-			this.installedSysPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+			this.installedSysPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
 			this.installedSysPackageFilterToolStripMenuItem.Text = "コンピュータ内";
 			this.installedSysPackageFilterToolStripMenuItem.ToolTipText = "コンピュータにインストールされているソフトを表示";
 			this.installedSysPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);
@@ -164,6 +164,7 @@
 			this.searchTextBox.Enter += new System.EventHandler(this.SearchTextBoxEnter);
 			this.searchTextBox.Leave += new System.EventHandler(this.SearchTextBoxLeave);
 			this.searchTextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.SearchTextBoxKeyPress);
+			this.searchTextBox.TextChanged += new System.EventHandler(this.SearchTextBoxTextChanged);
 			// 
 			// packageCommandsToolStrip
 			// 
@@ -175,7 +176,7 @@
 									this.uninstallToolStripButton});
 			this.packageCommandsToolStrip.Location = new System.Drawing.Point(3, 25);
 			this.packageCommandsToolStrip.Name = "packageCommandsToolStrip";
-			this.packageCommandsToolStrip.Size = new System.Drawing.Size(223, 25);
+			this.packageCommandsToolStrip.Size = new System.Drawing.Size(221, 25);
 			this.packageCommandsToolStrip.TabIndex = 2;
 			// 
 			// updateToolStripButton
diff --git a/AppliStation/PackageListViewForm.cs b/AppliStation/PackageListViewForm.cs
index 66e5c56..8d4ebc6 100644
--- a/AppliStation/PackageListViewForm.cs
+++ b/AppliStation/PackageListViewForm.cs
@@ -331,6 +331,13 @@ namespace AppliStation
 			}
 		}
 		
+		void SearchTextBoxTextChanged(object sender, EventArgs e)
+		{
+			if (searchTextBox.Focused) {
+				searchTextBoxUpdate(false);
+			}
+		}
+		
 		void SearchTextBoxKeyPress(object sender, KeyPressEventArgs e)
 		{
 			switch (e.KeyChar) {
@@ -339,10 +346,6 @@ namespace AppliStation
 					break;
 				case (char)Keys.Escape:
 					searchTextBox.Text = "";
-					searchTextBoxUpdate(false);
-					break;
-				default:
-					searchTextBoxUpdate(false);
 					break;
 			}
 		}
@@ -364,6 +367,7 @@ namespace AppliStation
 		private void searchUpdateTimerTick(object sender, EventArgs e)
 		{
 			searchUpdateTimer.Stop();
+			searchUpdateTimer = null;
 			
 			PackageListViewUpdate();
 		}
-- 
2.11.0