UploadImageTimeoutを設定画面から変更可能にする

diff --git a/OpenTween/AppendSettingDialog.cs b/OpenTween/AppendSettingDialog.cs
index 73eb49e..5ca9b4e 100644 (file)
--- a/OpenTween/AppendSettingDialog.cs
+++ b/OpenTween/AppendSettingDialog.cs
@@ -311,6 +311,9 @@ namespace OpenTween
             var timeout = int.Parse(this.ConnectionPanel.ConnectionTimeOut.Text.Trim());
             Networking.DefaultTimeout = TimeSpan.FromSeconds(timeout);
 
+            var uploadImageTimeout = int.Parse(this.ConnectionPanel.UploadImageTimeout.Text.Trim());
+            Networking.UploadImageTimeout = TimeSpan.FromSeconds(uploadImageTimeout);
+
             Networking.ForceIPv4 = this.ConnectionPanel.checkBoxForceIPv4.Checked;
 
             TwitterApiConnection.RestApiHost = this.ConnectionPanel.TwitterAPIText.Text.Trim();

diff --git a/OpenTween/Resources/ChangeLog.txt b/OpenTween/Resources/ChangeLog.txt
index b6a3b75..bee89b0 100644 (file)
--- a/OpenTween/Resources/ChangeLog.txt
+++ b/OpenTween/Resources/ChangeLog.txt
@@ -1,6 +1,8 @@
 更新履歴
 
 ==== Ver 1.3.6-dev(2016/xx/xx)
+ * NEW: 画像アップロード時のタイムアウト時間が変更できるようになりました
+  - ファイルサイズが大きい画像のアップロードに頻繁に失敗する場合は、長めに設定すると改善する可能性があります
  * CHG: 非公開アカウントであっても自分自身のツイートを公式RTできるようになりました
  * FIX: 発言詳細部のプロフィール画像に誤ったユーザーの画像が表示されることがある不具合を修正
  * FIX: ツイートURLのコピー時に余分な改行文字が末尾に付く不具合を修正

diff --git a/OpenTween/Setting/Panel/ConnectionPanel.Designer.cs b/OpenTween/Setting/Panel/ConnectionPanel.Designer.cs
index ae4a2e4..db06de2 100644 (file)
--- a/OpenTween/Setting/Panel/ConnectionPanel.Designer.cs
+++ b/OpenTween/Setting/Panel/ConnectionPanel.Designer.cs
@@ -35,6 +35,8 @@
             this.ConnectionTimeOut = new System.Windows.Forms.TextBox();
             this.Label63 = new System.Windows.Forms.Label();
             this.checkBoxForceIPv4 = new System.Windows.Forms.CheckBox();
+            this.UploadImageTimeout = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // TwitterAPIText
@@ -58,7 +60,7 @@
             // 
             resources.ApplyResources(this.ConnectionTimeOut, "ConnectionTimeOut");
             this.ConnectionTimeOut.Name = "ConnectionTimeOut";
-            this.ConnectionTimeOut.Validating += new System.ComponentModel.CancelEventHandler(this.ConnectionTimeOut_Validating);
+            this.ConnectionTimeOut.Validating += new System.ComponentModel.CancelEventHandler(this.ValidateTimeoutValue);
             // 
             // Label63
             // 
@@ -71,10 +73,23 @@
             this.checkBoxForceIPv4.Name = "checkBoxForceIPv4";
             this.checkBoxForceIPv4.UseVisualStyleBackColor = true;
             // 
+            // UploadImageTimeout
+            // 
+            resources.ApplyResources(this.UploadImageTimeout, "UploadImageTimeout");
+            this.UploadImageTimeout.Name = "UploadImageTimeout";
+            this.UploadImageTimeout.Validating += new System.ComponentModel.CancelEventHandler(this.ValidateTimeoutValue);
+            // 
+            // label2
+            // 
+            resources.ApplyResources(this.label2, "label2");
+            this.label2.Name = "label2";
+            // 
             // ConnectionPanel
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.Controls.Add(this.UploadImageTimeout);
+            this.Controls.Add(this.label2);
             this.Controls.Add(this.checkBoxForceIPv4);
             this.Controls.Add(this.TwitterAPIText);
             this.Controls.Add(this.Label8);
