ショートカットキーの処理タイミングを変更。Ctrl+iなどが効かなくなる不具合はなくなったはず

git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@230 e39ad16e-3079-482e-bb30-4b4d378143b6

diff --git a/Tween/Resources/ChangeLog.txt b/Tween/Resources/ChangeLog.txt
index 96049ec..c6ba5cd 100644 (file)
--- a/Tween/Resources/ChangeLog.txt
+++ b/Tween/Resources/ChangeLog.txt
@@ -3,6 +3,7 @@
 ==== Ver 0.8.8.7(2010/05/**)
  * 画像プレビューでのサムネイル生成完了報告タイミング見直し
  * 画像プレビューをTwitVideoに対応
+ * ショートカットキーの処理タイミングを変更。Ctrl+iなどが効かなくなる不具合はなくなったはず
 ==== Ver 0.8.8.6(2010/04/30)
  * Flickr/Pixivの画像ページ読み込み、解析処理を非同期に
  * 操作メニュー表示の際の判定漏れを修正

diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index 774aa3c..79802ca 100644 (file)
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -2642,7 +2642,7 @@ Public Class TweenMain
         MakeReplyOrDirectStatus(False, False)
     End Sub
 
-    Private Sub DeleteStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles DeleteStripMenuItem.Click, DelOpMenuItem.Click
+    Private Sub doStatusDelete()
         If _curTab Is Nothing OrElse _curList Is Nothing Then Exit Sub
         If _statuses.Tabs(_curTab.Text).TabType <> TabUsageType.DirectMessage Then
             Dim myPost As Boolean = False
@@ -2732,6 +2732,10 @@ Public Class TweenMain
         End Try
     End Sub
 
+    Private Sub DeleteStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles DeleteStripMenuItem.Click, DelOpMenuItem.Click
+        doStatusDelete()
+    End Sub
+
     Private Sub ReadedStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ReadedStripMenuItem.Click, ReadOpMenuItem.Click
         _curList.BeginUpdate()
         If SettingDialog.UnreadManage Then
@@ -4454,6 +4458,8 @@ RETRY:
             End If
             If e.KeyCode = Keys.N Then GoNextTab(True)
             If e.KeyCode = Keys.P Then GoNextTab(False)
+            If e.KeyCode = Keys.I Then doRepliedStatusOpen()
+            If e.KeyCode = Keys.D Then doStatusDelete()
             'If e.KeyCode = Keys.F Then
             '    e.Handled = True
             '    e.SuppressKeyPress = True
@@ -4478,6 +4484,7 @@ RETRY:
                 e.SuppressKeyPress = True
                 GoSamePostToAnotherTab(True)
             End If
+            If e.KeyCode = Keys.R Then doReTweetOriginal()
         End If
         If e.Shift AndAlso Not e.Control AndAlso Not e.Alt Then
             ' SHIFTキーが押されている場合
@@ -4529,6 +4536,10 @@ RETRY:
                 DoRefreshMore()
             End If
         End If
+        If e.Control AndAlso Not e.Alt AndAlso e.Shift Then
+            ' CTRL+SHIFTキーが押されている場合
+            If e.KeyCode = Keys.H Then doMoveToRTHome()
+        End If
         If Not e.Alt Then
             If e.KeyCode = Keys.J Then
                 e.Handled = True
@@ -6481,7 +6492,7 @@ RETRY:
         End If
     End Sub
 
-    Private Sub RepliedStatusOpenMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles RepliedStatusOpenMenuItem.Click, OpenRepSourceOpMenuItem.Click
+    Private Sub doRepliedStatusOpen()
         If _curPost IsNot Nothing AndAlso _curPost.InReplyToUser IsNot Nothing AndAlso _curPost.InReplyToId > 0 Then
             If _statuses.ContainsKey(_curPost.InReplyToId) AndAlso Not My.Computer.Keyboard.ShiftKeyDown Then
                 Dim repPost As PostClass = _statuses.Item(_curPost.InReplyToId)
@@ -6492,6 +6503,10 @@ RETRY:
         End If
     End Sub
 
+    Private Sub RepliedStatusOpenMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles RepliedStatusOpenMenuItem.Click, OpenRepSourceOpMenuItem.Click
+        doRepliedStatusOpen()
+    End Sub
+
     Private Sub ContextMenuStrip3_Opening(ByVal sender As System.Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles ContextMenuStrip3.Opening
         '発言詳細のアイコン右クリック時のメニュー制御
         If _curList.SelectedIndices.Count > 0 AndAlso _curPost IsNot Nothing Then
@@ -7300,7 +7315,7 @@ RETRY:
         End If
     End Sub
 
-    Private Sub ReTweetOriginalStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ReTweetOriginalStripMenuItem.Click, RtOpMenuItem.Click
+    Private Sub doReTweetOriginal()
         '公式RT
         If _curPost IsNot Nothing AndAlso Not _curPost.IsDm AndAlso Not _curPost.IsMe Then
             If SettingDialog.ProtectNotInclude AndAlso _curPost.IsProtect Then
@@ -7319,33 +7334,12 @@ RETRY:
 
             RunAsync(args)
         End If
-
-        ''RT @id:内容
-        ''元発言のみRT
-        'If _curPost IsNot Nothing Then
-        '    If _curPost.IsDm OrElse _
-        '       Not StatusText.Enabled Then Exit Sub
-
-        '    If SettingDialog.ProtectNotInclude AndAlso _curPost.IsProtect Then
-        '        MessageBox.Show("Protected.")
-        '        Exit Sub
-        '    End If
-
-        '    Dim rtdata As String = _curPost.OriginalData
-        '    rtdata = CreateRetweet(rtdata)
-
-        '    Dim rx As New Regex("^(?<multi>(RT @[0-9a-zA-Z_]+\s?:\s?)*)(?<org>RT @[0-9a-zA-Z_]+\s?:)")
-        '    If rx.IsMatch(rtdata) Then
-        '        StatusText.Text = HttpUtility.HtmlDecode(rx.Replace(rtdata, "${org}"))
-        '    Else
-        '        StatusText.Text = "RT @" + _curPost.Name + ": " + HttpUtility.HtmlDecode(rtdata)
-        '    End If
-
-        '    StatusText.SelectionStart = 0
-        '    StatusText.Focus()
-        'End If
     End Sub
 
+    Private Sub ReTweetOriginalStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ReTweetOriginalStripMenuItem.Click, RtOpMenuItem.Click
+        doReTweetOriginal()
+     End Sub
+
     Private Function CreateRetweet(ByVal status As String) As String
 
         ' Twitterにより省略されているURLを含むaタグをキャプチャしてリンク先URLへ置き換える
@@ -7687,7 +7681,7 @@ RETRY:
         End If
     End Sub
 
-    Private Sub MoveToRTHomeMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MoveToRTHomeMenuItem.Click, OpenRterHomeMenuItem.Click
+    Private Sub doMoveToRTHome()
         If _curList.SelectedIndices.Count > 0 Then
             Dim post As PostClass = GetCurTabPost(_curList.SelectedIndices(0))
             If post.RetweetedId > 0 Then
@@ -7695,6 +7689,9 @@ RETRY:
             End If
         End If
     End Sub
+    Private Sub MoveToRTHomeMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MoveToRTHomeMenuItem.Click, OpenRterHomeMenuItem.Click
+        doMoveToRTHome()
+    End Sub
 
     Private Sub IdFilterAddMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles IdFilterAddMenuItem.Click
         Dim m As Match = Regex.Match(Me._postBrowserStatusText, "^https?://twitter.com/(?<name>[a-zA-Z0-9_]+)$")