OSDN Git Service

DialogAsShieldIconクラスをアップデート通知専用のフォームに変更
authorKimura Youichi <kim.upsilon@bucyou.net>
Fri, 17 Aug 2012 12:15:22 +0000 (21:15 +0900)
committerKimura Youichi <kim.upsilon@bucyou.net>
Fri, 17 Aug 2012 12:45:08 +0000 (21:45 +0900)
細かい調整
 * OKボタンにデフォルトでフォーカスが当たっていたのを無くした
  スペースキーでTL流し読みしてるときに通知が出ると間違えてOK押しちゃうかもしれないので
 * ウィンドウサイズを広く+可変にした
  中途半端に折り返されることが多い感じなので

OpenTween/DialogAsShieldIcon.cs [deleted file]
OpenTween/OpenTween.csproj
OpenTween/Properties/Resources.Designer.cs
OpenTween/Resources/ChangeLog.txt
OpenTween/Tween.cs
OpenTween/UpdateDialog.Designer.cs [moved from OpenTween/DialogAsShieldIcon.Designer.cs with 65% similarity]
OpenTween/UpdateDialog.cs [new file with mode: 0644]
OpenTween/UpdateDialog.en.resx [new file with mode: 0644]
OpenTween/UpdateDialog.resx [moved from OpenTween/DialogAsShieldIcon.resx with 73% similarity]
OpenTween/UpdateDialog.zh-CHS.resx [moved from OpenTween/DialogAsShieldIcon.zh-CHS.resx with 94% similarity]

diff --git a/OpenTween/DialogAsShieldIcon.cs b/OpenTween/DialogAsShieldIcon.cs
deleted file mode 100644 (file)
index 5dd6a26..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-// OpenTween - Client of Twitter
-// Copyright (c) 2007-2011 kiri_feather (@kiri_feather) <kiri.feather@gmail.com>
-//           (c) 2008-2011 Moz (@syo68k)
-//           (c) 2008-2011 takeshik (@takeshik) <http://www.takeshik.org/>
-//           (c) 2010-2011 anis774 (@anis774) <http://d.hatena.ne.jp/anis774/>
-//           (c) 2010-2011 fantasticswallow (@f_swallow) <http://twitter.com/f_swallow>
-//           (c) 2012      tigree4th <crerish@gmail.com>
-// All rights reserved.
-// 
-// This file is part of OpenTween.
-// 
-// This program is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published by the Free
-// Software Foundation; either version 3 of the License, or (at your option)
-// any later version.
-// 
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details. 
-// 
-// You should have received a copy of the GNU General Public License along
-// with this program. If not, see <http://www.gnu.org/licenses/>, or write to
-// the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-// Boston, MA 02110-1301, USA.
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-namespace OpenTween
-{
-    public partial class DialogAsShieldIcon : Form
-    {
-
-        private DialogResult dResult = System.Windows.Forms.DialogResult.None;
-
-        public DialogAsShieldIcon()
-        {
-            InitializeComponent();
-        }
-
-        private void OK_Button_Click(object sender, EventArgs e)
-        {
-            this.dResult = System.Windows.Forms.DialogResult.OK;
-            this.Hide();
-        }
-
-        private void Cancel_Button_Click(object sender, EventArgs e)
-        {
-            this.dResult = System.Windows.Forms.DialogResult.Cancel;
-            this.Hide();
-        }
-
-        private void DialogAsShieldIcon_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            if (this.dResult == System.Windows.Forms.DialogResult.None)
-            {
-                e.Cancel = true;
-                this.dResult = System.Windows.Forms.DialogResult.Cancel;
-                this.Hide();
-            }
-        }
-
-        private void DialogAsShieldIcon_Load(object sender, EventArgs e)
-        {
-            this.PictureBox1.Image = System.Drawing.SystemIcons.Question.ToBitmap();
-        }
-
-        public System.Windows.Forms.DialogResult ShowDialog(IWin32Window owner,
-            string text, string detail = "", string caption = "DialogAsShieldIcon",
-            System.Windows.Forms.MessageBoxButtons Buttons = System.Windows.Forms.MessageBoxButtons.OKCancel,
-            System.Windows.Forms.MessageBoxIcon icon = MessageBoxIcon.Question)
-        {
-            this.Label1.Text = text;
-            this.Text = caption;
-            this.TextDetail.Text = detail;
-
-            switch (Buttons)
-            {
-                case MessageBoxButtons.OKCancel:
-                    OK_Button.Text = "OK";
-                    Cancel_Button.Text = "Cancel";
-                    break;
-                case MessageBoxButtons.YesNo:
-                    OK_Button.Text = "Yes";
-                    Cancel_Button.Text = "No";
-                    break;
-                default:
-                    OK_Button.Text = "OK";
-                    Cancel_Button.Text = "Cancel";
-                    break;
-            }
-            // とりあえずアイコンは処理しない(互換性のためパラメータだけ指定できる)
-
-            base.ShowDialog(this.Owner);
-            while (this.dResult == System.Windows.Forms.DialogResult.None)
-            {
-                System.Threading.Thread.Sleep(200);
-                Application.DoEvents();
-            }
-            if (Buttons == MessageBoxButtons.YesNo)
-            {
-                switch (dResult)
-                {
-                    case System.Windows.Forms.DialogResult.OK:
-                        return System.Windows.Forms.DialogResult.Yes;
-                    case System.Windows.Forms.DialogResult.Cancel:
-                        return System.Windows.Forms.DialogResult.No;
-                }
-            }
-            else
-            {
-                return dResult;
-            }
-
-            return dResult;
-        }
-    }
-}
index 8452ece..d837749 100644 (file)
     <Compile Include="DetailsListView.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="DialogAsShieldIcon.cs">
