タブ削除のUNDO

発言詳細のコンテキストメニューにアクセスキー追加
新着通知制限時の条件から、アプリケーションの非アクティブを削除
Outputzの設定変更が即時反映されないバグ修正
発言・fav削除時の応答がNot Foundだったら既に削除完了として処理する
RemoveをUnfollowと表記変更（一部のみ。要統一）

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

diff --git a/Tween/StatusDictionary.vb b/Tween/StatusDictionary.vb
index 7c026d6..1b234d7 100644 (file)
--- a/Tween/StatusDictionary.vb
+++ b/Tween/StatusDictionary.vb
@@ -353,6 +353,7 @@ Public NotInheritable Class TabInformations
     Private _statuses As New Dictionary(Of Long, PostClass)
     Private _addedIds As List(Of Long)
     Private _retweets As New Dictionary(Of Long, PostClass)
+    Private _removedTab As TabClass = Nothing
 
     '発言の追加
     'AddPost(複数回) -> DistributePosts          -> SubmitUpdate
@@ -403,10 +404,21 @@ Public NotInheritable Class TabInformations
                     If Not exist Then homeTab.Add(Id, _statuses(Id).IsRead, False)
                 Next
             End If
+            If _removedTab IsNot Nothing Then _removedTab = Nothing
+            _removedTab = _tabs(TabName)
             _tabs.Remove(TabName)
         End SyncLock
     End Sub
 
+    Public Property RemovedTab() As TabClass
+        Get
+            Return _removedTab
+        End Get
+        Set(ByVal value As TabClass)
+            _removedTab = value
+        End Set
+    End Property
+
     Public Function ContainsTab(ByVal TabText As String) As Boolean
         Return _tabs.ContainsKey(TabText)
     End Function

diff --git a/Tween/Tween.Designer.vb b/Tween/Tween.Designer.vb
index c532e18..e50bdda 100644 (file)
--- a/Tween/Tween.Designer.vb
+++ b/Tween/Tween.Designer.vb
@@ -43,7 +43,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
@@ -89,6 +88,8 @@ Partial Class TweenMain
         Me.ToolStripSeparator21 = New System.Windows.Forms.ToolStripSeparator
         Me.EndToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
         Me.MenuItemEdit = New System.Windows.Forms.ToolStripMenuItem
+        Me.UndoRemoveTabMenuItem = New System.Windows.Forms.ToolStripMenuItem
+        Me.ToolStripSeparator12 = New System.Windows.Forms.ToolStripSeparator
         Me.CopySTOTMenuItem = New System.Windows.Forms.ToolStripMenuItem
         Me.CopyURLMenuItem = New System.Windows.Forms.ToolStripMenuItem
         Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator
@@ -126,6 +127,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
@@ -329,12 +331,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
@@ -609,10 +605,20 @@ Partial Class TweenMain
         '
         'MenuItemEdit
         '
-        Me.MenuItemEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CopySTOTMenuItem, Me.CopyURLMenuItem, Me.ToolStripSeparator6, Me.MenuItemSubSearch, Me.MenuItemSearchNext, Me.MenuItemSearchPrev})
+        Me.MenuItemEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UndoRemoveTabMenuItem, Me.ToolStripSeparator12, Me.CopySTOTMenuItem, Me.CopyURLMenuItem, Me.ToolStripSeparator6, Me.MenuItemSubSearch, Me.MenuItemSearchNext, Me.MenuItemSearchPrev})
         Me.MenuItemEdit.Name = "MenuItemEdit"
         resources.ApplyResources(Me.MenuItemEdit, "MenuItemEdit")
         '
+        'UndoRemoveTabMenuItem
+        '
+        Me.UndoRemoveTabMenuItem.Name = "UndoRemoveTabMenuItem"
+        resources.ApplyResources(Me.UndoRemoveTabMenuItem, "UndoRemoveTabMenuItem")
+        '
+        'ToolStripSeparator12
+        '
+        Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
+        resources.ApplyResources(Me.ToolStripSeparator12, "ToolStripSeparator12")
+        '
         'CopySTOTMenuItem
         '
         Me.CopySTOTMenuItem.Name = "CopySTOTMenuItem"
