Changeset 31734

Timestamp:

03/31/09 18:37:20 (4 years ago)

Author:

syo68k

Message:

デフォルトタブ名を（疑似）列挙値に

Location:

lang/vb2005/Tween/Tween

Files:

• FilterDialog.vb (modified) (1 diff)
• MyCommon.vb (modified) (2 diffs)
• SettingToConfig.vb (modified) (1 diff)
• StatusDictionary.vb (modified) (5 diffs)
• Tween.vb (modified) (20 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" AndAlso key <> "Favorites" Then
+            If key <> DEFAULTTAB.RECENT AndAlso key <> DEFAULTTAB.DM AndAlso key <> DEFAULTTAB.FAV Then
                 ComboTabs.Items.Add(key)
             End If

lang/vb2005/Tween/Tween/MyCommon.vb

@@ -101 +101 @@
         OpenUri                 'Uri開く
     End Enum
+
+    Public Structure DEFAULTTAB
+        Const RECENT As String = "Recent"
+        Const REPLY As String = "Reply"
+        Const DM As String = "Direct"
+        Const FAV As String = "Favourites"
+
+        Private dummy As String
+
+        Private Shadows Function ReferenceEquals() As Object
+            Return New Object
+        End Function
+        Private Shadows Function Equals() As Object
+            Return New Object
+        End Function
+    End Structure
 
     Public Const Block As Object = Nothing
@@ -259 +275 @@
     ' デフォルトタブの判定処理
     Public Function IsDefaultTab(ByVal tabName As String) As Boolean
-        If tabName = "Recent" OrElse tabName = "Reply" _
-                OrElse tabName = "Direct" OrElse tabName = "Favorites" Then
+        If tabName = DEFAULTTAB.RECENT OrElse tabName = DEFAULTTAB.REPLY _
+                OrElse tabName = DEFAULTTAB.DM OrElse tabName = DEFAULTTAB.FAV Then
             Return True
         Else

lang/vb2005/Tween/Tween/SettingToConfig.vb

@@ -351 +351 @@
             If tconf.Count = 0 Then
                 Dim tdic As New Dictionary(Of String, TabClass)
-                tdic.Add("Recent", New TabClass)
-                tdic.Add("Reply", New TabClass)
-                tdic.Add("Direct", New TabClass)
-                tdic.Add("Favorites", New TabClass)
+                tdic.Add(DEFAULTTAB.RECENT, New TabClass)
+                tdic.Add(DEFAULTTAB.REPLY, New TabClass)
+                tdic.Add(DEFAULTTAB.DM, New TabClass)
+                tdic.Add(DEFAULTTAB.FAV, New TabClass)
                 Return tdic
             End If

lang/vb2005/Tween/Tween/StatusDictionary.vb

@@ -345 +345 @@
                 Dim Id As Long = _tabs(TabName).GetId(idx)
                 For Each key As String In _tabs.Keys
-                    If Not key = TabName AndAlso Not key = "Direct" Then
+                    If Not key = TabName AndAlso Not key = DEFAULTTAB.DM Then
                         If _tabs(key).Contains(Id) Then
                             exist = True
@@ -352 +352 @@
                     End If
                 Next
-                If Not exist Then _tabs("Recent").Add(Id, _statuses(Id).IsRead, False)
+                If Not exist Then _tabs(DEFAULTTAB.RECENT).Add(Id, _statuses(Id).IsRead, False)
             Next
 
@@ -599 +599 @@
                 Next
                 If Not mv Then  '移動されなかったらRecentに追加
-                    _tabs("Recent").Add(post.Id, post.IsRead, True)
-                    If Not _tabs("Recent").SoundFile = "" AndAlso _soundFile = "" Then _soundFile = _tabs("Recent").SoundFile
-                    If _tabs("Recent").Notify Then add = True
+                    _tabs(DEFAULTTAB.RECENT).Add(post.Id, post.IsRead, True)
+                    If Not _tabs(DEFAULTTAB.RECENT).SoundFile = "" AndAlso _soundFile = "" Then _soundFile = _tabs(DEFAULTTAB.RECENT).SoundFile
+                    If _tabs(DEFAULTTAB.RECENT).Notify Then add = True
                 End If
                 If post.IsReply Then    'ReplyだったらReplyタブに追加
-                    _tabs("Reply").Add(post.Id, post.IsRead, True)
-                    If Not _tabs("Reply").SoundFile = "" Then _soundFile = _tabs("Reply").SoundFile
-                    If _tabs("Reply").Notify Then add = True
+                    _tabs(DEFAULTTAB.REPLY).Add(post.Id, post.IsRead, True)
+                    If Not _tabs(DEFAULTTAB.REPLY).SoundFile = "" Then _soundFile = _tabs(DEFAULTTAB.REPLY).SoundFile
+                    If _tabs(DEFAULTTAB.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
+                    _tabs(DEFAULTTAB.FAV).Add(post.Id, post.IsRead, True)
+                    If Not _tabs(DEFAULTTAB.FAV).SoundFile = "" Then _soundFile = _tabs(DEFAULTTAB.FAV).SoundFile
+                    If _tabs(DEFAULTTAB.FAV).Notify Then add = True
                 End If
                 If add Then _notifyPosts.Add(post)
@@ -739 +739 @@
     Public Sub FilterAll()
         SyncLock LockObj
-            Dim tbr As TabClass = _tabs("Recent")
+            Dim tbr As TabClass = _tabs(DEFAULTTAB.RECENT)
             For Each key As String In _tabs.Keys
                 Dim tb As TabClass = _tabs(key)
@@ -758 +758 @@
                                 tbr.Remove(post.Id)
                             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)
+                                If key = DEFAULTTAB.REPLY And post.IsReply Then _tabs(DEFAULTTAB.REPLY).Add(post.Id, post.IsRead, True)
+                                If post.IsFav Then _tabs(DEFAULTTAB.FAV).Add(post.Id, post.IsRead, True)
                         End Select
                     Next

lang/vb2005/Tween/Tween/Tween.vb

@@ -668 +668 @@
         _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)
