Commit: fc38135a14e221e4a1f2ca8ea8e8364437735b94 - Twirunrun (git)

Commit MetaInfo

• Revision: fc38135a14e221e4a1f2ca8ea8e8364437735b94 (tree)
• Time: 2011-01-18 18:59:13
• Author: azyobuzin <azyobuzin@user...>
• Commiter: azyobuzin

Log Message

Ownerプロパティを廃止してGetMainFormメソッドを作成

Change Summary

• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/Controls/Tabs/DirectMessagesTimelineTabPage.cs"
• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/Controls/Tabs/HomeTimelineTabPage.cs"
• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/Controls/Tabs/MentionsTabPage.cs"
• 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/Controls/TwirunrunTabControl.cs"
• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/Extensions.cs"
• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/Forms/MainForm.Designer.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/TabInfo.cs"

Incremental Difference

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/Tabs/DirectMessagesTimelineTabPage.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/Tabs/DirectMessagesTimelineTabPage.cs"
@@ -5,8 +5,8 @@ namespace Azyobuzi.Twirunrun
 {
     public class DirectMessagesTimelineTabPage : TimelineTabPage
     {
-        public DirectMessagesTimelineTabPage(TwirunrunTabControl owner, TabInfo tabsettings)
-            : base(owner, tabsettings)
+        public DirectMessagesTimelineTabPage(/*TwirunrunTabControl owner, */TabInfo tabsettings)
+            : base(/*owner, */tabsettings)
         {
             RecentStatusesCollection.Instance.CollectionChanged += (sender, e) =>
             {
@@ -28,7 +28,7 @@ namespace Azyobuzi.Twirunrun
             NotifyStarted();
             RecentStatusesCollection.Instance.AddRange(
                 new[] { DirectMessageType.SentTo, DirectMessageType.SentBy }.SelectMany(type =>
-                    Owner.Owner.TwitterContext.DirectMessage.Where(dm =>
+                    this.GetMainForm().TwitterContext.DirectMessage.Where(dm =>
                         dm.Type == type &&
                         dm.Page == page &&
                         dm.Count == count

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/Tabs/HomeTimelineTabPage.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/Tabs/HomeTimelineTabPage.cs"
@@ -5,8 +5,8 @@ namespace Azyobuzi.Twirunrun
 {
     public class HomeTimelineTabPage : TimelineTabPage
     {
-        public HomeTimelineTabPage(TwirunrunTabControl owner, TabInfo tabsettings)
-            : base(owner, tabsettings)
+        public HomeTimelineTabPage(/*TwirunrunTabControl owner, */TabInfo tabsettings)
+            : base(/*owner, */tabsettings)
         {
             RecentStatusesCollection.Instance.CollectionChanged += (sender, e) =>
             {
@@ -28,7 +28,7 @@ namespace Azyobuzi.Twirunrun
         {
             NotifyStarted();
             RecentStatusesCollection.Instance.AddRange(
-                Owner.Owner.TwitterContext.Status.Where(tweet =>
+                this.GetMainForm().TwitterContext.Status.Where(tweet =>
                     tweet.Type == StatusType.Home &&
                     tweet.Page == page &&
                     tweet.Count == count

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/Tabs/MentionsTabPage.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/Tabs/MentionsTabPage.cs"
@@ -6,8 +6,8 @@ namespace Azyobuzi.Twirunrun
 {
     public class MentionsTabPage : TimelineTabPage
     {
-        public MentionsTabPage(TwirunrunTabControl owner, TabInfo tabsettings)
-            : base(owner, tabsettings)
+        public MentionsTabPage(/*TwirunrunTabControl owner, */TabInfo tabsettings)
+            : base(/*owner, */tabsettings)
         {
             var mentionCheckRegex = new Regex(
                 string.Format(@"[@＠]{0}(\W|$)", Settings.Instance.MyScreenName.RegexEscape()),
@@ -36,7 +36,7 @@ namespace Azyobuzi.Twirunrun
         {
             NotifyStarted();
             RecentStatusesCollection.Instance.AddRange(
-                Owner.Owner.TwitterContext.Status.Where(tweet =>
+                this.GetMainForm().TwitterContext.Status.Where(tweet =>
                     tweet.Type == StatusType.Mentions &&
                     tweet.Page == page &&
                     tweet.Count == count

--- "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"
@@ -7,21 +7,21 @@ namespace Azyobuzi.Twirunrun
 {
     public abstract class TimelineTabPage : TabPage
     {
-        public TimelineTabPage(TwirunrunTabControl owner, TabInfo tabsettings)
+        public TimelineTabPage(/*TwirunrunTabControl owner, */TabInfo tabsettings)
         {
-            Owner = owner;
+            //Owner = owner;
             TabSettings = tabsettings;
             this.Text = TabSettings.Name;
             Timeline.Dock = DockStyle.Fill;
             this.Controls.Add(Timeline);
             TabSettings.PropertyChanged += TabSettings_PropertyChanged;
             Timeline.SelectedIndexChanged += (sender, e) =>
-                Owner.Owner.ShowDetailStatus(Timeline.Statuses[Timeline.SelectedIndex]);
+                this.GetMainForm().ShowDetailStatus(Timeline.Statuses[Timeline.SelectedIndex]);
             Timeline.DoubleClick += (sender, e) =>
             {
                 if (Timeline.SelectedIndex == -1) return;
                 var selecting = Timeline.Statuses[Timeline.SelectedIndex];
-                Owner.Owner.UpdateStatusPanel.SetReplyTo(
+                this.GetMainForm().UpdateStatusPanel.SetReplyTo(
                      selecting.Type == StatusTypes.Retweet ?
                             selecting.Tweet.Retweet.ID : selecting.Id,
                     new[] { selecting.User.Identifier.ScreenName },
@@ -30,7 +30,7 @@ namespace Azyobuzi.Twirunrun
             };
         }
 
-        public TwirunrunTabControl Owner { private set; get; }
+        //public TwirunrunTabControl Owner { private set; get; }
 
         public StatusesListBox Timeline = new StatusesListBox();
 
@@ -57,7 +57,7 @@ namespace Azyobuzi.Twirunrun
         {
             refreshing = true;
             this.Invoke((MethodInvoker)(() => this.Text = "更新中..."));
-            Owner.Owner.StatusChange(TabSettings.Name + "を更新中");
+            this.GetMainForm().StatusChange(TabSettings.Name + "を更新中");
         }
 
         /// <summary>
@@ -65,7 +65,7 @@ namespace Azyobuzi.Twirunrun
         /// </summary>
         protected void NotifyCompleted()
         {
-            Owner.Owner.StatusChange(TabSettings.Name + "：取得しました");
+            this.GetMainForm().StatusChange(TabSettings.Name + "：取得しました");
             refreshing = false;
             this.Invoke((MethodInvoker)(() => this.Text = TabSettings.Name));
         }

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/TwirunrunTabControl.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/TwirunrunTabControl.cs"
@@ -9,6 +9,6 @@ namespace Azyobuzi.Twirunrun
 {
     public class TwirunrunTabControl : AnisTabControl
     {
-        public ITwirunrunMainForm Owner { get; set; }
+        //public ITwirunrunMainForm Owner { get; set; }
     }
 }

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Extensions.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Extensions.cs"
@@ -3,13 +3,14 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Drawing;
+using System.IO;
 using System.Linq;
 using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
+using System.Windows.Forms;
 using System.Xml.Linq;
-using System.IO;
 
 namespace Azyobuzi.Twirunrun
 {
@@ -295,6 +296,11 @@ namespace Azyobuzi.Twirunrun
         {
             return source.RegexMatch(@"^https?://[\w\d/%#$&?()~_.=+-!]+$");
         }
+
+        public static ITwirunrunMainForm GetMainForm(this Control control)
+        {
+            return control.FindForm() as ITwirunrunMainForm;
+        }
     }
 
     //public class StringRegex

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Forms/MainForm.Designer.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Forms/MainForm.Designer.cs"
@@ -109,7 +109,6 @@
             this.timelineTabs.Dock = System.Windows.Forms.DockStyle.Fill;
             this.timelineTabs.Location = new System.Drawing.Point(0, 104);
             this.timelineTabs.Name = "timelineTabs";
-            this.timelineTabs.Owner = null;
             this.timelineTabs.SelectedIndex = 0;
             this.timelineTabs.Size = new System.Drawing.Size(371, 156);
             this.timelineTabs.SortTabDragDrop = true;

--- "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"
@@ -17,7 +17,7 @@ namespace Azyobuzi.Twirunrun
         public MainForm()
         {
             InitializeComponent();
-            timelineTabs.Owner = this;
+            //timelineTabs.Owner = this;
         }
 
         private string statusBrowserUri = "file:///" + (Application.StartupPath + @"\html\resultPage.html").Replace('\\', '/');

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/TabInfo.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/TabInfo.cs"
@@ -216,9 +216,9 @@ namespace Azyobuzi.Twirunrun
         public TimelineTabPage CreateTabPage(TwirunrunTabControl tabControl)
         {
             return this.Type.SelectCase()
-                .Case(TabTypes.Home, () => new HomeTimelineTabPage(tabControl, this))
-                .Case(TabTypes.Mentions, () => new MentionsTabPage(tabControl, this))
-                .Case(TabTypes.DirectMessages, () => new DirectMessagesTimelineTabPage(tabControl, this))
+                .Case(TabTypes.Home, () => new HomeTimelineTabPage(/*tabControl, */this))
+                .Case(TabTypes.Mentions, () => new MentionsTabPage(/*tabControl, */this))
+                .Case(TabTypes.DirectMessages, () => new DirectMessagesTimelineTabPage(/*tabControl, */this))
                 .Result as TimelineTabPage;
             //TODO
         }