OSDN Git Service

(root) / opentween / open-tween.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 71c2b30)
関連移動できない問題を修正
authorkiri_feather <kiri_feather@users.sourceforge.jp>
Thu, 10 Dec 2009 09:24:29 +0000 (09:24 +0000)
committerKimura Youichi <kim.upsilon@bucyou.net>
Sat, 18 Feb 2012 14:10:31 +0000 (23:10 +0900)
振り分け時に公式RTのRTした人を対象にするよう変更

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

Tween/ApplicationEvents.vb patch | blob | history
Tween/Resources/ChangeLog.txt patch | blob | history
Tween/StatusDictionary.vb patch | blob | history
Tween/Tween.resx patch | blob | history
Tween/Tween.vb patch | blob | history
Tween/Tween.vbproj patch | blob | history

diff --git a/Tween/ApplicationEvents.vb b/Tween/ApplicationEvents.vb
index f1505c7..8b0ebee 100644 (file)
--- a/Tween/ApplicationEvents.vb
+++ b/Tween/ApplicationEvents.vb
@@ -92,6 +92,8 @@ Namespace My
             If e.Exception.Message <> "A generic error occurred in GDI+." AndAlso _
                e.Exception.Message <> "GDI+ で汎用エラーが発生しました。" Then
                 e.ExitApplication = ExceptionOut(e.Exception)
+            Else
+                e.ExitApplication = False
             End If
         End Sub
 
diff --git a/Tween/Resources/ChangeLog.txt b/Tween/Resources/ChangeLog.txt
index 3915420..79c758b 100644 (file)
--- a/Tween/Resources/ChangeLog.txt
+++ b/Tween/Resources/ChangeLog.txt
@@ -2,6 +2,12 @@
 
 ==== Ver 0.8.1.0(Unreleased)
  * 細かい不具合対応
+ * 公式RT発言を振り分けする際、RTした人を対象にするよう変更
+ * 関連移動、同発言者移動する際、RTした人も考慮するよう変更
+ * ポスト時のリトライをしないよう変更
+ * ポスト時にエラーが帰ってきた際、入力欄がクリアされてしまうバグ修正
+ * 不正なアニメgifを表示すると落ちてしまう問題に対処
+ * タブの設定ファイル構成を変更。SettingTabs.xmlに集約されました。
 ==== Ver 0.8.0.0(2009/11/27)
  * Webモードで公式RT発言をコピー、開くした時にユーザーと発言IDが不整合になっていた問題に対応
  * 公式RTに正式対応
diff --git a/Tween/StatusDictionary.vb b/Tween/StatusDictionary.vb
index 1afdc9f..bdd4804 100644 (file)
--- a/Tween/StatusDictionary.vb
+++ b/Tween/StatusDictionary.vb
@@ -51,8 +51,8 @@ Public NotInheritable Class PostClass
     Private _statuses As Statuses = Statuses.None
     Private _Uid As Long
     Private _FilterHit As Boolean
-    Private _RetweetedBy As String
-    Private _RetweetedId As Long
+    Private _RetweetedBy As String = ""
+    Private _RetweetedId As Long = 0
 
     <FlagsAttribute()> _
     Private Enum Statuses
@@ -689,7 +689,12 @@ Public NotInheritable Class TabInformations
                 Dim add As Boolean = False  '通知リスト追加フラグ
                 Dim mv As Boolean = False   '移動フラグ（Recent追加有無）
                 For Each tn As String In _tabs.Keys
-                    Dim rslt As HITRESULT = _tabs(tn).AddFiltered(post.Id, post.IsRead, post.Name, post.Data, post.OriginalData)
+                    Dim rslt As HITRESULT = HITRESULT.None
+                    If post.RetweetedId = 0 Then
+                        rslt = _tabs(tn).AddFiltered(post.Id, post.IsRead, post.Name, post.Data, post.OriginalData)
+                    Else
+                        rslt = _tabs(tn).AddFiltered(post.Id, post.IsRead, post.RetweetedBy, post.Data, post.OriginalData)
+                    End If
                     If rslt <> HITRESULT.None Then
                         If rslt = HITRESULT.CopyAndMark Then post.IsMark = True 'マークあり
                         If rslt = HITRESULT.Move Then
@@ -943,7 +948,12 @@ Public NotInheritable Class TabInformations
                     For Each id As Long In _statuses.Keys
                         Dim post As PostClass = _statuses.Item(id)
                         If post.IsDm Then Continue For
-                        Dim rslt As HITRESULT = tb.AddFiltered(post.Id, post.IsRead, post.Name, post.Data, post.OriginalData)
+                        Dim rslt As HITRESULT = HITRESULT.None
+                        If post.RetweetedId = 0 Then
+                            rslt = tb.AddFiltered(post.Id, post.IsRead, post.Name, post.Data, post.OriginalData)
+                        Else
+                            rslt = tb.AddFiltered(post.Id, post.IsRead, post.RetweetedBy, post.Data, post.OriginalData)
+                        End If
                         Select Case rslt
                             Case HITRESULT.CopyAndMark
                                 post.IsMark = True 'マークあり
@@ -1092,6 +1102,7 @@ Public NotInheritable Class TabClass
     Private _tmpIds As List(Of TempolaryId)
     Private _tabName As String = ""
     Private _tabType As TabUsageType = TabUsageType.Undefined
+    Private _tabFilename As String = ""
     'Private rwLock As New System.Threading.ReaderWriterLock()   'フィルタ用
 
     Private Structure TempolaryId
@@ -1115,7 +1126,7 @@ Public NotInheritable Class TabClass
     End Sub
 
     Public Sub New(ByVal TabName As String, ByVal TabType As TabUsageType)
-        Me.TabName = TabName
+        _tabName = TabName
         _filters = New List(Of FiltersClass)
         _notify = True
         _soundFile = ""
@@ -1372,6 +1383,16 @@ Public NotInheritable Class TabClass
         End Set
     End Property
 
+    <Xml.Serialization.XmlIgnore()> _
+    Public Property TabFilename() As String
+        Get
+            Return _tabFilename
+        End Get
+        Set(ByVal value As String)
+            _tabFilename = value
+        End Set
+    End Property
+
     Public Property TabType() As TabUsageType
         Get
             Return _tabType
@@ -1743,8 +1764,9 @@ Public NotInheritable Class FiltersClass
             rgOpt = RegexOptions.IgnoreCase
         End If
         If _searchBoth Then
-            If _name = "" OrElse Name.Equals(_name, compOpt) OrElse _
-                            (_useRegex AndAlso Regex.IsMatch(Name, _name, rgOpt)) Then
+            If _name = "" OrElse _
+                Name.Equals(_name, compOpt) OrElse _
+                (_useRegex AndAlso Regex.IsMatch(Name, _name, rgOpt)) Then
                 For Each fs As String In _body
                     If _useRegex Then
                         If Regex.IsMatch(tBody, fs, rgOpt) = False Then bHit = False
diff --git a/Tween/Tween.resx b/Tween/Tween.resx
index 5e614fd..d240c66 100644 (file)
--- a/Tween/Tween.resx
+++ b/Tween/Tween.resx
@@ -321,6 +321,48 @@
   <data name="TableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
     <value>3</value>
   </data>
