UserTimelineタブでルールが追加できたりなんだり対応

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

diff --git a/Tween/FilterDialog.vb b/Tween/FilterDialog.vb
index 1b926af..6209e64 100644 (file)
--- a/Tween/FilterDialog.vb
+++ b/Tween/FilterDialog.vb
@@ -760,12 +760,7 @@ Public Class FilterDialog
     Private Sub SetTabnamesToDialog()
         tabdialog.ClearTab()
         For Each key As String In _sts.Tabs.Keys
-            Select Case TabInformations.GetInstance.Tabs(key).TabType
-                Case TabUsageType.Home, TabUsageType.DirectMessage, TabUsageType.Favorites, TabUsageType.PublicSearch, TabUsageType.Lists, TabUsageType.Related, TabUsageType.UserTimeline
-                    Exit Select
-                Case Else
-                    tabdialog.AddTab(key)
-            End Select
+            If TabInformations.GetInstance.IsDistributableTab(key) Then tabdialog.AddTab(key)
         Next
     End Sub
 

diff --git a/Tween/StatusDictionary.vb b/Tween/StatusDictionary.vb
index 13fa19a..75f6694 100644 (file)
--- a/Tween/StatusDictionary.vb
+++ b/Tween/StatusDictionary.vb
@@ -1605,6 +1605,14 @@ Public NotInheritable Class TabInformations
         End If
     End Function
 
+    '振り分け可能タブの判定処理
+    Public Function IsDistributableTab(ByVal tabName As String) As Boolean
+        Return tabName IsNot Nothing AndAlso
+            _tabs.ContainsKey(tabName) AndAlso
+            (_tabs(tabName).TabType = TabUsageType.Mentions OrElse
+             _tabs(tabName).TabType = TabUsageType.UserDefined)
+    End Function
+
     Public Function GetUniqueTabName() As String
         Dim tabNameTemp As String = "MyTab" + (_tabs.Count + 1).ToString
         For i As Integer = 2 To 100

diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index e6f06a4..edd2e4a 100644 (file)
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -3581,12 +3581,7 @@ Public Class TweenMain
         _colHd8.Text = ColumnText(7)
         _colHd8.Width = 50
 
-        If (_statuses.Tabs.ContainsKey(tabName) AndAlso _statuses.Tabs(tabName).TabType = TabUsageType.Mentions) _
-           OrElse (Not _statuses.IsDefaultTab(tabName) AndAlso tabType <> TabUsageType.PublicSearch _
-                   AndAlso tabType <> TabUsageType.Lists AndAlso tabType <> TabUsageType.Related _
-                   AndAlso tabType <> TabUsageType.UserTimeline) Then
-            TabDialog.AddTab(tabName)
-        End If
+        If _statuses.IsDistributableTab(tabName) Then TabDialog.AddTab(tabName)
 
         _listCustom.SmallImageList = New ImageList()
         If _iconSz > 0 Then
@@ -6228,8 +6223,7 @@ RETRY:
             Next
             'タブ名のリスト作り直し（デフォルトタブ以外は再作成）
             For i As Integer = 0 To ListTab.TabCount - 1
-                If _statuses.Tabs(ListTab.TabPages(i).Text).TabType = TabUsageType.Mentions OrElse _
-                   (Not _statuses.IsDefaultTab(ListTab.TabPages(i).Text) AndAlso _statuses.Tabs(ListTab.TabPages(i).Text).TabType <> TabUsageType.PublicSearch AndAlso _statuses.Tabs(ListTab.TabPages(i).Text).TabType <> TabUsageType.Lists AndAlso _statuses.Tabs(ListTab.TabPages(i).Text).TabType <> TabUsageType.Related) Then
+                If _statuses.IsDistributableTab(ListTab.TabPages(i).Text) Then
                     TabDialog.RemoveTab(ListTab.TabPages(i).Text)
                 End If
                 If ListTab.TabPages(i).Text = tabName Then
@@ -6239,10 +6233,7 @@ RETRY:
             _statuses.RenameTab(tabName, newTabText)
 
             For i As Integer = 0 To ListTab.TabCount - 1
-                Dim tabUsageType As TabUsageType = _statuses.Tabs(ListTab.TabPages(i).Text).TabType
-                If tabUsageType = tabUsageType.Mentions OrElse (Not _statuses.IsDefaultTab(ListTab.TabPages(i).Text) _
-                                AndAlso tabUsageType <> tabUsageType.PublicSearch AndAlso tabUsageType <> tabUsageType.Lists _
-                                AndAlso tabUsageType <> tabUsageType.Related AndAlso tabUsageType <> tabUsageType.UserTimeline) Then
+                If _statuses.IsDistributableTab(ListTab.TabPages(i).Text) Then
                     If ListTab.TabPages(i).Text = tabName Then
                         ListTab.TabPages(i).Text = newTabText
                     End If