From cbaeb747d2e1d91665341709760f15ed91eceb8c Mon Sep 17 00:00:00 2001 From: kiri_feather Date: Sat, 30 Jan 2010 10:52:56 +0000 Subject: [PATCH] =?utf8?q?0820=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=B9?= =?utf8?q?=E3=80=82=E8=B5=B7=E5=8B=95=E6=99=82=E3=81=AE=E5=85=AC=E5=BC=8F?= =?utf8?q?=E6=A4=9C=E7=B4=A2=E3=81=AE=E6=97=A2=E8=AA=AD=E5=8C=96=E3=82=92?= =?utf8?q?=E8=A8=AD=E5=AE=9A=E3=81=AB=E5=BE=93=E3=81=86=E3=82=88=E3=81=86?= =?utf8?q?=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@73 e39ad16e-3079-482e-bb30-4b4d378143b6 --- Tween/Tween.resx | 306 +++++++++++++++++++++++++++---------------------------- Tween/Tween.vb | 28 +++-- 2 files changed, 172 insertions(+), 162 deletions(-) diff --git a/Tween/Tween.resx b/Tween/Tween.resx index 8f3d3e5e..a45f6d2d 100644 --- a/Tween/Tween.resx +++ b/Tween/Tween.resx @@ -126,7 +126,7 @@ - 261, 17 + 245, 22 ToolStripStatusLabel1 @@ -135,7 +135,7 @@ MiddleLeft - 61, 17 + 71, 22 Starting... @@ -147,37 +147,37 @@ 130, 8 - 235, 22 + 268, 22 URLからの全角文字列の切り離し - 235, 22 + 268, 22 APIコマンドを回避する - 235, 22 + 268, 22 自動的にURLを短縮する - 235, 22 + 268, 22 全角スペースを半角スペースにする - 232, 6 + 265, 6 Ctrl+T - 235, 22 + 268, 22 ハッシュタグ切り替え @@ -186,13 +186,13 @@ Ctrl+Shift+T - 235, 22 + 268, 22 ハッシュタグ設定 - 236, 142 + 269, 142 ContextMenuStripPostMode @@ -203,23 +203,23 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL - U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI - VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ - QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4 - /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9 - cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j - 3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR - dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb - NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE - s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI + ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9 + HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN + rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K + TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx + oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8 + 7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI + xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX + LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd + KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC Magenta - 45, 20 + 51, 25 #[-] @@ -228,7 +228,7 @@ 0, 0 - 382, 22 + 382, 27 @@ -277,73 +277,73 @@ 236, 41 - 196, 22 + 213, 22 タブ作成(&N)... - 196, 22 + 213, 22 タブ名の変更 - 193, 6 + 210, 6 - 196, 22 + 213, 22 未読管理(&U) - 196, 22 + 213, 22 新着通知表示(&Q) - 121, 21 + 121, 26 再生するwavファイルを指定してください - 193, 6 + 210, 6 - 196, 22 + 213, 22 振り分けルール編集(&F)... - 193, 6 + 210, 6 - 196, 22 + 213, 22 このタブの発言をクリア - 193, 6 + 210, 6 - 196, 22 + 213, 22 タブ削除(&D) - 50, 20 + 62, 22 タブ(&T) - 197, 207 + 214, 212 ContextMenuTabProperty @@ -370,7 +370,7 @@ 0, 0, 0, 0 - 378, 169 + 378, 162 5 @@ -415,22 +415,22 @@ 17, 82 - 122, 22 + 136, 22 IconName - 119, 6 + 133, 6 - 122, 22 + 136, 22 保存(&I)... - 123, 54 + 137, 54 ContextMenuStrip3 @@ -511,46 +511,46 @@ 337, 7 - 158, 22 + 180, 22 Google(&G) - 158, 22 + 180, 22 Wikipedia(&W) - 158, 22 + 180, 22 Twitter検索(&Y) - 158, 22 + 180, 22 Twitter Search(&S) - 158, 22 + 180, 22 現在のタブ(&L) - 196, 22 + 215, 22 選択文字列で検索(&S) - 193, 6 + 212, 6 - 196, 22 + 215, 22 選択文字列をコピー(&C) @@ -559,52 +559,52 @@ False - 196, 22 + 215, 22 URLをコピー(&U) - 196, 22 + 215, 22 すべて選択(&A) - 193, 6 + 212, 6 - 196, 22 + 215, 22 フォローする(&F) - 196, 22 + 215, 22 フォロー解除(&N) - 196, 22 + 215, 22 相互フォロー状態表示(&H) - 196, 22 + 215, 22 ID振分ルール作成(&I) - 196, 22 + 215, 22 Use this &Hashtag - 197, 214 + 216, 214 ContextMenuStrip4 @@ -859,10 +859,10 @@ 23 - 382, 307 + 382, 300 - 173 + 166 2 @@ -883,7 +883,7 @@ 0 - 382, 307 + 382, 300 ToolStripContainer1.ContentPanel @@ -946,67 +946,67 @@ 763, 0 - 224, 22 + 239, 22 設定(&O)... - 221, 6 + 236, 6 - 224, 22 + 239, 22 ファイル保存(&S)... - 221, 6 + 236, 6 - 224, 22 + 239, 22 新着通知(&Q) - 224, 22 + 239, 22 サウンド再生 - 224, 22 + 239, 22 新着時リスト固定(&L) - 221, 6 + 236, 6 Ctrl+Y - 224, 22 + 239, 22 発言欄複数行入力(&M) - 221, 6 + 236, 6 False - 224, 22 + 239, 22 終了(&X) - 225, 182 + 240, 182 ContextMenuStrip1 @@ -1015,40 +1015,40 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 67, 20 + 85, 22 ファイル(&F) - 230, 22 + 259, 22 タブ削除の取消 - 227, 6 + 256, 6 - 230, 22 + 259, 22 コピー（STOT形式テキスト）(&C) - 230, 22 + 259, 22 コピー（ステータスURL）(&S) - 227, 6 + 256, 6 Ctrl+F - 230, 22 + 259, 22 検索(&F)... @@ -1057,7 +1057,7 @@ F3 - 230, 22 + 259, 22 次を検索(&X) @@ -1066,25 +1066,25 @@ Shift+F3 - 230, 22 + 259, 22 前を検索(&P) - 227, 6 + 256, 6 Ctrl+Shift+F - 230, 22 + 259, 22 抽出条件入力(&Q) - 57, 20 + 61, 22 編集(&E) @@ -1096,7 +1096,7 @@ Ctrl+R - 234, 22 + 268, 22 @返信(&R) @@ -1105,7 +1105,7 @@ Ctrl+Shift+R - 234, 22 + 268, 22 @返信ALL @@ -1114,7 +1114,7 @@ Ctrl+M - 234, 22 + 268, 22 DM送信(&M) @@ -1123,7 +1123,7 @@ Alt+R - 234, 22 + 268, 22 ReTweet @@ -1132,7 +1132,7 @@ Alt+Shift+R - 234, 22 + 268, 22 ReTweet(Unofficial) @@ -1141,19 +1141,19 @@ Ctrl+Q - 234, 22 + 268, 22 Quote - 231, 6 + 265, 6 Ctrl+S - 234, 22 + 268, 22 Fav追加(&F) @@ -1162,7 +1162,7 @@ Ctrl+Shift+S - 234, 22 + 268, 22 Fav削除 @@ -1171,7 +1171,7 @@ Ctrl+H - 268, 22 + 315, 22 ホームを開く(&H) @@ -1180,7 +1180,7 @@ Ctrl+G - 268, 22 + 315, 22 Favを開く(&G) @@ -1189,7 +1189,7 @@ Ctrl+O - 268, 22 + 315, 22 ステータスを開く(&O) @@ -1198,7 +1198,7 @@ Ctrl+I - 268, 22 + 315, 22 返信元ステータスを開く(&I) @@ -1207,7 +1207,7 @@ Ctrl+Shift+O - 268, 22 + 315, 22 ふぁぼられを開く(&P) @@ -1216,7 +1216,7 @@ Ctrl+E - 268, 22 + 315, 22 発言内URLを開く(&U) @@ -1225,43 +1225,43 @@ Ctrl+Shift+H - 268, 22 + 315, 22 RTした人のホームを開く(&R) - 234, 22 + 268, 22 開く - 214, 22 + 239, 22 タブ振り分けルール作成(&N)... - 214, 22 + 239, 22 ID振り分けルール作成... - 234, 22 + 268, 22 振り分けルール作成 - 231, 6 + 265, 6 Ctrl+B - 194, 22 + 220, 22 既読にする(&B) @@ -1270,31 +1270,31 @@ Ctrl+Shift+B - 194, 22 + 220, 22 未読にする - 234, 22 + 268, 22 未読状態変更 - 234, 22 + 268, 22 未読へジャンプ - 231, 6 + 265, 6 Ctrl+A - 234, 22 + 268, 22 全て選択(&A) @@ -1303,7 +1303,7 @@ Ctrl+D - 234, 22 + 268, 22 削除(&D) @@ -1312,7 +1312,7 @@ F5 - 234, 22 + 268, 22 更新(&U) @@ -1321,13 +1321,13 @@ Shift+F5 - 234, 22 + 268, 22 前データを取得 - 235, 374 + 269, 374 ContextMenuStrip2 @@ -1336,7 +1336,7 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 59, 20 + 63, 22 操作(&O) @@ -1345,7 +1345,7 @@ Ctrl+L - 220, 22 + 242, 22 短縮サービス自動選択 @@ -1354,49 +1354,49 @@ False - 220, 22 + 242, 22 元に戻す - 220, 22 + 242, 22 TinyURL - 220, 22 + 242, 22 is.gd - 220, 22 + 242, 22 twurl.nl - 220, 22 + 242, 22 u.nu - 220, 22 + 242, 22 bit.ly - 220, 22 + 242, 22 j.mp - 196, 22 + 220, 22 入力欄のURLを短縮変換 @@ -1405,31 +1405,31 @@ False - 195, 22 + 208, 22 現在からの増加分を取得 - 195, 22 + 208, 22 全て再取得 - 196, 22 + 220, 22 片思いユーザーリスト取得 - 154, 22 + 169, 22 BlackFav追加(&F) - 196, 22 + 220, 22 BlackFav @@ -1438,37 +1438,37 @@ False - 193, 6 + 217, 6 - 196, 22 + 220, 22 フォローする(&F) - 196, 22 + 220, 22 フォロー解除(&N) - 196, 22 + 220, 22 相互フォロー状態表示(&H) - 193, 6 + 217, 6 - 196, 22 + 220, 22 自分のプロフィール表示 - 89, 20 + 98, 22 その他機能(&C) @@ -1477,64 +1477,64 @@ F1 - 194, 22 + 227, 22 Tweenまとめサイト(&H) - 191, 6 + 224, 6 - 194, 22 + 227, 22 最新版の取得(&G) - 194, 22 + 227, 22 解析キー情報更新 - 191, 6 + 224, 6 - 194, 22 + 227, 22 API情報 - 194, 22 + 227, 22 Twitterからのお知らせ(&I) - 191, 6 + 224, 6 - 194, 22 + 227, 22 Tweenについて(&A)... - 157, 22 + 179, 22 PostClassのダンプ - 157, 22 + 179, 22 TraceOut出力 - 194, 22 + 227, 22 デバッグモード @@ -1543,7 +1543,7 @@ False - 63, 20 + 75, 22 ヘルプ(&H) @@ -1552,7 +1552,7 @@ 0, 0 - 382, 24 + 382, 26 10 @@ -1648,7 +1648,7 @@ StatusLabel - Tween.TweenCustomControl.ToolStripLabelHistory, Tween, Version=0.8.3681.15781, Culture=neutral, PublicKeyToken=null + Tween.TweenCustomControl.ToolStripLabelHistory, Tween, Version=0.8.3682.24535, Culture=neutral, PublicKeyToken=null HashStripSplitButton diff --git a/Tween/Tween.vb b/Tween/Tween.vb index eb5b29c7..af23015d 100644 --- a/Tween/Tween.vb +++ b/Tween/Tween.vb @@ -179,6 +179,7 @@ Public Class TweenMain Private _waitReply As Boolean = False Private _waitDm As Boolean = False Private _waitFav As Boolean = False + Private _waitPubSearch As Boolean = False Private _bw(9) As BackgroundWorker Private _bwFollower As BackgroundWorker Private cMode As Integer @@ -319,7 +320,6 @@ Public Class TweenMain If _brsBackColorNone IsNot Nothing Then _brsBackColorNone.Dispose() If _brsDeactiveSelection IsNot Nothing Then _brsDeactiveSelection.Dispose() shield.Dispose() - StatusLabel.Dispose() sf.Dispose() sfTab.Dispose() For Each bw As BackgroundWorker In _bw @@ -437,9 +437,6 @@ Public Class TweenMain VerUpMenuItem.Image = shield.Icon If Not My.Application.CommandLineArgs.Count = 0 AndAlso My.Application.CommandLineArgs.Contains("/d") Then TraceFlag = True - StatusLabel.BorderSides = ToolStripStatusLabelBorderSides.Right - Me.StatusStrip1.Items.Insert(1, StatusLabel) - fileVersion = _ System.Diagnostics.FileVersionInfo.GetVersionInfo( _ System.Reflection.Assembly.GetExecutingAssembly().Location).FileVersion @@ -856,6 +853,8 @@ Public Class TweenMain '状態表示部の初期化（画面右下） StatusLabel.Text = "" + StatusLabel.AutoToolTip = False + StatusLabel.ToolTipText = "" '文字カウンタ初期化 lblLen.Text = GetRestStatusCount(True, False).ToString() @@ -1256,9 +1255,7 @@ Public Class TweenMain End If If _pubSearchCounter <= 0 AndAlso SettingDialog.PubSearchPeriodInt > 0 Then _pubSearchCounter = SettingDialog.PubSearchPeriodInt - For Each tb As TabClass In _statuses.Tabs.Values - If tb.TabType = TabUsageType.PublicSearch AndAlso tb.SearchWords <> "" Then GetTimeline(WORKERTYPE.PublicSearch, 1, 0, tb.TabName) - Next + GetTimeline(WORKERTYPE.PublicSearch, 1, 0, "") End If End Sub @@ -1957,7 +1954,15 @@ Public Class TweenMain rslt.addCount = _statuses.DistributePosts() Case WORKERTYPE.PublicSearch bw.ReportProgress(50, MakeStatusMessage(args, False)) - ret = Twitter.GetSearch(read, args.tName, args.page = -1) + If args.tName = "" Then + For Each tn As String In _statuses.Tabs.Keys + If _statuses.Tabs(tn).TabType = TabUsageType.PublicSearch Then + ret = Twitter.GetSearch(read, tn, False) + End If + Next + Else + ret = Twitter.GetSearch(read, args.tName, args.page = -1) + End If '新着時未読クリア rslt.addCount = _statuses.DistributePosts() End Select @@ -2117,6 +2122,7 @@ Public Class TweenMain _waitReply = False _waitDm = False _waitFav = False + _waitPubSearch = False Throw New Exception("BackgroundWorker Exception", e.Error) Exit Sub End If @@ -2267,6 +2273,8 @@ Public Class TweenMain _itemCache = Nothing _postCache = Nothing _curList.Refresh() + Case WORKERTYPE.PublicSearch + _waitPubSearch = False End Select End Sub @@ -6879,8 +6887,10 @@ RETRY: _waitFav = True GetTimeline(WORKERTYPE.Favorites, 1, 1, "") End If + _waitPubSearch = True + GetTimeline(WORKERTYPE.PublicSearch, 1, 0, "") 'tabname="":全タブ Dim i As Integer = 0 - Do While (_waitTimeline OrElse _waitReply OrElse _waitDm OrElse _waitFav) AndAlso Not _endingFlag + Do While (_waitTimeline OrElse _waitReply OrElse _waitDm OrElse _waitFav OrElse _waitPubSearch) AndAlso Not _endingFlag System.Threading.Thread.Sleep(100) My.Application.DoEvents() i += 1 -- 2.11.0