+        If Not _statuses.Tabs.ContainsKey(DEFAULTTAB.RECENT) Then _statuses.Tabs.Add(DEFAULTTAB.RECENT, New TabClass)
+        If Not _statuses.Tabs.ContainsKey(DEFAULTTAB.REPLY) Then _statuses.Tabs.Add(DEFAULTTAB.REPLY, New TabClass)
+        If Not _statuses.Tabs.ContainsKey(DEFAULTTAB.DM) Then _statuses.Tabs.Add(DEFAULTTAB.DM, New TabClass)
+        If Not _statuses.Tabs.ContainsKey(DEFAULTTAB.FAV) Then _statuses.Tabs.Add(DEFAULTTAB.FAV, New TabClass)
         For Each tn As String In _statuses.Tabs.Keys
             If Not AddNewTab(tn, True) Then Throw New Exception("タブ作成エラー")
@@ -714 +714 @@
             _section = DirectCast(_config.GetSection("TwitterSetting"), ListSection)
             _section.SectionInformation.ForceSave = True
-            _section.ListElement = New ListElementCollection("Recent")
+            _section.ListElement = New ListElementCollection(DEFAULTTAB.RECENT)
         End If
         ''Replyタブ
-        If _section.ListElement.Item("Reply") Is Nothing Then
-            _section.ListElement.Add(New ListElement("Reply"))
+        If _section.ListElement.Item(DEFAULTTAB.REPLY) Is Nothing Then
+            _section.ListElement.Add(New ListElement(DEFAULTTAB.REPLY))
         End If
         ''DirectMsgタブ
-        If _section.ListElement.Item("Direct") Is Nothing Then
-            _section.ListElement.Add(New ListElement("Direct"))
+        If _section.ListElement.Item(DEFAULTTAB.DM) Is Nothing Then
+            _section.ListElement.Add(New ListElement(DEFAULTTAB.DM))
         End If
         ''Favoritesタブ
-        If _section.ListElement.Item("Favourites") Is Nothing Then
-            _section.ListElement.Add(New ListElement("Favourites"))
+        If _section.ListElement.Item(DEFAULTTAB.FAV) Is Nothing Then
+            _section.ListElement.Add(New ListElement(DEFAULTTAB.FAV))
         End If
         _cfg = New SettingToConfig
@@ -1396 +1396 @@
                             post.IsFav = True    'リスト再描画必要
                             _favTimestamps.Add(Now)
-                            _statuses.Tabs.Item("Favourites").Add(post.Id, post.IsRead, False)
+                            _statuses.Tabs.Item(DEFAULTTAB.FAV).Add(post.Id, post.IsRead, False)
                         End If
                     End If
@@ -1649 +1649 @@
             DispSelectedPost()          ' 詳細画面書き直し
             For Each i As Long In rslt.sIds
-                _statuses.RemovePost("Favourites", i)
+                _statuses.RemovePost(DEFAULTTAB.FAV, i)
                 nm += 1
             Next