@@ -805,6 +811,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})
@@ -1233,5 +1245,7 @@ Partial Class TweenMain
     Friend WithEvents RefreshMoreStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ToolStripSeparator8 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents HashSelectComboBox As System.Windows.Forms.ToolStripComboBox
+    Friend WithEvents UndoRemoveTabMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator12 As System.Windows.Forms.ToolStripSeparator
 
 End Class

diff --git a/Tween/Tween.en.resx b/Tween/Tween.en.resx
index cb5528c..19ef1bf 100644 (file)
--- a/Tween/Tween.en.resx
+++ b/Tween/Tween.en.resx
@@ -118,6 +118,9 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="ContextMenuTabProperty.Size" type="System.Drawing.Size, System.Drawing">
+    <value>193, 206</value>
+  </data>
   <data name="AddTabMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>192, 22</value>
   </data>
@@ -172,14 +175,8 @@
   <data name="DeleteTabMenuItem.Text" xml:space="preserve">
     <value>&amp;Delete This Tab</value>
   </data>
-  <data name="MenuItemTab.Size" type="System.Drawing.Size, System.Drawing">
-    <value>36, 20</value>
-  </data>
-  <data name="MenuItemTab.Text" xml:space="preserve">
-    <value>&amp;Tab</value>
-  </data>
-  <data name="ContextMenuTabProperty.Size" type="System.Drawing.Size, System.Drawing">
-    <value>193, 206</value>
+  <data name="ContextMenuStrip3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>127, 54</value>
   </data>
   <data name="IconNameToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>126, 22</value>
@@ -193,38 +190,11 @@
   <data name="SaveIconPictureToolStripMenuItem.Text" xml:space="preserve">
     <value>Save &amp;Icon...</value>
   </data>
-  <data name="ContextMenuStrip3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>127, 54</value>
-  </data>
-  <data name="SearchItem2ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>249, 22</value>
-  </data>
-  <data name="SearchItem1ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>249, 22</value>
-  </data>
-  <data name="SearchItem3ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>249, 22</value>
-  </data>
-  <data name="SearchItem3ToolStripMenuItem.Text" xml:space="preserve">
-    <value>Twitter Search</value>
-  </data>
-  <data name="SearchItem4ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>249, 22</value>
-  </data>
-  <data name="SearchItem4ToolStripMenuItem.Text" xml:space="preserve">
-    <value>Twitter Search (search.twitter.com)</value>
-  </data>
-  <data name="CurrentTabToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>249, 22</value>
-  </data>
-  <data name="CurrentTabToolStripMenuItem.Text" xml:space="preserve">
-    <value>Current Tab</value>
-  </data>
   <data name="ToolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">
     <value>235, 22</value>
   </data>
   <data name="ToolStripMenuItem2.Text" xml:space="preserve">
-    <value>Search for Selected String From</value>
+    <value>&amp;Search for Selected String From</value>
   </data>
   <data name="ToolStripSeparator13.Size" type="System.Drawing.Size, System.Drawing">
     <value>232, 6</value>
@@ -233,19 +203,19 @@
     <value>235, 22</value>
   </data>
   <data name="ToolStripMenuItem3.Text" xml:space="preserve">
-    <value>Copy</value>
+    <value>&amp;Copy</value>
   </data>
   <data name="ToolStripMenuItem4.Size" type="System.Drawing.Size, System.Drawing">
     <value>235, 22</value>
   </data>
   <data name="ToolStripMenuItem4.Text" xml:space="preserve">
-    <value>Copy shortcut</value>
+    <value>Copy &amp;URL</value>
   </data>
   <data name="ToolStripMenuItem5.Size" type="System.Drawing.Size, System.Drawing">
     <value>235, 22</value>
   </data>
   <data name="ToolStripMenuItem5.Text" xml:space="preserve">
-    <value>Select All</value>
+    <value>Select &amp;All</value>
   </data>
   <data name="ToolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing">
     <value>232, 6</value>