+  <metadata name="ContextMenuStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 82</value>
+  </metadata>
+  <data name="IconNameToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>120, 22</value>
+  </data>
+  <data name="IconNameToolStripMenuItem.Text" xml:space="preserve">
+    <value>IconName</value>
+  </data>
+  <data name="ToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>117, 6</value>
+  </data>
+  <data name="SaveIconPictureToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>120, 22</value>
+  </data>
+  <data name="SaveIconPictureToolStripMenuItem.Text" xml:space="preserve">
+    <value>保存(&amp;I)...</value>
+  </data>
+  <data name="ContextMenuStrip3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>121, 54</value>
+  </data>
+  <data name="&gt;&gt;ContextMenuStrip3.Name" xml:space="preserve">
+    <value>ContextMenuStrip3</value>
+  </data>
+  <data name="&gt;&gt;ContextMenuStrip3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="UserPicture.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>Off</value>
+  </data>
+  <data name="UserPicture.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 3</value>
+  </data>
+  <data name="UserPicture.Size" type="System.Drawing.Size, System.Drawing">
+    <value>50, 50</value>
+  </data>
+  <data name="UserPicture.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
+    <value>Zoom</value>
+  </data>
+  <data name="UserPicture.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
   <data name="&gt;&gt;UserPicture.Name" xml:space="preserve">
     <value>UserPicture</value>
   </data>
@@ -333,6 +375,36 @@
   <data name="&gt;&gt;UserPicture.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="NameLabel.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="NameLabel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="NameLabel.Font" type="System.Drawing.Font, System.Drawing">
+    <value>MS UI Gothic, 9pt, style=Bold</value>
+  </data>
+  <data name="NameLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>Off</value>
+  </data>
+  <data name="NameLabel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>59, 3</value>
+  </data>
+  <data name="NameLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 0</value>
+  </data>
+  <data name="NameLabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>266, 14</value>
+  </data>
+  <data name="NameLabel.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="NameLabel.Text" xml:space="preserve">
+    <value>LblName</value>
+  </data>
+  <data name="NameLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
   <data name="&gt;&gt;NameLabel.Name" xml:space="preserve">
     <value>NameLabel</value>
   </data>
@@ -345,6 +417,111 @@
   <data name="&gt;&gt;NameLabel.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <metadata name="ContextMenuStrip4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>337, 7</value>
+  </metadata>
+  <data name="SearchItem2ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>145, 22</value>
+  </data>
+  <data name="SearchItem2ToolStripMenuItem.Text" xml:space="preserve">
+    <value>Google</value>
+  </data>
+  <data name="SearchItem1ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>145, 22</value>
+  </data>
+  <data name="SearchItem1ToolStripMenuItem.Text" xml:space="preserve">
+    <value>Wikipedia</value>
+  </data>
+  <data name="SearchItem3ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>145, 22</value>
+  </data>
+  <data name="SearchItem3ToolStripMenuItem.Text" xml:space="preserve">
+    <value>Twitter検索</value>
+  </data>
+  <data name="SearchItem4ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>145, 22</value>
+  </data>
+  <data name="SearchItem4ToolStripMenuItem.Text" xml:space="preserve">
+    <value>Twitter Search</value>
+  </data>
+  <data name="CurrentTabToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>145, 22</value>
+  </data>
+  <data name="CurrentTabToolStripMenuItem.Text" xml:space="preserve">
+    <value>現在のタブ</value>
+  </data>
+  <data name="ToolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>166, 22</value>
+  </data>
+  <data name="ToolStripMenuItem2.Text" xml:space="preserve">
+    <value>選択文字列で検索</value>
+  </data>
+  <data name="ToolStripSeparator13.Size" type="System.Drawing.Size, System.Drawing">
+    <value>163, 6</value>
+  </data>
+  <data name="ToolStripMenuItem3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>166, 22</value>
+  </data>
+  <data name="ToolStripMenuItem3.Text" xml:space="preserve">
+    <value>選択文字列をコピー</value>
+  </data>
+  <data name="ToolStripMenuItem4.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="ToolStripMenuItem4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>166, 22</value>
+  </data>
+  <data name="ToolStripMenuItem4.Text" xml:space="preserve">
+    <value>URLをコピー</value>
+  </data>
+  <data name="ToolStripMenuItem5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>166, 22</value>
+  </data>
+  <data name="ToolStripMenuItem5.Text" xml:space="preserve">
+    <value>すべて選択</value>
+  </data>
+  <data name="ToolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>163, 6</value>
+  </data>
+  <data name="FollowContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>166, 22</value>
+  </data>
+  <data name="FollowContextMenuItem.Text" xml:space="preserve">
+    <value>Follow</value>
+  </data>
+  <data name="RemoveContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>166, 22</value>
+  </data>
+  <data name="RemoveContextMenuItem.Text" xml:space="preserve">
+    <value>Remove</value>
+  </data>
+  <data name="FriendshipContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>166, 22</value>
+  </data>
+  <data name="FriendshipContextMenuItem.Text" xml:space="preserve">
+    <value>ShowFriendship</value>
+  </data>
+  <data name="ContextMenuStrip4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>167, 170</value>
+  </data>
+  <data name="&gt;&gt;ContextMenuStrip4.Name" xml:space="preserve">
+    <value>ContextMenuStrip4</value>
+  </data>
+  <data name="&gt;&gt;ContextMenuStrip4.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="PostBrowser.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="PostBrowser.Location" type="System.Drawing.Point, System.Drawing">
+    <value>59, 20</value>
+  </data>
+  <data name="PostBrowser.Size" type="System.Drawing.Size, System.Drawing">
+    <value>395, 82</value>
+  </data>
+  <data name="PostBrowser.TabIndex" type="System.Int32, mscorlib">
+    <value>12</value>
+  </data>
   <data name="&gt;&gt;PostBrowser.Name" xml:space="preserve">
     <value>PostBrowser</value>
   </data>
@@ -357,6 +534,30 @@
   <data name="&gt;&gt;PostBrowser.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
+  <data name="DateTimeLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Right</value>
+  </data>
+  <data name="DateTimeLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>Off</value>
+  </data>
+  <data name="DateTimeLabel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>331, 3</value>
+  </data>
+  <data name="DateTimeLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 0</value>
+  </data>
+  <data name="DateTimeLabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>123, 14</value>
+  </data>
+  <data name="DateTimeLabel.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="DateTimeLabel.Text" xml:space="preserve">
+    <value>Label1</value>
+  </data>
+  <data name="DateTimeLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleRight</value>
+  </data>
   <data name="&gt;&gt;DateTimeLabel.Name" xml:space="preserve">
     <value>DateTimeLabel</value>
   </data>
@@ -672,344 +873,47 @@
   <data name="MenuStrip1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>None</value>
   </data>
-  <data name="MenuStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>763, 0</value>
+  </metadata>
+  <data name="SettingStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>220, 22</value>
   </data>
-  <data name="MenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>461, 24</value>
+  <data name="SettingStripMenuItem.Text" xml:space="preserve">
+    <value>設定(&amp;O)...</value>
   </data>
