From: kiri_feather Date: Fri, 29 Jan 2010 08:51:46 +0000 (+0000) Subject: ハッシュタグトグルで、前回使用時のものと入れ替わらなかった問題を修正 X-Git-Tag: Tween_v0.8.1.5-beta^0 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bfebca627c3fed307061ad02f536d28635e3511d;p=opentween%2Fopen-tween.git ハッシュタグトグルで、前回使用時のものと入れ替わらなかった問題を修正 振り分けルール編集で、既存ルールの編集時にRT,Sourceが反映されない問題を修正 振り分けルールのリスト部文字列で、RT,Sourceが反映されない問題を修正 未読管理していないとき、公式RTして挿入された自発言が未読状態でリストに追加されてしまう問題を修正 複数行入力切替のショートカットをCtrl-Yに設定 git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@72 e39ad16e-3079-482e-bb30-4b4d378143b6 --- diff --git a/Tween/HashtagManage.Designer.vb b/Tween/HashtagManage.Designer.vb index ca54504e..13139588 100644 --- a/Tween/HashtagManage.Designer.vb +++ b/Tween/HashtagManage.Designer.vb @@ -22,6 +22,7 @@ Partial Class HashtagManage 'コード エディタを使って変更しないでください。 _ Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(HashtagManage)) Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel Me.OK_Button = New System.Windows.Forms.Button Me.Cancel_Button = New System.Windows.Forms.Button @@ -36,98 +37,101 @@ Partial Class HashtagManage ' 'TableLayoutPanel1 ' - Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TableLayoutPanel1.ColumnCount = 2 - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) + Me.TableLayoutPanel1.AccessibleDescription = Nothing + Me.TableLayoutPanel1.AccessibleName = Nothing + resources.ApplyResources(Me.TableLayoutPanel1, "TableLayoutPanel1") + Me.TableLayoutPanel1.BackgroundImage = Nothing Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0) Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0) - Me.TableLayoutPanel1.Location = New System.Drawing.Point(135, 228) + Me.TableLayoutPanel1.Font = Nothing Me.TableLayoutPanel1.Name = "TableLayoutPanel1" - Me.TableLayoutPanel1.RowCount = 1 - Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 27) - Me.TableLayoutPanel1.TabIndex = 7 ' 'OK_Button ' - Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None - Me.OK_Button.Location = New System.Drawing.Point(3, 3) + Me.OK_Button.AccessibleDescription = Nothing + Me.OK_Button.AccessibleName = Nothing + resources.ApplyResources(Me.OK_Button, "OK_Button") + Me.OK_Button.BackgroundImage = Nothing + Me.OK_Button.Font = Nothing Me.OK_Button.Name = "OK_Button" - Me.OK_Button.Size = New System.Drawing.Size(67, 21) - Me.OK_Button.TabIndex = 0 - Me.OK_Button.Text = "OK" ' 'Cancel_Button ' - Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None + Me.Cancel_Button.AccessibleDescription = Nothing + Me.Cancel_Button.AccessibleName = Nothing + resources.ApplyResources(Me.Cancel_Button, "Cancel_Button") + Me.Cancel_Button.BackgroundImage = Nothing Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.Cancel_Button.Location = New System.Drawing.Point(76, 3) + Me.Cancel_Button.Font = Nothing Me.Cancel_Button.Name = "Cancel_Button" - Me.Cancel_Button.Size = New System.Drawing.Size(67, 21) - Me.Cancel_Button.TabIndex = 1 - Me.Cancel_Button.Text = "キャンセル" ' 'DeleteButton ' - Me.DeleteButton.Location = New System.Drawing.Point(200, 191) + Me.DeleteButton.AccessibleDescription = Nothing + Me.DeleteButton.AccessibleName = Nothing + resources.ApplyResources(Me.DeleteButton, "DeleteButton") + Me.DeleteButton.BackgroundImage = Nothing + Me.DeleteButton.Font = Nothing Me.DeleteButton.Name = "DeleteButton" - Me.DeleteButton.Size = New System.Drawing.Size(79, 29) - Me.DeleteButton.TabIndex = 5 - Me.DeleteButton.Text = "Delete" Me.DeleteButton.UseVisualStyleBackColor = True ' 'ReplaceButton ' - Me.ReplaceButton.Location = New System.Drawing.Point(97, 191) + Me.ReplaceButton.AccessibleDescription = Nothing + Me.ReplaceButton.AccessibleName = Nothing + resources.ApplyResources(Me.ReplaceButton, "ReplaceButton") + Me.ReplaceButton.BackgroundImage = Nothing + Me.ReplaceButton.Font = Nothing Me.ReplaceButton.Name = "ReplaceButton" - Me.ReplaceButton.Size = New System.Drawing.Size(79, 29) - Me.ReplaceButton.TabIndex = 4 - Me.ReplaceButton.Text = "Replace" Me.ReplaceButton.UseVisualStyleBackColor = True ' 'AddButton ' - Me.AddButton.Location = New System.Drawing.Point(12, 191) + Me.AddButton.AccessibleDescription = Nothing + Me.AddButton.AccessibleName = Nothing + resources.ApplyResources(Me.AddButton, "AddButton") + Me.AddButton.BackgroundImage = Nothing + Me.AddButton.Font = Nothing Me.AddButton.Name = "AddButton" - Me.AddButton.Size = New System.Drawing.Size(79, 29) - Me.AddButton.TabIndex = 3 - Me.AddButton.Text = "Add" Me.AddButton.UseVisualStyleBackColor = True ' 'HistoryHashList ' + Me.HistoryHashList.AccessibleDescription = Nothing + Me.HistoryHashList.AccessibleName = Nothing + resources.ApplyResources(Me.HistoryHashList, "HistoryHashList") + Me.HistoryHashList.BackgroundImage = Nothing + Me.HistoryHashList.Font = Nothing Me.HistoryHashList.FormattingEnabled = True - Me.HistoryHashList.ItemHeight = 12 - Me.HistoryHashList.Location = New System.Drawing.Point(12, 49) Me.HistoryHashList.Name = "HistoryHashList" Me.HistoryHashList.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended - Me.HistoryHashList.Size = New System.Drawing.Size(267, 136) - Me.HistoryHashList.TabIndex = 2 ' 'UseHashText ' - Me.UseHashText.Location = New System.Drawing.Point(12, 24) + Me.UseHashText.AccessibleDescription = Nothing + Me.UseHashText.AccessibleName = Nothing + resources.ApplyResources(Me.UseHashText, "UseHashText") + Me.UseHashText.BackgroundImage = Nothing + Me.UseHashText.Font = Nothing Me.UseHashText.Name = "UseHashText" - Me.UseHashText.Size = New System.Drawing.Size(267, 19) - Me.UseHashText.TabIndex = 1 ' 'Label1 ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(10, 9) + Me.Label1.AccessibleDescription = Nothing + Me.Label1.AccessibleName = Nothing + resources.ApplyResources(Me.Label1, "Label1") + Me.Label1.Font = Nothing Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(65, 12) - Me.Label1.TabIndex = 0 - Me.Label1.Text = "使用するタグ" ' 'HashtagManage ' Me.AcceptButton = Me.OK_Button - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!) + Me.AccessibleDescription = Nothing + Me.AccessibleName = Nothing + resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackgroundImage = Nothing Me.CancelButton = Me.Cancel_Button - Me.ClientSize = New System.Drawing.Size(293, 266) Me.Controls.Add(Me.DeleteButton) Me.Controls.Add(Me.ReplaceButton) Me.Controls.Add(Me.AddButton) @@ -135,13 +139,13 @@ Partial Class HashtagManage Me.Controls.Add(Me.UseHashText) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.TableLayoutPanel1) + Me.Font = Nothing Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.Icon = Nothing Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "HashtagManage" Me.ShowInTaskbar = False - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent - Me.Text = "HashtagManage" Me.TableLayoutPanel1.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() diff --git a/Tween/HashtagManage.en.resx b/Tween/HashtagManage.en.resx new file mode 100644 index 00000000..b1998e17 --- /dev/null +++ b/Tween/HashtagManage.en.resx @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Cancel + + + + 156, 12 + + + Hashtag adding to your tweet + + \ No newline at end of file diff --git a/Tween/HashtagManage.resx b/Tween/HashtagManage.resx index 19dc0dd8..ceb10cea 100644 --- a/Tween/HashtagManage.resx +++ b/Tween/HashtagManage.resx @@ -117,4 +117,259 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 267, 19 + + + 65, 12 + + + 0 + + + $this + + + + 5 + + + $this + + + + CenterParent + + + 293, 266 + + + 4 + + + HistoryHashList + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 2 + + + Cancel_Button + + + Add + + + 0 + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1 + + + TableLayoutPanel1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + None + + + OK_Button + + + 使用するタグ + + + AddButton + + + Delete + + + Replace + + + 2 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="OK_Button" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="Cancel_Button" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,Percent,50" /><Rows Styles="Percent,50" /></TableLayoutSettings> + + + キャンセル + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 5 + + + 79, 29 + + + 135, 228 + + + 3 + + + 1 + + + 1 + + + 6, 12 + + + 12, 24 + + + 67, 21 + + + TableLayoutPanel1 + + + $this + + + ReplaceButton + + + 4 + + + 12, 49 + + + HashtagManage + + + UseHashText + + + 3, 3 + + + 79, 29 + + + Bottom, Right + + + 1 + + + None + + + System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 67, 21 + + + TableLayoutPanel1 + + + 7 + + + DeleteButton + + + 6 + + + 3 + + + 12 + + + 79, 29 + + + 97, 191 + + + $this + + + 76, 3 + + + 1 + + + 0 + + + HashtagManage + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10, 9 + + + 267, 136 + + + True + + + $this + + + OK + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 200, 191 + + + 12, 191 + + + 146, 27 + + + Label1 + + + True + \ No newline at end of file diff --git a/Tween/HashtagManage.vb b/Tween/HashtagManage.vb index 4c8be4dd..319a6f15 100644 --- a/Tween/HashtagManage.vb +++ b/Tween/HashtagManage.vb @@ -68,7 +68,8 @@ Public Class HashtagManage Public Sub AddHashToHistory(ByVal hash As String) hash = hash.Trim - If hash <> "" AndAlso Not HistoryHashList.Items.Contains(hash) Then + If hash <> "" Then + If HistoryHashList.Items.Contains(hash) Then HistoryHashList.Items.Remove(hash) HistoryHashList.Items.Insert(0, hash) End If End Sub @@ -134,6 +135,7 @@ Public Class HashtagManage Public Sub ToggleHash() If _useHash <> "" Then + Me.AddHashToHistory(_useHash) _useHash = "" UseHashText.Text = "" Else diff --git a/Tween/My Project/AssemblyInfo.vb b/Tween/My Project/AssemblyInfo.vb index f2456cc6..849937b0 100644 --- a/Tween/My Project/AssemblyInfo.vb +++ b/Tween/My Project/AssemblyInfo.vb @@ -55,5 +55,5 @@ Imports System.Runtime.InteropServices ' - + diff --git a/Tween/My Project/Resources.Designer.vb b/Tween/My Project/Resources.Designer.vb index b0227b8e..69e38d53 100644 --- a/Tween/My Project/Resources.Designer.vb +++ b/Tween/My Project/Resources.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' このコードはツールによって生成されました。 -' ランタイム バージョン:2.0.50727.4927 +' ランタイム バージョン:2.0.50727.3603 ' ' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 ' コードが再生成されるときに損失したりします。 @@ -1925,7 +1925,7 @@ Namespace My.Resources End Property ''' - ''' エラーが発生しました。ごめんなさい。ログをexeファイルのある場所に {0} として作ったので、kiri.feather@gmail.comまで送っていただけると助かります。{1}ご面倒なら@kiri_featherまでお知らせ頂くだけでも助かります。{1}「はい」ボタンをクリックするとログを開きます。ログを開かない場合は「いいえ」、このまま終了する場合は「キャンセル」ボタンをクリックしてください。 に類似しているローカライズされた文字列を検索します。 + ''' エラーが発生しました。ごめんなさい。ログをexeファイルのある場所に {0} として作ったので、kiri_feather@users.sourceforge.jpまで送っていただけると助かります。{1}ご面倒なら@kiri_featherまでお知らせ頂くだけでも助かります。{1}「はい」ボタンをクリックするとログを開きます。ログを開かない場合は「いいえ」、このまま終了する場合は「キャンセル」ボタンをクリックしてください。 に類似しているローカライズされた文字列を検索します。 ''' Friend ReadOnly Property UnhandledExceptionText9() As String Get diff --git a/Tween/My Project/Resources.en.resx b/Tween/My Project/Resources.en.resx index 4c3e6417..46dd5077 100644 --- a/Tween/My Project/Resources.en.resx +++ b/Tween/My Project/Resources.en.resx @@ -607,7 +607,7 @@ Exception {0}: {1} - We are sorry but error was happened. A log text was created as {0} in same folder of Tween.exe. Please send this to kiri.feather@gmail.com or{1}tweet to @kiri_feather in Twitter.{1}[OK] to open log file. [Cancel] to continue. + We are sorry but error was happened. A log text was created as {0} in same folder of Tween.exe. Please send this to kiri_feather@users.sourceforge.jp or{1}tweet to @kiri_feather in Twitter.{1}[OK] to open log file. [Cancel] to continue. Followers refreshing... diff --git a/Tween/My Project/Resources.resx b/Tween/My Project/Resources.resx index e917acb1..219f3b5d 100644 --- a/Tween/My Project/Resources.resx +++ b/Tween/My Project/Resources.resx @@ -641,7 +641,7 @@ 例外 {0}: {1} - エラーが発生しました。ごめんなさい。ログをexeファイルのある場所に {0} として作ったので、kiri.feather@gmail.comまで送っていただけると助かります。{1}ご面倒なら@kiri_featherまでお知らせ頂くだけでも助かります。{1}「はい」ボタンをクリックするとログを開きます。ログを開かない場合は「いいえ」、このまま終了する場合は「キャンセル」ボタンをクリックしてください。 + エラーが発生しました。ごめんなさい。ログをexeファイルのある場所に {0} として作ったので、kiri_feather@users.sourceforge.jpまで送っていただけると助かります。{1}ご面倒なら@kiri_featherまでお知らせ頂くだけでも助かります。{1}「はい」ボタンをクリックするとログを開きます。ログを開かない場合は「いいえ」、このまま終了する場合は「キャンセル」ボタンをクリックしてください。 Followers取得中... diff --git a/Tween/Resources/ChangeLog.txt b/Tween/Resources/ChangeLog.txt index 4c1e44b1..2c02017f 100644 --- a/Tween/Resources/ChangeLog.txt +++ b/Tween/Resources/ChangeLog.txt @@ -46,6 +46,7 @@ * 状態ログのツールチップをやめ、ステータス欄の状態部ダブルクリックでメッセージボックス表示するよう変更 * Postボタンにフォーカスがある時にSpaceキーを押した場合は、ボタン押下ではなく未読ジャンプするよう変更 * 更新間隔の不正変更への対処を追加 + * 複数行入力切替のショートカットをCtrl-TからCtrl-Yに変更 ==== Ver 0.8.1.0(2009/12/14) * 細かい不具合対応 * 公式RT発言を振り分けする際、RTした人を対象にするよう変更 diff --git a/Tween/StatusDictionary.vb b/Tween/StatusDictionary.vb index 768ed583..09a6c882 100644 --- a/Tween/StatusDictionary.vb +++ b/Tween/StatusDictionary.vb @@ -1555,12 +1555,16 @@ Public NotInheritable Class TabClass original.SearchUrl = modified.SearchUrl original.UseRegex = modified.UseRegex original.CaseSensitive = modified.CaseSensitive + original.IsRt = modified.IsRt + original.Source = modified.Source original.ExBodyFilter = modified.ExBodyFilter original.ExNameFilter = modified.ExNameFilter original.ExSearchBoth = modified.ExSearchBoth original.ExSearchUrl = modified.ExSearchUrl original.ExUseRegex = modified.ExUseRegex original.ExCaseSensitive = modified.ExCaseSensitive + original.IsExRt = modified.IsExRt + original.ExSource = modified.ExSource original.MoveFrom = modified.MoveFrom original.SetMark = modified.SetMark _filterMod = True @@ -1736,7 +1740,7 @@ Public NotInheritable Class FiltersClass 'フィルタ一覧に表示する文言生成 Private Function MakeSummary() As String Dim fs As New System.Text.StringBuilder() - If _name <> "" OrElse _body.Count > 0 Then + If _name <> "" OrElse _body.Count > 0 OrElse _isRt OrElse _source <> "" Then If _searchBoth Then If _name <> "" Then fs.AppendFormat(My.Resources.SetFiltersText1, _name) @@ -1772,7 +1776,7 @@ Public NotInheritable Class FiltersClass fs.Append("RT/") End If If _source <> "" Then - fs.AppendFormat("Source…{0}/", _source) + fs.AppendFormat("Src…{0}/", _source) End If 'If _moveFrom Then ' fs.Append(My.Resources.SetFiltersText9) @@ -1784,7 +1788,7 @@ Public NotInheritable Class FiltersClass fs.Length -= 1 fs.Append(")") End If - If _exname <> "" OrElse _exbody.Count > 0 Then + If _exname <> "" OrElse _exbody.Count > 0 OrElse _isExRt OrElse _exSource <> "" Then '除外 fs.Append(My.Resources.SetFiltersText12) If _exsearchBoth Then @@ -1822,7 +1826,7 @@ Public NotInheritable Class FiltersClass fs.Append("RT/") End If If _exSource <> "" Then - fs.AppendFormat("Source…{0}/", _exSource) + fs.AppendFormat("Src…{0}/", _exSource) End If fs.Length -= 1 fs.Append(")") diff --git a/Tween/Tween.Designer.vb b/Tween/Tween.Designer.vb index 45874280..548cffd1 100644 --- a/Tween/Tween.Designer.vb +++ b/Tween/Tween.Designer.vb @@ -53,7 +53,6 @@ Partial Class TweenMain Me.ClearTabMenuItem = New System.Windows.Forms.ToolStripMenuItem Me.ToolStripSeparator11 = New System.Windows.Forms.ToolStripSeparator Me.DeleteTabMenuItem = New System.Windows.Forms.ToolStripMenuItem - Me.MenuItemTab = New System.Windows.Forms.ToolStripMenuItem Me.TabImage = New System.Windows.Forms.ImageList(Me.components) Me.SplitContainer2 = New System.Windows.Forms.SplitContainer Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel @@ -142,6 +141,7 @@ Partial Class TweenMain Me.DeleteStripMenuItem = New System.Windows.Forms.ToolStripMenuItem Me.RefreshStripMenuItem = New System.Windows.Forms.ToolStripMenuItem Me.RefreshMoreStripMenuItem = New System.Windows.Forms.ToolStripMenuItem + Me.MenuItemTab = New System.Windows.Forms.ToolStripMenuItem Me.MenuItemCommand = New System.Windows.Forms.ToolStripMenuItem Me.TinyUrlConvertToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem Me.UrlConvertAutoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem @@ -404,12 +404,6 @@ Partial Class TweenMain Me.DeleteTabMenuItem.Name = "DeleteTabMenuItem" resources.ApplyResources(Me.DeleteTabMenuItem, "DeleteTabMenuItem") ' - 'MenuItemTab - ' - Me.MenuItemTab.DropDown = Me.ContextMenuTabProperty - Me.MenuItemTab.Name = "MenuItemTab" - resources.ApplyResources(Me.MenuItemTab, "MenuItemTab") - ' 'TabImage ' Me.TabImage.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit @@ -908,6 +902,12 @@ Partial Class TweenMain Me.RefreshMoreStripMenuItem.Name = "RefreshMoreStripMenuItem" resources.ApplyResources(Me.RefreshMoreStripMenuItem, "RefreshMoreStripMenuItem") ' + 'MenuItemTab + ' + Me.MenuItemTab.DropDown = Me.ContextMenuTabProperty + Me.MenuItemTab.Name = "MenuItemTab" + resources.ApplyResources(Me.MenuItemTab, "MenuItemTab") + ' 'MenuItemCommand ' Me.MenuItemCommand.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TinyUrlConvertToolStripMenuItem, Me.UpdateFollowersMenuItem1, Me.ToolStripMenuItem10, Me.ToolStripSeparator1, Me.FollowCommandMenuItem, Me.RemoveCommandMenuItem, Me.FriendshipMenuItem, Me.ToolStripSeparator3, Me.OwnStatusMenuItem}) diff --git a/Tween/Tween.en.resx b/Tween/Tween.en.resx index cb26f3df..19cfa531 100644 --- a/Tween/Tween.en.resx +++ b/Tween/Tween.en.resx @@ -118,29 +118,89 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 185, 207 + + + 313, 142 + + + + 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 + + + + 312, 22 + + + &Separation of multibyte character string from URL + + + 312, 22 + + + The &collision with API command is evaded + + + 312, 22 + + + &URL is automatically shortened + + + 312, 22 + + + &Convert IdeographicSpace to Space + + + 309, 6 + + + 312, 22 + + + &Toggle Hashtag + + + 312, 22 + + + Hashtag &Manager + - 190, 22 + 184, 22 Create &New Tab... - 190, 22 + 184, 22 Rename Tab - 187, 6 + 181, 6 - 190, 22 + 184, 22 Manage Reading (&U) - 190, 22 + 184, 22 &Enable Alert Popup (&Q) @@ -149,28 +209,28 @@ Select a wav file. - 187, 6 + 181, 6 - 190, 22 + 184, 22 Edit &Filtering Rules... - 187, 6 + 181, 6 - 190, 22 + 184, 22 Clear Posts in This Tab - 187, 6 + 181, 6 - 190, 22 + 184, 22 &Delete This Tab @@ -181,9 +241,6 @@ &Tab - - 191, 207 - 135, 54 @@ -200,7 +257,7 @@ Save &Icon... - 227, 192 + 227, 214 226, 22 @@ -286,6 +343,18 @@ Filter by &Id ... + + 226, 22 + + + 185, 182 + + + 35, 20 + + + &File + 184, 22 @@ -340,15 +409,6 @@ E&xit - - 185, 182 - - - 35, 20 - - - &File - 37, 20 @@ -406,6 +466,12 @@ Input search &Query + + 67, 20 + + + &Operation + @ &Reply @@ -427,33 +493,6 @@ Open as ... - - Make filter as ... - - - Change unread state - - - Jump Next to read post - - - Select &All - - - &Delete - - - &Update - - - GetMore - - - 67, 20 - - - &Operation - 253, 22 @@ -496,6 +535,9 @@ Open &Retweeter Home + + Make filter as ... + 167, 22 @@ -508,6 +550,9 @@ Filter by ID... + + Change unread state + 215, 22 @@ -520,6 +565,21 @@ Make Not Read + + Jump Next to read post + + + Select &All + + + &Delete + + + &Update + + + GetMore + 66, 20 @@ -673,34 +733,4 @@ 212, 22 - - 313, 123 - - - 312, 22 - - - Separation of multibyte character string from URL - - - 312, 22 - - - The collision with API command is evaded - - - 312, 22 - - - URL is automatically shortened - - - 312, 22 - - - Convert IdeographicSpace to Space - - - 309, 6 - \ No newline at end of file diff --git a/Tween/Tween.resx b/Tween/Tween.resx index 70f8c82d..8f3d3e5e 100644 --- a/Tween/Tween.resx +++ b/Tween/Tween.resx @@ -126,7 +126,7 @@ - 245, 22 + 261, 17 ToolStripStatusLabel1 @@ -135,46 +135,49 @@ MiddleLeft - 71, 22 + 61, 17 Starting... + + Starting... + 130, 8 - 268, 22 + 235, 22 URLからの全角文字列の切り離し - 268, 22 + 235, 22 APIコマンドを回避する - 268, 22 + 235, 22 自動的にURLを短縮する - 268, 22 + 235, 22 全角スペースを半角スペースにする - 265, 6 + 232, 6 Ctrl+T - 268, 22 + 235, 22 ハッシュタグ切り替え @@ -183,13 +186,13 @@ Ctrl+Shift+T - 268, 22 + 235, 22 ハッシュタグ設定 - 269, 142 + 236, 142 ContextMenuStripPostMode @@ -200,23 +203,23 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - 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 + 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 Magenta - 51, 25 + 45, 20 #[-] @@ -225,7 +228,7 @@ 0, 0 - 382, 27 + 382, 22 @@ -274,73 +277,73 @@ 236, 41 - 213, 22 + 196, 22 タブ作成(&N)... - 213, 22 + 196, 22 タブ名の変更 - 210, 6 + 193, 6 - 213, 22 + 196, 22 未読管理(&U) - 213, 22 + 196, 22 新着通知表示(&Q) - 121, 26 + 121, 21 再生するwavファイルを指定してください - 210, 6 + 193, 6 - 213, 22 + 196, 22 振り分けルール編集(&F)... - 210, 6 + 193, 6 - 213, 22 + 196, 22 このタブの発言をクリア - 210, 6 + 193, 6 - 213, 22 + 196, 22 タブ削除(&D) - 62, 22 + 50, 20 タブ(&T) - 214, 212 + 197, 207 ContextMenuTabProperty @@ -367,7 +370,7 @@ 0, 0, 0, 0 - 378, 162 + 378, 169 5 @@ -412,22 +415,22 @@ 17, 82 - 136, 22 + 122, 22 IconName - 133, 6 + 119, 6 - 136, 22 + 122, 22 保存(&I)... - 137, 54 + 123, 54 ContextMenuStrip3 @@ -508,46 +511,46 @@ 337, 7 - 180, 22 + 158, 22 Google(&G) - 180, 22 + 158, 22 Wikipedia(&W) - 180, 22 + 158, 22 Twitter検索(&Y) - 180, 22 + 158, 22 Twitter Search(&S) - 180, 22 + 158, 22 現在のタブ(&L) - 215, 22 + 196, 22 選択文字列で検索(&S) - 212, 6 + 193, 6 - 215, 22 + 196, 22 選択文字列をコピー(&C) @@ -556,52 +559,52 @@ False - 215, 22 + 196, 22 URLをコピー(&U) - 215, 22 + 196, 22 すべて選択(&A) - 212, 6 + 193, 6 - 215, 22 + 196, 22 フォローする(&F) - 215, 22 + 196, 22 フォロー解除(&N) - 215, 22 + 196, 22 相互フォロー状態表示(&H) - 215, 22 + 196, 22 ID振分ルール作成(&I) - 215, 22 + 196, 22 Use this &Hashtag - 216, 214 + 197, 214 ContextMenuStrip4 @@ -856,10 +859,10 @@ 23 - 382, 300 + 382, 307 - 166 + 173 2 @@ -880,7 +883,7 @@ 0 - 382, 300 + 382, 307 ToolStripContainer1.ContentPanel @@ -943,64 +946,67 @@ 763, 0 - 192, 22 + 224, 22 設定(&O)... - 189, 6 + 221, 6 - 192, 22 + 224, 22 ファイル保存(&S)... - 189, 6 + 221, 6 - 192, 22 + 224, 22 新着通知(&Q) - 192, 22 + 224, 22 サウンド再生 - 192, 22 + 224, 22 新着時リスト固定(&L) - 189, 6 + 221, 6 + + + Ctrl+Y - 192, 22 + 224, 22 発言欄複数行入力(&M) - 189, 6 + 221, 6 False - 192, 22 + 224, 22 終了(&X) - 193, 182 + 225, 182 ContextMenuStrip1 @@ -1009,40 +1015,40 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 85, 22 + 67, 20 ファイル(&F) - 259, 22 + 230, 22 タブ削除の取消 - 256, 6 + 227, 6 - 259, 22 + 230, 22 コピー（STOT形式テキスト）(&C) - 259, 22 + 230, 22 コピー（ステータスURL）(&S) - 256, 6 + 227, 6 Ctrl+F - 259, 22 + 230, 22 検索(&F)... @@ -1051,7 +1057,7 @@ F3 - 259, 22 + 230, 22 次を検索(&X) @@ -1060,25 +1066,25 @@ Shift+F3 - 259, 22 + 230, 22 前を検索(&P) - 256, 6 + 227, 6 Ctrl+Shift+F - 259, 22 + 230, 22 抽出条件入力(&Q) - 61, 22 + 57, 20 編集(&E) @@ -1090,7 +1096,7 @@ Ctrl+R - 268, 22 + 234, 22 @返信(&R) @@ -1099,7 +1105,7 @@ Ctrl+Shift+R - 268, 22 + 234, 22 @返信ALL @@ -1108,7 +1114,7 @@ Ctrl+M - 268, 22 + 234, 22 DM送信(&M) @@ -1117,7 +1123,7 @@ Alt+R - 268, 22 + 234, 22 ReTweet @@ -1126,7 +1132,7 @@ Alt+Shift+R - 268, 22 + 234, 22 ReTweet(Unofficial) @@ -1135,19 +1141,19 @@ Ctrl+Q - 268, 22 + 234, 22 Quote - 265, 6 + 231, 6 Ctrl+S - 268, 22 + 234, 22 Fav追加(&F) @@ -1156,7 +1162,7 @@ Ctrl+Shift+S - 268, 22 + 234, 22 Fav削除 @@ -1165,7 +1171,7 @@ Ctrl+H - 315, 22 + 268, 22 ホームを開く(&H) @@ -1174,7 +1180,7 @@ Ctrl+G - 315, 22 + 268, 22 Favを開く(&G) @@ -1183,7 +1189,7 @@ Ctrl+O - 315, 22 + 268, 22 ステータスを開く(&O) @@ -1192,7 +1198,7 @@ Ctrl+I - 315, 22 + 268, 22 返信元ステータスを開く(&I) @@ -1201,7 +1207,7 @@ Ctrl+Shift+O - 315, 22 + 268, 22 ふぁぼられを開く(&P) @@ -1210,7 +1216,7 @@ Ctrl+E - 315, 22 + 268, 22 発言内URLを開く(&U) @@ -1219,43 +1225,43 @@ Ctrl+Shift+H - 315, 22 + 268, 22 RTした人のホームを開く(&R) - 268, 22 + 234, 22 開く - 239, 22 + 214, 22 タブ振り分けルール作成(&N)... - 239, 22 + 214, 22 ID振り分けルール作成... - 268, 22 + 234, 22 振り分けルール作成 - 265, 6 + 231, 6 Ctrl+B - 220, 22 + 194, 22 既読にする(&B) @@ -1264,31 +1270,31 @@ Ctrl+Shift+B - 220, 22 + 194, 22 未読にする - 268, 22 + 234, 22 未読状態変更 - 268, 22 + 234, 22 未読へジャンプ - 265, 6 + 231, 6 Ctrl+A - 268, 22 + 234, 22 全て選択(&A) @@ -1297,7 +1303,7 @@ Ctrl+D - 268, 22 + 234, 22 削除(&D) @@ -1306,7 +1312,7 @@ F5 - 268, 22 + 234, 22 更新(&U) @@ -1315,13 +1321,13 @@ Shift+F5 - 268, 22 + 234, 22 前データを取得 - 269, 374 + 235, 374 ContextMenuStrip2 @@ -1330,7 +1336,7 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 63, 22 + 59, 20 操作(&O) @@ -1339,7 +1345,7 @@ Ctrl+L - 242, 22 + 220, 22 短縮サービス自動選択 @@ -1348,49 +1354,49 @@ False - 242, 22 + 220, 22 元に戻す - 242, 22 + 220, 22 TinyURL - 242, 22 + 220, 22 is.gd - 242, 22 + 220, 22 twurl.nl - 242, 22 + 220, 22 u.nu - 242, 22 + 220, 22 bit.ly - 242, 22 + 220, 22 j.mp - 220, 22 + 196, 22 入力欄のURLを短縮変換 @@ -1399,31 +1405,31 @@ False - 208, 22 + 195, 22 現在からの増加分を取得 - 208, 22 + 195, 22 全て再取得 - 220, 22 + 196, 22 片思いユーザーリスト取得 - 169, 22 + 154, 22 BlackFav追加(&F) - 220, 22 + 196, 22 BlackFav @@ -1432,37 +1438,37 @@ False - 217, 6 + 193, 6 - 220, 22 + 196, 22 フォローする(&F) - 220, 22 + 196, 22 フォロー解除(&N) - 220, 22 + 196, 22 相互フォロー状態表示(&H) - 217, 6 + 193, 6 - 220, 22 + 196, 22 自分のプロフィール表示 - 98, 22 + 89, 20 その他機能(&C) @@ -1471,64 +1477,64 @@ F1 - 227, 22 + 194, 22 Tweenまとめサイト(&H) - 224, 6 + 191, 6 - 227, 22 + 194, 22 最新版の取得(&G) - 227, 22 + 194, 22 解析キー情報更新 - 224, 6 + 191, 6 - 227, 22 + 194, 22 API情報 - 227, 22 + 194, 22 Twitterからのお知らせ(&I) - 224, 6 + 191, 6 - 227, 22 + 194, 22 Tweenについて(&A)... - 179, 22 + 157, 22 PostClassのダンプ - 179, 22 + 157, 22 TraceOut出力 - 227, 22 + 194, 22 デバッグモード @@ -1537,7 +1543,7 @@ False - 75, 22 + 63, 20 ヘルプ(&H) @@ -1546,7 +1552,7 @@ 0, 0 - 382, 26 + 382, 24 10 @@ -1642,7 +1648,7 @@ StatusLabel - Tween.TweenCustomControl.ToolStripLabelHistory, Tween, Version=0.8.3681.7215, Culture=neutral, PublicKeyToken=null + Tween.TweenCustomControl.ToolStripLabelHistory, Tween, Version=0.8.3681.15781, Culture=neutral, PublicKeyToken=null HashStripSplitButton @@ -1764,12 +1770,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MenuItemTab - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabImage @@ -2214,6 +2214,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + MenuItemTab + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + MenuItemCommand diff --git a/Tween/Tween.vb b/Tween/Tween.vb index 2fa581a2..eb5b29c7 100644 --- a/Tween/Tween.vb +++ b/Tween/Tween.vb @@ -1913,7 +1913,7 @@ Public Class TweenMain bw.ReportProgress(300) Case WORKERTYPE.Retweet bw.ReportProgress(200) - ret = Twitter.PostRetweet(args.ids(0)) + ret = Twitter.PostRetweet(args.ids(0), read) bw.ReportProgress(300) Case WORKERTYPE.Follower bw.ReportProgress(50, My.Resources.UpdateFollowersMenuItem1_ClickText1) diff --git a/Tween/Tween.vbproj b/Tween/Tween.vbproj index 090a5105..a6efa1ad 100644 --- a/Tween/Tween.vbproj +++ b/Tween/Tween.vbproj @@ -199,6 +199,10 @@ DialogAsShieldIcon.vb Designer + + Designer + HashtagManage.vb + Designer HashtagManage.vb diff --git a/Tween/Twitter.vb b/Tween/Twitter.vb index 52ffb300..1cd7a612 100644 --- a/Tween/Twitter.vb +++ b/Tween/Twitter.vb @@ -1975,7 +1975,7 @@ Public Module Twitter Return "" End Function - Public Function PostRetweet(ByVal id As Long) As String + Public Function PostRetweet(ByVal id As Long, ByVal read As Boolean) As String If _endingFlag Then Return "" If Twitter.AccountState <> ACCOUNT_STATE.Valid Then Return "" @@ -2062,7 +2062,7 @@ Public Module Twitter End If End If - post.IsRead = False + post.IsRead = read post.IsReply = post.ReplyToList.Contains(_uid) If post.IsMe Then