Changeset 31706

Timestamp:

03/31/09 10:58:52 (4 years ago)

Author:

syo68k

Message:

Favouritesタブの新設 Bug:FavタブからFav削除するとクラッシュ

Location:

lang/vb2005/Tween/Tween

Files:

• FilterDialog.vb (modified) (1 diff)
• MyCommon.vb (modified) (1 diff)
• SettingToConfig.vb (modified) (1 diff)
• StatusDictionary.vb (modified) (2 diffs)
• Tween.vb (modified) (7 diffs)

lang/vb2005/Tween/Tween/FilterDialog.vb

@@ -365 +365 @@
         ComboTabs.Items.Clear()
         For Each key As String In _sts.Tabs.Keys
-            If key <> "Recent" AndAlso key <> "Direct" Then
+            If key <> "Recent" AndAlso key <> "Direct" AndAlso key <> "Favorites" Then
                 ComboTabs.Items.Add(key)
             End If

lang/vb2005/Tween/Tween/MyCommon.vb

@@ -260 +260 @@
     Public Function IsDefaultTab(ByVal tabName As String) As Boolean
         If tabName = "Recent" OrElse tabName = "Reply" _
-                OrElse tabName = "Direct" Then
+                OrElse tabName = "Direct" OrElse tabName = "Favorites" Then
             Return True
         Else

lang/vb2005/Tween/Tween/SettingToConfig.vb

@@ -354 +354 @@
                 tdic.Add("Reply", New TabClass)
                 tdic.Add("Direct", New TabClass)
+                tdic.Add("Favorites", New TabClass)
                 Return tdic
             End If

lang/vb2005/Tween/Tween/StatusDictionary.vb

@@ -593 +593 @@
                     If _tabs("Reply").Notify Then add = True
                 End If
+                If post.IsFav Then    'Fav済み発言だったらFavoritesタブに追加
+                    _tabs("Favourites").Add(post.Id, post.IsRead, True)
+                    If Not _tabs("Favourites").SoundFile = "" Then _soundFile = _tabs("Favourites").SoundFile
+                    If _tabs("Favourites").Notify Then add = True
+                End If
                 If add Then _notifyPosts.Add(post)
             Else
@@ -739 +744 @@
                             Case HITRESULT.None
                                 If key = "Reply" And post.IsReply Then _tabs("Reply").Add(post.Id, post.IsRead, True)
+                                If post.IsFav Then _tabs("Favorites").Add(post.Id, post.IsRead, True)
                         End Select
                     Next

lang/vb2005/Tween/Tween/Tween.vb

@@ -667 +667 @@
         '<<<<<<<<タブ関連>>>>>>>
         _statuses.Tabs = _cfg.Tabs
+        'デフォルトタブの存在チェック、ない場合には追加
+        If Not _statuses.Tabs.ContainsKey("Recent") Then _statuses.Tabs.Add("Recent", New TabClass)
+        If Not _statuses.Tabs.ContainsKey("Reply") Then _statuses.Tabs.Add("Reply", New TabClass)
+        If Not _statuses.Tabs.ContainsKey("Direct") Then _statuses.Tabs.Add("Direct", New TabClass)
+        If Not _statuses.Tabs.ContainsKey("Favourites") Then _statuses.Tabs.Add("Favourites", New TabClass)
         For Each tn As String In _statuses.Tabs.Keys
             If Not AddNewTab(tn, True) Then Throw New Exception("タブ作成エラー")
@@ -718 +723 @@
         If _section.ListElement.Item("Direct") Is Nothing Then
             _section.ListElement.Add(New ListElement("Direct"))
+        End If
+        ''Favoritesタブ
+        If _section.ListElement.Item("Favourites") Is Nothing Then
+            _section.ListElement.Add(New ListElement("Favourites"))
         End If
         _cfg = New SettingToConfig
@@ -1387 +1396 @@
                             post.IsFav = True    'リスト再描画必要
                             _favTimestamps.Add(Now)
+                            _statuses.Tabs.Item("Favourites").Add(post.Id, post.IsRead, False)
                         End If
                     End If
@@ -1397 +1407 @@
                     args.page = i + 1
                     bw.ReportProgress(50, MakeStatusMessage(args, False))
+                    bw.ReportProgress(60, MakeStatusMessage(args, False))
                     If post.IsFav Then
                         ret = Twitter.PostFavRemove(post.Id)
@@ -1402 +1413 @@
                             args.sIds.Add(post.Id)
                             post.IsFav = False    'リスト再描画必要
+                            _statuses.Tabs.Item("Favourites").Remove(post.Id)
+                            If _curTab.Text.Equals("Favourites") Then
+                                _itemCache = Nothing    'キャッシュ破棄
+                                _postCache = Nothing
+                                _curPost = Nothing
+                                _curItemIndex = -1
+                            End If
                         End If
                     End If
@@ -4035 +4053 @@
         SoundFileComboBox.SelectedIndex = idx
         UreadManageMenuItem.Checked = tb.UnreadManage
-        If _rclickTabName = "Recent" OrElse _rclickTabName = "Direct" Then
+        If _rclickTabName = "Recent" OrElse _rclickTabName = "Direct" OrElse _rclickTabName = "Favourites" Then
             FilterEditMenuItem.Enabled = False
             DeleteTabMenuItem.Enabled = False
@@ -4092 +4110 @@
 
     Private Sub FilterEditMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles FilterEditMenuItem.Click
-        If _rclickTabName = "" OrElse _rclickTabName = "Recent" OrElse _rclickTabName = "Direct" Then Exit Sub
+        If _rclickTabName = "" OrElse _rclickTabName = "Recent" OrElse _rclickTabName = "Direct" _
+                OrElse _rclickTabName = "Favourites" Then Exit Sub
 
         fDialog.SetCurrent(_rclickTabName)