-  <data name="MenuStrip1.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
+  <data name="ToolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
+    <value>217, 6</value>
   </data>
-  <data name="MenuStrip1.Text" xml:space="preserve">
-    <value>MenuStrip1</value>
+  <data name="SaveLogMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>220, 22</value>
   </data>
-  <data name="&gt;&gt;MenuStrip1.Name" xml:space="preserve">
-    <value>MenuStrip1</value>
+  <data name="SaveLogMenuItem.Text" xml:space="preserve">
+    <value>ファイル保存(&amp;S)...</value>
   </data>
-  <data name="&gt;&gt;MenuStrip1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="ToolStripSeparator17.Size" type="System.Drawing.Size, System.Drawing">
+    <value>217, 6</value>
   </data>
-  <data name="&gt;&gt;MenuStrip1.Parent" xml:space="preserve">
-    <value>ToolStripContainer1.TopToolStripPanel</value>
+  <data name="NewPostPopMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>220, 22</value>
   </data>
-  <data name="&gt;&gt;MenuStrip1.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="NewPostPopMenuItem.Text" xml:space="preserve">
+    <value>新着通知(&amp;Q)</value>
   </data>
-  <data name="&gt;&gt;ToolStripContainer1.TopToolStripPanel.Name" xml:space="preserve">
-    <value>ToolStripContainer1.TopToolStripPanel</value>
+  <data name="PlaySoundMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>220, 22</value>
   </data>
-  <data name="&gt;&gt;ToolStripContainer1.TopToolStripPanel.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="PlaySoundMenuItem.Text" xml:space="preserve">
+    <value>サウンド再生</value>
   </data>
-  <data name="&gt;&gt;ToolStripContainer1.TopToolStripPanel.Parent" xml:space="preserve">
-    <value>ToolStripContainer1</value>
+  <data name="ListLockMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>220, 22</value>
   </data>
-  <data name="&gt;&gt;ToolStripContainer1.TopToolStripPanel.ZOrder" xml:space="preserve">
-    <value>3</value>
+  <data name="ListLockMenuItem.Text" xml:space="preserve">
+    <value>新着時リスト固定(&amp;L)</value>
   </data>
-  <data name="&gt;&gt;ToolStripContainer1.Name" xml:space="preserve">
-    <value>ToolStripContainer1</value>
-  </data>
-  <data name="&gt;&gt;ToolStripContainer1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ToolStripContainer1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;ToolStripContainer1.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <metadata name="ContextMenuStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 82</value>
-  </metadata>
-  <data name="ContextMenuStrip3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>121, 54</value>
-  </data>
-  <data name="&gt;&gt;ContextMenuStrip3.Name" xml:space="preserve">
-    <value>ContextMenuStrip3</value>
-  </data>
-  <data name="&gt;&gt;ContextMenuStrip3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="UserPicture.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>Off</value>
-  </data>
-  <data name="UserPicture.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
-  </data>
-  <data name="UserPicture.Size" type="System.Drawing.Size, System.Drawing">
-    <value>50, 50</value>
-  </data>
-  <data name="UserPicture.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
-    <value>Zoom</value>
-  </data>
-  <data name="UserPicture.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="&gt;&gt;UserPicture.Name" xml:space="preserve">
-    <value>UserPicture</value>
-  </data>
-  <data name="&gt;&gt;UserPicture.Type" xml:space="preserve">
-    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;UserPicture.Parent" xml:space="preserve">
-    <value>TableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;UserPicture.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="IconNameToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 22</value>
-  </data>
-  <data name="IconNameToolStripMenuItem.Text" xml:space="preserve">
-    <value>IconName</value>
-  </data>
-  <data name="ToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>117, 6</value>
-  </data>
-  <data name="SaveIconPictureToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 22</value>
-  </data>
-  <data name="SaveIconPictureToolStripMenuItem.Text" xml:space="preserve">
-    <value>保存(&amp;I)...</value>
-  </data>
-  <data name="NameLabel.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="NameLabel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="NameLabel.Font" type="System.Drawing.Font, System.Drawing">
-    <value>MS UI Gothic, 9pt, style=Bold</value>
-  </data>
-  <data name="NameLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>Off</value>
-  </data>
-  <data name="NameLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>59, 3</value>
-  </data>
-  <data name="NameLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 3, 3, 0</value>
-  </data>
-  <data name="NameLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>266, 14</value>
-  </data>
-  <data name="NameLabel.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="NameLabel.Text" xml:space="preserve">
-    <value>LblName</value>
-  </data>
-  <data name="NameLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleLeft</value>
-  </data>
-  <data name="&gt;&gt;NameLabel.Name" xml:space="preserve">
-    <value>NameLabel</value>
-  </data>
-  <data name="&gt;&gt;NameLabel.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;NameLabel.Parent" xml:space="preserve">
-    <value>TableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;NameLabel.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <metadata name="ContextMenuStrip4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>337, 7</value>
-  </metadata>
-  <data name="ContextMenuStrip4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>167, 170</value>
-  </data>
-  <data name="&gt;&gt;ContextMenuStrip4.Name" xml:space="preserve">
-    <value>ContextMenuStrip4</value>
-  </data>
-  <data name="&gt;&gt;ContextMenuStrip4.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="PostBrowser.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="PostBrowser.Location" type="System.Drawing.Point, System.Drawing">
-    <value>59, 20</value>
-  </data>
-  <data name="PostBrowser.Size" type="System.Drawing.Size, System.Drawing">
-    <value>395, 82</value>
-  </data>
-  <data name="PostBrowser.TabIndex" type="System.Int32, mscorlib">
-    <value>12</value>
-  </data>
-  <data name="&gt;&gt;PostBrowser.Name" xml:space="preserve">
-    <value>PostBrowser</value>
-  </data>
-  <data name="&gt;&gt;PostBrowser.Type" xml:space="preserve">
-    <value>System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;PostBrowser.Parent" xml:space="preserve">
-    <value>TableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;PostBrowser.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="ToolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 22</value>
-  </data>
-  <data name="ToolStripMenuItem2.Text" xml:space="preserve">
-    <value>選択文字列で検索</value>
-  </data>
-  <data name="SearchItem2ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>145, 22</value>
-  </data>
-  <data name="SearchItem2ToolStripMenuItem.Text" xml:space="preserve">
-    <value>Google</value>
-  </data>
-  <data name="SearchItem1ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>145, 22</value>
-  </data>
-  <data name="SearchItem1ToolStripMenuItem.Text" xml:space="preserve">
-    <value>Wikipedia</value>
-  </data>
-  <data name="SearchItem3ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>145, 22</value>
-  </data>
-  <data name="SearchItem3ToolStripMenuItem.Text" xml:space="preserve">
-    <value>Twitter検索</value>
-  </data>
-  <data name="SearchItem4ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>145, 22</value>
-  </data>
-  <data name="SearchItem4ToolStripMenuItem.Text" xml:space="preserve">
-    <value>Twitter Search</value>
-  </data>
-  <data name="CurrentTabToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>145, 22</value>
-  </data>
-  <data name="CurrentTabToolStripMenuItem.Text" xml:space="preserve">
-    <value>現在のタブ</value>
-  </data>
-  <data name="ToolStripSeparator13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>163, 6</value>
-  </data>
-  <data name="ToolStripMenuItem3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 22</value>
-  </data>
-  <data name="ToolStripMenuItem3.Text" xml:space="preserve">
-    <value>選択文字列をコピー</value>
-  </data>
-  <data name="ToolStripMenuItem4.Enabled" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="ToolStripMenuItem4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 22</value>
-  </data>
-  <data name="ToolStripMenuItem4.Text" xml:space="preserve">
-    <value>URLをコピー</value>
-  </data>
-  <data name="ToolStripMenuItem5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 22</value>
-  </data>
-  <data name="ToolStripMenuItem5.Text" xml:space="preserve">
-    <value>すべて選択</value>
-  </data>
-  <data name="ToolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>163, 6</value>
-  </data>
-  <data name="FollowContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 22</value>
-  </data>
-  <data name="FollowContextMenuItem.Text" xml:space="preserve">
-    <value>Follow</value>
-  </data>
-  <data name="RemoveContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 22</value>
-  </data>
-  <data name="RemoveContextMenuItem.Text" xml:space="preserve">
-    <value>Remove</value>
-  </data>
-  <data name="FriendshipContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 22</value>
-  </data>
-  <data name="FriendshipContextMenuItem.Text" xml:space="preserve">
-    <value>ShowFriendship</value>
-  </data>
-  <data name="DateTimeLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Bottom, Right</value>
-  </data>
-  <data name="DateTimeLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>Off</value>
-  </data>
-  <data name="DateTimeLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>331, 3</value>
-  </data>
-  <data name="DateTimeLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 3, 3, 0</value>
-  </data>
-  <data name="DateTimeLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>123, 14</value>
-  </data>
-  <data name="DateTimeLabel.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
-  </data>
-  <data name="DateTimeLabel.Text" xml:space="preserve">
-    <value>Label1</value>
-  </data>
-  <data name="DateTimeLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleRight</value>
-  </data>
-  <data name="&gt;&gt;DateTimeLabel.Name" xml:space="preserve">
-    <value>DateTimeLabel</value>
-  </data>
-  <data name="&gt;&gt;DateTimeLabel.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;DateTimeLabel.Parent" xml:space="preserve">
-    <value>TableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;DateTimeLabel.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>763, 0</value>
-  </metadata>
-  <data name="SettingStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>220, 22</value>
-  </data>
-  <data name="SettingStripMenuItem.Text" xml:space="preserve">
-    <value>設定(&amp;O)...</value>
-  </data>
-  <data name="ToolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>217, 6</value>
-  </data>
-  <data name="SaveLogMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>220, 22</value>
-  </data>
-  <data name="SaveLogMenuItem.Text" xml:space="preserve">
-    <value>ファイル保存(&amp;S)...</value>
-  </data>
-  <data name="ToolStripSeparator17.Size" type="System.Drawing.Size, System.Drawing">
-    <value>217, 6</value>
-  </data>
-  <data name="NewPostPopMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>220, 22</value>
-  </data>
-  <data name="NewPostPopMenuItem.Text" xml:space="preserve">
-    <value>新着通知(&amp;Q)</value>
-  </data>
-  <data name="PlaySoundMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>220, 22</value>
-  </data>
-  <data name="PlaySoundMenuItem.Text" xml:space="preserve">
-    <value>サウンド再生</value>
-  </data>
-  <data name="ListLockMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>220, 22</value>
-  </data>
-  <data name="ListLockMenuItem.Text" xml:space="preserve">
-    <value>新着時リスト固定(&amp;L)</value>
-  </data>
-  <data name="ToolStripSeparator15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>217, 6</value>
+  <data name="ToolStripSeparator15.Size" type="System.Drawing.Size, System.Drawing">
+    <value>217, 6</value>
   </data>
   <data name="MultiLineMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
     <value>Ctrl+T</value>