-            If _curTab.Text.Equals("Favourites") Then
+            If _curTab.Text.Equals(DEFAULTTAB.FAV) Then
                 _curList.VirtualListSize -= nm
                 _itemCache = Nothing    'キャッシュ破棄
@@ -1729 +1729 @@
             Case WORKERTYPE.FavAdd, WORKERTYPE.BlackFavAdd, WORKERTYPE.FavRemove
                 _curList.BeginUpdate()
-                If rslt.type = WORKERTYPE.FavRemove AndAlso _curTab.Text.Equals("Favourites") Then
+                If rslt.type = WORKERTYPE.FavRemove AndAlso _curTab.Text.Equals(DEFAULTTAB.FAV) Then
                     For i As Integer = 0 To _curList.VirtualListSize - 1
                         '
@@ -1826 +1826 @@
 
     Private Sub FavAddToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles FavAddToolStripMenuItem.Click
-        If _curTab.Text = "Direct" OrElse _curList.SelectedIndices.Count = 0 Then Exit Sub
+        If _curTab.Text = DEFAULTTAB.DM OrElse _curList.SelectedIndices.Count = 0 Then Exit Sub
 
         '複数fav確認msg
@@ -1854 +1854 @@
 
     Private Sub FavRemoveToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles FavRemoveToolStripMenuItem.Click
-        If _curTab.Text = "Direct" OrElse _curList.SelectedIndices.Count = 0 Then Exit Sub
+        If _curTab.Text = DEFAULTTAB.DM OrElse _curList.SelectedIndices.Count = 0 Then Exit Sub
 
         If _curList.SelectedIndices.Count > 1 Then
