QTと非公式RT機能を統合

(旧)
Retweet(Unofficial)→in_reply_toなし非公式RT
Quote→in_reply_to付き非公式RT

(新)
Retweet(Unofficial)→in_reply_to付き非公式RT
Quoteは引用ツイート機能 (ツイートURLを付けるやつ) に既に変更されている

diff --git a/OpenTween/Resources/ChangeLog.txt b/OpenTween/Resources/ChangeLog.txt
index cefa847..381fd0f 100644 (file)
--- a/OpenTween/Resources/ChangeLog.txt
+++ b/OpenTween/Resources/ChangeLog.txt
@@ -6,8 +6,11 @@
  * NEW: 公式RTの通知に対応しました
  * NEW: 公式の引用ツイートに則った投稿に対応しました
   - 操作メニューまたはツイート右クリックメニューから Quote を選択すると、投稿欄に該当のステータスURLが入力されます
-  - 注：これまでの Quote は Quote(Unofficial) に変更しました
+  - 以前までの「Quote」とは機能が異なるため注意して下さい
  * NEW: Gyazoのサムネイル表示に対応
+ * CHG: 非公式RTとQTの機能を統合しました
+  - 「Retweet(Unofficial)」機能は「RT @***: 」が入力されるだけでなく返信先 (in_reply_to と呼ばれる) の情報が投稿時に付くようになります
+  - かつては非公式RTの in_reply_to の有無でフォロワーから見える範囲が変化しましたが、現在はその差異がないため統合しました
  * FIX: ツイートの選択時にシステムの効果音が鳴っていた不具合を修正
  * FIX: Ctrl+Eでツイート内のリンクを開く際に、Ctrlキーで「ユーザーのホームをタブで開く」設定を反転させる機能と競合していた不具合を修正 (thx @dj_kusuha!)
  * FIX: 異常なsourceを含むツイートの振り分け時にエラーが発生する問題の回避

diff --git a/OpenTween/Tween.Designer.cs b/OpenTween/Tween.Designer.cs
index bc32b88..b57e5de 100644 (file)
--- a/OpenTween/Tween.Designer.cs
+++ b/OpenTween/Tween.Designer.cs
@@ -144,7 +144,6 @@
             this.RtOpMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.RtUnOpMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.QtOpMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.QtUnOpMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ToolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator();
             this.FavOpMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.FavoriteRetweetMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -282,7 +281,6 @@
             this.ReTweetStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ReTweetUnofficialStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.QuoteStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.QuoteUnofficialStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ToolStripSeparator39 = new System.Windows.Forms.ToolStripSeparator();
             this.FavAddToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.FavoriteRetweetContextMenu = new System.Windows.Forms.ToolStripMenuItem();
@@ -1296,7 +1294,6 @@
             this.RtOpMenuItem,
             this.RtUnOpMenuItem,
             this.QtOpMenuItem,
-            this.QtUnOpMenuItem,
             this.ToolStripSeparator25,
             this.FavOpMenuItem,
             this.FavoriteRetweetMenuItem,
@@ -1357,12 +1354,6 @@
             resources.ApplyResources(this.QtOpMenuItem, "QtOpMenuItem");
             this.QtOpMenuItem.Click += new System.EventHandler(this.QuoteStripMenuItem_Click);
             // 
-            // QtUnOpMenuItem
-            // 
-            this.QtUnOpMenuItem.Name = "QtUnOpMenuItem";
-            resources.ApplyResources(this.QtUnOpMenuItem, "QtUnOpMenuItem");
-            this.QtUnOpMenuItem.Click += new System.EventHandler(this.QuoteUnofficialStripMenuItem_Click);
-            // 
             // ToolStripSeparator25
             // 
             this.ToolStripSeparator25.Name = "ToolStripSeparator25";
@@ -2229,7 +2220,6 @@
             this.ReTweetStripMenuItem,
             this.ReTweetUnofficialStripMenuItem,
             this.QuoteStripMenuItem,
-            this.QuoteUnofficialStripMenuItem,
             this.ToolStripSeparator39,
             this.FavAddToolStripMenuItem,
             this.FavoriteRetweetContextMenu,
@@ -2291,12 +2281,6 @@
             resources.ApplyResources(this.QuoteStripMenuItem, "QuoteStripMenuItem");
             this.QuoteStripMenuItem.Click += new System.EventHandler(this.QuoteStripMenuItem_Click);
             // 
-            // QuoteUnofficialStripMenuItem
-            // 
-            this.QuoteUnofficialStripMenuItem.Name = "QuoteUnofficialStripMenuItem";
-            resources.ApplyResources(this.QuoteUnofficialStripMenuItem, "QuoteUnofficialStripMenuItem");
-            this.QuoteUnofficialStripMenuItem.Click += new System.EventHandler(this.QuoteUnofficialStripMenuItem_Click);
-            // 
             // ToolStripSeparator39
             // 
             this.ToolStripSeparator39.Name = "ToolStripSeparator39";