@@ -1047,12 +951,6 @@
   <data name="MenuItemFile.Text" xml:space="preserve">
     <value>ファイル(&amp;F)</value>
   </data>
-  <data name="MenuItemEdit.Size" type="System.Drawing.Size, System.Drawing">
-    <value>56, 20</value>
-  </data>
-  <data name="MenuItemEdit.Text" xml:space="preserve">
-    <value>編集(&amp;E)</value>
-  </data>
   <data name="CopySTOTMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>214, 22</value>
   </data>
@@ -1095,6 +993,12 @@
   <data name="MenuItemSearchPrev.Text" xml:space="preserve">
     <value>前を検索(&amp;P)</value>
   </data>
+  <data name="MenuItemEdit.Size" type="System.Drawing.Size, System.Drawing">
+    <value>56, 20</value>
+  </data>
+  <data name="MenuItemEdit.Text" xml:space="preserve">
+    <value>編集(&amp;E)</value>
+  </data>
   <metadata name="ContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>930, 0</value>
   </metadata>
@@ -1117,133 +1021,61 @@
     <value>@返信ALL</value>
   </data>
   <data name="DMStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Ctrl+M</value>
-  </data>
-  <data name="DMStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>236, 22</value>
-  </data>
-  <data name="DMStripMenuItem.Text" xml:space="preserve">
-    <value>DM送信(&amp;M)</value>
-  </data>
-  <data name="ReTweetOriginalStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Alt+R</value>
-  </data>
-  <data name="ReTweetOriginalStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>236, 22</value>
-  </data>
-  <data name="ReTweetOriginalStripMenuItem.Text" xml:space="preserve">
-    <value>ReTweet</value>
-  </data>
-  <data name="ReTweetStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Alt+Shift+R</value>
-  </data>
-  <data name="ReTweetStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>236, 22</value>
-  </data>
-  <data name="ReTweetStripMenuItem.Text" xml:space="preserve">
-    <value>ReTweet(Unofficial)</value>
-  </data>
-  <data name="QuoteStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Ctrl+Q</value>
-  </data>
-  <data name="QuoteStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>236, 22</value>
-  </data>
-  <data name="QuoteStripMenuItem.Text" xml:space="preserve">
-    <value>Quote</value>
-  </data>
-  <data name="ToolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 6</value>
-  </data>
-  <data name="FavAddToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Ctrl+S</value>
-  </data>
-  <data name="FavAddToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>236, 22</value>
-  </data>
-  <data name="FavAddToolStripMenuItem.Text" xml:space="preserve">
-    <value>Fav追加(&amp;F)</value>
-  </data>
-  <data name="FavRemoveToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Ctrl+Shift+S</value>
-  </data>
-  <data name="FavRemoveToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>236, 22</value>
-  </data>
-  <data name="FavRemoveToolStripMenuItem.Text" xml:space="preserve">
-    <value>Fav削除</value>
-  </data>
-  <data name="ToolStripMenuItem6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>236, 22</value>
-  </data>
-  <data name="ToolStripMenuItem6.Text" xml:space="preserve">
-    <value>開く</value>
-  </data>
-  <data name="ToolStripMenuItem7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>236, 22</value>
-  </data>
-  <data name="ToolStripMenuItem7.Text" xml:space="preserve">
-    <value>振り分けルール作成</value>
-  </data>
-  <data name="ToolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 6</value>
-  </data>
-  <data name="ToolStripMenuItem11.Size" type="System.Drawing.Size, System.Drawing">
-    <value>236, 22</value>
-  </data>
-  <data name="ToolStripMenuItem11.Text" xml:space="preserve">
-    <value>未読状態変更</value>
+    <value>Ctrl+M</value>
   </data>
