Commit: b34bc4e15708c54345e7db4472fc9a677478c50d - Twirunrun (git)

Commit MetaInfo

• Revision: b34bc4e15708c54345e7db4472fc9a677478c50d (tree)
• Zeit: 2011-02-19 14:14:19
• Autor: azyobuzin <azyobuzin@user...>
• Commiter: azyobuzin

Log Message

・@#補完完成
・SortOrderを使うようにした
・SelectCaseのバグを修正

Ändern Zusammenfassung

• 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/UpdateStatusTextBox.Designer.cs"
• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/Controls/UpdateStatusTextBox.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.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/Settings/SettingsBase.cs"

Diff

--- "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"
@@ -55,8 +55,9 @@ namespace Azyobuzi.Twirunrun
                     this.SelectedIndices.Clear();
                     indexes.Select(oldIndex => oldIndex +
                         (int)Settings.Instance.OrderType.SelectCase()
-                            .Case(OrderTypes.Ascending, () => -1)
-                            .Case(OrderTypes.Descending, () => +1)
+                            .Case(SortOrder.Ascending, () => -1)
+                            .Case(SortOrder.Descending, () => +1)
+                            .Default(() => 0)
                             .Result
                         )
                         .ForEach(newIndex => this.SelectedIndices.Add(newIndex));

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/UpdateStatusTextBox.Designer.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/UpdateStatusTextBox.Designer.cs"
@@ -65,6 +65,7 @@
             this.textBox1.Name = "textBox1";
             this.textBox1.Size = new System.Drawing.Size(150, 150);
             this.textBox1.TabIndex = 0;
+            this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
             this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
             this.textBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox1_KeyPress);
             // 
@@ -77,6 +78,7 @@
             this.listBox1.Name = "listBox1";
             this.listBox1.Size = new System.Drawing.Size(96, 100);
             this.listBox1.TabIndex = 0;
+            this.listBox1.TabStop = false;
             // 
             // UpdateStatusTextBox
             // 

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/UpdateStatusTextBox.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/UpdateStatusTextBox.cs"
@@ -14,7 +14,19 @@ namespace Azyobuzi.Twirunrun
         public UpdateStatusTextBox()
         {
             InitializeComponent();
-            listBox1.DataSource = Settings.Instance.AtHashtagList;
+            Settings.Instance.PropertyChanged += (sender, e) =>
+            {
+                if (e.PropertyName == "AtHashtagList")
+                {
+                    listBox1.Invoke((MethodInvoker)(() =>
+                    {
+                        var selected = listBox1.SelectedItem;
+                        listBox1.Items.Clear();
+                        listBox1.Items.AddRange(Settings.Instance.AtHashtagList);
+                        listBox1.SelectedItem = selected;
+                    }));
+                }
+            };
         }
 
         public void Clear()
@@ -36,26 +48,43 @@ namespace Azyobuzi.Twirunrun
             }
         }
 
-        private void textBox1_KeyPress(object sender, KeyPressEventArgs e)
+        private void textBox1_KeyPress(object sender, KeyPressEventArgs e)//読みにくくて辛い
         {
             if (e.KeyChar == (char)Keys.Back)
             {
                 if (textBox1.SelectionStart > 0 && "@＠#＃".Contains(textBox1.Text[textBox1.SelectionStart - 1]))
+                {
                     splitContainer1.Panel2Collapsed = true;
-                else
-                    return;
+                }
+                return;
             }
-            else if (e.KeyChar == (char)Keys.Delete)
+            else if (e.KeyChar == (char)Keys.Escape)
             {
-                if (textBox1.SelectionStart != textBox1.TextLength && "@＠#＃".Contains(textBox1.Text[textBox1.SelectionStart]))
-                    splitContainer1.Panel2Collapsed = true;
-                else
-                    return;
+                splitContainer1.Panel2Collapsed = true;
+                return;
+            }
+            else if (e.KeyChar == (char)Keys.Enter)
+            {
+                splitContainer1.Panel2Collapsed = true;
+                if ((Control.ModifierKeys & Keys.Shift) != Keys.Shift && listBox1.SelectedIndex != -1)
+                {
+                    int atHashtagStart = textBox1.Text.LastIndexOfAny("@＠#＃".ToArray(), textBox1.SelectionStart - 1);
+                    var selected = listBox1.SelectedItem.ToString();
+                    textBox1.Text = textBox1.Text.Substring(0, atHashtagStart) + selected + textBox1.Text.Substring(textBox1.SelectionStart);
+                    textBox1.SelectionStart = atHashtagStart + selected.Length;
+                    e.Handled = true;
+                }
+                return;
             }
 
             if ("@＠#＃".Contains(e.KeyChar))
-                splitContainer1.Panel2Collapsed = false;
-            else if (!"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWSYZ_-0123456789".Contains(e.KeyChar))
+            {
+                if (Settings.Instance.AutoComplete)
+                    splitContainer1.Panel2Collapsed = false;
+                return;
+            }
+
+            if (!"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWSYZ_-0123456789".Contains(e.KeyChar))
                 splitContainer1.Panel2Collapsed = true;
         }
 
