Commit: cc060214b95bd3b48489b260159f3a846fe80502 - Twirunrun (git)

Commit MetaInfo

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

Log Message

StatusesListViewに移行
TODO:オーナードローなど

Change Summary

• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/Controls/StatusesListBox.cs"
• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/Controls/StatusesListView.cs"
• 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/Settings/Settings.cs"
• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/StatusInfo.cs"

Incremental Difference

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/StatusesListBox.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/StatusesListBox.cs"
@@ -20,7 +20,7 @@ namespace Azyobuzi.Twirunrun
                     e.ItemHeight =
                         Math.Max(
                             Settings.Instance.IconSize,
-                            (int)Settings.Instance.MainFont.ConvertToFont().GetHeight()
+                            (int)Settings.Instance.MainFont.GetHeight()
                         ) + 1;
             this.DrawItem += this_DrawItem;
         }
@@ -69,18 +69,18 @@ namespace Azyobuzi.Twirunrun
 
             var post = Statuses[e.Index];
 
-            var font = Settings.Instance.MainFont.ConvertToFont();
+            var font = Settings.Instance.MainFont;
             var color = (e.State & DrawItemState.Selected) == DrawItemState.Selected ?
-                SystemColors.HighlightText : Settings.Instance.MainFontColor.ConvertToColor();
+                SystemColors.HighlightText : Settings.Instance.MainFontColor;
 
             e.Graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
 
             //背景色描画
             Brush bgBrush;
             if (post.Type == StatusTypes.Retweet)
-                bgBrush = new SolidBrush(Settings.Instance.RetweetedBgColor.ConvertToColor());
+                bgBrush = new SolidBrush(Settings.Instance.RetweetedBgColor);
             else
-                bgBrush = new SolidBrush(Settings.Instance.MainBgColor.ConvertToColor());
+                bgBrush = new SolidBrush(Settings.Instance.MainBgColor);
 
             e.Graphics.FillRectangle(bgBrush, e.Bounds);
 

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/StatusesListView.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/StatusesListView.cs"
@@ -12,9 +12,16 @@ namespace Azyobuzi.Twirunrun
         {
             this.View = View.Details;
             this.VirtualMode = true;
+            this.HeaderStyle = ColumnHeaderStyle.None;
+            this.FullRowSelect = true;
             this.RetrieveVirtualItem += this_RetrieveVirtualItem;
+            this.Columns.Add("名前", Settings.Instance.NameWidth);
+            this.Columns.Add("投稿");
+            this.SizeChanged += (sender, e) => this.AutoResizeColumn(1, ColumnHeaderAutoResizeStyle.ColumnContent);
         }
 
+        public const string NAME_SUBITEM = "NameSubItem";//SubItem識別用
+
         private IList<StatusInfo> statuses;
         public IList<StatusInfo> Statuses
         {
@@ -31,7 +38,7 @@ namespace Azyobuzi.Twirunrun
 
         public void SetItemsCount(int count)
         {
-            VirtualListSize = count;
+            this.Invoke((MethodInvoker)(() => VirtualListSize = count));
         }
 
         public void SetItemsCount()
@@ -42,9 +49,19 @@ namespace Azyobuzi.Twirunrun
         private void this_RetrieveVirtualItem(object sender, RetrieveVirtualItemEventArgs e)
         {
             var item = Statuses[e.ItemIndex];
+            var s = Settings.Instance;
 
             var lvi = new ListViewItem();
+            lvi.BackColor = item.Type == StatusTypes.Retweet ? s.RetweetedBgColor : s.MainBgColor;
+            lvi.Font = s.MainFont;
+            lvi.ForeColor = item.Type == StatusTypes.Retweet ? s.RetweetedFontColor : s.MainFontColor;
+            lvi.Text = s.NameType == NameTypes.Name ? item.User.Name : item.User.ScreenName;
+
+            lvi.SubItems.Add(item.Text.Replace('\n', ' '));
+
+            lvi.SubItems[0].Tag = NAME_SUBITEM;
 
+            e.Item = lvi;
         }
     }
 }

--- "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"
@@ -14,7 +14,7 @@ namespace Azyobuzi.Twirunrun
                     RecentStatusesCollection.Instance.AsParallel()
                     .Where(tweet => tweet.Type == StatusTypes.DirectMessage)
                     .OrderBy(Settings.Instance.OrderType)