-  <data name="JumpUnreadMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="DMStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>236, 22</value>
   </data>
-  <data name="JumpUnreadMenuItem.Text" xml:space="preserve">
-    <value>未読へジャンプ</value>
-  </data>
-  <data name="ToolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 6</value>
+  <data name="DMStripMenuItem.Text" xml:space="preserve">
+    <value>DM送信(&amp;M)</value>
   </data>
-  <data name="SelectAllMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Ctrl+A</value>
+  <data name="ReTweetOriginalStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Alt+R</value>
   </data>
-  <data name="SelectAllMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="ReTweetOriginalStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>236, 22</value>
   </data>
-  <data name="SelectAllMenuItem.Text" xml:space="preserve">
-    <value>全て選択(&amp;A)</value>
+  <data name="ReTweetOriginalStripMenuItem.Text" xml:space="preserve">
+    <value>ReTweet</value>
   </data>
-  <data name="DeleteStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Ctrl+D</value>
+  <data name="ReTweetStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Alt+Shift+R</value>
   </data>
-  <data name="DeleteStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="ReTweetStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>236, 22</value>
   </data>
-  <data name="DeleteStripMenuItem.Text" xml:space="preserve">
-    <value>削除(&amp;D)</value>
+  <data name="ReTweetStripMenuItem.Text" xml:space="preserve">
+    <value>ReTweet(Unofficial)</value>
   </data>
-  <data name="RefreshStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>F5</value>
+  <data name="QuoteStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Ctrl+Q</value>
   </data>
-  <data name="RefreshStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="QuoteStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>236, 22</value>
   </data>
-  <data name="RefreshStripMenuItem.Text" xml:space="preserve">
-    <value>更新(&amp;U)</value>
+  <data name="QuoteStripMenuItem.Text" xml:space="preserve">
+    <value>Quote</value>
   </data>
-  <data name="ContextMenuStrip2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>237, 352</value>
+  <data name="ToolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>233, 6</value>
   </data>
-  <data name="&gt;&gt;ContextMenuStrip2.Name" xml:space="preserve">
-    <value>ContextMenuStrip2</value>
+  <data name="FavAddToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Ctrl+S</value>
   </data>
-  <data name="&gt;&gt;ContextMenuStrip2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="FavAddToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>236, 22</value>
   </data>
-  <data name="MenuItemOperate.Size" type="System.Drawing.Size, System.Drawing">
-    <value>57, 20</value>
+  <data name="FavAddToolStripMenuItem.Text" xml:space="preserve">
+    <value>Fav追加(&amp;F)</value>
   </data>
-  <data name="MenuItemOperate.Text" xml:space="preserve">
-    <value>操作(&amp;O)</value>
+  <data name="FavRemoveToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Ctrl+Shift+S</value>
+  </data>
+  <data name="FavRemoveToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>236, 22</value>
+  </data>
+  <data name="FavRemoveToolStripMenuItem.Text" xml:space="preserve">
+    <value>Fav削除</value>
   </data>
   <data name="MoveToHomeToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
     <value>Ctrl+H</value>
@@ -1299,6 +1131,12 @@
   <data name="OpenURLMenuItem.Text" xml:space="preserve">
     <value>発言内URLを開く(&amp;U)</value>
   </data>
+  <data name="ToolStripMenuItem6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>236, 22</value>
+  </data>
+  <data name="ToolStripMenuItem6.Text" xml:space="preserve">
+    <value>開く</value>
+  </data>
   <data name="TabMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>205, 22</value>
   </data>
@@ -1311,6 +1149,15 @@
   <data name="IDRuleMenuItem.Text" xml:space="preserve">
     <value>ID振り分けルール作成...</value>
   </data>
+  <data name="ToolStripMenuItem7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>236, 22</value>
+  </data>
+  <data name="ToolStripMenuItem7.Text" xml:space="preserve">
+    <value>振り分けルール作成</value>
+  </data>
+  <data name="ToolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>233, 6</value>
+  </data>
   <data name="ReadedStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
     <value>Ctrl+B</value>
   </data>
@@ -1329,17 +1176,62 @@
   <data name="UnreadStripMenuItem.Text" xml:space="preserve">
     <value>未読にする</value>
   </data>
-  <data name="MenuItemCommand.Size" type="System.Drawing.Size, System.Drawing">
-    <value>88, 20</value>
+  <data name="ToolStripMenuItem11.Size" type="System.Drawing.Size, System.Drawing">
+    <value>236, 22</value>
   </data>
-  <data name="MenuItemCommand.Text" xml:space="preserve">
-    <value>その他機能(&amp;C)</value>
+  <data name="ToolStripMenuItem11.Text" xml:space="preserve">
+    <value>未読状態変更</value>
   </data>
-  <data name="TinyUrlConvertToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+  <data name="JumpUnreadMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>236, 22</value>
   </data>
-  <data name="TinyUrlConvertToolStripMenuItem.Text" xml:space="preserve">
-    <value>入力欄のURLを短縮変換</value>
+  <data name="JumpUnreadMenuItem.Text" xml:space="preserve">
+    <value>未読へジャンプ</value>
+  </data>
+  <data name="ToolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
+    <value>233, 6</value>
+  </data>
+  <data name="SelectAllMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Ctrl+A</value>
+  </data>
+  <data name="SelectAllMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>236, 22</value>
+  </data>
+  <data name="SelectAllMenuItem.Text" xml:space="preserve">
+    <value>全て選択(&amp;A)</value>
+  </data>
+  <data name="DeleteStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Ctrl+D</value>
+  </data>
+  <data name="DeleteStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>236, 22</value>
+  </data>
+  <data name="DeleteStripMenuItem.Text" xml:space="preserve">
+    <value>削除(&amp;D)</value>
+  </data>
+  <data name="RefreshStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>F5</value>
+  </data>
+  <data name="RefreshStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>236, 22</value>
+  </data>
+  <data name="RefreshStripMenuItem.Text" xml:space="preserve">
+    <value>更新(&amp;U)</value>
+  </data>
+  <data name="ContextMenuStrip2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>237, 352</value>
+  </data>
+  <data name="&gt;&gt;ContextMenuStrip2.Name" xml:space="preserve">
+    <value>ContextMenuStrip2</value>
+  </data>
+  <data name="&gt;&gt;ContextMenuStrip2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="MenuItemOperate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>57, 20</value>
+  </data>
+  <data name="MenuItemOperate.Text" xml:space="preserve">
+    <value>操作(&amp;O)</value>
   </data>
   <data name="UrlConvertAutoToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
     <value>Ctrl+L</value>
@@ -1395,11 +1287,11 @@
   <data name="JmpStripMenuItem.Text" xml:space="preserve">
     <value>j.mp</value>
   </data>