@@ -253,15 +223,54 @@
   <data name="FollowContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>235, 22</value>
   </data>
+  <data name="FollowContextMenuItem.Text" xml:space="preserve">
+    <value>&amp;Follow</value>
+  </data>
   <data name="RemoveContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>235, 22</value>
   </data>
+  <data name="RemoveContextMenuItem.Text" xml:space="preserve">
+    <value>&amp;Unfollow</value>
+  </data>
   <data name="FriendshipContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>235, 22</value>
   </data>
+  <data name="FriendshipContextMenuItem.Text" xml:space="preserve">
+    <value>S&amp;howFriendship</value>
+  </data>
   <data name="ContextMenuStrip4.Size" type="System.Drawing.Size, System.Drawing">
     <value>236, 170</value>
   </data>
+  <data name="SearchItem2ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>249, 22</value>
+  </data>
+  <data name="SearchItem2ToolStripMenuItem.Text" xml:space="preserve">
+    <value>&amp;Google</value>
+  </data>
+  <data name="SearchItem1ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>249, 22</value>
+  </data>
+  <data name="SearchItem1ToolStripMenuItem.Text" xml:space="preserve">
+    <value>&amp;Wikipedia</value>
+  </data>
+  <data name="SearchItem3ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>249, 22</value>
+  </data>
+  <data name="SearchItem3ToolStripMenuItem.Text" xml:space="preserve">
+    <value>Twitter Search &amp;YATS</value>
+  </data>
+  <data name="SearchItem4ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>249, 22</value>
+  </data>
+  <data name="SearchItem4ToolStripMenuItem.Text" xml:space="preserve">
+    <value>Twitter &amp;Search (search.twitter.com)</value>
+  </data>
+  <data name="CurrentTabToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>249, 22</value>
+  </data>
+  <data name="CurrentTabToolStripMenuItem.Text" xml:space="preserve">
+    <value>Current Tab(&amp;Local)</value>
+  </data>
   <data name="SettingStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>188, 22</value>
   </data>
@@ -325,6 +334,18 @@
   <data name="MenuItemFile.Text" xml:space="preserve">
     <value>&amp;File</value>
   </data>
+  <data name="MenuItemEdit.Size" type="System.Drawing.Size, System.Drawing">
+    <value>37, 20</value>
+  </data>
+  <data name="MenuItemEdit.Text" xml:space="preserve">
+    <value>&amp;Edit</value>
+  </data>
+  <data name="UndoRemoveTabMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>188, 22</value>
+  </data>
+  <data name="ToolStripSeparator12.Size" type="System.Drawing.Size, System.Drawing">
+    <value>185, 6</value>
+  </data>
   <data name="CopySTOTMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>188, 22</value>
   </data>
@@ -358,12 +379,6 @@
   <data name="MenuItemSearchPrev.Text" xml:space="preserve">
     <value>Find &amp;Previous</value>
   </data>
-  <data name="MenuItemEdit.Size" type="System.Drawing.Size, System.Drawing">
-    <value>37, 20</value>
-  </data>
-  <data name="MenuItemEdit.Text" xml:space="preserve">
-    <value>&amp;Edit</value>
-  </data>
   <data name="ReplyStripMenuItem.Text" xml:space="preserve">
     <value>@ &amp;Reply</value>
   </data>
@@ -382,6 +397,36 @@
   <data name="FavRemoveToolStripMenuItem.Text" xml:space="preserve">
     <value>Unmark Favorite</value>
   </data>