-                    .ToList().AsReadOnly();
+                    .ToList();
                 if (e.NewItems.Count != 0)
                 {
                     var newTweets = e.NewItems.OfType<StatusInfo>().Where(tweet => tweet.Type == StatusTypes.DirectMessage);

--- "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"
@@ -14,7 +14,7 @@ namespace Azyobuzi.Twirunrun
                     RecentStatusesCollection.Instance.AsParallel()
                     .Where(tweet => tweet.Type != StatusTypes.DirectMessage)
                     .OrderBy(Settings.Instance.OrderType)
-                    .ToList().AsReadOnly();
+                    .ToList();
                 //新着通知
                 if (e.NewItems.Count != 0)
                 {

--- "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"
@@ -22,7 +22,7 @@ namespace Azyobuzi.Twirunrun
                         tweet.Type != StatusTypes.DirectMessage &&
                         mentionCheckRegex.IsMatch(tweet.Text))
                     .OrderBy(Settings.Instance.OrderType)
-                    .ToList().AsReadOnly();
+                    .ToList();
                 //新着通知
                 if (e.NewItems.Count != 0)
                 {

--- "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"
@@ -15,12 +15,14 @@ namespace Azyobuzi.Twirunrun
             Timeline.Dock = DockStyle.Fill;
             this.Controls.Add(Timeline);
             TabSettings.PropertyChanged += TabSettings_PropertyChanged;
-            Timeline.SelectedIndexChanged += (sender, e) =>
-                this.GetMainForm().ShowDetailStatus(Timeline.Statuses[Timeline.SelectedIndex]);
+            Timeline.SelectedIndexChanged += (sender, e) =>{
+                if (Timeline.SelectedIndices.Count != 0)
+                    this.GetMainForm().ShowDetailStatus(Timeline.Statuses[Timeline.SelectedIndices[0]]);
+            };
             Timeline.DoubleClick += (sender, e) =>
             {
-                if (Timeline.SelectedIndex == -1) return;
-                var selecting = Timeline.Statuses[Timeline.SelectedIndex];
+                if (Timeline.SelectedIndices.Count == 0) return;
+                var selecting = Timeline.Statuses[Timeline.SelectedIndices[0]];
                 this.GetMainForm().UpdateStatusPanel.SetReplyTo(
                      selecting.Type == StatusTypes.Retweet ?
                             selecting.Tweet.Retweet.ID : selecting.Id,
@@ -32,7 +34,7 @@ namespace Azyobuzi.Twirunrun
 
         //public TwirunrunTabControl Owner { private set; get; }
 
-        public StatusesListBox Timeline = new StatusesListBox();
+        public StatusesListView Timeline = new StatusesListView();
 
         public TabInfo TabSettings { private set; get; }
 

--- "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"
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 using System.Linq;
+using System.Xml.Serialization;
 
 namespace Azyobuzi.Twirunrun
 {
@@ -199,14 +200,36 @@ namespace Azyobuzi.Twirunrun
             }
         }
 
-        private string mainFont = new Font("MS UI Gothic", 9f).ConvertToString();
-        public string MainFont
+        private string mainFontString = new Font("MS UI Gothic", 9f).ConvertToString();
+        public string MainFontString
         {
             set
             {
-                if (mainFont != value)
+                if (mainFontString != value)
+                {
+                    mainFontString = value;
+                    mainFont = value.ConvertToFont();
+                    OnPropertyChanged("MainFontString");
+                    OnPropertyChanged("MainFont");
+                }
+            }
+            get
+            {
+                return mainFontString;
+            }
+        }
+
+        private Font mainFont = new Font("MS UI Gothic", 9f);
+        [XmlIgnore]
+        public Font MainFont
+        {
+            set
+            {
+                if (!mainFont.Equals(value))
                 {
                     mainFont = value;
+                    mainFontString = value.ConvertToString();
+                    OnPropertyChanged("MainFontString");
                     OnPropertyChanged("MainFont");
                 }
             }
@@ -216,14 +239,36 @@ namespace Azyobuzi.Twirunrun
             }
         }
 
-        private string mainFontColor = SystemColors.ControlText.ConvertToString();
-        public string MainFontColor
+        private string mainFontColorString = SystemColors.ControlText.ConvertToString();
+        public string MainFontColorString
+        {
+            set
+            {
+                if (mainFontColorString != value)
+                {
+                    mainFontColorString = value;
+                    mainFontColor = value.ConvertToColor();
+                    OnPropertyChanged("MainFontColorString");
+                    OnPropertyChanged("MainFontColor");
+                }
+            }
+            get
+            {
+                return mainFontColorString;
+            }
+        }
+
+        private Color mainFontColor = SystemColors.ControlText;
+        [XmlIgnore]
+        public Color MainFontColor
         {
             set
             {
                 if (mainFontColor != value)
                 {
                     mainFontColor = value;
+                    mainFontColorString = value.ConvertToString();
+                    OnPropertyChanged("MainFontColorString");
                     OnPropertyChanged("MainFontColor");
                 }
             }
@@ -233,14 +278,36 @@ namespace Azyobuzi.Twirunrun
             }
         }
 
-        private string mainBgColor = Color.White.ConvertToString();
-        public string MainBgColor
+        private string mainBgColorString = SystemColors.Window.ConvertToString();
+        public string MainBgColorString
+        {
+            set
+            {
+                if (mainBgColorString != value)
+                {
+                    mainBgColorString = value;
+                    mainBgColor = value.ConvertToColor();
+                    OnPropertyChanged("MainBgColorString");
+                    OnPropertyChanged("MainBgColor");
+                }
+            }
+            get
+            {
+                return mainBgColorString;
+            }
+        }
+
+        private Color mainBgColor = SystemColors.Window;
+        [XmlIgnore]
+        public Color MainBgColor
         {
             set
             {
                 if (mainBgColor != value)
                 {
                     mainBgColor = value;
+                    mainBgColorString = value.ConvertToString();
+                    OnPropertyChanged("MainBgColorString");
                     OnPropertyChanged("MainBgColor");
                 }
             }
@@ -250,14 +317,36 @@ namespace Azyobuzi.Twirunrun
             }
         }
 