-  <data name="UpdateFollowersMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="TinyUrlConvertToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>195, 22</value>
   </data>
-  <data name="UpdateFollowersMenuItem1.Text" xml:space="preserve">
-    <value>片思いユーザーリスト取得</value>
+  <data name="TinyUrlConvertToolStripMenuItem.Text" xml:space="preserve">
+    <value>入力欄のURLを短縮変換</value>
   </data>
   <data name="GetFollowersDiffToolStripMenuItem.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -1416,11 +1308,11 @@
   <data name="GetFollowersAllToolStripMenuItem.Text" xml:space="preserve">
     <value>全て再取得</value>
   </data>
-  <data name="ToolStripMenuItem10.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="UpdateFollowersMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
     <value>195, 22</value>
   </data>
-  <data name="ToolStripMenuItem10.Text" xml:space="preserve">
-    <value>BlackFav</value>
+  <data name="UpdateFollowersMenuItem1.Text" xml:space="preserve">
+    <value>片思いユーザーリスト取得</value>
   </data>
   <data name="BlackFavAddToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>157, 22</value>
@@ -1428,6 +1320,12 @@
   <data name="BlackFavAddToolStripMenuItem.Text" xml:space="preserve">
     <value>BlackFav追加(&amp;F)</value>
   </data>
+  <data name="ToolStripMenuItem10.Size" type="System.Drawing.Size, System.Drawing">
+    <value>195, 22</value>
+  </data>
+  <data name="ToolStripMenuItem10.Text" xml:space="preserve">
+    <value>BlackFav</value>
+  </data>
   <data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
     <value>192, 6</value>
   </data>
@@ -1458,11 +1356,11 @@
   <data name="OwnStatusMenuItem.Text" xml:space="preserve">
     <value>Show your status</value>
   </data>
-  <data name="MenuItemHelp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>62, 20</value>
+  <data name="MenuItemCommand.Size" type="System.Drawing.Size, System.Drawing">
+    <value>88, 20</value>
   </data>
-  <data name="MenuItemHelp.Text" xml:space="preserve">
-    <value>ã\83\98ã\83«ã\83\97(&amp;H)</value>
+  <data name="MenuItemCommand.Text" xml:space="preserve">
+    <value>ã\81\9dã\81®ä»\96æ©\9fè\83½(&amp;C)</value>
   </data>
   <data name="MatomeMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
     <value>F1</value>
@@ -1512,6 +1410,18 @@
   <data name="AboutMenuItem.Text" xml:space="preserve">
     <value>Tweenについて(&amp;A)...</value>
   </data>
+  <data name="DumpPostClassToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>159, 22</value>
+  </data>
+  <data name="DumpPostClassToolStripMenuItem.Text" xml:space="preserve">
+    <value>PostClassのダンプ</value>
+  </data>
+  <data name="TraceOutToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>159, 22</value>
+  </data>
+  <data name="TraceOutToolStripMenuItem.Text" xml:space="preserve">
+    <value>TraceOut出力</value>
+  </data>
   <data name="DebugModeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>191, 22</value>
   </data>
@@ -1521,30 +1431,63 @@
   <data name="DebugModeToolStripMenuItem.Visible" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <data name="DumpPostClassToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>159, 22</value>
+  <data name="MenuItemHelp.Size" type="System.Drawing.Size, System.Drawing">
+    <value>62, 20</value>
   </data>
-  <data name="DumpPostClassToolStripMenuItem.Text" xml:space="preserve">
-    <value>PostClassのダンプ</value>
+  <data name="MenuItemHelp.Text" xml:space="preserve">
+    <value>ヘルプ(&amp;H)</value>
   </data>
-  <data name="TraceOutToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>159, 22</value>
+  <data name="MenuStrip1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
   </data>
-  <data name="TraceOutToolStripMenuItem.Text" xml:space="preserve">
-    <value>TraceOut出力</value>
+  <data name="MenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>461, 24</value>
   </data>
-  <metadata name="ContextMenuStripPostMode.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>120, 0</value>
-  </metadata>
-  <data name="ContextMenuStripPostMode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 92</value>
+  <data name="MenuStrip1.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
   </data>
-  <data name="&gt;&gt;ContextMenuStripPostMode.Name" xml:space="preserve">
-    <value>ContextMenuStripPostMode</value>
+  <data name="MenuStrip1.Text" xml:space="preserve">
+    <value>MenuStrip1</value>
   </data>
-  <data name="&gt;&gt;ContextMenuStripPostMode.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;MenuStrip1.Name" xml:space="preserve">
+    <value>MenuStrip1</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip1.Parent" xml:space="preserve">
+    <value>ToolStripContainer1.TopToolStripPanel</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;ToolStripContainer1.TopToolStripPanel.Name" xml:space="preserve">
+    <value>ToolStripContainer1.TopToolStripPanel</value>
+  </data>
+  <data name="&gt;&gt;ToolStripContainer1.TopToolStripPanel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;ToolStripContainer1.TopToolStripPanel.Parent" xml:space="preserve">
+    <value>ToolStripContainer1</value>
+  </data>
+  <data name="&gt;&gt;ToolStripContainer1.TopToolStripPanel.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;ToolStripContainer1.Name" xml:space="preserve">
+    <value>ToolStripContainer1</value>
+  </data>
+  <data name="&gt;&gt;ToolStripContainer1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;ToolStripContainer1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;ToolStripContainer1.ZOrder" xml:space="preserve">
+    <value>6</value>
   </data>
+  <metadata name="ContextMenuStripPostMode.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>120, 0</value>
+  </metadata>
   <data name="ToolStripMenuItemUrlMultibyteSplit.Size" type="System.Drawing.Size, System.Drawing">
     <value>231, 22</value>
   </data>
@@ -1569,6 +1512,15 @@
   <data name="IdeographicSpaceToSpaceToolStripMenuItem.Text" xml:space="preserve">
     <value>全角スペースを半角スペースにする</value>
   </data>
+  <data name="ContextMenuStripPostMode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>232, 92</value>
+  </data>
+  <data name="&gt;&gt;ContextMenuStripPostMode.Name" xml:space="preserve">
+    <value>ContextMenuStripPostMode</value>
+  </data>
+  <data name="&gt;&gt;ContextMenuStripPostMode.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <metadata name="TimerTimeline.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>504, 0</value>
   </metadata>
diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index e9cc4fa..1493f98 100644 (file)
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -962,7 +962,7 @@ Public Class TweenMain
         e.Graphics.DrawString(txt, e.Font, fore, e.Bounds, sfTab)
     End Sub
 
-    Private Function LoadConfig() As Boolean
+    Private Function LoadOldConfig() As Boolean
         Dim needToSave As Boolean = False
         _cfgCommon = SettingCommon.Load()
         _cfgLocal = SettingLocal.Load()
@@ -1001,8 +1001,29 @@ Public Class TweenMain
         End If
     End Function
 
