From 9796139d3fe87981870e042ae9a41354a265439c Mon Sep 17 00:00:00 2001 From: Egtra Date: Sun, 25 Mar 2012 00:03:18 +0900 Subject: [PATCH] =?utf8?q?TabsDialog=E3=81=AEOK=E3=83=9C=E3=82=BF=E3=83=B3?= =?utf8?q?=E3=81=8C=E5=8F=8D=E5=BF=9C=E3=81=97=E3=81=AA=E3=81=8F=E3=81=AA?= =?utf8?q?=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B=E5=95=8F=E9=A1=8C=E3=81=AE?= =?utf8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit C#書き換え時の誤り --- OpenTween/TabsDialog.Designer.cs | 1 + OpenTween/TabsDialog.cs | 12 --- OpenTween/TabsDialog.resx | 176 +++++++++++++++++++-------------------- 3 files changed, 89 insertions(+), 100 deletions(-) diff --git a/OpenTween/TabsDialog.Designer.cs b/OpenTween/TabsDialog.Designer.cs index 2505920f..bb3a7313 100644 --- a/OpenTween/TabsDialog.Designer.cs +++ b/OpenTween/TabsDialog.Designer.cs @@ -46,6 +46,7 @@ // OK_Button // resources.ApplyResources(this.OK_Button, "OK_Button"); + this.OK_Button.DialogResult = System.Windows.Forms.DialogResult.OK; this.OK_Button.Name = "OK_Button"; // // Cancel_Button diff --git a/OpenTween/TabsDialog.cs b/OpenTween/TabsDialog.cs index 324a64d1..17dd0c33 100644 --- a/OpenTween/TabsDialog.cs +++ b/OpenTween/TabsDialog.cs @@ -57,18 +57,6 @@ namespace OpenTween } - private void OK_Button_Click(object sender, EventArgs e) - { - this.DialogResult = DialogResult.OK; - this.Close(); - } - - private void Cancel_Button_Click(object sender, EventArgs e) - { - this.DialogResult = DialogResult.Cancel; - this.Close(); - } - private void TabsDialog_Load(object sender, EventArgs e) { if (_multiSelect) diff --git a/OpenTween/TabsDialog.resx b/OpenTween/TabsDialog.resx index af9320a9..438f97a9 100644 --- a/OpenTween/TabsDialog.resx +++ b/OpenTween/TabsDialog.resx @@ -112,147 +112,147 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, 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 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 67, 21 - - - System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - キャンセル - - - - 0 - - - TableLayoutPanel1 + + + Bottom, Right - - TabList + + + 2 - - TableLayoutPanel1 + + None - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3, 3 67, 21 - - 14, 12 - - - 1 - - - 2 - 0 - - (新規タブ) + + OK - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + OK_Button - - - None + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - タブ選択 + + TableLayoutPanel1 - - 12 + + 0 None - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 76, 3 + + + 67, 21 + + + 1 + + + キャンセル Cancel_Button - - Bottom, Right + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - OK + + TableLayoutPanel1 - - 76, 3 + + 1 11, 111 - - 140, 88 - - - 169, 149 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="OK_Button" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="Cancel_Button" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,Percent,50" /><Rows Styles="Percent,50" /></TableLayoutSettings> - - + 1 - - 0 - 146, 27 - - 1 - - + 1 - - $this - - + TableLayoutPanel1 + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + $this - - CenterParent + + 0 - + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="OK_Button" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="Cancel_Button" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,Percent,50" /><Rows Styles="Percent,50" /></TableLayoutSettings> + + + 12 + + + (新規タブ) + + + 14, 12 + + + 140, 88 + + 0 + + TabList + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + True + 6, 12 - - 3, 3 + + 169, 149 - - 1 + + CenterParent + + + タブ選択 TabsDialog - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - OK_Button + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - \ No newline at end of file -- 2.11.0