+  <data name="ToolStripMenuItem6.Text" xml:space="preserve">
+    <value>Open as ...</value>
+  </data>
+  <data name="ToolStripMenuItem7.Text" xml:space="preserve">
+    <value>Make filter as ...</value>
+  </data>
+  <data name="ToolStripMenuItem11.Text" xml:space="preserve">
+    <value>Change unread state</value>
+  </data>
+  <data name="JumpUnreadMenuItem.Text" xml:space="preserve">
+    <value>Jump Next to read post</value>
+  </data>
+  <data name="SelectAllMenuItem.Text" xml:space="preserve">
+    <value>Select &amp;All</value>
+  </data>
+  <data name="DeleteStripMenuItem.Text" xml:space="preserve">
+    <value>&amp;Delete</value>
+  </data>
+  <data name="RefreshStripMenuItem.Text" xml:space="preserve">
+    <value>&amp;Update</value>
+  </data>
+  <data name="RefreshMoreStripMenuItem.Text" xml:space="preserve">
+    <value>GetMore</value>
+  </data>
+  <data name="MenuItemOperate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>66, 20</value>
+  </data>
+  <data name="MenuItemOperate.Text" xml:space="preserve">
+    <value>&amp;Operation</value>
+  </data>
   <data name="MoveToHomeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>230, 22</value>
   </data>
@@ -418,9 +463,6 @@
   <data name="OpenURLMenuItem.Text" xml:space="preserve">
     <value>Open Reffered &amp;URL</value>
   </data>
-  <data name="ToolStripMenuItem6.Text" xml:space="preserve">
-    <value>Open as ...</value>
-  </data>
   <data name="TabMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>166, 22</value>
   </data>
@@ -433,9 +475,6 @@
   <data name="IDRuleMenuItem.Text" xml:space="preserve">
     <value>Filter by ID...</value>
   </data>
-  <data name="ToolStripMenuItem7.Text" xml:space="preserve">
-    <value>Make filter as ...</value>
-  </data>
   <data name="ReadedStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>217, 22</value>
   </data>
@@ -448,29 +487,23 @@
   <data name="UnreadStripMenuItem.Text" xml:space="preserve">
     <value>Make Not Read</value>
   </data>
-  <data name="ToolStripMenuItem11.Text" xml:space="preserve">
-    <value>Change unread state</value>
-  </data>
-  <data name="JumpUnreadMenuItem.Text" xml:space="preserve">
-    <value>Jump Next to read post</value>
-  </data>
-  <data name="SelectAllMenuItem.Text" xml:space="preserve">
-    <value>Select &amp;All</value>
+  <data name="MenuItemTab.Size" type="System.Drawing.Size, System.Drawing">
+    <value>36, 20</value>
   </data>
-  <data name="DeleteStripMenuItem.Text" xml:space="preserve">
-    <value>&amp;Delete</value>
+  <data name="MenuItemTab.Text" xml:space="preserve">
+    <value>&amp;Tab</value>
   </data>
-  <data name="RefreshStripMenuItem.Text" xml:space="preserve">
-    <value>&amp;Update</value>
+  <data name="MenuItemCommand.Size" type="System.Drawing.Size, System.Drawing">
+    <value>67, 20</value>
   </data>
-  <data name="RefreshMoreStripMenuItem.Text" xml:space="preserve">
-    <value>GetMore</value>
+  <data name="MenuItemCommand.Text" xml:space="preserve">
+    <value>&amp;Command</value>
   </data>
-  <data name="MenuItemOperate.Size" type="System.Drawing.Size, System.Drawing">
-    <value>66, 20</value>
+  <data name="TinyUrlConvertToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>165, 22</value>
   </data>
-  <data name="MenuItemOperate.Text" xml:space="preserve">
-    <value>&amp;Operation</value>
+  <data name="TinyUrlConvertToolStripMenuItem.Text" xml:space="preserve">
+    <value>&amp;Shorten URL</value>
   </data>
   <data name="UrlConvertAutoToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>166, 22</value>
@@ -502,11 +535,11 @@
   <data name="JmpStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>166, 22</value>
   </data>
-  <data name="TinyUrlConvertToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="UpdateFollowersMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
     <value>165, 22</value>
   </data>
-  <data name="TinyUrlConvertToolStripMenuItem.Text" xml:space="preserve">
-    <value>&amp;Shorten URL</value>
+  <data name="UpdateFollowersMenuItem1.Text" xml:space="preserve">
+    <value>Fetch User List</value>
   </data>
   <data name="GetFollowersDiffToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>260, 22</value>
@@ -520,18 +553,12 @@
   <data name="GetFollowersAllToolStripMenuItem.Text" xml:space="preserve">
     <value>Re-acquisition of all</value>
   </data>