+    Private Sub LoadConfig()
+        Dim needToSave As Boolean = False
+        _cfgCommon = SettingCommon.Load()
+        _cfgLocal = SettingLocal.Load()
+        Dim tabs As List(Of TabClass) = SettingTabs.Load().Tabs
+        For Each tb As TabClass In tabs
+            _statuses.Tabs.Add(tb.TabName, tb)
+        Next
+        If _statuses.Tabs.Count = 0 Then
+            _statuses.AddTab(DEFAULTTAB.RECENT, TabUsageType.Home)
+            _statuses.AddTab(DEFAULTTAB.REPLY, TabUsageType.Mentions)
+            _statuses.AddTab(DEFAULTTAB.DM, TabUsageType.DirectMessage)
+            _statuses.AddTab(DEFAULTTAB.FAV, TabUsageType.Favorites)
+        End If
+    End Sub
+
     Private Sub ConvertConfig()
-        If LoadConfig() Then Exit Sub
+        '新タブ設定ファイル存在チェック
+        If System.IO.File.Exists(SettingTabs.GetSettingFilePath("")) Then
+            LoadConfig()
+            Exit Sub
+        End If
+        If LoadOldConfig() Then Exit Sub
 
         '_cfg = SettingToConfig.Load()
         'If _cfg Is Nothing Then Exit Sub
@@ -2090,7 +2111,7 @@ Public Class TweenMain
                 urlUndoBuffer = Nothing
                 UrlUndoToolStripMenuItem.Enabled = False  'Undoをできないように設定
 
-                If rslt.retMsg.Length > 0 AndAlso Not rslt.retMsg.StartsWith("Outputz") AndAlso Not rslt.retMsg <> "OK:Delaying?" Then
+                If rslt.retMsg.Length > 0 AndAlso Not rslt.retMsg.StartsWith("Outputz") AndAlso rslt.retMsg <> "OK:Delaying?" Then
                     StatusLabel.Text = rslt.retMsg
                 Else
                     _postTimestamps.Add(Now)
@@ -3813,6 +3834,17 @@ RETRY:
         End If
         'If UserPicture.Image IsNot Nothing Then UserPicture.Image.Dispose()
         If _curPost.ImageIndex > -1 Then
+            Dim fd As New System.Drawing.Imaging.FrameDimension(TIconDic(_curPost.ImageUrl).FrameDimensionsList(0))
+            Dim fd_count As Integer = TIconDic(_curPost.ImageUrl).GetFrameCount(fd)
+            If fd_count > 1 Then
+                Try
+                    TIconDic(_curPost.ImageUrl).SelectActiveFrame(fd, 1)
+                Catch ex As Exception
+                    Dim bmp As New Bitmap(TIconDic(_curPost.ImageUrl))
+                    TIconDic(_curPost.ImageUrl).Dispose()
+                    TIconDic(_curPost.ImageUrl) = bmp
+                End Try
+            End If
             UserPicture.Image = TIconDic(_curPost.ImageUrl)
         Else
             UserPicture.Image = Nothing
@@ -4200,11 +4232,25 @@ RETRY:
             stp = -1
         End If
 
+        Dim name As String = ""
+        If _curPost.RetweetedId = 0 Then
+            name = _curPost.Name
+        Else
+            name = _curPost.RetweetedBy
+        End If
         For idx As Integer = fIdx To toIdx Step stp
-            If _statuses.Item(_curTab.Text, idx).Name = _curPost.Name Then
-                SelectListItem(_curList, idx)
-                _curList.EnsureVisible(idx)
-                Exit For
+            If _statuses.Item(_curTab.Text, idx).RetweetedId = 0 Then
+                If _statuses.Item(_curTab.Text, idx).Name = name Then
+                    SelectListItem(_curList, idx)
+                    _curList.EnsureVisible(idx)
+                    Exit For
+                End If
+            Else
+                If _statuses.Item(_curTab.Text, idx).RetweetedBy = name Then
+                    SelectListItem(_curList, idx)
+                    _curList.EnsureVisible(idx)
+                    Exit For
+                End If
             End If
         Next
     End Sub
@@ -4238,8 +4284,13 @@ RETRY:
         For idx As Integer = fIdx To toIdx Step stp
             Dim post As PostClass = _statuses.Item(_curTab.Text, idx)
             If post.Name = _anchorPost.Name OrElse _
+               post.RetweetedBy = _anchorPost.Name OrElse _
+               post.Name = _anchorPost.RetweetedBy OrElse _
+               (Not String.IsNullOrEmpty(post.RetweetedBy) AndAlso post.RetweetedBy = _anchorPost.RetweetedBy) OrElse _
                _anchorPost.ReplyToList.Contains(post.Name.ToLower()) OrElse _
-               post.ReplyToList.Contains(_anchorPost.Name.ToLower()) Then
+               _anchorPost.ReplyToList.Contains(post.RetweetedBy.ToLower()) OrElse _
+               post.ReplyToList.Contains(_anchorPost.Name.ToLower()) OrElse _
+               post.ReplyToList.Contains(_anchorPost.RetweetedBy.ToLower()) Then
                 SelectListItem(_curList, idx)
                 _curList.EnsureVisible(idx)
                 Exit For
@@ -4462,7 +4513,8 @@ RETRY:
         If Not ifModified Then
             SaveConfigsCommon()
             SaveConfigsLocal()
-            SaveConfigsTab(True)    'True:事前に設定ファイル削除
+            'SaveConfigsTab(True)    'True:事前に設定ファイル削除
+            SaveConfigsTabs()
         Else
             If modifySettingCommon Then SaveConfigsCommon()
             If modifySettingLocal Then SaveConfigsLocal()
@@ -4559,10 +4611,19 @@ RETRY:
                         _cfgCommon.SortColumn = 7
                 End Select
 
-                _cfgCommon.TabList.Clear()
-                For i As Integer = 0 To ListTab.TabPages.Count - 1
-                    _cfgCommon.TabList.Add(ListTab.TabPages(i).Text)
-                Next
+                '                _cfgCommon.TabList.Clear()
+                '                For i As Integer = 0 To ListTab.TabPages.Count - 1
+                '                    Dim tnList As String = ListTab.TabPages(i).Text
+                '                    Dim seq As Integer = 1
+                'RETRY:
+                '                    seq += 1
+                '                    For Each tn As String In _cfgCommon.TabList
+                '                        If tn.ToLower() = tnList.ToLower() Then
+                '                            tnList += "_" + seq.ToString()
+                '                        End If
+                '                    Next
+                '                    _cfgCommon.TabList.Add(ListTab.TabPages(i).Text)
+                '                Next
 
                 _cfgCommon.Save()
             End SyncLock
@@ -4614,26 +4675,34 @@ RETRY:
         End SyncLock
     End Sub
 
