Revert "UpdateDialog に [今後このダイアログを表示しない] チェックボックスを追加"

This reverts commit 522b105dd033e6c8501556da30be8db5e513ebe7.

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 05b578a..53a3f90 100644 (file)
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -5920,11 +5920,6 @@ namespace OpenTween
                     {
                         await this.OpenUriAsync(versionInfo.DownloadUri.OriginalString);
                     }
-
-                    if (dialog.DoNotShowAgain)
-                    {
-                        SettingDialog.StartupVersion = false;
-                    }
                 }
             }
             catch (Exception)

diff --git a/OpenTween/UpdateDialog.Designer.cs b/OpenTween/UpdateDialog.Designer.cs
index a329a05..d97f3a2 100644 (file)
--- a/OpenTween/UpdateDialog.Designer.cs
+++ b/OpenTween/UpdateDialog.Designer.cs
@@ -35,7 +35,6 @@
             this.TableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.YesButton = new System.Windows.Forms.Button();
             this.NoButton = new System.Windows.Forms.Button();
-            this.DoNotShowAgainCheckBox = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();
             this.TableLayoutPanel1.SuspendLayout();
             this.SuspendLayout();
@@ -78,19 +77,12 @@
             this.NoButton.Name = "NoButton";
             this.NoButton.Click += new System.EventHandler(this.NoButton_Click);
             // 
-            // DoNotShowAgainCheckBox
-            // 
-            resources.ApplyResources(this.DoNotShowAgainCheckBox, "DoNotShowAgainCheckBox");
-            this.DoNotShowAgainCheckBox.Name = "DoNotShowAgainCheckBox";
-            this.DoNotShowAgainCheckBox.UseVisualStyleBackColor = true;
-            // 
             // UpdateDialog
             // 
             this.AcceptButton = this.YesButton;
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.CancelButton = this.NoButton;
-            this.Controls.Add(this.DoNotShowAgainCheckBox);
             this.Controls.Add(this.TextDetail);
             this.Controls.Add(this.LabelSummary);
             this.Controls.Add(this.PictureBox1);
@@ -101,7 +93,6 @@
             this.ShowIcon = false;
             this.ShowInTaskbar = false;
             this.TopMost = true;
-            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.UpdateDialog_FormClosed);
             this.Shown += new System.EventHandler(this.UpdateDialog_Shown);
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();
             this.TableLayoutPanel1.ResumeLayout(false);
@@ -118,6 +109,5 @@
         internal System.Windows.Forms.TableLayoutPanel TableLayoutPanel1;
         internal System.Windows.Forms.Button YesButton;
         internal System.Windows.Forms.Button NoButton;
-        private System.Windows.Forms.CheckBox DoNotShowAgainCheckBox;
     }
 }
\ No newline at end of file

diff --git a/OpenTween/UpdateDialog.cs b/OpenTween/UpdateDialog.cs
index 7c699f5..8b4d8bc 100644 (file)
--- a/OpenTween/UpdateDialog.cs
+++ b/OpenTween/UpdateDialog.cs
@@ -50,8 +50,6 @@ namespace OpenTween
             set { this.TextDetail.Text = value; }
         }
 
-        public bool DoNotShowAgain { get; private set; }
-
         public UpdateDialog()
         {
             InitializeComponent();
@@ -75,10 +73,5 @@ namespace OpenTween
             // デフォルトではテキストが全選択されるため抑制
             this.TextDetail.SelectionLength = 0;
         }
-
-        private void UpdateDialog_FormClosed(object sender, FormClosedEventArgs e)
-        {
-            this.DoNotShowAgain = this.DoNotShowAgainCheckBox.Checked;
-        }
     }
 }

diff --git a/OpenTween/UpdateDialog.en.resx b/OpenTween/UpdateDialog.en.resx
index 7bf48ea..cd2f87d 100644 (file)
--- a/OpenTween/UpdateDialog.en.resx
+++ b/OpenTween/UpdateDialog.en.resx
@@ -126,7 +126,4 @@
   <data name="$this.Text" xml:space="preserve">
     <value>%AppName% Update Check</value>
   </data>
-  <data name="DoNotShowAgainCheckBox.Text" xml:space="preserve">
-    <value>Don't show this dialog again</value>
-  </data>
 </root>
\ No newline at end of file

diff --git a/OpenTween/UpdateDialog.resx b/OpenTween/UpdateDialog.resx
index 4dca2da..232db7b 100644 (file)
--- a/OpenTween/UpdateDialog.resx
+++ b/OpenTween/UpdateDialog.resx
@@ -213,57 +213,6 @@
   <data name="TableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
-  <data name="&gt;&gt;YesButton.Name" xml:space="preserve">
-    <value>YesButton</value>
-  </data>
-  <data name="&gt;&gt;YesButton.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;YesButton.Parent" xml:space="preserve">
-    <value>TableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;YesButton.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;NoButton.Name" xml:space="preserve">
-    <value>NoButton</value>
-  </data>
-  <data name="&gt;&gt;NoButton.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;NoButton.Parent" xml:space="preserve">
-    <value>TableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;NoButton.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="TableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>259, 195</value>
-  </data>
-  <data name="TableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="TableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>181, 44</value>
-  </data>
-  <data name="TableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;TableLayoutPanel1.Name" xml:space="preserve">
-    <value>TableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;TableLayoutPanel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;TableLayoutPanel1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;TableLayoutPanel1.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="TableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="YesButton" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="NoButton" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,50,Percent,50" /&gt;&lt;Rows Styles="Percent,50" /&gt;&lt;/TableLayoutSettings&gt;</value>
-  </data>
   <data name="YesButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>None</value>
   </data>
@@ -321,32 +270,32 @@
   <data name="&gt;&gt;NoButton.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="DoNotShowAgainCheckBox.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="DoNotShowAgainCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>13, 210</value>
+  <data name="TableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>259, 195</value>
   </data>
-  <data name="DoNotShowAgainCheckBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>173, 16</value>
+  <data name="TableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
+    <value>1</value>
   </data>
-  <data name="DoNotShowAgainCheckBox.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
+  <data name="TableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>181, 44</value>
   </data>
-  <data name="DoNotShowAgainCheckBox.Text" xml:space="preserve">
-    <value>今後このダイアログを表示しない</value>
+  <data name="TableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
   </data>
-  <data name="&gt;&gt;DoNotShowAgainCheckBox.Name" xml:space="preserve">
-    <value>DoNotShowAgainCheckBox</value>
+  <data name="&gt;&gt;TableLayoutPanel1.Name" xml:space="preserve">
+    <value>TableLayoutPanel1</value>
   </data>
-  <data name="&gt;&gt;DoNotShowAgainCheckBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;TableLayoutPanel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;DoNotShowAgainCheckBox.Parent" xml:space="preserve">
+  <data name="&gt;&gt;TableLayoutPanel1.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;DoNotShowAgainCheckBox.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="&gt;&gt;TableLayoutPanel1.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="TableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
+    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="YesButton" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="NoButton" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,50,Percent,50" /&gt;&lt;Rows Styles="Percent,50" /&gt;&lt;/TableLayoutSettings&gt;</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>