-  <data name="UpdateFollowersMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="ToolStripMenuItem10.Size" type="System.Drawing.Size, System.Drawing">
     <value>165, 22</value>
   </data>
-  <data name="UpdateFollowersMenuItem1.Text" xml:space="preserve">
-    <value>Fetch User List</value>
-  </data>
   <data name="BlackFavAddToolStripMenuItem.Text" xml:space="preserve">
     <value>Add BlackFav(&amp;F)</value>
   </data>
-  <data name="ToolStripMenuItem10.Size" type="System.Drawing.Size, System.Drawing">
-    <value>165, 22</value>
-  </data>
   <data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
     <value>162, 6</value>
   </data>
@@ -550,11 +577,11 @@
   <data name="OwnStatusMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>165, 22</value>
   </data>
-  <data name="MenuItemCommand.Size" type="System.Drawing.Size, System.Drawing">
-    <value>67, 20</value>
+  <data name="MenuItemHelp.Size" type="System.Drawing.Size, System.Drawing">
+    <value>40, 20</value>
   </data>
-  <data name="MenuItemCommand.Text" xml:space="preserve">
-    <value>&amp;Command</value>
+  <data name="MenuItemHelp.Text" xml:space="preserve">
+    <value>&amp;Help</value>
   </data>
   <data name="MatomeMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>216, 22</value>
@@ -604,11 +631,8 @@
   <data name="DebugModeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>216, 22</value>
   </data>
-  <data name="MenuItemHelp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>40, 20</value>
-  </data>
-  <data name="MenuItemHelp.Text" xml:space="preserve">
-    <value>&amp;Help</value>
+  <data name="ContextMenuStripPostMode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>328, 122</value>
   </data>
   <data name="ToolStripMenuItemUrlMultibyteSplit.Size" type="System.Drawing.Size, System.Drawing">
     <value>327, 22</value>
@@ -634,7 +658,7 @@
   <data name="IdeographicSpaceToSpaceToolStripMenuItem.Text" xml:space="preserve">
     <value>Convert IdeographicSpace to Space</value>
   </data>
-  <data name="ContextMenuStripPostMode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>328, 92</value>
+  <data name="ToolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>324, 6</value>
   </data>
 </root>
\ No newline at end of file

diff --git a/Tween/Tween.resx b/Tween/Tween.resx
index bd28290..e6668b1 100644 (file)
--- a/Tween/Tween.resx
+++ b/Tween/Tween.resx
@@ -424,88 +424,88 @@
     <value>337, 7</value>
   </metadata>
   <data name="SearchItem2ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>145, 22</value>
+    <value>160, 22</value>
   </data>
   <data name="SearchItem2ToolStripMenuItem.Text" xml:space="preserve">
-    <value>Google</value>
+    <value>Google(&amp;G)</value>
   </data>
   <data name="SearchItem1ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>145, 22</value>
+    <value>160, 22</value>
   </data>
   <data name="SearchItem1ToolStripMenuItem.Text" xml:space="preserve">
-    <value>Wikipedia</value>
+    <value>Wikipedia(&amp;W)</value>
   </data>
   <data name="SearchItem3ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>145, 22</value>
+    <value>160, 22</value>
   </data>
   <data name="SearchItem3ToolStripMenuItem.Text" xml:space="preserve">
-    <value>Twitter検索</value>
+    <value>Twitter検索(&amp;Y)</value>
   </data>
   <data name="SearchItem4ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>145, 22</value>
+    <value>160, 22</value>
   </data>
   <data name="SearchItem4ToolStripMenuItem.Text" xml:space="preserve">
-    <value>Twitter Search</value>
+    <value>Twitter Search(&amp;S)</value>
   </data>
   <data name="CurrentTabToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>145, 22</value>
+    <value>160, 22</value>
   </data>
   <data name="CurrentTabToolStripMenuItem.Text" xml:space="preserve">
-    <value>現在のタブ</value>
+    <value>現在のタブ(&amp;L)</value>
   </data>
   <data name="ToolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 22</value>
