From 3d01079af867c22b8a8726d075424506aafba433 Mon Sep 17 00:00:00 2001 From: syo68k Date: Thu, 26 Aug 2010 04:57:24 +0000 Subject: [PATCH] =?utf8?q?=E3=82=BD=E3=83=BC=E3=82=B9=E3=82=B3=E3=83=BC?= =?utf8?q?=E3=83=89=E8=A6=8B=E7=9B=B4=E3=81=97=20=E8=B5=B7=E5=8B=95?= =?utf8?q?=E6=99=82=E5=87=A6=E7=90=86=E3=81=A7=E3=82=AA=E3=83=95=E3=83=A9?= =?utf8?q?=E3=82=A4=E3=83=B3=E3=81=A0=E3=81=A3=E3=81=9F=E5=A0=B4=E5=90=88?= =?utf8?q?=E3=81=AB=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=92=E7=84=A1?= =?utf8?q?=E5=8A=B9=E3=81=AB=E3=81=99=E3=82=8B=E5=87=A6=E7=90=86=E3=82=92?= =?utf8?q?=E5=BF=B5=E3=81=AE=E3=81=9F=E3=82=81=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@766 e39ad16e-3079-482e-bb30-4b4d378143b6 --- Tween/Tween.Designer.vb | 85 +++++----- Tween/Tween.resx | 410 ++++++++++++++++++++++++------------------------ Tween/Tween.vb | 90 +++-------- 3 files changed, 268 insertions(+), 317 deletions(-) diff --git a/Tween/Tween.Designer.vb b/Tween/Tween.Designer.vb index 3c10915a..077a3500 100644 --- a/Tween/Tween.Designer.vb +++ b/Tween/Tween.Designer.vb @@ -89,16 +89,16 @@ Partial Class TweenMain Me.NameLabel = New System.Windows.Forms.Label() Me.PostBrowser = New System.Windows.Forms.WebBrowser() Me.ContextMenuPostBrowser = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() - Me.SearchItem2ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.SearchItem1ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.SearchItem3ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.SearchItem4ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SelectionSearchContextMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SearchGoogleContextMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SearchWikipediaContextMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SearchYatsContextMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SearchPublicSearchContextMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CurrentTabToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator13 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem() + Me.SelectionCopyContextMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.UrlCopyContextMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SelectionAllContextMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() Me.FollowContextMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.RemoveContextMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -363,7 +363,6 @@ Partial Class TweenMain ' Me.ContextMenuPostMode.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItemUrlMultibyteSplit, Me.ToolStripMenuItemApiCommandEvasion, Me.ToolStripMenuItemUrlAutoShorten, Me.IdeographicSpaceToSpaceToolStripMenuItem, Me.MultiLineMenuItem, Me.ToolStripFocusLockMenuItem, Me.ToolStripSeparator35, Me.ImageSelectMenuItem, Me.ToolStripSeparator8, Me.HashToggleMenuItem, Me.HashManageMenuItem}) Me.ContextMenuPostMode.Name = "ContextMenuStripPostMode" - Me.ContextMenuPostMode.OwnerItem = Me.HashStripSplitButton resources.ApplyResources(Me.ContextMenuPostMode, "ContextMenuPostMode") ' 'ToolStripMenuItemUrlMultibyteSplit @@ -745,35 +744,35 @@ Partial Class TweenMain ' 'ContextMenuPostBrowser ' - Me.ContextMenuPostBrowser.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem2, Me.ToolStripSeparator13, Me.ToolStripMenuItem3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.ToolStripSeparator5, Me.FollowContextMenuItem, Me.RemoveContextMenuItem, Me.FriendshipContextMenuItem, Me.FriendshipAllMenuItem, Me.ToolStripSeparator36, Me.ShowUserStatusContextMenuItem, Me.SearchPostsDetailToolStripMenuItem, Me.ToolStripSeparator32, Me.IdFilterAddMenuItem, Me.ListManageUserContextToolStripMenuItem, Me.ToolStripSeparator33, Me.UseHashtagMenuItem}) + Me.ContextMenuPostBrowser.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SelectionSearchContextMenuItem, Me.ToolStripSeparator13, Me.SelectionCopyContextMenuItem, Me.UrlCopyContextMenuItem, Me.SelectionAllContextMenuItem, Me.ToolStripSeparator5, Me.FollowContextMenuItem, Me.RemoveContextMenuItem, Me.FriendshipContextMenuItem, Me.FriendshipAllMenuItem, Me.ToolStripSeparator36, Me.ShowUserStatusContextMenuItem, Me.SearchPostsDetailToolStripMenuItem, Me.ToolStripSeparator32, Me.IdFilterAddMenuItem, Me.ListManageUserContextToolStripMenuItem, Me.ToolStripSeparator33, Me.UseHashtagMenuItem}) Me.ContextMenuPostBrowser.Name = "ContextMenuStrip4" resources.ApplyResources(Me.ContextMenuPostBrowser, "ContextMenuPostBrowser") ' - 'ToolStripMenuItem2 + 'SelectionSearchContextMenuItem ' - Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SearchItem2ToolStripMenuItem, Me.SearchItem1ToolStripMenuItem, Me.SearchItem3ToolStripMenuItem, Me.SearchItem4ToolStripMenuItem, Me.CurrentTabToolStripMenuItem}) - Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" - resources.ApplyResources(Me.ToolStripMenuItem2, "ToolStripMenuItem2") + Me.SelectionSearchContextMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SearchGoogleContextMenuItem, Me.SearchWikipediaContextMenuItem, Me.SearchYatsContextMenuItem, Me.SearchPublicSearchContextMenuItem, Me.CurrentTabToolStripMenuItem}) + Me.SelectionSearchContextMenuItem.Name = "SelectionSearchContextMenuItem" + resources.ApplyResources(Me.SelectionSearchContextMenuItem, "SelectionSearchContextMenuItem") ' - 'SearchItem2ToolStripMenuItem + 'SearchGoogleContextMenuItem ' - Me.SearchItem2ToolStripMenuItem.Name = "SearchItem2ToolStripMenuItem" - resources.ApplyResources(Me.SearchItem2ToolStripMenuItem, "SearchItem2ToolStripMenuItem") + Me.SearchGoogleContextMenuItem.Name = "SearchGoogleContextMenuItem" + resources.ApplyResources(Me.SearchGoogleContextMenuItem, "SearchGoogleContextMenuItem") ' - 'SearchItem1ToolStripMenuItem + 'SearchWikipediaContextMenuItem ' - Me.SearchItem1ToolStripMenuItem.Name = "SearchItem1ToolStripMenuItem" - resources.ApplyResources(Me.SearchItem1ToolStripMenuItem, "SearchItem1ToolStripMenuItem") + Me.SearchWikipediaContextMenuItem.Name = "SearchWikipediaContextMenuItem" + resources.ApplyResources(Me.SearchWikipediaContextMenuItem, "SearchWikipediaContextMenuItem") ' - 'SearchItem3ToolStripMenuItem + 'SearchYatsContextMenuItem ' - Me.SearchItem3ToolStripMenuItem.Name = "SearchItem3ToolStripMenuItem" - resources.ApplyResources(Me.SearchItem3ToolStripMenuItem, "SearchItem3ToolStripMenuItem") + Me.SearchYatsContextMenuItem.Name = "SearchYatsContextMenuItem" + resources.ApplyResources(Me.SearchYatsContextMenuItem, "SearchYatsContextMenuItem") ' - 'SearchItem4ToolStripMenuItem + 'SearchPublicSearchContextMenuItem ' - Me.SearchItem4ToolStripMenuItem.Name = "SearchItem4ToolStripMenuItem" - resources.ApplyResources(Me.SearchItem4ToolStripMenuItem, "SearchItem4ToolStripMenuItem") + Me.SearchPublicSearchContextMenuItem.Name = "SearchPublicSearchContextMenuItem" + resources.ApplyResources(Me.SearchPublicSearchContextMenuItem, "SearchPublicSearchContextMenuItem") ' 'CurrentTabToolStripMenuItem ' @@ -785,20 +784,20 @@ Partial Class TweenMain Me.ToolStripSeparator13.Name = "ToolStripSeparator13" resources.ApplyResources(Me.ToolStripSeparator13, "ToolStripSeparator13") ' - 'ToolStripMenuItem3 + 'SelectionCopyContextMenuItem ' - Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3" - resources.ApplyResources(Me.ToolStripMenuItem3, "ToolStripMenuItem3") + Me.SelectionCopyContextMenuItem.Name = "SelectionCopyContextMenuItem" + resources.ApplyResources(Me.SelectionCopyContextMenuItem, "SelectionCopyContextMenuItem") ' - 'ToolStripMenuItem4 + 'UrlCopyContextMenuItem ' - resources.ApplyResources(Me.ToolStripMenuItem4, "ToolStripMenuItem4") - Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4" + resources.ApplyResources(Me.UrlCopyContextMenuItem, "UrlCopyContextMenuItem") + Me.UrlCopyContextMenuItem.Name = "UrlCopyContextMenuItem" ' - 'ToolStripMenuItem5 + 'SelectionAllContextMenuItem ' - Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5" - resources.ApplyResources(Me.ToolStripMenuItem5, "ToolStripMenuItem5") + Me.SelectionAllContextMenuItem.Name = "SelectionAllContextMenuItem" + resources.ApplyResources(Me.SelectionAllContextMenuItem, "SelectionAllContextMenuItem") ' 'ToolStripSeparator5 ' @@ -1804,16 +1803,16 @@ Partial Class TweenMain Friend WithEvents UrlConvertAutoToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents UrlUndoToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ContextMenuPostBrowser As System.Windows.Forms.ContextMenuStrip - Friend WithEvents ToolStripMenuItem2 As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents SelectionSearchContextMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ToolStripSeparator13 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents ToolStripMenuItem3 As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ToolStripMenuItem5 As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents SearchItem1ToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents SearchItem2ToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents SearchItem3ToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents SearchItem4ToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents SelectionCopyContextMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents SelectionAllContextMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents SearchWikipediaContextMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents SearchGoogleContextMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents SearchYatsContextMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents SearchPublicSearchContextMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents CurrentTabToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ToolStripMenuItem4 As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents UrlCopyContextMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ToolStripMenuItem6 As System.Windows.Forms.ToolStripMenuItem Friend WithEvents MoveToHomeToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents MoveToFavToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem diff --git a/Tween/Tween.resx b/Tween/Tween.resx index bf54b6b0..a3dfa175 100644 --- a/Tween/Tween.resx +++ b/Tween/Tween.resx @@ -130,7 +130,7 @@ - 243, 22 + 277, 22 ToolStripStatusLabel1 @@ -139,13 +139,13 @@ MiddleLeft - 77, 22 + 67, 22 API ???/??? - 71, 22 + 55, 22 Starting... @@ -157,25 +157,25 @@ 263, 17 - 280, 22 + 237, 22 URLからの全角文字列の切り離し - 280, 22 + 237, 22 APIコマンドを回避する - 280, 22 + 237, 22 自動的にURLを短縮する - 280, 22 + 237, 22 全角スペースを半角スペースにする @@ -184,37 +184,37 @@ Ctrl+Y - 280, 22 + 237, 22 発言欄複数行入力(&M) - 280, 22 + 237, 22 フォーカスを発言欄へロックする - 277, 6 + 234, 6 Ctrl+Shift+P - 280, 22 + 237, 22 投稿画像選択(&P) - 277, 6 + 234, 6 Ctrl+Shift+T - 280, 22 + 237, 22 ハッシュタグ自動付加 @@ -223,13 +223,13 @@ Ctrl+T - 280, 22 + 237, 22 ハッシュタグ設定 - 281, 214 + 238, 214 ContextMenuPostMode @@ -238,7 +238,7 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 51, 25 + 43, 25 #[-] @@ -322,7 +322,7 @@ 新着通知表示(&Q) - 121, 26 + 121, 20 再生するwavファイルを指定してください @@ -382,7 +382,7 @@ 0, 0, 0, 0 - 453, 164 + 453, 166 0 @@ -406,7 +406,7 @@ 0, 0 - 453, 164 + 453, 166 0 @@ -436,7 +436,7 @@ 0, 0 - 453, 136 + 453, 138 Zoom @@ -640,7 +640,7 @@ Bottom - 0, 136 + 0, 138 3, 3, 3, 3 @@ -670,7 +670,7 @@ 0, 0 - 453, 164 + 453, 166 1 @@ -697,7 +697,7 @@ 0, 0 - 453, 164 + 453, 166 2 @@ -921,134 +921,134 @@ 480, 17 - - 180, 22 + + 160, 22 - + Google(&G) - - 180, 22 + + 160, 22 - + Wikipedia(&W) - - 180, 22 + + 160, 22 - + Twitter検索(&Y) - - 180, 22 + + 160, 22 - + Twitter Search(&S) - 180, 22 + 160, 22 現在のタブ(&L) - - 238, 22 + + 210, 22 - + 選択文字列で検索(&S) - 235, 6 + 207, 6 - - 238, 22 + + 210, 22 - + 選択文字列をコピー(&C) - + False - - 238, 22 + + 210, 22 - + URLをコピー(&U) - - 238, 22 + + 210, 22 - + すべて選択(&A) - 235, 6 + 207, 6 - 238, 22 + 210, 22 フォローする(&F) - 238, 22 + 210, 22 フォロー解除(&N) - 238, 22 + 210, 22 相互フォロー状態表示(&R) - 238, 22 + 210, 22 全ユーザーのフォロー状態(&A) - 235, 6 + 207, 6 - 238, 22 + 210, 22 プロフィール表示(&P) - 238, 22 + 210, 22 このユーザーの発言を検索(&F) - 235, 6 + 207, 6 - 238, 22 + 210, 22 ID振分ルール作成(&I) - 238, 22 + 210, 22 リスト管理(&L) - 235, 6 + 207, 6 - 238, 22 + 210, 22 ハッシュタグを固定(&H) - 239, 320 + 211, 342 ContextMenuPostBrowser @@ -1369,10 +1369,10 @@ 23 - 457, 300 + 457, 302 - 168 + 170 2 @@ -1393,7 +1393,7 @@ 0 - 457, 300 + 457, 302 ToolStripContainer1.ContentPanel @@ -1453,85 +1453,85 @@ None - 189, 22 + 168, 22 設定(&O) - 186, 6 + 165, 6 - 189, 22 + 168, 22 ファイル保存(&S) - 186, 6 + 165, 6 - 189, 22 + 168, 22 新着通知(&Q) - 189, 22 + 168, 22 サウンド再生(&P) - 189, 22 + 168, 22 新着時リスト固定(&L) - 186, 6 + 165, 6 - 189, 22 + 168, 22 終了(&X) - 85, 22 + 66, 20 ファイル(&F) - 259, 22 + 225, 22 タブ削除の取消 - 256, 6 + 222, 6 - 259, 22 + 225, 22 コピー（STOT形式テキスト）(&C) - 259, 22 + 225, 22 コピー（ステータスURL）(&S) - 256, 6 + 222, 6 Ctrl+F - 259, 22 + 225, 22 検索(&F)... @@ -1540,7 +1540,7 @@ F3 - 259, 22 + 225, 22 次を検索(&X) @@ -1549,25 +1549,25 @@ Shift+F3 - 259, 22 + 225, 22 前を検索(&P) - 256, 6 + 222, 6 Ctrl+Shift+F - 259, 22 + 225, 22 抽出条件入力(&Q) - 61, 22 + 56, 20 編集(&E) @@ -1576,7 +1576,7 @@ Ctrl+R - 267, 22 + 233, 22 ＠返信(&R) @@ -1585,7 +1585,7 @@ Ctrl+Shift+R - 267, 22 + 233, 22 ＠返信ALL(&E) @@ -1594,7 +1594,7 @@ Ctrl+M - 267, 22 + 233, 22 DM送信(&M) @@ -1603,7 +1603,7 @@ Alt+R - 267, 22 + 233, 22 Re&tweet @@ -1612,7 +1612,7 @@ Alt+Shift+R - 267, 22 + 233, 22 Retweet(U&nofficial) @@ -1621,19 +1621,19 @@ Ctrl+Q - 267, 22 + 233, 22 &Quote - 264, 6 + 230, 6 Ctrl+S - 267, 22 + 233, 22 Fav追加(&F) @@ -1642,7 +1642,7 @@ Ctrl+Shift+S - 267, 22 + 233, 22 Fav削除(&V) @@ -1654,7 +1654,7 @@ Alt+P - 267, 22 + 233, 22 プロフィール表示 @@ -1663,7 +1663,7 @@ Ctrl+H - 315, 22 + 266, 22 ホームを開く(&H) @@ -1672,7 +1672,7 @@ Ctrl+G - 315, 22 + 266, 22 Favを開く(&G) @@ -1681,7 +1681,7 @@ Ctrl+O - 315, 22 + 266, 22 ステータスを開く(&O) @@ -1690,7 +1690,7 @@ Ctrl+I - 315, 22 + 266, 22 返信元ステータスを開く(&I) @@ -1699,7 +1699,7 @@ Ctrl+Shift+O - 315, 22 + 266, 22 ふぁぼられを開く(&P) @@ -1708,7 +1708,7 @@ Ctrl+E - 315, 22 + 266, 22 発言内URLを開く(&U) @@ -1717,49 +1717,49 @@ Ctrl+Shift+H - 315, 22 + 266, 22 RTした人のホームを開く(&R) - 267, 22 + 233, 22 開く(&O) - 227, 22 + 199, 22 タブ振り分けルール作成(&N) - 227, 22 + 199, 22 ID振り分けルール作成(&I) - 267, 22 + 233, 22 振り分けルール作成(&C) - 267, 22 + 233, 22 リスト管理(&L) - 264, 6 + 230, 6 Ctrl+B - 239, 22 + 206, 22 既読にする(&B) @@ -1768,31 +1768,31 @@ Ctrl+Shift+B - 239, 22 + 206, 22 未読にする(&U) - 267, 22 + 233, 22 未読状態変更(&H) - 267, 22 + 233, 22 未読へジャンプ(&J) - 264, 6 + 230, 6 Ctrl+A - 267, 22 + 233, 22 全て選択(&A) @@ -1801,7 +1801,7 @@ Ctrl+D - 267, 22 + 233, 22 削除(&D) @@ -1810,7 +1810,7 @@ F5 - 267, 22 + 233, 22 更新(&U) @@ -1819,79 +1819,79 @@ Shift+F5 - 267, 22 + 233, 22 前データを取得(&I) - 63, 22 + 57, 20 操作(&O) - 226, 22 + 188, 22 タブ作成(&N)... - 226, 22 + 188, 22 タブ名変更(&R) - 223, 6 + 185, 6 - 226, 22 + 188, 22 未読管理(&U) - 226, 22 + 188, 22 新着通知表示(&Q) - 121, 26 + 121, 20 - 223, 6 + 185, 6 - 226, 22 + 188, 22 振り分けルール編集(&F)... - 223, 6 + 185, 6 - 226, 22 + 188, 22 このタブの発言をクリア(&C) - 223, 6 + 185, 6 Ctrl+W - 226, 22 + 188, 22 タブ削除(&D) - 62, 22 + 49, 20 タブ(&T) @@ -1900,7 +1900,7 @@ Ctrl+L - 242, 22 + 215, 22 短縮サービス自動選択 @@ -1909,103 +1909,103 @@ False - 242, 22 + 215, 22 元に戻す - 242, 22 + 215, 22 TinyURL - 242, 22 + 215, 22 is.gd - 242, 22 + 215, 22 twurl.nl - 242, 22 + 215, 22 u.nu - 242, 22 + 215, 22 bit.ly - 242, 22 + 215, 22 j.mp - 280, 22 + 237, 22 入力欄のURLを短縮変換 - 280, 22 + 237, 22 片思いユーザーリスト取得 - 277, 6 + 234, 6 - 280, 22 + 237, 22 フォローする(&F) - 280, 22 + 237, 22 フォロー解除(&N) - 280, 22 + 237, 22 相互フォロー状態表示(&H) - 277, 6 + 234, 6 - 280, 22 + 237, 22 自プロフィール簡易表示 - 280, 22 + 237, 22 プロフィール表示 - 277, 6 + 234, 6 Ctrl+Shift+T - 280, 22 + 237, 22 ハッシュタグ自動付加 @@ -2014,25 +2014,25 @@ Ctrl+T - 280, 22 + 237, 22 ハッシュタグ設定 - 280, 22 + 237, 22 この発言のRetweet回数を確認 - 280, 22 + 237, 22 リスト編集 - 98, 22 + 88, 20 その他機能(&C) @@ -2041,58 +2041,58 @@ F1 - 227, 22 + 191, 22 Tweenまとめサイト(&H) - 227, 22 + 191, 22 ショートカットキー一覧 - 224, 6 + 188, 6 - 227, 22 + 191, 22 最新版の取得(&G) - 224, 6 + 188, 6 - 227, 22 + 191, 22 API情報 - 224, 6 + 188, 6 - 227, 22 + 191, 22 Tweenについて(&A)... - 179, 22 + 159, 22 PostClassのダンプ - 179, 22 + 159, 22 TraceOut出力 - 227, 22 + 191, 22 デバッグモード @@ -2101,7 +2101,7 @@ False - 75, 22 + 62, 20 ヘルプ(&H) @@ -2110,7 +2110,7 @@ 0, 0 - 457, 26 + 457, 24 0 @@ -2215,43 +2215,43 @@ プロフィール表示 - 230, 22 + 198, 22 ホームを開く(&H) - 230, 22 + 198, 22 Favを開く(&G) - 230, 22 + 198, 22 ステータスを開く(&O) - 230, 22 + 198, 22 返信元ステータスを開く(&I) - 230, 22 + 198, 22 ふぁぼられを開く(&P) - 230, 22 + 198, 22 発言内URLを開く(&U) - 230, 22 + 198, 22 RTした人のホームを開く(&R) @@ -2263,13 +2263,13 @@ 開く(&O) - 239, 22 + 205, 22 タブ振り分けルール作成(&N)... - 239, 22 + 205, 22 ID振り分けルール作成... @@ -2290,13 +2290,13 @@ 199, 6 - 154, 22 + 138, 22 既読にする(&B) - 154, 22 + 138, 22 未読にする @@ -2679,34 +2679,34 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ToolStripMenuItem2 + + SelectionSearchContextMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - SearchItem2ToolStripMenuItem + + SearchGoogleContextMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - SearchItem1ToolStripMenuItem + + SearchWikipediaContextMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - SearchItem3ToolStripMenuItem + + SearchYatsContextMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - SearchItem4ToolStripMenuItem + + SearchPublicSearchContextMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2721,22 +2721,22 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ToolStripMenuItem3 + + SelectionCopyContextMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ToolStripMenuItem4 + + UrlCopyContextMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ToolStripMenuItem5 + + SelectionAllContextMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/Tween/Tween.vb b/Tween/Tween.vb index 743848e5..e01989a0 100644 --- a/Tween/Tween.vb +++ b/Tween/Tween.vb @@ -1866,10 +1866,7 @@ Public Class TweenMain End If End If '検索、リストタブに反映 - For Each tb As TabClass In _statuses.GetTabsByType(TabUsageType.PublicSearch) - If tb.Contains(post.Id) Then tb.Posts(post.Id).IsFav = True - Next - For Each tb As TabClass In _statuses.GetTabsByType(TabUsageType.Lists) + For Each tb As TabClass In _statuses.GetTabsByType(TabUsageType.PublicSearch Or TabUsageType.Lists) If tb.Contains(post.Id) Then tb.Posts(post.Id).IsFav = True Next End If @@ -1901,10 +1898,7 @@ Public Class TweenMain post.IsFav = False 'リスト再描画必要 If _statuses.ContainsKey(post.Id) Then _statuses.Item(post.Id).IsFav = False '検索,リストタブに反映 - For Each tb As TabClass In _statuses.GetTabsByType(TabUsageType.PublicSearch) - If tb.Contains(post.Id) Then tb.Posts(post.Id).IsFav = False - Next - For Each tb As TabClass In _statuses.GetTabsByType(TabUsageType.Lists) + For Each tb As TabClass In _statuses.GetTabsByType(TabUsageType.PublicSearch Or TabUsageType.Lists) If tb.Contains(post.Id) Then tb.Posts(post.Id).IsFav = False Next End If @@ -2068,8 +2062,6 @@ Public Class TweenMain smsg = My.Resources.GetTimelineWorker_RunWorkerCompletedText4 + AsyncArg.page.ToString() + My.Resources.GetTimelineWorker_RunWorkerCompletedText6 Case WORKERTYPE.DirectMessegeRcv smsg = My.Resources.GetTimelineWorker_RunWorkerCompletedText8 + AsyncArg.page.ToString() + My.Resources.GetTimelineWorker_RunWorkerCompletedText6 - 'Case WORKERTYPE.DirectMessegeSnt - ' smsg = My.Resources.GetTimelineWorker_RunWorkerCompletedText12 + AsyncArg.page.ToString() + My.Resources.GetTimelineWorker_RunWorkerCompletedText6 Case WORKERTYPE.FavAdd smsg = My.Resources.GetTimelineWorker_RunWorkerCompletedText15 + AsyncArg.page.ToString() + "/" + AsyncArg.ids.Count.ToString() + _ My.Resources.GetTimelineWorker_RunWorkerCompletedText16 + (AsyncArg.page - AsyncArg.sIds.Count - 1).ToString() @@ -6357,7 +6349,7 @@ RETRY: End Sub Private Sub ClearTabMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ClearTabMenuItem.Click, ClearTbMenuItem.Click - If _rclickTabName = "" Then Exit Sub + If String.IsNullOrEmpty(_rclickTabName) Then Exit Sub Dim tmp As String = String.Format(My.Resources.ClearTabMenuItem_ClickText1, Environment.NewLine) If MessageBox.Show(tmp, _rclickTabName + " " + My.Resources.ClearTabMenuItem_ClickText2, MessageBoxButtons.OKCancel, MessageBoxIcon.Question) = Windows.Forms.DialogResult.Cancel Then Exit Sub @@ -6595,7 +6587,7 @@ RETRY: If Not _initialLayout AndAlso SettingDialog.MinimizeToTray AndAlso WindowState = FormWindowState.Minimized Then Me.Visible = False End If - If _initialLayout AndAlso _cfgLocal IsNot Nothing AndAlso Me.WindowState = FormWindowState.Normal AndAlso Me.Visible = True Then + If _initialLayout AndAlso _cfgLocal IsNot Nothing AndAlso Me.WindowState = FormWindowState.Normal AndAlso Me.Visible Then Me.ClientSize = _cfgLocal.FormSize '_mySize = Me.ClientSize 'サイズ保持（最小化・最大化されたまま終了した場合の対応用） Me.DesktopLocation = _cfgLocal.FormLocation @@ -7084,7 +7076,7 @@ RETRY: Return DirectCast(_objRange.GetType().InvokeMember("text", BindingFlags.GetProperty, Nothing, _objRange, Nothing), String) End Function - Private Sub ToolStripMenuItem3_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ToolStripMenuItem3.Click + Private Sub SelectionCopyContextMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles SelectionCopyContextMenuItem.Click '発言詳細で「選択文字列をコピー」 Dim _selText As String = WebBrowser_GetSelectionText(PostBrowser) Try @@ -7110,28 +7102,28 @@ RETRY: End If End Sub - Private Sub ToolStripMenuItem5_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ToolStripMenuItem5.Click + Private Sub SelectionAllContextMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles SelectionAllContextMenuItem.Click '発言詳細ですべて選択 PostBrowser.Document.ExecCommand("SelectAll", False, Nothing) End Sub - Private Sub SearchItem1ToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles SearchItem1ToolStripMenuItem.Click + Private Sub SearchWikipediaContextMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles SearchWikipediaContextMenuItem.Click doSearchToolStrip(My.Resources.SearchItem1Url) End Sub - Private Sub SearchItem2ToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles SearchItem2ToolStripMenuItem.Click + Private Sub SearchGoogleContextMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles SearchGoogleContextMenuItem.Click doSearchToolStrip(My.Resources.SearchItem2Url) End Sub - Private Sub SearchItem3ToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles SearchItem3ToolStripMenuItem.Click + Private Sub SearchYatsContextMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles SearchYatsContextMenuItem.Click doSearchToolStrip(My.Resources.SearchItem3Url) End Sub - Private Sub SearchItem4ToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles SearchItem4ToolStripMenuItem.Click + Private Sub SearchPublicSearchContextMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles SearchPublicSearchContextMenuItem.Click doSearchToolStrip(My.Resources.SearchItem4Url) End Sub - Private Sub ToolStripMenuItem4_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ToolStripMenuItem4.Click + Private Sub UrlCopyContextMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles UrlCopyContextMenuItem.Click Try Clipboard.SetDataObject(Me._postBrowserStatusText, False, 5, 100) Catch ex As Exception @@ -7144,7 +7136,7 @@ RETRY: If PostBrowser.StatusText.StartsWith("http") Then Me._postBrowserStatusText = PostBrowser.StatusText Dim m As Match = Regex.Match(Me._postBrowserStatusText, "^https?://twitter.com/(?[a-zA-Z0-9_]+)$") - ToolStripMenuItem4.Enabled = True + UrlCopyContextMenuItem.Enabled = True If m.Success AndAlso IsTwitterId(m.Result("${name}")) Then FollowContextMenuItem.Enabled = True RemoveContextMenuItem.Enabled = True @@ -7170,7 +7162,7 @@ RETRY: End If Else Me._postBrowserStatusText = "" - ToolStripMenuItem4.Enabled = False + UrlCopyContextMenuItem.Enabled = False FollowContextMenuItem.Enabled = False RemoveContextMenuItem.Enabled = False FriendshipContextMenuItem.Enabled = False @@ -7183,11 +7175,11 @@ RETRY: ' 文字列選択されていないときは選択文字列関係の項目を非表示に Dim _selText As String = WebBrowser_GetSelectionText(PostBrowser) If _selText Is Nothing Then - ToolStripMenuItem2.Enabled = False - ToolStripMenuItem3.Enabled = False + SelectionSearchContextMenuItem.Enabled = False + SelectionCopyContextMenuItem.Enabled = False Else - ToolStripMenuItem2.Enabled = True - ToolStripMenuItem3.Enabled = True + SelectionSearchContextMenuItem.Enabled = True + SelectionCopyContextMenuItem.Enabled = True End If '発言内に自分以外のユーザーが含まれてればフォロー状態全表示を有効に Dim ma As MatchCollection = Regex.Matches(Me.PostBrowser.DocumentText, "href=""https?://twitter.com/(?[a-zA-Z0-9_]+)""") @@ -7398,13 +7390,6 @@ RETRY: If bw Is Nothing Then Exit Sub bw.RunWorkerAsync(args) - - 'Static cnt As Integer = 0 - 'cnt += 1 - 'If cnt > 100 Then - ' GC.Collect() - ' cnt = 0 - 'End If End Sub Private Sub TweenMain_Shown(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Shown @@ -7460,18 +7445,9 @@ RETRY: GetTimeline(WORKERTYPE.Follower, 0, 0, "") End If - If Not _cfgCommon.IsOAuth Then MessageBox.Show(String.Format(My.Resources.BasicAuthWarning, Environment.NewLine)) End If - Else - PostButton.Enabled = False - FavAddToolStripMenuItem.Enabled = False - FavRemoveToolStripMenuItem.Enabled = False - MoveToHomeToolStripMenuItem.Enabled = False - MoveToFavToolStripMenuItem.Enabled = False - DeleteStripMenuItem.Enabled = False - RefreshStripMenuItem.Enabled = False End If _initial = False TimerTimeline.Enabled = True @@ -7497,7 +7473,7 @@ RETRY: Exit Sub End If Dim rtdata As String = _curPost.OriginalData - rtdata = CreateRetweet(rtdata) + rtdata = CreateRetweetUnofficial(rtdata) StatusText.Text = "RT @" + _curPost.Name + ": " + HttpUtility.HtmlDecode(rtdata) @@ -7535,7 +7511,7 @@ RETRY: doReTweetOriginal(True) End Sub - Private Function CreateRetweet(ByVal status As String) As String + Private Function CreateRetweetUnofficial(ByVal status As String) As String ' Twitterにより省略されているURLを含むaタグをキャプチャしてリンク先URLへ置き換える '展開しないように変更 @@ -7863,40 +7839,19 @@ RETRY: End Sub Private Sub OwnStatusMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OwnStatusMenuItem.Click -#If 0 Then - Dim loc As String = "" - Dim bio As String = "" - If Not String.IsNullOrEmpty(tw.Location) Then - loc = tw.Location - End If - If Not String.IsNullOrEmpty(tw.Bio) Then - bio = tw.Bio - End If - If tw.FriendsCount = 0 AndAlso tw.FollowersCount = 0 AndAlso tw.StatusesCount = 0 AndAlso loc = "" AndAlso bio = "" Then - MessageBox.Show(My.Resources.ShowYourProfileText1, "Your status", MessageBoxButtons.OK, MessageBoxIcon.Information) - Exit Sub - End If - MessageBox.Show("Following : " + tw.FriendsCount.ToString() + Environment.NewLine + _ - "Followers : " + tw.FollowersCount.ToString() + Environment.NewLine + _ - "Statuses count : " + tw.StatusesCount.ToString() + Environment.NewLine + _ - "Location : " + loc + Environment.NewLine + _ - "Bio : " + bio, "Your status") -#Else If Not String.IsNullOrEmpty(tw.UserInfoXml) Then doShowUserStatus(tw.UserInfoXml) Else MessageBox.Show(My.Resources.ShowYourProfileText1, "Your status", MessageBoxButtons.OK, MessageBoxIcon.Information) Exit Sub End If -#End If End Sub ' TwitterIDでない固定文字列を調べる（文字列検証のみ　実際に取得はしない） ' URLから切り出した文字列を渡す Private Function IsTwitterId(ByVal name As String) As Boolean - Dim m As Match = Regex.Match(name, "^(about|jobs|tos|privacy)$") - Return Not m.Success + Return Not Regex.Match(name, "^(about|jobs|tos|privacy)$").Success End Function Private Sub FollowContextMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles FollowContextMenuItem.Click @@ -7965,7 +7920,7 @@ RETRY: Exit Sub End If Dim rtdata As String = _curPost.OriginalData - rtdata = CreateRetweet(rtdata) + rtdata = CreateRetweetUnofficial(rtdata) StatusText.Text = " QT @" + _curPost.Name + ": " + HttpUtility.HtmlDecode(rtdata) If _curPost.RetweetedId = 0 Then @@ -8568,15 +8523,12 @@ RETRY: Exit Sub End If - 're = New Regex("http://.*\.jpg.*|http://.*(\.jpg|\.jpeg|\.gif|\.png|\.bmp)|http://twitpic\.com/show/thumb/.*|http://TweetPhotoAPI\.com/api/TPAPI\.svc/imagefromurl.*", RegexOptions.IgnoreCase) - 'If re.IsMatch(imglist(0)) = True Then ThumbnailProgressChanged(0) Dim bgw As BackgroundWorker bgw = New BackgroundWorker() AddHandler bgw.DoWork, AddressOf bgw_DoWork AddHandler bgw.RunWorkerCompleted, AddressOf bgw_Completed bgw.RunWorkerAsync(New PreviewData(id, imglist)) - 'End If End Sub -- 2.11.0