Commit: 4df7778f41e192c70d9e7bedf1b90924361de49c - Twirunrun (git)

Commit MetaInfo

• Revision: 4df7778f41e192c70d9e7bedf1b90924361de49c (tree)
• Time: 2011-01-22 20:44:57
• Author: azyobuzin <azyobuzin@user...>
• Commiter: azyobuzin

Log Message

新着通知にバルーンを追加

Change Summary

• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/Controls/Tabs/TimelineTabPage.cs"
• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/Forms/MainForm.cs"
• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/Forms/NotifyForm.Designer.cs"
• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/ITwirunrunMainForm.cs"
• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/Settings/Settings.cs"

Incremental Difference

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/Tabs/TimelineTabPage.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/Tabs/TimelineTabPage.cs"
@@ -1,6 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace Azyobuzi.Twirunrun
@@ -108,7 +108,21 @@ namespace Azyobuzi.Twirunrun
             this.Invoke((MethodInvoker)(() =>
             {
                 if (TabSettings.NotifyNewTweet)
-                    NotifyForm.ShowItems(newItems, this.FindForm());
+                    Settings.Instance.NotifyType.SelectCase()
+                        .Case(NotifyTypes.NotifyForm,
+                            () => NotifyForm.ShowItems(newItems, this.FindForm()))
+                        .Case(NotifyTypes.Balloon,
+                            () => this.GetMainForm().ShowBalloon(
+                                Settings.Instance.NotifyFormShowTime * 1000,
+                                TabSettings.Name + "の新着",
+                                string.Join("\n", newItems.Select(item =>
+                                    string.Format("{0}：{1}", Settings.Instance.NameType == NameTypes.Name ?
+                                        item.User.Name : item.User.Identifier.ScreenName,
+                                        item.Text)
+                                )),
+                                ToolTipIcon.Info
+                            )
+                        );
             }));
         }
     }

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Forms/MainForm.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Forms/MainForm.cs"
@@ -225,5 +225,10 @@ namespace Azyobuzi.Twirunrun
         {
             e.Cancel = e.CloseReason != CloseReason.UserClosing && !closing;
         }
+
+        public void ShowBalloon(int timeout, string tipTitle, string tipText, ToolTipIcon tipIcon)
+        {
+            notifyIcon1.ShowBalloonTip(timeout, tipTitle, tipText, tipIcon);
+        }
     }
 }

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Forms/NotifyForm.Designer.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Forms/NotifyForm.Designer.cs"
@@ -103,6 +103,7 @@
             this.Controls.Add(this.profileImg);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "NotifyForm";
+            this.Opacity = 0.8D;
             this.ShowInTaskbar = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
             this.Text = "ついるんるん 通知画面";

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/ITwirunrunMainForm.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/ITwirunrunMainForm.cs"
@@ -12,5 +12,6 @@ namespace Azyobuzi.Twirunrun
         void ShowDetailStatus(StatusInfo status);
         IEnumerable<TimelineTabPage> GetTabPages();
         void RefreshTimelines(IEnumerable<TimelineTabPage> tabs, bool first);
+        void ShowBalloon(int timeout, string tipTitle, string tipText, ToolTipIcon tipIcon);
     }
 }

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Settings/Settings.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Settings/Settings.cs"
@@ -615,7 +615,7 @@ namespace Azyobuzi.Twirunrun
         }
 
         //
-        //新着通知表示時間
+        //新着通知
         //
         private int notifyFormShowTime = 7;
         public int NotifyFormShowTime
@@ -633,6 +633,23 @@ namespace Azyobuzi.Twirunrun
                 return notifyFormShowTime;
             }
         }
+
+        private NotifyTypes notifyType = NotifyTypes.NotifyForm;
+        public NotifyTypes NotifyType
+        {
+            set
+            {
+                if (notifyType != value)
+                {
+                    notifyType = value;
+                    OnPropertyChanged("NotifyType");
+                }
+            }
+            get
+            {
+                return notifyType;
+            }
+        }
     }
 
     public class FormSettings : IEquatable<FormSettings>
@@ -685,4 +702,10 @@ namespace Azyobuzi.Twirunrun
         Name,
         ScreenName
     }
+
+    public enum NotifyTypes
+    {
+        NotifyForm,
+        Balloon
+    }
 }