@@ -2811,8 +2795,6 @@
         private ToolStripAPIGauge toolStripApiGauge;
         private System.Windows.Forms.ToolStripMenuItem CreateSourceRuleOpMenuItem;
         private System.Windows.Forms.ToolStripMenuItem SourceRuleMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem QtUnOpMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem QuoteUnofficialStripMenuItem;
 
     }
 }
\ No newline at end of file

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 1a72c4f..cb07672 100644 (file)
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -3845,7 +3845,6 @@ namespace OpenTween
                 ReTweetStripMenuItem.Enabled = false;
                 ReTweetUnofficialStripMenuItem.Enabled = false;
                 QuoteStripMenuItem.Enabled = false;
-                QuoteUnofficialStripMenuItem.Enabled = false;
                 FavoriteRetweetContextMenu.Enabled = false;
                 FavoriteRetweetUnofficialContextMenu.Enabled = false;
             }
@@ -3862,7 +3861,6 @@ namespace OpenTween
                     ReTweetStripMenuItem.Enabled = false;  //公式RTは無効に
                     ReTweetUnofficialStripMenuItem.Enabled = true;
                     QuoteStripMenuItem.Enabled = true;
-                    QuoteUnofficialStripMenuItem.Enabled = true;
                     FavoriteRetweetContextMenu.Enabled = false;  //公式RTは無効に
                     FavoriteRetweetUnofficialContextMenu.Enabled = true;
                 }
@@ -3873,7 +3871,6 @@ namespace OpenTween
                         ReTweetStripMenuItem.Enabled = false;
                         ReTweetUnofficialStripMenuItem.Enabled = false;
                         QuoteStripMenuItem.Enabled = false;
-                        QuoteUnofficialStripMenuItem.Enabled = false;
                         FavoriteRetweetContextMenu.Enabled = false;
                         FavoriteRetweetUnofficialContextMenu.Enabled = false;
                     }
@@ -3882,7 +3879,6 @@ namespace OpenTween
                         ReTweetStripMenuItem.Enabled = true;
                         ReTweetUnofficialStripMenuItem.Enabled = true;
                         QuoteStripMenuItem.Enabled = true;
-                        QuoteUnofficialStripMenuItem.Enabled = true;
                         FavoriteRetweetContextMenu.Enabled = true;
                         FavoriteRetweetUnofficialContextMenu.Enabled = true;
                     }
@@ -7070,9 +7066,6 @@ namespace OpenTween
                 ShortcutCommand.Create(Keys.Control | Keys.Shift | Keys.O)
                     .Do(() => this.FavorareMenuItem_Click(null, null)),
 
-                ShortcutCommand.Create(Keys.Control | Keys.Shift | Keys.Q)
-                    .Do(() => this.doQuoteUnofficial()),
-
                 ShortcutCommand.Create(Keys.Control | Keys.Shift | Keys.Up)
                     .FocusedOn(FocusedControl.StatusText)
                     .Do(() => {
@@ -9872,7 +9865,7 @@ namespace OpenTween
                 {
                     foreach (Match mid in m)
                     {
-                        if (StatusText.Contains("QT " + mid.Result("${id}") + ":") && mid.Result("${id}") == "@" + inReplyToScreenName) return;
+                        if (StatusText.Contains("RT " + mid.Result("${id}") + ":") && mid.Result("${id}") == "@" + inReplyToScreenName) return;
                     }
                 }
             }
@@ -11236,31 +11229,6 @@ namespace OpenTween
             await this.doGetFollowersMenu();
         }
 
-        private void doReTweetUnofficial()
-        {
-            //RT @id:内容
-            if (this.ExistCurrentPost)
-            {
-                if (_curPost.IsDm ||
-                    !StatusText.Enabled) return;
-
-                if (_curPost.IsProtect)
-                {
-                    MessageBox.Show("Protected.");
-                    return;
-                }
-                string rtdata = _curPost.Text;
-                rtdata = CreateRetweetUnofficial(rtdata, this.StatusText.Multiline);
-
-                this.inReplyTo = null;
-
-                StatusText.Text = "RT @" + _curPost.ScreenName + ": " + rtdata;
-
-                StatusText.SelectionStart = 0;
-                StatusText.Focus();
-            }
-        }
-
         private void ReTweetUnofficialStripMenuItem_Click(object sender, EventArgs e)
         {
             doReTweetUnofficial();
@@ -11807,14 +11775,13 @@ namespace OpenTween
             }
         }
 