+    <value>182, 22</value>
   </data>
   <data name="ToolStripMenuItem2.Text" xml:space="preserve">
-    <value>選択文字列で検索</value>
+    <value>選択文字列で検索(&amp;S)</value>
   </data>
   <data name="ToolStripSeparator13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>163, 6</value>
+    <value>179, 6</value>
   </data>
   <data name="ToolStripMenuItem3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 22</value>
+    <value>182, 22</value>
   </data>
   <data name="ToolStripMenuItem3.Text" xml:space="preserve">
-    <value>選択文字列をコピー</value>
+    <value>選択文字列をコピー(&amp;C)</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>
+    <value>182, 22</value>
   </data>
   <data name="ToolStripMenuItem4.Text" xml:space="preserve">
-    <value>URLをコピー</value>
+    <value>URLをコピー(&amp;U)</value>
   </data>
   <data name="ToolStripMenuItem5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 22</value>
+    <value>182, 22</value>
   </data>
   <data name="ToolStripMenuItem5.Text" xml:space="preserve">
-    <value>すべて選択</value>
+    <value>すべて選択(&amp;A)</value>
   </data>
   <data name="ToolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>163, 6</value>
+    <value>179, 6</value>
   </data>
   <data name="FollowContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 22</value>
+    <value>182, 22</value>
   </data>
   <data name="FollowContextMenuItem.Text" xml:space="preserve">
-    <value>Follow</value>
+    <value>Follow(&amp;F)</value>
   </data>
   <data name="RemoveContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 22</value>
+    <value>182, 22</value>
   </data>
   <data name="RemoveContextMenuItem.Text" xml:space="preserve">
-    <value>Remove</value>
+    <value>Unfollow(&amp;N)</value>
   </data>
   <data name="FriendshipContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 22</value>
+    <value>182, 22</value>
   </data>
   <data name="FriendshipContextMenuItem.Text" xml:space="preserve">
-    <value>ShowFriendship</value>
+    <value>ShowFriendship(&amp;H)</value>
   </data>
   <data name="ContextMenuStrip4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>167, 170</value>
+    <value>183, 170</value>
   </data>
   <data name="&gt;&gt;ContextMenuStrip4.Name" xml:space="preserve">
     <value>ContextMenuStrip4</value>
@@ -954,6 +954,15 @@
   <data name="MenuItemFile.Text" xml:space="preserve">
     <value>ファイル(&amp;F)</value>
   </data>
+  <data name="UndoRemoveTabMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>214, 22</value>
+  </data>
+  <data name="UndoRemoveTabMenuItem.Text" xml:space="preserve">
+    <value>Undo remove tab</value>
+  </data>
+  <data name="ToolStripSeparator12.Size" type="System.Drawing.Size, System.Drawing">
+    <value>211, 6</value>
+  </data>
   <data name="CopySTOTMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>214, 22</value>
   </data>
@@ -1662,12 +1671,6 @@
   <data name="&gt;&gt;DeleteTabMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;MenuItemTab.Name" xml:space="preserve">
-    <value>MenuItemTab</value>
-  </data>
-  <data name="&gt;&gt;MenuItemTab.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;TabImage.Name" xml:space="preserve">
     <value>TabImage</value>
   </data>
@@ -1854,6 +1857,18 @@
   <data name="&gt;&gt;MenuItemEdit.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;UndoRemoveTabMenuItem.Name" xml:space="preserve">
+    <value>UndoRemoveTabMenuItem</value>
+  </data>
+  <data name="&gt;&gt;UndoRemoveTabMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;ToolStripSeparator12.Name" xml:space="preserve">
+    <value>ToolStripSeparator12</value>
+  </data>
+  <data name="&gt;&gt;ToolStripSeparator12.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;CopySTOTMenuItem.Name" xml:space="preserve">
     <value>CopySTOTMenuItem</value>
   </data>
@@ -2070,6 +2085,12 @@
   <data name="&gt;&gt;RefreshMoreStripMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;MenuItemTab.Name" xml:space="preserve">
