From 240dbd8c9a9762476da3ba1bdd5d2b8f0923b912 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 6 Oct 2014 06:47:59 +0900
Subject: [PATCH] =?utf8?q?=E5=85=A8=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD?=
 =?utf8?q?=E3=82=B0=E3=82=92ESC=E3=82=AD=E3=83=BC=E3=81=A7=E3=82=AD?=
 =?utf8?q?=E3=83=A3=E3=83=B3=E3=82=BB=E3=83=AB=E3=81=A7=E3=81=8D=E3=82=8B?=
 =?utf8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 OpenTween/AppendSettingDialog.Designer.cs | 1 +
 OpenTween/HashtagManage.Designer.cs       | 1 +
 OpenTween/Resources/ChangeLog.txt         | 1 +
 OpenTween/SearchWordDialog.Designer.cs    | 2 ++
 OpenTween/SearchWordDialog.cs             | 6 ++++++
 OpenTween/TweenAboutBox.Designer.cs       | 2 ++
 6 files changed, 13 insertions(+)

diff --git a/OpenTween/AppendSettingDialog.Designer.cs b/OpenTween/AppendSettingDialog.Designer.cs
index 9a807af7..24443205 100644
--- a/OpenTween/AppendSettingDialog.Designer.cs
+++ b/OpenTween/AppendSettingDialog.Designer.cs
@@ -233,6 +233,7 @@
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.CancelButton = this.Cancel;
             this.Controls.Add(this.SplitContainer1);
             this.Controls.Add(this.Save);
             this.Controls.Add(this.Cancel);
diff --git a/OpenTween/HashtagManage.Designer.cs b/OpenTween/HashtagManage.Designer.cs
index 628e9930..b3161b8c 100644
--- a/OpenTween/HashtagManage.Designer.cs
+++ b/OpenTween/HashtagManage.Designer.cs
@@ -205,6 +205,7 @@
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.CancelButton = this.Cancel_Button;
             this.Controls.Add(this.TableLayoutButtons);
             this.Controls.Add(this.GroupHashtag);
             this.Controls.Add(this.CheckNotAddToAtReply);
diff --git a/OpenTween/Resources/ChangeLog.txt b/OpenTween/Resources/ChangeLog.txt
index 5de6f035..70b1f49e 100644
--- a/OpenTween/Resources/ChangeLog.txt
+++ b/OpenTween/Resources/ChangeLog.txt
@@ -7,6 +7,7 @@
  * CHG: デフォルトの画像投稿先を Twitter (pic.twitter.com) に変更しました
  * FIX: 画像投稿時に、入力したツイートと画像URLの間に空白が2文字入ってしまう不具合を修正
  * FIX: 画像が紐付いていないTumblrのURLに対してサムネイル画像欄が表示され読み込みに失敗する不具合を修正
+ * FIX: ESCキーで閉じられないダイアログが一部存在していた問題を修正
 
 ==== Ver 1.2.3(2014/09/03)
  * NEW: UserSteams の (un)mute イベント追加に対応
diff --git a/OpenTween/SearchWordDialog.Designer.cs b/OpenTween/SearchWordDialog.Designer.cs
index 12a558c2..eaa36d49 100644
--- a/OpenTween/SearchWordDialog.Designer.cs
+++ b/OpenTween/SearchWordDialog.Designer.cs
@@ -157,11 +157,13 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.Controls.Add(this.tabControl);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.KeyPreview = true;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "SearchWordDialog";
             this.ShowInTaskbar = false;
             this.Shown += new System.EventHandler(this.textSearchTimeline_Shown);
+            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SearchWordDialog_KeyDown);
             this.tableLayoutPanel1.ResumeLayout(false);
             this.tableLayoutPanel1.PerformLayout();
             this.tabControl.ResumeLayout(false);
diff --git a/OpenTween/SearchWordDialog.cs b/OpenTween/SearchWordDialog.cs
index 6e51599f..66a114be 100644
--- a/OpenTween/SearchWordDialog.cs
+++ b/OpenTween/SearchWordDialog.cs
@@ -207,5 +207,11 @@ namespace OpenTween
             var tweenMain = (TweenMain)this.Owner;
             tweenMain.OpenUriAsync(PublicSearchHelpUrl);
         }
+
+        private void SearchWordDialog_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+                this.DialogResult = DialogResult.Cancel;
+        }
     }
 }
diff --git a/OpenTween/TweenAboutBox.Designer.cs b/OpenTween/TweenAboutBox.Designer.cs
index 8ae9c8c0..51ca51a3 100644
--- a/OpenTween/TweenAboutBox.Designer.cs
+++ b/OpenTween/TweenAboutBox.Designer.cs
@@ -110,8 +110,10 @@
             // 
             // TweenAboutBox
             // 
+            this.AcceptButton = this.OKButton;
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.CancelButton = this.OKButton;
             this.Controls.Add(this.TableLayoutPanel);
             this.Name = "TweenAboutBox";
             this.ShowIcon = false;
-- 
2.11.0