-        private string retweetedBgColor = Color.Green.ConvertToString();
-        public string RetweetedBgColor
+        private string retweetedBgColorString = SystemColors.Window.ConvertToString();
+        public string RetweetedBgColorString
+        {
+            set
+            {
+                if (retweetedBgColorString != value)
+                {
+                    retweetedBgColorString = value;
+                    retweetedBgColor = value.ConvertToColor();
+                    OnPropertyChanged("RetweetedBgColorString");
+                    OnPropertyChanged("RetweetedBgColor");
+                }
+            }
+            get
+            {
+                return retweetedBgColorString;
+            }
+        }
+
+        private Color retweetedBgColor = SystemColors.Window;
+        [XmlIgnore]
+        public Color RetweetedBgColor
         {
             set
             {
                 if (retweetedBgColor != value)
                 {
                     retweetedBgColor = value;
+                    retweetedBgColorString = value.ConvertToString();
+                    OnPropertyChanged("RetweetedBgColorString");
                     OnPropertyChanged("RetweetedBgColor");
                 }
             }
@@ -267,14 +356,75 @@ namespace Azyobuzi.Twirunrun
             }
         }
 
-        private string postPanelFont = new Font("MS UI Gothic", 9f).ConvertToString();
-        public string PostPanelFont
+        private string retweetedFontColorString = Color.Green.ConvertToString();
+        public string RetweetedFontColorString
+        {
+            set
+            {
+                if (retweetedFontColorString != value)
+                {
+                    retweetedFontColorString = value;
+                    retweetedFontColor = value.ConvertToColor();
+                    OnPropertyChanged("RetweetedFontColorString");
+                    OnPropertyChanged("RetweetedFontColor");
+                }
+            }
+            get
+            {
+                return retweetedFontColorString;
+            }
+        }
+
+        private Color retweetedFontColor = Color.Green;
+        [XmlIgnore]
+        public Color RetweetedFontColor
+        {
+            set
+            {
+                if (retweetedFontColor != value)
+                {
+                    retweetedFontColor = value;
+                    retweetedFontColorString = value.ConvertToString();
+                    OnPropertyChanged("RetweetedFontColorString");
+                    OnPropertyChanged("RetweetedFontColor");
+                }
+            }
+            get
+            {
+                return retweetedFontColor;
+            }
+        }
+
+        private string postPanelFontString = new Font("MS UI Gothic", 9f).ConvertToString();
+        public string PostPanelFontString
+        {
+            set
+            {
+                if (postPanelFontString != value)
+                {
+                    postPanelFontString = value;
+                    postPanelFont = value.ConvertToFont();
+                    OnPropertyChanged("PostPanelFontString");
+                    OnPropertyChanged("PostPanelFont");
+                }
+            }
+            get
+            {
+                return postPanelFontString;
+            }
+        }
+
+        private Font postPanelFont = new Font("MS UI Gothic", 9f);
+        [XmlIgnore]
+        public Font PostPanelFont
         {
             set
             {
-                if (postPanelFont != value)
+                if (!postPanelFont.Equals(value))
                 {
                     postPanelFont = value;
+                    postPanelFontString = value.ConvertToString();
+                    OnPropertyChanged("PostPanelFontString");
                     OnPropertyChanged("PostPanelFont");
                 }
             }

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/StatusInfo.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/StatusInfo.cs"
@@ -27,7 +27,6 @@ namespace Azyobuzi.Twirunrun
                     ReplyToStatusId = Tweet.InReplyToStatusID;
                     Favorited = Tweet.Favorited;
                     Source = new SourceClient(Tweet.Source);
-                    IsProtected = Tweet.User.Protected;
                     ProfileImageUri = Tweet.User.ProfileImageUrl;
                 }
                 else
@@ -74,7 +73,6 @@ namespace Azyobuzi.Twirunrun
                 Text = DirectMessage.SenderScreenName.Equals(Settings.Instance.MyScreenName, StringComparison.InvariantCultureIgnoreCase) ?
                     string.Format("@{0} {1}", DirectMessage.RecipientScreenName, DirectMessage.Text) : DirectMessage.Text;
                 CreatedAt = DirectMessage.CreatedAt.ToLocalTime();
-                IsProtected = DirectMessage.Sender.Protected;
                 ProfileImageUri = DirectMessage.Sender.ProfileImageUrl;
             }
             else
@@ -100,9 +98,6 @@ namespace Azyobuzi.Twirunrun
         public bool Favorited { get; set; }
         [XmlIgnore]
         public SourceClient Source { set; get; }
-        //public Retweet Retweet { set; get; }
-        [XmlIgnore]
-        public bool IsProtected { set; get; }
         [XmlIgnore]
         public string ProfileImageUri { set; get; }