@@ -95,5 +110,7 @@
         internal System.Windows.Forms.TextBox ConnectionTimeOut;
         internal System.Windows.Forms.Label Label63;
         internal System.Windows.Forms.CheckBox checkBoxForceIPv4;
+        internal System.Windows.Forms.TextBox UploadImageTimeout;
+        internal System.Windows.Forms.Label label2;
     }
 }

diff --git a/OpenTween/Setting/Panel/ConnectionPanel.cs b/OpenTween/Setting/Panel/ConnectionPanel.cs
index 9949c8f..4460b7f 100644 (file)
--- a/OpenTween/Setting/Panel/ConnectionPanel.cs
+++ b/OpenTween/Setting/Panel/ConnectionPanel.cs
@@ -45,6 +45,7 @@ namespace OpenTween.Setting.Panel
         public void LoadConfig(SettingCommon settingCommon)
         {
             this.ConnectionTimeOut.Text = settingCommon.DefaultTimeOut.ToString();
+            this.UploadImageTimeout.Text = settingCommon.UploadImageTimeout.ToString();
             this.checkBoxForceIPv4.Checked = settingCommon.ForceIPv4;
             this.TwitterAPIText.Text = settingCommon.TwitterApiHost;
         }
@@ -52,11 +53,12 @@ namespace OpenTween.Setting.Panel
         public void SaveConfig(SettingCommon settingCommon)
         {
             settingCommon.DefaultTimeOut = int.Parse(this.ConnectionTimeOut.Text);
+            settingCommon.UploadImageTimeout = int.Parse(this.UploadImageTimeout.Text);
             settingCommon.ForceIPv4 = this.checkBoxForceIPv4.Checked;
             settingCommon.TwitterApiHost = this.TwitterAPIText.Text.Trim();
         }
 
