From 5eead26fc140e98bda903cdbfc22bf697a34f8c4 Mon Sep 17 00:00:00 2001
From: syo68k <syo68k@users.sourceforge.jp>
Date: Thu, 13 Jan 2011 12:57:32 +0000
Subject: [PATCH] =?utf8?q?Favorites=E4=BB=A5=E5=A4=96=E3=81=AE=E3=82=A4?=
 =?utf8?q?=E3=83=99=E3=83=B3=E3=83=88=E3=82=92=E9=80=9A=E7=9F=A5=E3=81=99?=
 =?utf8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=EF=BC=88=E3=81=A8=E3=82=8A?=
 =?utf8?q?=E3=81=82=E3=81=88=E3=81=9A=E7=89=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@1349 e39ad16e-3079-482e-bb30-4b4d378143b6
---
 Tween/Tween.vb | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index aeddc64a..abeb992c 100644
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -9889,9 +9889,10 @@ RETRY:
             Exit Sub
         End If
         StatusLabel.Text = "Event: " + ev.Event
-        If ev.Event = "favorite" Then
-            NotifyFavorite(ev)
-        End If
+        'If ev.Event = "favorite" Then
+        '    NotifyFavorite(ev)
+        'End If
+        NotifyEvent(ev)
         If ev.Event = "favorite" OrElse ev.Event = "unfavorite" Then
             If _curTab IsNot Nothing AndAlso _statuses.Tabs(_curTab.Text).Contains(ev.Id) Then
                 _itemCache = Nothing
@@ -9905,13 +9906,28 @@ RETRY:
         End If
     End Sub
 
-    Private Sub NotifyFavorite(ByVal ev As Twitter.FormattedEvent)
+    'Private Sub NotifyFavorite(ByVal ev As Twitter.FormattedEvent)
+    '    '新着通知
+    '    If BalloonRequired() Then
+    '        NotifyIcon1.BalloonTipIcon = ToolTipIcon.Warning
+    '        If SettingDialog.DispUsername Then NotifyIcon1.BalloonTipTitle = tw.Username + " - " Else NotifyIcon1.BalloonTipTitle = ""
+    '        NotifyIcon1.BalloonTipTitle += "Tween [FAVORITE] by " + ev.Username
+    '        NotifyIcon1.BalloonTipText = ev.Target
+    '        NotifyIcon1.ShowBalloonTip(500)
+    '    End If
+    'End Sub
+
+    Private Sub NotifyEvent(ByVal ev As Twitter.FormattedEvent)
         '新着通知
         If BalloonRequired() Then
             NotifyIcon1.BalloonTipIcon = ToolTipIcon.Warning
             If SettingDialog.DispUsername Then NotifyIcon1.BalloonTipTitle = tw.Username + " - " Else NotifyIcon1.BalloonTipTitle = ""
-            NotifyIcon1.BalloonTipTitle += "Tween [FAVORITE] by " + ev.Username
-            NotifyIcon1.BalloonTipText = ev.Target
+            NotifyIcon1.BalloonTipTitle += "Tween [" + ev.Event.ToUpper() + "] by " + DirectCast(IIf(Not String.IsNullOrEmpty(ev.Username), ev.Username, ""), String)
+            If Not String.IsNullOrEmpty(ev.Target) Then
+                NotifyIcon1.BalloonTipText = ev.Target
+            Else
+                NotifyIcon1.BalloonTipText = " "
+            End If
             NotifyIcon1.ShowBalloonTip(500)
         End If
     End Sub
-- 
2.11.0