@@ -1965 +1965 @@
 
     Private Sub ContextMenuStrip2_Opening(ByVal sender As System.Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles ContextMenuStrip2.Opening
-        If ListTab.SelectedTab.Text = "Direct" Then
+        If ListTab.SelectedTab.Text = DEFAULTTAB.DM Then
             FavAddToolStripMenuItem.Enabled = False
             FavRemoveToolStripMenuItem.Enabled = False
@@ -1993 +1993 @@
 
     Private Sub DeleteStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles DeleteStripMenuItem.Click
-        If _curTab.Text <> "Direct" Then
+        If _curTab.Text <> DEFAULTTAB.DM Then
             Dim myPost As Boolean = False
             For Each idx As Integer In _curList.SelectedIndices
@@ -2016 +2016 @@
             For Each Id As Long In _statuses.GetId(_curTab.Text, _curList.SelectedIndices)
                 Dim rtn As String = ""
-                If _curTab.Text = "Direct" Then
+                If _curTab.Text = DEFAULTTAB.DM Then
                     rtn = Twitter.RemoveDirectMessage(Id)
                 Else
@@ -2092 +2092 @@
     Private Sub DoRefresh()
         Select Case _curTab.Text
-            Case "Reply"
+            Case DEFAULTTAB.REPLY
                 GetTimeline(WORKERTYPE.Reply, 1, 0)
-            Case "Direct"
+            Case DEFAULTTAB.DM
                 GetTimeline(WORKERTYPE.DirectMessegeRcv, 1, 0)
             Case Else
@@ -3129 +3129 @@
         NameLabel.ForeColor = System.Drawing.SystemColors.ControlText
         DateTimeLabel.Text = _curPost.PDate.ToString()
-        If _curPost.IsOwl AndAlso (SettingDialog.OneWayLove OrElse _curTab.Text = "Direct") Then NameLabel.ForeColor = _clOWL
+        If _curPost.IsOwl AndAlso (SettingDialog.OneWayLove OrElse _curTab.Text = DEFAULTTAB.DM) Then NameLabel.ForeColor = _clOWL
         If _curPost.IsFav Then NameLabel.ForeColor = _clFav
 
@@ -3411 +3411 @@
         Dim targetId As Long = 0
 
-        If _curTab.Text = "Direct" Then Exit Sub ' Directタブは対象外（見つかるはずがない）
+        If _curTab.Text = DEFAULTTAB.DM Then Exit Sub ' Directタブは対象外（見つかるはずがない）
         If _curList.SelectedIndices.Count = 0 Then Exit Sub '未選択も処理しない
 
@@ -3438 +3438 @@
         Dim found As Boolean = False
         For tabidx As Integer = fIdx To toIdx Step stp
-            If ListTab.TabPages(tabidx).Text = "Direct" Then Continue For ' Directタブは対象外
+            If ListTab.TabPages(tabidx).Text = DEFAULTTAB.DM Then Continue For ' Directタブは対象外
             '_itemCache = Nothing
             '_postCache = Nothing
@@ -3922 +3922 @@
             If _curList.SelectedIndices.Count = 1 AndAlso Not isAll AndAlso _curPost IsNot Nothing Then
                 ' 単独ユーザー宛リプライまたはDM
-                If (ListTab.SelectedTab.Text = "Direct" AndAlso isAuto) OrElse (Not isAuto AndAlso Not isReply) Then
+                If (ListTab.SelectedTab.Text = DEFAULTTAB.DM AndAlso isAuto) OrElse (Not isAuto AndAlso Not isReply) Then
                     ' ダイレクトメッセージ
                     StatusText.Text = "D " + _curPost.Name + " " + StatusText.Text
@@ -4067 +4067 @@
         SoundFileComboBox.SelectedIndex = idx
         UreadManageMenuItem.Checked = tb.UnreadManage
-        If _rclickTabName = "Recent" OrElse _rclickTabName = "Direct" OrElse _rclickTabName = "Favourites" Then
+        If _rclickTabName = DEFAULTTAB.RECENT OrElse _rclickTabName = DEFAULTTAB.DM OrElse _rclickTabName = DEFAULTTAB.FAV Then
             FilterEditMenuItem.Enabled = False
             DeleteTabMenuItem.Enabled = False
-        ElseIf _rclickTabName = "Reply" Then
+        ElseIf _rclickTabName = DEFAULTTAB.REPLY Then
             FilterEditMenuItem.Enabled = True
             DeleteTabMenuItem.Enabled = False
@@ -4124 +4124 @@
 
     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" _
-                OrElse _rclickTabName = "Favourites" Then Exit Sub
+        If _rclickTabName = "" OrElse _rclickTabName = DEFAULTTAB.RECENT OrElse _rclickTabName = DEFAULTTAB.DM _
+                OrElse _rclickTabName = DEFAULTTAB.FAV Then Exit Sub
 
         fDialog.SetCurrent(_rclickTabName)
@@ -4501 +4501 @@
                 End If
             Case DispTitleEnum.UnreadRepCount
-                ttl.AppendFormat(My.Resources.SetMainWindowTitleText1, _statuses.Tabs("Reply").UnreadCount + _statuses.Tabs("Direct").UnreadCount)
+                ttl.AppendFormat(My.Resources.SetMainWindowTitleText1, _statuses.Tabs(DEFAULTTAB.REPLY).UnreadCount + _statuses.Tabs(DEFAULTTAB.DM).UnreadCount)
             Case DispTitleEnum.UnreadAllCount
                 ttl.AppendFormat(My.Resources.SetMainWindowTitleText2, ur)
             Case DispTitleEnum.UnreadAllRepCount
-                ttl.AppendFormat(My.Resources.SetMainWindowTitleText3, ur, _statuses.Tabs("Reply").UnreadCount + _statuses.Tabs("Direct").UnreadCount)
+                ttl.AppendFormat(My.Resources.SetMainWindowTitleText3, ur, _statuses.Tabs(DEFAULTTAB.REPLY).UnreadCount + _statuses.Tabs(DEFAULTTAB.DM).UnreadCount)
             Case DispTitleEnum.UnreadCountAllCount
                 ttl.AppendFormat(My.Resources.SetMainWindowTitleText4, ur, al)
@@ -4516 +4516 @@
         'ステータス欄にカウント表示
         'タブ未読数/タブ発言数 全未読数/総発言数 (未読＠＋未読DM数)
-        Dim urat As Integer = _statuses.Tabs("Reply").UnreadCount + _statuses.Tabs("Direct").UnreadCount
+        Dim urat As Integer = _statuses.Tabs(DEFAULTTAB.REPLY).UnreadCount + _statuses.Tabs(DEFAULTTAB.DM).UnreadCount
         Dim ur As Integer = 0
         Dim al As Integer = 0
@@ -5036 +5036 @@
         'Dim MyList As DetailsListView = DirectCast(ListTab.SelectedTab.Controls(0), DetailsListView)
 
-        If _curTab.Text = "Direct" OrElse _curList.SelectedIndices.Count = 0 Then Exit Sub
+        If _curTab.Text = DEFAULTTAB.DM OrElse _curList.SelectedIndices.Count = 0 Then Exit Sub
 
         If _curList.SelectedIndices.Count > 1 Then