+    <Compile Include="UpdateDialog.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DialogAsShieldIcon.Designer.cs">
-      <DependentUpon>DialogAsShieldIcon.cs</DependentUpon>
+    <Compile Include="UpdateDialog.Designer.cs">
+      <DependentUpon>UpdateDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="DoubleClickCopyCanceller.cs" />
     <Compile Include="Foursquare.cs" />
     <EmbeddedResource Include="AppendSettingDialog.zh-CHS.resx">
       <DependentUpon>AppendSettingDialog.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DialogAsShieldIcon.resx">
-      <DependentUpon>DialogAsShieldIcon.cs</DependentUpon>
+    <EmbeddedResource Include="UpdateDialog.en.resx">
+      <DependentUpon>UpdateDialog.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DialogAsShieldIcon.zh-CHS.resx">
-      <DependentUpon>DialogAsShieldIcon.cs</DependentUpon>
+    <EmbeddedResource Include="UpdateDialog.resx">
+      <DependentUpon>UpdateDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UpdateDialog.zh-CHS.resx">
+      <DependentUpon>UpdateDialog.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="FormInfo.resx">
       <DependentUpon>FormInfo.cs</DependentUpon>
index b65f5ab..01a46da 100644 (file)
@@ -637,7 +637,10 @@ namespace OpenTween.Properties {
         /// <summary>
         ///   更新履歴
         ///
-        ///==== Ver 1.0.5-beta1(2012/xx/xx)
+        ///==== Ver 1.0.6-beta1(2012/xx/xx)
+        /// * CHG: アップデート通知画面をちょっと変更
+        ///
+        ///==== Ver 1.0.5(2012/08/17)
         /// * CHG: 「タブを固定」機能を「タブを保護」に名称変更
         /// * CHG: 閉鎖された画像共有サービスbrightkite・picplzのサムネイル対応を終了
         /// * FIX: UserStreamsの &gt;突然の仕様変更&lt; に対応
@@ -648,10 +651,7 @@ namespace OpenTween.Properties {
         /// * CHG: Instagramのサムネイル画像を正式に提供されているURLに更新
         /// * FIX: プロフィール編集中に編集画面を閉じると次回編集時の挙動がおかしくなる問題を修正 (thanks @miracleflyer!)
         /// * FIX: ツイートのRT回数が正常に表示されない問題を修正 (thanks @re4k!)
-        /// * FIX: ついっぷるフォト・imgur・pixivのサムネイルが正常に取得できない問題を修正
-        /// * FIX: Bing翻訳のAPI仕様変更に対応
-        ///
-        ///==== Ver 1.0.3(201 [残りの文字列は切り詰められました]&quot;; に類似しているローカライズされた文字列を検索します。
+        /// * FIX: ついっぷるフォト・imgur・pixivのサムネイルが正常に取得で [残りの文字列は切り詰められました]&quot;; に類似しているローカライズされた文字列を検索します。
         /// </summary>
         internal static string ChangeLog {
             get {
index 1486349..c0e2fb4 100644 (file)
@@ -2,6 +2,7 @@
 
 ==== Ver 1.0.6-beta1(2012/xx/xx)
  * NEW: TUNA.BE のサムネイル表示に対応
+ * CHG: アップデート通知画面をちょっと変更
 
 ==== Ver 1.0.5(2012/08/17)
  * CHG: 「タブを固定」機能を「タブを保護」に名称変更
index c27dae9..2d65f84 100644 (file)
@@ -6006,11 +6006,11 @@ namespace OpenTween
 
             if (currentVersion.Replace(".", "").CompareTo(MyCommon.fileVersion.Replace(".", "")) > 0)
             {
-                string dialogText = string.Format(Properties.Resources.CheckNewVersionText3, MyCommon.GetReadableVersion(currentVersion));
-                using (DialogAsShieldIcon dialog = new DialogAsShieldIcon())
+                using (var dialog = new UpdateDialog())
                 {
-                    DialogResult ret = dialog.ShowDialog(this, dialogText, msgBody, MyCommon.ReplaceAppName(Properties.Resources.CheckNewVersionText1), MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-                    if (ret == DialogResult.Yes)
+                    dialog.SummaryText = string.Format(Properties.Resources.CheckNewVersionText3, MyCommon.GetReadableVersion(currentVersion));
+                    dialog.DetailsText = msgBody;
+                    if (dialog.ShowDialog(this) == DialogResult.Yes)
                     {
                         this.OpenUriAsync(downloadUrl);
                     }
similarity index 65%
rename from OpenTween/DialogAsShieldIcon.Designer.cs
rename to OpenTween/UpdateDialog.Designer.cs
index 63b0fdb..005cb43 100644 (file)
@@ -1,6 +1,6 @@
 namespace OpenTween
 {
-    partial class DialogAsShieldIcon
+    partial class UpdateDialog
     {
         /// <summary>
         /// Required designer variable.
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DialogAsShieldIcon));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpdateDialog));
             this.TextDetail = new System.Windows.Forms.TextBox();
-            this.Label1 = new System.Windows.Forms.Label();
+            this.LabelSummary = new System.Windows.Forms.Label();
             this.PictureBox1 = new System.Windows.Forms.PictureBox();
             this.TableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.OK_Button = new System.Windows.Forms.Button();
-            this.Cancel_Button = new System.Windows.Forms.Button();
+            this.YesButton = new System.Windows.Forms.Button();
+            this.NoButton = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();
             this.TableLayoutPanel1.SuspendLayout();
             this.SuspendLayout();
             this.TextDetail.Name = "TextDetail";
             this.TextDetail.ReadOnly = true;
             // 
-            // Label1
+            // LabelSummary
             // 
-            resources.ApplyResources(this.Label1, "Label1");
-            this.Label1.Name = "Label1";
+            resources.ApplyResources(this.LabelSummary, "LabelSummary");
+            this.LabelSummary.Name = "LabelSummary";
             // 
             // PictureBox1
             // 
             // TableLayoutPanel1
             // 
             resources.ApplyResources(this.TableLayoutPanel1, "TableLayoutPanel1");
-            this.TableLayoutPanel1.Controls.Add(this.OK_Button, 0, 0);
-            this.TableLayoutPanel1.Controls.Add(this.Cancel_Button, 1, 0);
+            this.TableLayoutPanel1.Controls.Add(this.YesButton, 0, 0);
+            this.TableLayoutPanel1.Controls.Add(this.NoButton, 1, 0);
             this.TableLayoutPanel1.Name = "TableLayoutPanel1";
             // 
-            // OK_Button
+            // YesButton
             // 
-            resources.ApplyResources(this.OK_Button, "OK_Button");
-            this.OK_Button.Name = "OK_Button";
-            this.OK_Button.Click += new System.EventHandler(this.OK_Button_Click);
+            resources.ApplyResources(this.YesButton, "YesButton");
+            this.YesButton.DialogResult = System.Windows.Forms.DialogResult.Yes;
+            this.YesButton.Name = "YesButton";
+            this.YesButton.Click += new System.EventHandler(this.YesButton_Click);
             // 
-            // Cancel_Button
+            // NoButton
             // 
-            resources.ApplyResources(this.Cancel_Button, "Cancel_Button");
-            this.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.Cancel_Button.Name = "Cancel_Button";
-            this.Cancel_Button.Click += new System.EventHandler(this.Cancel_Button_Click);
+            resources.ApplyResources(this.NoButton, "NoButton");
+            this.NoButton.DialogResult = System.Windows.Forms.DialogResult.No;
+            this.NoButton.Name = "NoButton";
+            this.NoButton.Click += new System.EventHandler(this.NoButton_Click);
             // 
-            // DialogAsShieldIcon
+            // UpdateDialog
             // 
-            this.AcceptButton = this.OK_Button;
+            this.AcceptButton = this.YesButton;
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.Cancel_Button;
+            this.CancelButton = this.NoButton;
             this.Controls.Add(this.TextDetail);
-            this.Controls.Add(this.Label1);
+            this.Controls.Add(this.LabelSummary);
             this.Controls.Add(this.PictureBox1);
             this.Controls.Add(this.TableLayoutPanel1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-            this.Name = "DialogAsShieldIcon";
+            this.Name = "UpdateDialog";
             this.ShowInTaskbar = false;
             this.TopMost = true;
-            this.Load += new System.EventHandler(this.DialogAsShieldIcon_Load);
+            this.Shown += new System.EventHandler(this.UpdateDialog_Shown);
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();
             this.TableLayoutPanel1.ResumeLayout(false);
             this.ResumeLayout(false);
         #endregion
 
         internal System.Windows.Forms.TextBox TextDetail;
-        internal System.Windows.Forms.Label Label1;
+        internal System.Windows.Forms.Label LabelSummary;
         internal System.Windows.Forms.PictureBox PictureBox1;
         internal System.Windows.Forms.TableLayoutPanel TableLayoutPanel1;
-        internal System.Windows.Forms.Button OK_Button;
-        internal System.Windows.Forms.Button Cancel_Button;
+        internal System.Windows.Forms.Button YesButton;
+        internal System.Windows.Forms.Button NoButton;
     }
 }
\ No newline at end of file
diff --git a/OpenTween/UpdateDialog.cs b/OpenTween/UpdateDialog.cs
new file mode 100644 (file)
index 0000000..09441e6
--- /dev/null
@@ -0,0 +1,77 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2007-2011 kiri_feather (@kiri_feather) <kiri.feather@gmail.com>
+//           (c) 2008-2011 Moz (@syo68k)
+//           (c) 2008-2011 takeshik (@takeshik) <http://www.takeshik.org/>
+//           (c) 2010-2011 anis774 (@anis774) <http://d.hatena.ne.jp/anis774/>
+//           (c) 2010-2011 fantasticswallow (@f_swallow) <http://twitter.com/f_swallow>
+//           (c) 2012      tigree4th <crerish@gmail.com>
+//           (c) 2012      kim_upsilon (@kim_upsilon) <https://upsilo.net/~upsilon/>
+// All rights reserved.
+// 
+// This file is part of OpenTween.
+// 
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 3 of the License, or (at your option)
+// any later version.
+// 
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details. 
+// 
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>, or write to
+// the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+// Boston, MA 02110-1301, USA.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace OpenTween
+{
+    public partial class UpdateDialog : Form
+    {
+        public string SummaryText
+        {
+            get { return this.LabelSummary.Text; }
+            set { this.LabelSummary.Text = value; }
+        }
+
+        public string DetailsText
+        {
+            get { return this.TextDetail.Text; }
+            set { this.TextDetail.Text = value; }
+        }
+
+        public UpdateDialog()
+        {
+            InitializeComponent();
+
+            this.PictureBox1.Image = SystemIcons.Question.ToBitmap();
+            this.Text = MyCommon.ReplaceAppName(this.Text);
+        }
+
+        private void YesButton_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void NoButton_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void UpdateDialog_Shown(object sender, EventArgs e)
+        {
+            // デフォルトではテキストが全選択されるため抑制
+            this.TextDetail.SelectionLength = 0;
+        }
+    }
+}
diff --git a/OpenTween/UpdateDialog.en.resx b/OpenTween/UpdateDialog.en.resx
new file mode 100644 (file)
index 0000000..cd2f87d
--- /dev/null
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="YesButton.Text" xml:space="preserve">
+    <value>&amp;Yes</value>
+  </data>
+  <data name="NoButton.Text" xml:space="preserve">
+    <value>&amp;No</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>%AppName% Update Check</value>
+  </data>
+</root>
\ No newline at end of file
similarity index 73%
rename from OpenTween/DialogAsShieldIcon.resx
rename to OpenTween/UpdateDialog.resx
index ae6f51c..8b7d5c0 100644 (file)
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="TableLayoutPanel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Right</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="TextDetail.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="TableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
-    <value>2</value>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="TextDetail.Location" type="System.Drawing.Point, System.Drawing">
+    <value>13, 67</value>
   </data>
-  <data name="OK_Button.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>None</value>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="TextDetail.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="OK_Button.Location" type="System.Drawing.Point, System.Drawing">
-    <value>5, 9</value>
+  <data name="TextDetail.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
+    <value>Both</value>
   </data>
-  <data name="OK_Button.Size" type="System.Drawing.Size, System.Drawing">
-    <value>80, 26</value>
+  <data name="TextDetail.Size" type="System.Drawing.Size, System.Drawing">
+    <value>427, 122</value>
   </data>
-  <data name="OK_Button.TabIndex" type="System.Int32, mscorlib">
+  <data name="TextDetail.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="OK_Button.Text" xml:space="preserve">
-    <value>OK</value>
+  <data name="TextDetail.Text" xml:space="preserve">
+    <value>Details</value>
   </data>
-  <data name="OK_Button.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
-    <value>ImageBeforeText</value>
-  </data>
-  <data name="&gt;&gt;OK_Button.Name" xml:space="preserve">
-    <value>OK_Button</value>
+  <data name="&gt;&gt;TextDetail.Name" xml:space="preserve">
+    <value>TextDetail</value>
   </data>
-  <data name="&gt;&gt;OK_Button.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;TextDetail.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;OK_Button.Parent" xml:space="preserve">
-    <value>TableLayoutPanel1</value>
+  <data name="&gt;&gt;TextDetail.Parent" xml:space="preserve">
+    <value>$this</value>
   </data>
-  <data name="&gt;&gt;OK_Button.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;TextDetail.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="Cancel_Button.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>None</value>
-  </data>
-  <data name="Cancel_Button.Location" type="System.Drawing.Point, System.Drawing">
-    <value>95, 9</value>
+  <data name="LabelSummary.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
   </data>
-  <data name="Cancel_Button.Size" type="System.Drawing.Size, System.Drawing">
-    <value>80, 26</value>
-  </data>
-  <data name="Cancel_Button.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="Cancel_Button.Text" xml:space="preserve">
-    <value>キャンセル</value>
-  </data>
-  <data name="&gt;&gt;Cancel_Button.Name" xml:space="preserve">
-    <value>Cancel_Button</value>
-  </data>
-  <data name="&gt;&gt;Cancel_Button.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Cancel_Button.Parent" xml:space="preserve">
-    <value>TableLayoutPanel1</value>
+  <data name="LabelSummary.Location" type="System.Drawing.Point, System.Drawing">
+    <value>75, 13</value>
   </data>
-  <data name="&gt;&gt;Cancel_Button.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="LabelSummary.Size" type="System.Drawing.Size, System.Drawing">
+    <value>365, 48</value>
   </data>
-  <data name="TableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>220, 174</value>
+  <data name="LabelSummary.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
   </data>
-  <data name="TableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
-    <value>1</value>
+  <data name="LabelSummary.Text" xml:space="preserve">
+    <value>Summary</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 name="LabelSummary.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
   </data>
-  <data name="&gt;&gt;TableLayoutPanel1.Name" xml:space="preserve">
-    <value>TableLayoutPanel1</value>
+  <data name="&gt;&gt;LabelSummary.Name" xml:space="preserve">
+    <value>LabelSummary</value>
   </data>
-  <data name="&gt;&gt;TableLayoutPanel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;LabelSummary.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;TableLayoutPanel1.Parent" xml:space="preserve">
+  <data name="&gt;&gt;LabelSummary.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <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="OK_Button" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="Cancel_Button" 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 name="&gt;&gt;LabelSummary.ZOrder" xml:space="preserve">
+    <value>1</value>
   </data>
   <data name="PictureBox1.Location" type="System.Drawing.Point, System.Drawing">
     <value>13, 13</value>
   <data name="PictureBox1.Size" type="System.Drawing.Size, System.Drawing">
     <value>48, 48</value>
   </data>
+  <data name="PictureBox1.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
+    <value>CenterImage</value>
+  </data>
   <data name="PictureBox1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
     <value>PictureBox1</value>
   </data>
   <data name="&gt;&gt;PictureBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;PictureBox1.Parent" xml:space="preserve">
     <value>$this</value>
   <data name="&gt;&gt;PictureBox1.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>75, 13</value>
+  <data name="TableLayoutPanel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
   </data>
-  <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>326, 48</value>
+  <data name="TableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
+    <value>2</value>
   </data>
-  <data name="Label1.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+  <data name="YesButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>None</value>
   </data>
-  <data name="Label1.Text" xml:space="preserve">
-    <value>Label1</value>
+  <data name="YesButton.Location" type="System.Drawing.Point, System.Drawing">
+    <value>5, 9</value>
   </data>
-  <data name="Label1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleLeft</value>
+  <data name="YesButton.Size" type="System.Drawing.Size, System.Drawing">
+    <value>80, 26</value>
   </data>
-  <data name="&gt;&gt;Label1.Name" xml:space="preserve">
-    <value>Label1</value>
+  <data name="YesButton.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
   </data>
-  <data name="&gt;&gt;Label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="YesButton.Text" xml:space="preserve">
+    <value>はい (&amp;Y)</value>
   </data>
-  <data name="&gt;&gt;Label1.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="YesButton.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageBeforeText</value>
   </data>
-  <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="&gt;&gt;YesButton.Name" xml:space="preserve">
+    <value>YesButton</value>
   </data>
-  <data name="TextDetail.Location" type="System.Drawing.Point, System.Drawing">
-    <value>13, 67</value>
+  <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="TextDetail.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="&gt;&gt;YesButton.Parent" xml:space="preserve">
+    <value>TableLayoutPanel1</value>
   </data>
-  <data name="TextDetail.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
-    <value>Both</value>
+  <data name="&gt;&gt;YesButton.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
-  <data name="TextDetail.Size" type="System.Drawing.Size, System.Drawing">
-    <value>388, 101</value>
+  <data name="NoButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>None</value>
   </data>
-  <data name="TextDetail.TabIndex" type="System.Int32, mscorlib">
+  <data name="NoButton.Location" type="System.Drawing.Point, System.Drawing">
+    <value>95, 9</value>
+  </data>
+  <data name="NoButton.Size" type="System.Drawing.Size, System.Drawing">
+    <value>80, 26</value>
+  </data>
+  <data name="NoButton.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
-  <data name="&gt;&gt;TextDetail.Name" xml:space="preserve">
-    <value>TextDetail</value>
+  <data name="NoButton.Text" xml:space="preserve">
+    <value>いいえ (&amp;N)</value>
   </data>
-  <data name="&gt;&gt;TextDetail.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;NoButton.Name" xml:space="preserve">
+    <value>NoButton</value>
   </data>
-  <data name="&gt;&gt;TextDetail.Parent" xml:space="preserve">
+  <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;TextDetail.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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 12</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>413, 229</value>
+    <value>452, 250</value>
   </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterScreen</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>DialogAsShieldIcon</value>
+    <value>%AppName%更新通知</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>DialogAsShieldIcon</value>
+    <value>UpdateDialog</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>
\ No newline at end of file
similarity index 94%
rename from OpenTween/DialogAsShieldIcon.zh-CHS.resx
rename to OpenTween/UpdateDialog.zh-CHS.resx
index 0fcc048..44fcb46 100644 (file)
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="OK_Button.Text" xml:space="preserve">
-    <value>确定</value>
-  </data>
-  <data name="Cancel_Button.Text" xml:space="preserve">
-    <value>取消</value>
+  <data name="$this.Text" xml:space="preserve">
+    <value>%AppName%更新检查</value>
   </data>
 </root>
\ No newline at end of file