-    Private Sub SaveConfigsTab(ByVal DeleteBefore As Boolean)
-        If _ignoreConfigSave Then Exit Sub
-        Dim cnt As Integer = 0
-        If ListTab IsNot Nothing AndAlso _
-           ListTab.TabPages IsNot Nothing AndAlso _
-           ListTab.TabPages.Count > 0 Then
-            If DeleteBefore Then SettingTab.DeleteConfigFile() '旧設定ファイル削除
-            For cnt = 0 To ListTab.TabPages.Count - 1
-                SaveConfigsTab(ListTab.TabPages(cnt).Text)
-            Next
-        End If
-    End Sub
+    'Private Sub SaveConfigsTab(ByVal DeleteBefore As Boolean)
+    '    If _ignoreConfigSave Then Exit Sub
+    '    Dim cnt As Integer = 0
+    '    If ListTab IsNot Nothing AndAlso _
+    '       ListTab.TabPages IsNot Nothing AndAlso _
+    '       ListTab.TabPages.Count > 0 Then
+    '        If DeleteBefore Then SettingTab.DeleteConfigFile() '旧設定ファイル削除
+    '        For cnt = 0 To ListTab.TabPages.Count - 1
+    '            SaveConfigsTab(ListTab.TabPages(cnt).Text)
+    '        Next
+    '    End If
+    'End Sub
 
-    Private Sub SaveConfigsTab(ByVal tabName As String)
-        If _ignoreConfigSave Then Exit Sub
-        SyncLock _syncObject
-            Dim tabSetting As New SettingTab
-            tabSetting.Tab = _statuses.Tabs(tabName)
-            tabSetting.Save()
-        End SyncLock
+    'Private Sub SaveConfigsTab(ByVal tabName As String)
+    '    If _ignoreConfigSave Then Exit Sub
+    '    SyncLock _syncObject
+    '        Dim tabSetting As New SettingTab
+    '        tabSetting.Tab = _statuses.Tabs(tabName)
+    '        tabSetting.Save()
+    '    End SyncLock
+    'End Sub
+
+    Private Sub SaveConfigsTabs()
+        Dim tabSetting As New SettingTabs
+        For i As Integer = 0 To ListTab.TabPages.Count - 1
+            tabSetting.Tabs.Add(_statuses.Tabs(ListTab.TabPages(i).Text))
+        Next
+        tabSetting.Save()
     End Sub
 
     Private Sub SaveLogMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles SaveLogMenuItem.Click
@@ -4732,7 +4801,8 @@ RETRY:
                 End If
             Next
             SaveConfigsCommon()
-            SaveConfigsTab(newTabText)
+            'SaveConfigsTab(newTabText)
+            SaveConfigsTabs()
             _rclickTabName = newTabText
             tabName = newTabText
             Return True
@@ -5161,7 +5231,8 @@ RETRY:
 
         ChangeTabUnreadManage(_rclickTabName, UreadManageMenuItem.Checked)
 
-        SaveConfigsTab(_rclickTabName)
+        'SaveConfigsTab(_rclickTabName)
+        SaveConfigsTabs()
     End Sub
 
     Public Sub ChangeTabUnreadManage(ByVal tabName As String, ByVal isManage As Boolean)
@@ -5196,7 +5267,8 @@ RETRY:
 
         _statuses.Tabs(_rclickTabName).Notify = NotifyDispMenuItem.Checked
 
-        SaveConfigsTab(_rclickTabName)
+        'SaveConfigsTab(_rclickTabName)
+        SaveConfigsTabs()
     End Sub
 
     Private Sub SoundFileComboBox_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles SoundFileComboBox.SelectedIndexChanged
@@ -5204,7 +5276,8 @@ RETRY:
 
         _statuses.Tabs(_rclickTabName).SoundFile = DirectCast(SoundFileComboBox.SelectedItem, String)
 
-        SaveConfigsTab(_rclickTabName)
+        'SaveConfigsTab(_rclickTabName)
+        SaveConfigsTabs()
     End Sub
 
     Private Sub DeleteTabMenuItem_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles DeleteTabMenuItem.Click
@@ -5213,7 +5286,8 @@ RETRY:
         RemoveSpecifiedTab(_rclickTabName)
         _rclickTabName = ""
         SaveConfigsCommon()
-        SaveConfigsTab(False)
+        'SaveConfigsTab(False)
+        SaveConfigsTabs()
     End Sub
 
     Private Sub FilterEditMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles FilterEditMenuItem.Click
@@ -5248,7 +5322,8 @@ RETRY:
         Finally
             Me.Cursor = Cursors.Default
         End Try
-        SaveConfigsTab(False)
+        'SaveConfigsTab(False)
+        SaveConfigsTabs()
     End Sub
 
     Private Sub AddTabMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles AddTabMenuItem.Click
@@ -5267,7 +5342,8 @@ RETRY:
                 '成功
                 _statuses.AddTab(tabName, TabUsageType.UserDefined)
                 SaveConfigsCommon()
-                SaveConfigsTab(False)
+                'SaveConfigsTab(False)
+                SaveConfigsTabs()
             End If
         End If
     End Sub
@@ -5308,7 +5384,11 @@ RETRY:
                 End If
             Loop While True
             fDialog.SetCurrent(tabName)
-            fDialog.AddNewFilter(_statuses.Item(_curTab.Text, idx).Name, _statuses.Item(_curTab.Text, idx).Data)
+            If _statuses.Item(_curTab.Text, idx).RetweetedId = 0 Then
+                fDialog.AddNewFilter(_statuses.Item(_curTab.Text, idx).Name, _statuses.Item(_curTab.Text, idx).Data)
+            Else
+                fDialog.AddNewFilter(_statuses.Item(_curTab.Text, idx).RetweetedBy, _statuses.Item(_curTab.Text, idx).Data)
+            End If
             fDialog.ShowDialog()
             Me.TopMost = SettingDialog.AlwaysTop
         Next
@@ -5337,7 +5417,8 @@ RETRY:
             Me.Cursor = Cursors.Default
         End Try
         SaveConfigsCommon()
-        SaveConfigsTab(False)
+        'SaveConfigsTab(False)
+        SaveConfigsTabs()
     End Sub
 
     Protected Overrides Function ProcessDialogKey( _
@@ -5453,7 +5534,11 @@ RETRY:
             If Not ids.Contains(post.Name) Then
                 Dim fc As New FiltersClass
                 ids.Add(post.Name)
-                fc.NameFilter = post.Name
+                If post.RetweetedId = 0 Then
+                    fc.NameFilter = post.Name
+                Else
+                    fc.NameFilter = post.RetweetedBy
+                End If
                 fc.SearchBoth = True
                 fc.MoveFrom = mv
                 fc.SetMark = mk
@@ -5487,7 +5572,8 @@ RETRY:
             Me.Cursor = Cursors.Default
         End Try
         SaveConfigsCommon()
-        SaveConfigsTab(False)
+        'SaveConfigsTab(False)
+        SaveConfigsTabs()
     End Sub
 
     Private Sub CopySTOTMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles CopySTOTMenuItem.Click
diff --git a/Tween/Tween.vbproj b/Tween/Tween.vbproj
index b044a7d..11ab81d 100644 (file)
--- a/Tween/Tween.vbproj
+++ b/Tween/Tween.vbproj
@@ -146,6 +146,7 @@
     <Compile Include="Setting\SettingLocal.vb" />
     <Compile Include="Setting\SettingTab.vb" />
     <Compile Include="Setting\SettingFollower.vb" />
+    <Compile Include="Setting\SettingTabs.vb" />
     <Compile Include="ShieldIcon.vb" />
     <Compile Include="StatusDictionary.vb" />
     <Compile Include="FilterDialog.Designer.vb">
開発に使用するリポジトリ
About OSDN
Find Software
Develop Software
Help