+    <value>MenuItemTab</value>
+  </data>
+  <data name="&gt;&gt;MenuItemTab.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;MenuItemCommand.Name" xml:space="preserve">
     <value>MenuItemCommand</value>
   </data>

diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index c10f290..d0228e0 100644 (file)
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -1376,14 +1376,14 @@ Public Class TweenMain
                         SettingDialog.LimitBalloon AndAlso _
                         ( _
                             Me.WindowState = FormWindowState.Minimized OrElse _
-                            Not Me.Visible OrElse _
-                            Form.ActiveForm Is Nothing _
+                            Not Me.Visible _
                         ) _
                     ) OrElse _
                     Not SettingDialog.LimitBalloon _
                 ) _
             ) AndAlso _
             Not IsScreenSaverRunning() Then
+            '                            Form.ActiveForm Is Nothing _
             Dim sb As New StringBuilder
             Dim reply As Boolean = False
             Dim dm As Boolean = False
@@ -2844,6 +2844,16 @@ Public Class TweenMain
                 _postCache = Nothing
                 If _curList IsNot Nothing Then _curList.Refresh()
                 ListTab.Refresh()
+
+                Outputz.key = SettingDialog.OutputzKey
+                Outputz.Enabled = SettingDialog.OutputzEnabled
+                Select Case SettingDialog.OutputzUrlmode
+                    Case OutputzUrlmode.twittercom
+                        Outputz.url = "http://twitter.com/"
+                    Case OutputzUrlmode.twittercomWithUsername
+                        Outputz.url = "http://twitter.com/" + SettingDialog.UserID
+                End Select
+
             End SyncLock
         End If
 
@@ -7193,4 +7203,23 @@ RETRY:
         'もっと前を取得
         DoRefreshMore()
     End Sub
+
+    Private Sub UndoRemoveTabMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles UndoRemoveTabMenuItem.Click
+        If _statuses.RemovedTab Is Nothing Then
+            MessageBox.Show("There isn't removed tab.", "Undo", MessageBoxButtons.OK, MessageBoxIcon.Information)
+            Exit Sub
+        Else
+            Dim tb As TabClass = _statuses.RemovedTab
+            _statuses.RemovedTab = Nothing
+            Dim renamed As String = tb.TabName
+            For i As Integer = 1 To Integer.MaxValue
+                If Not _statuses.ContainsTab(renamed) Then Exit For
+                renamed = tb.TabName + "(" + i.ToString + ")"
+            Next
+            tb.TabName = renamed
+            _statuses.Tabs.Add(renamed, tb)
+            AddNewTab(renamed, False, tb.TabType)
+            SaveConfigsTabs()
+        End If
+    End Sub
 End Class

diff --git a/Tween/Twitter.vb b/Tween/Twitter.vb
index 9319c9b..5a78880 100644 (file)
--- a/Tween/Twitter.vb
+++ b/Tween/Twitter.vb
@@ -1938,6 +1938,9 @@ Public Module Twitter
             If resStatus.StartsWith("Err: Unauthorized") Then
                 Twitter.AccountState = ACCOUNT_STATE.Invalid
                 Return "Check your Username/Password."
+            ElseIf resStatus.StartsWith("Err: Not Found") Then
+                '削除済みと判定する
+                Return ""
             Else
                 Return resStatus
             End If
@@ -1984,6 +1987,9 @@ Public Module Twitter
             If resStatus.StartsWith("Err: Unauthorized") Then
                 Twitter.AccountState = ACCOUNT_STATE.Invalid
                 Return "Check your Username/Password."
+            ElseIf resStatus.StartsWith("Err: Not Found") Then
+                '削除済みと判定する
+                Return ""
             Else
                 Return resStatus
             End If
@@ -2163,6 +2169,9 @@ Public Module Twitter
             If resStatus.StartsWith("Err: Unauthorized") Then
                 Twitter.AccountState = ACCOUNT_STATE.Invalid
                 Return "Check your Username/Password."
+            ElseIf resStatus.StartsWith("Err: Not Found") Then
+                '削除済みと判定する
+                Return ""
             Else
                 Return resStatus
             End If