-        private void doQuoteUnofficial()
+        private void doReTweetUnofficial()
         {
-            //QT @id:内容
-            //返信先情報付加
+            //RT @id:内容
             if (this.ExistCurrentPost)
             {
-                if (_curPost.IsDm ||
-                    !StatusText.Enabled) return;
+                if (_curPost.IsDm || !StatusText.Enabled)
+                    return;
 
                 if (_curPost.IsProtect)
                 {
@@ -11824,8 +11791,9 @@ namespace OpenTween
                 string rtdata = _curPost.Text;
                 rtdata = CreateRetweetUnofficial(rtdata, this.StatusText.Multiline);
 
-                StatusText.Text = " QT @" + _curPost.ScreenName + ": " + rtdata;
+                StatusText.Text = " RT @" + _curPost.ScreenName + ": " + rtdata;
 
+                // 投稿時に in_reply_to_status_id を付加する
                 var inReplyToStatusId = this._curPost.RetweetedId ?? this._curPost.StatusId;
                 var inReplyToScreenName = this._curPost.ScreenName;
                 this.inReplyTo = Tuple.Create(inReplyToStatusId, inReplyToScreenName);
@@ -11840,11 +11808,6 @@ namespace OpenTween
             doQuoteOfficial();
         }
 
-        private void QuoteUnofficialStripMenuItem_Click(object sender, EventArgs e) // Handles QuoteUnofficialStripMenuItem.Click, QtUnOpMenuItem.Click
-        {
-            doQuoteUnofficial();
-        }
-
         private void SearchButton_Click(object sender, EventArgs e)
         {
             //公式検索
@@ -12269,7 +12232,6 @@ namespace OpenTween
                 this.RtOpMenuItem.Enabled = false;
                 this.RtUnOpMenuItem.Enabled = false;
                 this.QtOpMenuItem.Enabled = false;
-                this.QtUnOpMenuItem.Enabled = false;
                 this.FavoriteRetweetMenuItem.Enabled = false;
                 this.FavoriteRetweetUnofficialMenuItem.Enabled = false;
             }
@@ -12286,7 +12248,6 @@ namespace OpenTween
                     this.RtOpMenuItem.Enabled = false;  //公式RTは無効に
                     this.RtUnOpMenuItem.Enabled = true;
                     this.QtOpMenuItem.Enabled = true;
-                    this.QtUnOpMenuItem.Enabled = true;
                     this.FavoriteRetweetMenuItem.Enabled = false;  //公式RTは無効に
                     this.FavoriteRetweetUnofficialMenuItem.Enabled = true;
                 }
@@ -12297,7 +12258,6 @@ namespace OpenTween
                         this.RtOpMenuItem.Enabled = false;
                         this.RtUnOpMenuItem.Enabled = false;
                         this.QtOpMenuItem.Enabled = false;
-                        this.QtUnOpMenuItem.Enabled = false;
                         this.FavoriteRetweetMenuItem.Enabled = false;
                         this.FavoriteRetweetUnofficialMenuItem.Enabled = false;
                     }
@@ -12306,7 +12266,6 @@ namespace OpenTween
                         this.RtOpMenuItem.Enabled = true;
                         this.RtUnOpMenuItem.Enabled = true;
                         this.QtOpMenuItem.Enabled = true;
-                        this.QtUnOpMenuItem.Enabled = true;
                         this.FavoriteRetweetMenuItem.Enabled = true;
                         this.FavoriteRetweetUnofficialMenuItem.Enabled = true;
                     }

diff --git a/OpenTween/Tween.resx b/OpenTween/Tween.resx
index 8b8b7f1..55d11ba 100644 (file)
--- a/OpenTween/Tween.resx
+++ b/OpenTween/Tween.resx
@@ -2458,23 +2458,8 @@
   <data name="ToolStripMenuItem6.Text" xml:space="preserve">
     <value>開く(&amp;O)</value>
   </data>
-  <data name="QtUnOpMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Ctrl+Shift+Q</value>
-  </data>
-  <data name="QtUnOpMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>316, 22</value>
-  </data>
-  <data name="QtUnOpMenuItem.Text" xml:space="preserve">
-    <value>Quote(Unoffi&amp;cial)</value>
-  </data>
-  <data name="QuoteUnofficialStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>244, 22</value>
-  </data>
-  <data name="QuoteUnofficialStripMenuItem.Text" xml:space="preserve">
-    <value>Quote(Unoffi&amp;cial)</value>
-  </data>
   <data name="ContextMenuOperate.Size" type="System.Drawing.Size, System.Drawing">
-    <value>242, 512</value>
+    <value>242, 534</value>
   </data>
   <data name="&gt;&gt;ContextMenuOperate.Name" xml:space="preserve">
     <value>ContextMenuOperate</value>
@@ -4263,18 +4248,6 @@
   <data name="&gt;&gt;LockListSortOrderToolStripMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;QtUnOpMenuItem.Name" xml:space="preserve">
-    <value>QtUnOpMenuItem</value>
-  </data>
-  <data name="&gt;&gt;QtUnOpMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;QuoteUnofficialStripMenuItem.Name" xml:space="preserve">
-    <value>QuoteUnofficialStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;QuoteUnofficialStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>TweenMain</value>
   </data>