@@ -76,11 +105,26 @@ namespace Azyobuzi.Twirunrun
         {
             if (!splitContainer1.Panel2Collapsed)
             {
-                if (e.KeyCode == Keys.Down && listBox1.SelectedIndex != listBox1.Items.Count - 1)
+                if (e.KeyCode == Keys.Down)
                     listBox1.SelectedIndex++;
-                else if (e.KeyCode == Keys.Up && listBox1.SelectedIndex > -1)
+                else if (e.KeyCode == Keys.Up)
                     listBox1.SelectedIndex--;
             }
         }
+
+        private void textBox1_TextChanged(object sender, EventArgs e)
+        {
+            if (!splitContainer1.Panel2Collapsed)
+            {
+                int atHashtagStart = textBox1.Text.LastIndexOfAny("@＠#＃".ToArray(), textBox1.SelectionStart - 1);
+                listBox1.SelectedItem = Settings.Instance.AtHashtagList
+                    .FirstOrDefault(_ =>
+                        _.StartsWith(
+                            textBox1.Text.Substring(atHashtagStart, textBox1.SelectionStart - atHashtagStart)
+                        )
+                    )
+                    ?? listBox1.SelectedItem;
+            }
+        }
     }
 }

--- "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"
@@ -72,20 +72,16 @@ namespace Azyobuzi.Twirunrun
         #endregion
 
         #region OrderByの拡張
-        public static OrderedParallelQuery<TSource> OrderBy<TSource, TKey>(this ParallelQuery<TSource> source, Func<TSource, TKey> keySelector, OrderTypes orderType)
+        public static ParallelQuery<TSource> OrderBy<TSource, TKey>(this ParallelQuery<TSource> source, Func<TSource, TKey> keySelector, SortOrder orderType)
         {
-            var re = (OrderedParallelQuery<TSource>)orderType.SelectCase()
-                .Case(OrderTypes.Ascending, () => source.OrderBy(keySelector))
-                .Case(OrderTypes.Descending, () => source.OrderByDescending(keySelector))
-                .Result;
-
-            if (re == null)
-                throw new ArgumentException("orderTypeが正しくありません。");
-
-            return re;
+            return orderType.SelectCase()
+                .Case(SortOrder.Ascending, () => source.OrderBy(keySelector))
+                .Case(SortOrder.Descending, () => source.OrderByDescending(keySelector))
+                .Default(() => source)
+                .Result as ParallelQuery<TSource>;
         }
 
-        public static OrderedParallelQuery<T> OrderBy<T>(this ParallelQuery<T> source, OrderTypes orderType)
+        public static ParallelQuery<T> OrderBy<T>(this ParallelQuery<T> source, SortOrder orderType)
         {
             return OrderBy(source, o => o, orderType);
         }
@@ -308,51 +304,6 @@ namespace Azyobuzi.Twirunrun
         }
     }
 
-    //public class StringRegex
-    //{
-    //    public StringRegex(string source)
-    //    {
-    //        this._source = source;
-    //    }
-
-    //    private string _source;
-
-    //    public bool IsMatch(string pattern)
-    //    {
-    //        return Regex.IsMatch(_source, pattern);
-    //    }
-
-    //    public Match Match(string pattern)
-    //    {
-    //        return Regex.Match(_source, pattern);
-    //    }
-
-    //    public IEnumerable<Match> Matches(string pattern)
-    //    {
-    //        return Regex.Matches(_source, pattern).Cast<Match>();
-    //    }
-
-    //    public string Replace(string pattern, string replacement)
-    //    {
-    //        return Regex.Replace(_source, pattern, replacement);
-    //    }
-
-    //    public string Replace(string pattern, MatchEvaluator evaluator)
-    //    {
-    //        return Regex.Replace(_source, pattern, evaluator);
-    //    }
-
-    //    public string[] Split(string pattern)
-    //    {
-    //        return Regex.Split(_source, pattern);
-    //    }
-
-    //    public override string ToString()
-    //    {
-    //        return _source;
-    //    }
-    //}
-
     public class Selecting<T>
     {
         public Selecting(T selectObj, Func<T, T, bool> equalsFunc)
@@ -389,15 +340,21 @@ namespace Azyobuzi.Twirunrun
 
         public Selecting<T> Default(Action<T> action)
         {
-            flag = true;
-            action(selectObj);
+            if (!flag)
+            {
+                flag = true;
+                action(selectObj);
+            }
             return this;
         }
 
         public Selecting<T> Default(Action action)
         {
-            flag = true;
-            action();
+            if (!flag)
+            {
+                flag = true;
+                action();
+            }
             return this;
         }
 
@@ -423,15 +380,21 @@ namespace Azyobuzi.Twirunrun
 
         public Selecting<T> Default(Func<T, object> action)
         {
-            flag = true;
-            Result = action(selectObj);
+            if (!flag)
+            {
+                flag = true;
+                Result = action(selectObj);
+            }
             return this;
         }
 
         public Selecting<T> Default(Func<object> action)
         {
-            flag = true;
-            Result = action();
+            if (!flag)
+            {
+                flag = true;
+                Result = action();
+            }
             return this;
         }
     }