-        private void ConnectionTimeOut_Validating(object sender, CancelEventArgs e)
+        private void ValidateTimeoutValue(object sender, CancelEventArgs e)
         {
             int tm;
             try

diff --git a/OpenTween/Setting/Panel/ConnectionPanel.en.resx b/OpenTween/Setting/Panel/ConnectionPanel.en.resx
index 3690e04..f02b620 100644 (file)
--- a/OpenTween/Setting/Panel/ConnectionPanel.en.resx
+++ b/OpenTween/Setting/Panel/ConnectionPanel.en.resx
@@ -118,9 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="CheckUseSsl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>130, 16</value>
-  </data>
   <data name="Label64.Size" type="System.Drawing.Size, System.Drawing">
     <value>371, 12</value>
   </data>
@@ -139,4 +136,10 @@
   <data name="checkBoxForceIPv4.Text" xml:space="preserve">
     <value>Force to use IPv4 to connect to pbs.twimg.com</value>
   </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>220, 12</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>Connection timeout(sec, Uploading image)</value>
+  </data>
 </root>
\ No newline at end of file

diff --git a/OpenTween/Setting/Panel/ConnectionPanel.resx b/OpenTween/Setting/Panel/ConnectionPanel.resx
index cab491e..b436772 100644 (file)
--- a/OpenTween/Setting/Panel/ConnectionPanel.resx
+++ b/OpenTween/Setting/Panel/ConnectionPanel.resx
@@ -119,14 +119,14 @@
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="TwitterAPIText.Location" type="System.Drawing.Point, System.Drawing">
-    <value>267, 102</value>
+    <value>267, 127</value>
   </data>
   <data name="TwitterAPIText.Size" type="System.Drawing.Size, System.Drawing">
     <value>125, 19</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="TwitterAPIText.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+    <value>7</value>
   </data>
   <data name="TwitterAPIText.Text" xml:space="preserve">
     <value>api.twitter.com</value>
@@ -144,7 +144,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;TwitterAPIText.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>3</value>
   </data>
   <data name="Label8.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -154,13 +154,13 @@
     <value>NoControl</value>
   </data>
   <data name="Label8.Location" type="System.Drawing.Point, System.Drawing">
-    <value>23, 105</value>
+    <value>23, 130</value>
   </data>
   <data name="Label8.Size" type="System.Drawing.Size, System.Drawing">
     <value>174, 12</value>
   </data>
   <data name="Label8.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+    <value>6</value>
   </data>
   <data name="Label8.Text" xml:space="preserve">
     <value>Twitter API URL (api.twitter.com)</value>
@@ -178,7 +178,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;Label8.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>4</value>
   </data>
   <data name="Label64.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -187,16 +187,19 @@
     <value>NoControl</value>
   </data>
   <data name="Label64.Location" type="System.Drawing.Point, System.Drawing">
-    <value>23, 49</value>
+    <value>23, 75</value>
+  </data>
+  <data name="Label64.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 3</value>
   </data>
   <data name="Label64.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 12</value>
+    <value>231, 12</value>
   </data>
   <data name="Label64.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
+    <value>4</value>
   </data>
   <data name="Label64.Text" xml:space="preserve">
-    <value>※タイムアウトが頻発する場合に調整してください。初期設定は20秒です。</value>
+    <value>※タイムアウトが頻発する場合に調整してください</value>
   </data>
   <data name="&gt;&gt;Label64.Name" xml:space="preserve">
     <value>Label64</value>
@@ -208,7 +211,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;Label64.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>5</value>
   </data>
   <data name="ConnectionTimeOut.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>Disable</value>
@@ -232,7 +235,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ConnectionTimeOut.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>6</value>
   </data>
   <data name="Label63.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -262,19 +265,19 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;Label63.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>7</value>
   </data>
   <data name="checkBoxForceIPv4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="checkBoxForceIPv4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>23, 77</value>
+    <value>23, 102</value>
   </data>
   <data name="checkBoxForceIPv4.Size" type="System.Drawing.Size, System.Drawing">
     <value>281, 16</value>
   </data>
   <data name="checkBoxForceIPv4.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+    <value>5</value>
   </data>
   <data name="checkBoxForceIPv4.Text" xml:space="preserve">
     <value>pbs.twimg.com への接続に強制的に IPv4 を使用する</value>
@@ -289,8 +292,62 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;checkBoxForceIPv4.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="UploadImageTimeout.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>Disable</value>
+  </data>
+  <data name="UploadImageTimeout.Location" type="System.Drawing.Point, System.Drawing">
+    <value>267, 48</value>
+  </data>
+  <data name="UploadImageTimeout.Size" type="System.Drawing.Size, System.Drawing">
+    <value>125, 19</value>
+  </data>
+  <data name="UploadImageTimeout.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;UploadImageTimeout.Name" xml:space="preserve">
+    <value>UploadImageTimeout</value>
+  </data>
+  <data name="&gt;&gt;UploadImageTimeout.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;UploadImageTimeout.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;UploadImageTimeout.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>23, 51</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>214, 12</value>
+  </data>
+  <data name="label2.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>タイムアウトまでの時間(秒, 画像アップロード)</value>
+  </data>
+  <data name="&gt;&gt;label2.Name" xml:space="preserve">
+    <value>label2</value>
+  </data>
+  <data name="&gt;&gt;label2.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;label2.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 89574f8..454e5ce 100644 (file)
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -3766,6 +3766,7 @@ namespace OpenTween
                     TwitterApiConnection.RestApiHost = this._cfgCommon.TwitterApiHost;
 
                     Networking.DefaultTimeout = TimeSpan.FromSeconds(this._cfgCommon.DefaultTimeOut);
+                    Networking.UploadImageTimeout = TimeSpan.FromSeconds(this._cfgCommon.UploadImageTimeout);
                     Networking.SetWebProxy(this._cfgLocal.ProxyType,
                         this._cfgLocal.ProxyAddress, this._cfgLocal.ProxyPort,
                         this._cfgLocal.ProxyUser, this._cfgLocal.ProxyPassword);