--- "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"
@@ -12,6 +12,7 @@ using System.Threading.Tasks;
 using System.Net;
 using System.Reflection;
 using Azyobuzi.UserStreamEx;
+using System.Text.RegularExpressions;
 
 namespace Azyobuzi.Twirunrun
 {
@@ -146,10 +147,38 @@ namespace Azyobuzi.Twirunrun
             #endregion
             timelineTabs.TabPages.AddRange(Settings.Instance.Tabs.Select(tab => tab.CreateTabPage(timelineTabs)).ToArray());
 
+            RecentStatusesCollection.Instance.CollectionChanged += (_sender, _e) =>
+            {
+                var newAtHashtagList = Settings.Instance.AtHashtagList.Concat(
+                        _e.NewItems.Cast<StatusInfo>().SelectMany(_ =>
+                            new[] { "@" + _.User.Identifier.ScreenName }
+                            .Concat(_.Text.RegexMatches(@"[@＠][a-zA-Z0-9_]+")
+                                .Cast<Match>()
+                                .Select(atMatch => atMatch.ToString())
+                                .Concat(_.Text.RegexMatches(@"(^|[^\w&])([#＃][a-zA-Z0-9_\-]+)")
+                                    .Cast<Match>()
+                                    .Select(hashtagMatch => hashtagMatch.Groups[2].ToString())
+                                )
+                            )
+                        )
+                    )
+                    .Select(_ =>
+                    {
+                        if (_.FirstOrDefault() == '＠')
+                            return "@" + _.Substring(1);
+                        else if (_.FirstOrDefault() == '＃')
+                            return "#" + _.Substring(1);
+                        else
+                            return _;
+                    })
+                    .Distinct()
+                    .ToArray();
+                Array.Sort(newAtHashtagList);
+                Settings.Instance.AtHashtagList = newAtHashtagList;
+            };
+
             Settings.Instance.PropertyChanged += Settings_PropertyChanged;
-            //全設定項目でSettings_PropertyChangedを呼び出す
-            typeof(Settings).GetProperties().ForEach(property =>
-                Settings_PropertyChanged(Settings.Instance, new PropertyChangedEventArgs(property.Name)));
+            Settings.Instance.RaiseAllEvents();
 
             statusBrowser1.Navigate(statusBrowserUri);
         }

--- "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"
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Windows.Forms;
 using System.Linq;
+using System.Windows.Forms;
 using System.Xml.Serialization;
 
 namespace Azyobuzi.Twirunrun
@@ -513,8 +513,8 @@ namespace Azyobuzi.Twirunrun
         //
         //並べ替え順
         //
-        private OrderTypes orderType = OrderTypes.Descending;
-        public OrderTypes OrderType
+        private SortOrder orderType = SortOrder.Descending;
+        public SortOrder OrderType
         {
             set
             {
@@ -773,17 +773,17 @@ namespace Azyobuzi.Twirunrun
 
 
         //
-        //@・#の履歴
+        //@・#補完
         //
-        private List<string> atHashtagList = new List<string>();
-        public List<string> AtHashtagList
+        private string[] atHashtagList = new string[] { };
+        public string[] AtHashtagList
         {
             set
             {
                 if (!atHashtagList.SequenceEqual(value))
                 {
                     atHashtagList = value;
-                    OnPropertyChanged("AtHashtagList");//あんまり意味無い
+                    OnPropertyChanged("AtHashtagList");
                 }
             }
             get
@@ -791,6 +791,23 @@ namespace Azyobuzi.Twirunrun
                 return atHashtagList;
             }
         }
+
+        private bool autoComplete = true;
+        public bool AutoComplete
+        {
+            set
+            {
+                if (autoComplete != value)
+                {
+                    autoComplete = value;
+                    OnPropertyChanged("AutoComplete");
+                }
+            }
+            get
+            {
+                return autoComplete;
+            }
+        }
     }
 
     public class FormSettings : IEquatable<FormSettings>
@@ -822,20 +839,7 @@ namespace Azyobuzi.Twirunrun
     public enum PostKeys
     {
         Enter,
-        CtrlEnter,
-        ShiftEnter
-    }
-
-    public enum OrderTypes
-    {
-        /// <summary>
-        /// 昇順
-        /// </summary>
-        Ascending,
-        /// <summary>
-        /// 降順
-        /// </summary>
-        Descending
+        CtrlEnter
     }
 
     public enum NameTypes

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Settings/SettingsBase.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Settings/SettingsBase.cs"
@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using System.IO;
+using System.Linq;
 using System.Windows.Forms;
 using System.Xml.Serialization;
 
@@ -61,5 +62,15 @@ namespace Azyobuzi.Twirunrun
             if (PropertyChanged != null)
                 PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
         }
+
+        /// <summary>
+        /// このクラスのすべてのプロパティ名を使用してPropertyChangedイベントを発生させる
+        /// </summary>
+        public void RaiseAllEvents()
+        {
+            this.GetType().GetProperties()
+                .Select(property => property.Name)
+                .ForEach(OnPropertyChanged);
+        }
     }
 }