PageRenderTime 27ms CodeModel.GetById 27ms RepoModel.GetById 1ms app.codeStats 0ms

/cs/MiniTwitter-ma/MiniTwitter-ma/modified-files.diff

https://bitbucket.org/ksksts/junk
Unknown | 1126 lines | 1098 code | 28 blank | 0 comment | 0 complexity | 59919cdd510adcca09a82d7135a38b80 MD5 | raw file
Possible License(s): Apache-2.0

Large files files are truncated, but you can click here to view the full file

    

  1. 

    2. 

  2. C:\home\development\projects\bitbucket\junk\cs\MiniTwitter-ma>C:\cygwin\bin\diff.exe -urN -xobj -xbin -xmodified-files.diff MiniTwitter MiniTwitter-ma 

    3. 

  3. diff -urN -xobj -xbin -xmodified-files.diff MiniTwitter/MiniTwitter/Account.cs MiniTwitter-ma/MiniTwitter/Account.cs
    4. 

  4. --- MiniTwitter/MiniTwitter/Account.cs	1970-01-01 09:00:00.000000000 +0900
    5. 

  5. +++ MiniTwitter-ma/MiniTwitter/Account.cs	2010-01-12 22:47:24.183337200 +0900
    6. 

  6. @@ -0,0 +1,90 @@
    7. 

  7. +?using System;

    8. 

  8. +using System.Collections.Generic;

    9. 

  9. +using System.ComponentModel;

    10. 

  10. +using System.Linq;

    11. 

  11. +using System.Text;

    12. 

  12. +using System.Text.RegularExpressions;

    13. 

  13. +using System.Xml.Serialization;

    14. 

  14. +

    15. 

  15. +using MiniTwitter.Net.Twitter;

    16. 

  16. +

    17. 

  17. +namespace MiniTwitter

    18. 

  18. +{

    19. 

  19. +    [Serializable]

    20. 

  20. +    public class Account : PropertyChangedBase, IEditableObject, IEquatable<Account>

    21. 

  21. +    {

    22. 

  22. +        private string username;

    23. 

  23. +

    24. 

  24. +        [XmlAttribute]

    25. 

  25. +        public string Username

    26. 

  26. +        {

    27. 

  27. +            get { return username; }

    28. 

  28. +            set

    29. 

  29. +            {

    30. 

  30. +                if (username != value)

    31. 

  31. +                {

    32. 

  32. +                    username = value;

    33. 

  33. +                    OnPropertyChanged("Username");

    34. 

  34. +                }

    35. 

  35. +            }

    36. 

  36. +        }

    37. 

  37. +

    38. 

  38. +        private string password;

    39. 

  39. +

    40. 

  40. +        [XmlAttribute]

    41. 

  41. +        public string Password

    42. 

  42. +        {

    43. 

  43. +            get { return password; }

    44. 

  44. +            set

    45. 

  45. +            {

    46. 

  46. +                if (password != value)

    47. 

  47. +                {

    48. 

  48. +                    password = value;

    49. 

  49. +                    OnPropertyChanged("Password");

    50. 

  50. +                    OnPropertyChanged("HiddenPassword");

    51. 

  51. +                }

    52. 

  52. +            }

    53. 

  53. +        }

    54. 

  54. +

    55. 

  55. +        [XmlIgnore]

    56. 

  56. +        public string HiddenPassword

    57. 

  57. +        {

    58. 

  58. +            get { return new string('?', password.Length); }

    59. 

  59. +        }

    60. 

  60. +

    61. 

  61. +        private Account copy;

    62. 

  62. +

    63. 

  63. +        public void BeginEdit()

    64. 

  64. +        {

    65. 

  65. +            if (copy == null)

    66. 

  66. +            {

    67. 

  67. +                copy = new Account();

    68. 

  68. +            }

    69. 

  69. +            copy.Username = this.Username;

    70. 

  70. +            copy.Password = this.Password;

    71. 

  71. +        }

    72. 

  72. +

    73. 

  73. +        public void CancelEdit()

    74. 

  74. +        {

    75. 

  75. +            this.Username = copy.Username;

    76. 

  76. +            this.Password = copy.Password;

    77. 

  77. +        }

    78. 

  78. +

    79. 

  79. +        public void EndEdit()

    80. 

  80. +        {

    81. 

  81. +            copy.Username = "";

    82. 

  82. +            copy.Password = "";

    83. 

  83. +        }

    84. 

  84. +

    85. 

  85. +        #region IEquatable<Account> ???

    86. 

  86. +

    87. 

  87. +        public bool Equals(Account other)

    88. 

  88. +        {

    89. 

  89. +            if (other == null)

    90. 

  90. +                return false;

    91. 

  91. +            return username == other.username && password == other.password;

    92. 

  92. +        }

    93. 

  93. +

    94. 

  94. +        #endregion

    95. 

  95. +    }

    96. 

  96. +}

    97. 

  97. diff -urN -xobj -xbin -xmodified-files.diff MiniTwitter/MiniTwitter/App.xaml.cs MiniTwitter-ma/MiniTwitter/App.xaml.cs
    98. 

  98. --- MiniTwitter/MiniTwitter/App.xaml.cs	2010-01-16 19:32:34.890625000 +0900
    99. 

  99. +++ MiniTwitter-ma/MiniTwitter/App.xaml.cs	2010-01-22 22:46:46.156250000 +0900
    100. 

  100. @@ -1,4 +1,5 @@
    101. 

  101. -?using System;

    102. 

  102. +?/* modified by ksksts. see modified-files.diff */

    103. 

  103. +using System;

    104. 

  104.  using System.Collections.Generic;

    105. 

  105.  using System.Configuration;

    106. 

  106.  using System.Data;

    107. 

  107. @@ -120,7 +121,7 @@
    108. 

  108.  

    109. 

  109.          private readonly string directory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), NAME);

    110. 

  110.  

    111. 

  111. -        public const string VERSION = "1.05.2";

    112. 

  112. -        public const string NAME = "MiniTwitter";

    113. 

  113. +        public const string VERSION = "1.05.2+20100122";

    114. 

  114. +        public const string NAME = "MiniTwitter-ma";

    115. 

  115.      }

    116. 

  116.  }

    117. 

  117. diff -urN -xobj -xbin -xmodified-files.diff MiniTwitter/MiniTwitter/Controls/TextViewer.xaml MiniTwitter-ma/MiniTwitter/Controls/TextViewer.xaml
    118. 

  118. --- MiniTwitter/MiniTwitter/Controls/TextViewer.xaml	2010-01-16 19:32:34.906250000 +0900
    119. 

  119. +++ MiniTwitter-ma/MiniTwitter/Controls/TextViewer.xaml	2010-01-22 22:27:31.125000000 +0900
    120. 

  120. @@ -1,6 +1,7 @@
    121. 

  121. -?<UserControl x:Class="MiniTwitter.Controls.TextViewer"

    122. 

  122. +?<!-- modified by ksksts. see modified-files.diff -->

    123. 

  123. +<UserControl x:Class="MiniTwitter.Controls.TextViewer"

    124. 

  124.      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

    125. 

  125.      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

    126. 

  126.      x:Name="UserControl">

    127. 

  127. -    <TextBlock x:Name="TextBlock" TextWrapping="{Binding ElementName=UserControl, Path=TextWrapping}" TextTrimming="{Binding ElementName=UserControl, Path=TextTrimming}"/>

    128. 

  128. +    <TextBlock x:Name="TextBlock" TextWrapping="{Binding ElementName=UserControl, Path=TextWrapping}" TextTrimming="{Binding ElementName=UserControl, Path=TextTrimming}" LineHeight="{Binding ElementName=UserControl, Path=LineHeight}" LineStackingStrategy="{Binding ElementName=UserControl, Path=LineStackingStrategy}"/>

    129. 

  129.  </UserControl>

    130. 

  130. diff -urN -xobj -xbin -xmodified-files.diff MiniTwitter/MiniTwitter/Controls/TextViewer.xaml.cs MiniTwitter-ma/MiniTwitter/Controls/TextViewer.xaml.cs
    131. 

  131. --- MiniTwitter/MiniTwitter/Controls/TextViewer.xaml.cs	2010-01-16 19:32:34.921875000 +0900
    132. 

  132. +++ MiniTwitter-ma/MiniTwitter/Controls/TextViewer.xaml.cs	2010-01-22 22:33:57.187500000 +0900
    133. 

  133. @@ -1,4 +1,5 @@
    134. 

  134. -?using System;

    135. 

  135. +?/* modified by ksksts. see modified-files.diff */

    136. 

  136. +using System;

    137. 

  137.  using System.Collections.Generic;

    138. 

  138.  using System.Diagnostics;

    139. 

  139.  using System.Linq;

    140. 

  140. @@ -57,6 +58,24 @@
    141. 

  141.          public static readonly DependencyProperty TextTrimmingProperty =

    142. 

  142.              DependencyProperty.Register("TextTrimming", typeof(TextTrimming), typeof(TextViewer), new PropertyMetadata(TextTrimming.None));

    143. 

  143.  

    144. 

  144. +        public double LineHeight

    145. 

  145. +        {

    146. 

  146. +            get { return (double)GetValue(LineHeightProperty); }

    147. 

  147. +            set { SetValue(LineHeightProperty, value); }

    148. 

  148. +        }

    149. 

  149. +

    150. 

  150. +        public static readonly DependencyProperty LineHeightProperty =

    151. 

  151. +            DependencyProperty.Register("LineHeight", typeof(double), typeof(TextViewer), new PropertyMetadata(Double.NaN));

    152. 

  152. +

    153. 

  153. +        public LineStackingStrategy LineStackingStrategy

    154. 

  154. +        {

    155. 

  155. +            get { return (LineStackingStrategy)GetValue(LineStackingStrategyProperty); }

    156. 

  156. +            set { SetValue(LineStackingStrategyProperty, value); }

    157. 

  157. +        }

    158. 

  158. +

    159. 

  159. +        public static readonly DependencyProperty LineStackingStrategyProperty =

    160. 

  160. +            DependencyProperty.Register("LineStackingStrategy", typeof(LineStackingStrategy), typeof(TextViewer), new PropertyMetadata(LineStackingStrategy.MaxHeight));

    161. 

  161. +

    162. 

  162.          private static void TextPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)

    163. 

  163.          {

    164. 

  164.              ((TextViewer)sender).OnTextChanged((string)e.NewValue);

    165. 

  165. diff -urN -xobj -xbin -xmodified-files.diff MiniTwitter/MiniTwitter/Controls/TimelineStyleSelector.cs MiniTwitter-ma/MiniTwitter/Controls/TimelineStyleSelector.cs
    166. 

  166. --- MiniTwitter/MiniTwitter/Controls/TimelineStyleSelector.cs	2010-01-16 19:32:34.921875000 +0900
    167. 

  167. +++ MiniTwitter-ma/MiniTwitter/Controls/TimelineStyleSelector.cs	2010-01-22 22:33:57.140625000 +0900
    168. 

  168. @@ -1,4 +1,5 @@
    169. 

  169. -?using System;

    170. 

  170. +?/* modified by ksksts. see modified-files.diff */

    171. 

  171. +using System;

    172. 

  172.  using System.Collections.Generic;

    173. 

  173.  using System.Linq;

    174. 

  174.  using System.Text;

    175. 

  175. @@ -26,6 +27,9 @@
    176. 

  176.                  case TimelineStyle.List:

    177. 

  177.                      style = "List";

    178. 

  178.                      break;

    179. 

  179. +                case TimelineStyle.Tight:

    180. 

  180. +                    style = "Tight";

    181. 

  181. +                    break;

    182. 

  182.                  default:

    183. 

  183.                      return null;

    184. 

  184.              }

    185. 

  185. diff -urN -xobj -xbin -xmodified-files.diff MiniTwitter/MiniTwitter/MainWindow.xaml MiniTwitter-ma/MiniTwitter/MainWindow.xaml
    186. 

  186. --- MiniTwitter/MiniTwitter/MainWindow.xaml	2010-01-16 19:32:34.937500000 +0900
    187. 

  187. +++ MiniTwitter-ma/MiniTwitter/MainWindow.xaml	2010-01-22 22:32:28.109375000 +0900
    188. 

  188. @@ -1,4 +1,5 @@
    189. 

  189. -?<Window x:Class="MiniTwitter.MainWindow"

    190. 

  190. +?<!-- modified by ksksts. see modified-files.diff -->

    191. 

  191. +<Window x:Class="MiniTwitter.MainWindow"

    192. 

  192.      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

    193. 

  193.      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

    194. 

  194.      xmlns:MiniTwitter="clr-namespace:MiniTwitter"

    195. 

  195. @@ -48,9 +49,21 @@
    196. 

  196.                  <RowDefinition/>

    197. 

  197.              </Grid.RowDefinitions>

    198. 

  198.              <TextBlock Grid.Row="0" Text="What's happening?" VerticalAlignment="Center" Style="{DynamicResource HeaderTextBlockStyle}"/>

    199. 

  199. -            <TextBlock Grid.Row="0" HorizontalAlignment="Right" VerticalAlignment="Center"

    200. 

  200. -                       Text="{Binding ElementName=TweetTextBox, Path=Text.Length, Converter={StaticResource TextCountConverter}}"

    201. 

  201. -                       Style="{DynamicResource CounterTextBlockStyle}"/>

    202. 

  202. +            <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">

    203. 

  203. +                <Button VerticalAlignment="Center" Margin="0,0,6,0" 

    204. 

  204. +                        Click="AccountSwitchButton_Click" Style="{DynamicResource ImageButtonStyle}">

    205. 

  205. +                    <StackPanel Orientation="Horizontal">

    206. 

  206. +                        <Image Margin="0,0,3,0" Style="{DynamicResource ImageStyle}" 

    207. 

  207. +                               Source="{Binding ElementName=Window, Path=LoginedUserImageUrl}"

    208. 

  208. +                               Visibility="{Binding Source={x:Static MiniTwitter_Properties:Settings.Default}, Path=IsIconVisible, Converter={StaticResource BooleanToVisibilityConverter}}"/>

    209. 

  209. +                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Right" 

    210. 

  210. +                                   Text="{Binding ElementName=Window, Path=LoginedUserName}"

    211. 

  211. +                                   Style="{DynamicResource CurrentAccountTextBlockStyle}"/>

    212. 

  212. +                    </StackPanel>

    213. 

  213. +                </Button>

    214. 

  214. +                <TextBlock Text="{Binding ElementName=TweetTextBox, Path=Text.Length, Converter={StaticResource TextCountConverter}}"

    215. 

  215. +                           VerticalAlignment="Center" Style="{DynamicResource CounterTextBlockStyle}"/>

    216. 

  216. +            </StackPanel>

    217. 

  217.              <TextBox x:Name="TweetTextBox" Grid.Row="1" Margin="0,4.5,0,6" TextWrapping="Wrap" TextChanged="TweetTextBox_TextChanged"

    218. 

  218.                       VerticalScrollBarVisibility="Auto" KeyDown="TweetTextBox_KeyDown" PreviewKeyDown="TweetTextBox_PreviewKeyDown"  Style="{DynamicResource TweetTextBoxStyle}">

    219. 

  219.                  <TextBox.CommandBindings>

    220. 

  220. diff -urN -xobj -xbin -xmodified-files.diff MiniTwitter/MiniTwitter/MainWindow.xaml.cs MiniTwitter-ma/MiniTwitter/MainWindow.xaml.cs
    221. 

  221. --- MiniTwitter/MiniTwitter/MainWindow.xaml.cs	2010-01-16 19:32:34.953125000 +0900
    222. 

  222. +++ MiniTwitter-ma/MiniTwitter/MainWindow.xaml.cs	2010-01-22 22:33:57.093750000 +0900
    223. 

  223. @@ -1,4 +1,5 @@
    224. 

  224. -?using System;

    225. 

  225. +?/* modified by ksksts. see modified-files.diff */

    226. 

  226. +using System;

    227. 

  227.  using System.Collections.Generic;

    228. 

  228.  using System.Collections.ObjectModel;

    229. 

  229.  using System.ComponentModel;

    230. 

  230. @@ -74,6 +75,24 @@
    231. 

  231.          public static readonly DependencyProperty StatusTextProperty =

    232. 

  232.                  DependencyProperty.Register("StatusText", typeof(string), typeof(MainWindow), new PropertyMetadata(App.NAME + " " + App.VERSION));

    233. 

  233.  

    234. 

  234. +        public string LoginedUserName

    235. 

  235. +        {

    236. 

  236. +            get { return (string)GetValue(LoginedUserNameProperty); }

    237. 

  237. +            set { SetValue(LoginedUserNameProperty, value); }

    238. 

  238. +        }

    239. 

  239. +

    240. 

  240. +        public static readonly DependencyProperty LoginedUserNameProperty =

    241. 

  241. +                DependencyProperty.Register("LoginedUserName", typeof(string), typeof(MainWindow));

    242. 

  242. +

    243. 

  243. +        public string LoginedUserImageUrl

    244. 

  244. +        {

    245. 

  245. +            get { return (string)GetValue(LoginedUserImageUrlProperty); }

    246. 

  246. +            set { SetValue(LoginedUserImageUrlProperty, value); }

    247. 

  247. +        }

    248. 

  248. +

    249. 

  249. +        public static readonly DependencyProperty LoginedUserImageUrlProperty =

    250. 

  250. +                DependencyProperty.Register("LoginedUserImageUrl", typeof(string), typeof(MainWindow));

    251. 

  251. +       

    252. 

  252.          public enum RefreshTarget

    253. 

  253.          {

    254. 

  254.              All,

    255. 

  255. @@ -107,7 +126,7 @@
    256. 

  256.              replies.Filters.Add(new Filter { Type = FilterType.RegexText, Pattern = string.Format(@"@{0}[^a-zA-Z_0-9]", client.LoginedUser.ScreenName) });

    257. 

  257.              var archive = Timelines.TypeAt(TimelineType.Archive);

    258. 

  258.              archive.Filters.Clear();

    259. 

  259. -            archive.Filters.Add(new Filter { Type = FilterType.Name, Pattern = Settings.Default.Username });

    260. 

  260. +            archive.Filters.Add(new Filter { Type = FilterType.Name, Pattern = client.LoginedUser.Name });

    261. 

  261.          }

    262. 

  262.  

    263. 

  263.          private void InitializeAutoRefresh()

    264. 

  264. @@ -207,8 +226,17 @@
    265. 

  265.  

    266. 

  266.          private void LoginCallback(object state)

    267. 

  267.          {

    268. 

  268. +            // ??????????????????

    269. 

  269. +            Timelines.ClearAll();

    270. 

  270.              // ???????????

    271. 

  271. -            var result = client.Login(Settings.Default.Username, Settings.Default.Password);

    272. 

  272. +            var account = Settings.Default.CurrentAccount;

    273. 

  273. +            if (account == null)

    274. 

  274. +            {

    275. 

  275. +                // ??????????????

    276. 

  276. +                this.Invoke(() => StatusText = "???????????????");

    277. 

  277. +                return;

    278. 

  278. +            }

    279. 

  279. +            var result = client.Login(account.Username, account.Password);

    280. 

  280.              if (result == null)

    281. 

  281.              {

    282. 

  282.                  // ????ID?????????

    283. 

  283. @@ -222,8 +250,9 @@
    284. 

  284.              }

    285. 

  285.              else

    286. 

  286.              {

    287. 

  287. -                // ??????????????????

    288. 

  288. -                Timelines.ClearAll();

    289. 

  289. +                // ??????????????

    290. 

  290. +                this.Invoke(() => LoginedUserName = client.LoginedUser.Name);

    291. 

  291. +                this.Invoke(() => LoginedUserImageUrl = client.LoginedUser.ImageUrl);

    292. 

  292.                  // ????????

    293. 

  293.                  InitializeFilter();

    294. 

  294.                  // ???????????????

    295. 

  295. @@ -346,7 +375,7 @@
    296. 

  296.                          popupWindow.Show(statuses);

    297. 

  297.                      }

    298. 

  298.                  }

    299. 

  299. -                var action = statuses.Any(p => Regex.IsMatch(p.Text, string.Format(@"{0}[^a-zA-Z_0-9]", Settings.Default.Username))) ? SoundAction.Reply : SoundAction.Status;

    300. 

  300. +                var action = statuses.Any(p => Regex.IsMatch(p.Text, string.Format(@"{0}[^a-zA-Z_0-9]", client.LoginedUser.Name))) ? SoundAction.Reply : SoundAction.Status;

    301. 

  301.                  var sound = Settings.Default.SoundBindings.Where(p => p.IsEnabled && p.Action == action).FirstOrDefault();

    302. 

  302.                  if (sound != null)

    303. 

  303.                  {

    304. 

  304. @@ -460,7 +489,7 @@
    305. 

  305.  

    306. 

  306.          private void MainWindow_Loaded(object sender, RoutedEventArgs e)

    307. 

  307.          {

    308. 

  308. -            if (string.IsNullOrEmpty(Settings.Default.Username) || string.IsNullOrEmpty(Settings.Default.Password))

    309. 

  309. +            if (Settings.Default.CurrentAccount == null)

    310. 

  310.              {

    311. 

  311.                  SettingButton_Click(null, null);

    312. 

  312.                  return;

    313. 

  313. @@ -616,6 +645,29 @@
    314. 

  314.              TweetTextBox.Focus();

    315. 

  315.          }

    316. 

  316.  

    317. 

  317. +        private void AccountSwitchButton_Click(object sender, RoutedEventArgs e)

    318. 

  318. +        {

    319. 

  319. +            var accountMenu = new ContextMenu();

    320. 

  320. +            foreach (var account in Settings.Default.Accounts)

    321. 

  321. +            {

    322. 

  322. +                var item = new MenuItem();

    323. 

  323. +                item.Header = account.Username;

    324. 

  324. +                item.Tag = accountMenu.Items.Count;

    325. 

  325. +                item.Click += (senderItem, eventArgs) =>

    326. 

  326. +                {

    327. 

  327. +                    Settings.Default.CurrentAccountIndex = (int)((MenuItem)senderItem).Tag;

    328. 

  328. +                    Login();

    329. 

  329. +                };

    330. 

  330. +                accountMenu.Items.Add(item);

    331. 

  331. +            }

    332. 

  332. +            if (Settings.Default.CurrentAccountIndex >= 0)

    333. 

  333. +            {

    334. 

  334. +                var item = (MenuItem)accountMenu.Items[Settings.Default.CurrentAccountIndex];

    335. 

  335. +                item.IsChecked = true;

    336. 

  336. +            }

    337. 

  337. +            accountMenu.IsOpen = true;

    338. 

  338. +        }

    339. 

  339. +

    340. 

  340.          private void HomeButton_Click(object sender, RoutedEventArgs e)

    341. 

  341.          {

    342. 

  342.              Process.Start("http://twitter.com/home");

    343. 

  343. @@ -623,6 +675,7 @@
    344. 

  344.  

    345. 

  345.          private void SettingButton_Click(object sender, RoutedEventArgs e)

    346. 

  346.          {

    347. 

  347. +            var currentAccount = Settings.Default.CurrentAccount;

    348. 

  348.              SettingDialog dialog = new SettingDialog { Owner = this };

    349. 

  349.              if (!(dialog.ShowDialog() ?? false))

    350. 

  350.              {

    351. 

  351. @@ -636,8 +689,9 @@
    352. 

  352.              InitializePopupWindow();

    353. 

  353.              // ????????????????

    354. 

  354.              InitializeKeyboardShortcut();

    355. 

  355. -            // ???????????

    356. 

  356. -            if (!client.IsLogined)

    357. 

  357. +            // ?????????

    358. 

  358. +            if (Settings.Default.CurrentAccount != null &&

    359. 

  359. +                !Settings.Default.CurrentAccount.Equals(currentAccount))

    360. 

  360.              {

    361. 

  361.                  // Twitter ?????

    362. 

  362.                  Login();

    363. 

  363. diff -urN -xobj -xbin -xmodified-files.diff MiniTwitter/MiniTwitter/MiniTwitter.csproj MiniTwitter-ma/MiniTwitter/MiniTwitter.csproj
    364. 

  364. --- MiniTwitter/MiniTwitter/MiniTwitter.csproj	2010-01-16 19:32:34.968750000 +0900
    365. 

  365. +++ MiniTwitter-ma/MiniTwitter/MiniTwitter.csproj	2010-01-12 22:39:47.402087200 +0900
    366. 

  366. @@ -17,10 +17,14 @@
    367. 

  367.      <UICulture>ja-JP</UICulture>

    368. 

  368.      <TargetFrameworkSubset>Full</TargetFrameworkSubset>

    369. 

  369.      <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>

    370. 

  370. -    <SccProjectName>SAK</SccProjectName>

    371. 

  371. -    <SccLocalPath>SAK</SccLocalPath>

    372. 

  372. -    <SccAuxPath>SAK</SccAuxPath>

    373. 

  373. -    <SccProvider>SAK</SccProvider>

    374. 

  374. +    <SccProjectName>

    375. 

  375. +    </SccProjectName>

    376. 

  376. +    <SccLocalPath>

    377. 

  377. +    </SccLocalPath>

    378. 

  378. +    <SccAuxPath>

    379. 

  379. +    </SccAuxPath>

    380. 

  380. +    <SccProvider>

    381. 

  381. +    </SccProvider>

    382. 

  382.      <PublishUrl>publish\</PublishUrl>

    383. 

  383.      <Install>true</Install>

    384. 

  384.      <InstallFrom>Disk</InstallFrom>

    385. 

  385. @@ -58,11 +62,11 @@
    386. 

  386.    <ItemGroup>

    387. 

  387.      <Reference Include="Microsoft.WindowsAPICodePack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">

    388. 

  388.        <SpecificVersion>False</SpecificVersion>

    389. 

  389. -      <HintPath>.\Microsoft.WindowsAPICodePack.dll</HintPath>

    390. 

  390. +      <HintPath>..\..\..\..\libraries\WindowsAPICodePack\WindowsAPICodePack\Core\bin\Release\Microsoft.WindowsAPICodePack.dll</HintPath>

    391. 

  391.      </Reference>

    392. 

  392.      <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">

    393. 

  393.        <SpecificVersion>False</SpecificVersion>

    394. 

  394. -      <HintPath>.\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>

    395. 

  395. +      <HintPath>..\..\..\..\libraries\WindowsAPICodePack\WindowsAPICodePack\Shell\bin\Release\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>

    396. 

  396.      </Reference>

    397. 

  397.      <Reference Include="System" />

    398. 

  398.      <Reference Include="System.Core">

    399. 

  399. @@ -103,6 +107,7 @@
    400. 

  400.      </Compile>

    401. 

  401.    </ItemGroup>

    402. 

  402.    <ItemGroup>

    403. 

  403. +    <Compile Include="Account.cs" />

    404. 

  404.      <Compile Include="Controls\HyperlinkButton.xaml.cs">

    405. 

  405.        <DependentUpon>HyperlinkButton.xaml</DependentUpon>

    406. 

  406.      </Compile>

    407. 

  407. diff -urN -xobj -xbin -xmodified-files.diff MiniTwitter/MiniTwitter/Properties/Settings.cs MiniTwitter-ma/MiniTwitter/Properties/Settings.cs
    408. 

  408. --- MiniTwitter/MiniTwitter/Properties/Settings.cs	2010-01-16 19:32:34.968750000 +0900
    409. 

  409. +++ MiniTwitter-ma/MiniTwitter/Properties/Settings.cs	2010-01-22 22:33:57.000000000 +0900
    410. 

  410. @@ -1,4 +1,5 @@
    411. 

  411. -?using System;

    412. 

  412. +?/* modified by ksksts. see modified-files.diff */

    413. 

  413. +using System;

    414. 

  414.  using System.Collections.Generic;

    415. 

  415.  using System.Collections.ObjectModel;

    416. 

  416.  using System.ComponentModel;

    417. 

  417. @@ -61,15 +62,10 @@
    418. 

  418.          /// </summary>

    419. 

  419.          public WindowState WindowState { get; set; }

    420. 

  420.  

    421. 

  421. -        /// <summary>

    422. 

  422. -        /// ?????

    423. 

  423. -        /// </summary>

    424. 

  424. -        public string Username { get; set; }

    425. 

  425. -

    426. 

  426. -        /// <summary>

    427. 

  427. -        /// ?????

    428. 

  428. +         /// <summary>

    429. 

  429. +        /// ???????????????

    430. 

  430.          /// </summary>

    431. 

  431. -        public string Password { get; set; }

    432. 

  432. +        public int CurrentAccountIndex { get; set; }

    433. 

  433.  

    434. 

  434.          /// <summary>

    435. 

  435.          /// ??????????

    436. 

  436. @@ -279,6 +275,30 @@
    437. 

  437.          [XmlIgnore]

    438. 

  438.          public ObservableCollection<KeywordBinding> KeywordBindings { get; private set; }

    439. 

  439.  

    440. 

  440. +        [XmlArray("Accounts")]

    441. 

  441. +        public Account[] AccountsInternal

    442. 

  442. +        {

    443. 

  443. +            get { return Accounts.Count != 0 ? Accounts.ToArray() : null; }

    444. 

  444. +            set { Accounts = new ObservableCollection<Account>(value ?? Enumerable.Empty<Account>()); }

    445. 

  445. +        }

    446. 

  446. +

    447. 

  447. +        [XmlIgnore]

    448. 

  448. +        public ObservableCollection<Account> Accounts { get; private set; }

    449. 

  449. +

    450. 

  450. +        [XmlIgnore]

    451. 

  451. +        public Account CurrentAccount

    452. 

  452. +        {

    453. 

  453. +            get

    454. 

  454. +            {

    455. 

  455. +                Account currentAccount = null;

    456. 

  456. +                if (CurrentAccountIndex >= 0 && CurrentAccountIndex < Accounts.Count)

    457. 

  457. +                {

    458. 

  458. +                    currentAccount = Accounts[CurrentAccountIndex];

    459. 

  459. +                }

    460. 

  460. +                return currentAccount;

    461. 

  461. +            }

    462. 

  462. +        }

    463. 

  463. +

    464. 

  464.          [XmlIgnore]

    465. 

  465.          public Regex FavoriteRegex { get; set; }

    466. 

  466.  

    467. 

  467. @@ -321,6 +341,10 @@
    468. 

  468.              {

    469. 

  469.                  KeywordBindings = new ObservableCollection<KeywordBinding>();

    470. 

  470.              }

    471. 

  471. +            if (Accounts == null)

    472. 

  472. +            {

    473. 

  473. +                Accounts = new ObservableCollection<Account>();

    474. 

  474. +            }

    475. 

  475.              InitializeKeywordRegex();

    476. 

  476.          }

    477. 

  477.  

    478. 

  478. @@ -344,10 +368,6 @@
    479. 

  479.                          throw new Exception();

    480. 

  480.                      }

    481. 

  481.                  }

    482. 

  482. -                if (!Default.Password.IsNullOrEmpty())

    483. 

  483. -                {

    484. 

  484. -                    Default.Password = Encoding.ASCII.GetString(Convert.FromBase64String(Default.Password));

    485. 

  485. -                }

    486. 

  486.                  if (Default.RefreshReplyTick > 20)

    487. 

  487.                  {

    488. 

  488.                      Default.RefreshReplyTick = 10;

    489. 

  489. @@ -358,6 +378,14 @@
    490. 

  490.                      Default.RefreshTick = Math.Min(Default.RefreshTick * 60, 120);

    491. 

  491.                      Default.Version = 2;

    492. 

  492.                  }

    493. 

  493. +                for (int i = 0; i < Default.Accounts.Count; i++)

    494. 

  494. +                {

    495. 

  495. +                    var account = Default.Accounts[i];

    496. 

  496. +                    if (!account.Password.IsNullOrEmpty())

    497. 

  497. +                    {

    498. 

  498. +                        account.Password = Encoding.ASCII.GetString(Convert.FromBase64String(account.Password));

    499. 

  499. +                    }

    500. 

  500. +                }

    501. 

  501.              }

    502. 

  502.              catch

    503. 

  503.              {

    504. 

  504. @@ -381,9 +409,13 @@
    505. 

  505.              {

    506. 

  506.                  Directory.CreateDirectory(BaseDirectory);

    507. 

  507.              }

    508. 

  508. -            if (!Default.Password.IsNullOrEmpty())

    509. 

  509. +            for (int i = 0; i < Default.Accounts.Count; i++)

    510. 

  510.              {

    511. 

  511. -                Default.Password = Convert.ToBase64String(Encoding.ASCII.GetBytes(Default.Password));

    512. 

  512. +                var account = Default.Accounts[i];

    513. 

  513. +                if (!account.Password.IsNullOrEmpty())

    514. 

  514. +                {

    515. 

  515. +                    account.Password = Convert.ToBase64String(Encoding.ASCII.GetBytes(account.Password));

    516. 

  516. +                }

    517. 

  517.              }

    518. 

  518.              using (var stream = File.Open(Path.Combine(BaseDirectory, @"Preference.xml"), FileMode.Create, FileAccess.Write, FileShare.None))

    519. 

  519.              {

    520. 

  520. diff -urN -xobj -xbin -xmodified-files.diff MiniTwitter/MiniTwitter/Resources/Common.xaml MiniTwitter-ma/MiniTwitter/Resources/Common.xaml
    521. 

  521. --- MiniTwitter/MiniTwitter/Resources/Common.xaml	2010-01-16 19:32:34.984375000 +0900
    522. 

  522. +++ MiniTwitter-ma/MiniTwitter/Resources/Common.xaml	2010-01-22 22:32:27.734375000 +0900
    523. 

  523. @@ -1,4 +1,5 @@
    524. 

  524. -?<ResourceDictionary

    525. 

  525. +?<!-- modified by ksksts. see modified-files.diff -->

    526. 

  526. +<ResourceDictionary

    527. 

  527.      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

    528. 

  528.      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

    529. 

  529.      xmlns:System_ComponentModel="clr-namespace:System.ComponentModel;assembly=System"

    530. 

  530. @@ -50,6 +51,14 @@
    531. 

  531.          </Style.Triggers>

    532. 

  532.      </Style>

    533. 

  533.  

    534. 

  534. +    <Style x:Key="TightMenuItemStyle" TargetType="{x:Type MenuItem}">

    535. 

  535. +        <Style.Triggers>

    536. 

  536. +            <DataTrigger Binding="{Binding Source={x:Static MiniTwitter_Properties:Settings.Default}, Path=TimelineStyle}" Value="Tight">

    537. 

  537. +                <Setter Property="IsChecked" Value="True"/>

    538. 

  538. +            </DataTrigger>

    539. 

  539. +        </Style.Triggers>

    540. 

  540. +    </Style>

    541. 

  541. +

    542. 

  542.      <Style x:Key="CreatedAtCategoryMenuItemStyle" TargetType="{x:Type MenuItem}">

    543. 

  543.          <Style.Triggers>

    544. 

  544.              <DataTrigger Binding="{Binding Source={x:Static MiniTwitter_Properties:Settings.Default}, Path=SortCategory}" Value="CreatedAt">

    545. 

  545. @@ -90,7 +99,7 @@
    546. 

  546.              </DataTrigger>

    547. 

  547.          </Style.Triggers>

    548. 

  548.      </Style>

    549. 

  549. -    

    550. 

  550. +

    551. 

  551.      <Style x:Key="TimelineTextStyle" TargetType="{x:Type MiniTwitter_Controls:TextViewer}">

    552. 

  552.          <Style.Triggers>

    553. 

  553.              <DataTrigger Binding="{Binding Path=IsMention}" Value="True">

    554. 

  554. @@ -102,6 +111,11 @@
    555. 

  555.          </Style.Triggers>

    556. 

  556.      </Style>

    557. 

  557.  

    558. 

  558. +    <Style x:Key="TightTimelineTextStyle" TargetType="{x:Type MiniTwitter_Controls:TextViewer}" BasedOn="{StaticResource TimelineTextStyle}">

    559. 

  559. +        <Setter Property="LineHeight" Value="12.0" />

    560. 

  560. +        <Setter Property="LineStackingStrategy" Value="BlockLineHeight" />

    561. 

  561. +    </Style>

    562. 

  562. +

    563. 

  563.      <ContextMenu x:Key="TextBoxContextMenu">

    564. 

  564.          <MenuItem Header="????(_U)" Command="ApplicationCommands.Undo"/>

    565. 

  565.          <Separator/>

    566. 

  566. @@ -154,6 +168,7 @@
    567. 

  567.              <MenuItem Header="??(_S)" Command="MiniTwitter_Input:Commands.TimelineStyle" CommandParameter="{x:Static MiniTwitter:TimelineStyle.Standard}" Style="{StaticResource StandardMenuItemStyle}"/>

    568. 

  568.              <MenuItem Header="????(_B)" Command="MiniTwitter_Input:Commands.TimelineStyle" CommandParameter="{x:Static MiniTwitter:TimelineStyle.Balloon}" Style="{StaticResource BalloonMenuItemStyle}"/>

    569. 

  569.              <MenuItem Header="??(_L)" Command="MiniTwitter_Input:Commands.TimelineStyle" CommandParameter="{x:Static MiniTwitter:TimelineStyle.List}" Style="{StaticResource ListMenuItemStyle}"/>

    570. 

  570. +            <MenuItem Header="???(_T)" Command="MiniTwitter_Input:Commands.TimelineStyle" CommandParameter="{x:Static MiniTwitter:TimelineStyle.Tight}" Style="{StaticResource TightMenuItemStyle}"/>

    571. 

  571.              <Separator/>

    572. 

  572.              <MenuItem Header="???????(_I)" IsCheckable="True" IsChecked="{Binding Source={x:Static MiniTwitter_Properties:Settings.Default}, Path=IsIconVisible}"/>

    573. 

  573.          </MenuItem>

    574. 

  574. diff -urN -xobj -xbin -xmodified-files.diff MiniTwitter/MiniTwitter/Resources/Templates.xaml MiniTwitter-ma/MiniTwitter/Resources/Templates.xaml
    575. 

  575. --- MiniTwitter/MiniTwitter/Resources/Templates.xaml	2010-01-16 19:32:34.984375000 +0900
    576. 

  576. +++ MiniTwitter-ma/MiniTwitter/Resources/Templates.xaml	2010-01-22 22:32:27.515625000 +0900
    577. 

  577. @@ -1,4 +1,5 @@
    578. 

  578. -?<ResourceDictionary

    579. 

  579. +?<!-- modified by ksksts. see modified-files.diff -->

    580. 

  580. +<ResourceDictionary

    581. 

  581.      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

    582. 

  582.      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

    583. 

  583.      xmlns:MiniTwitter="clr-namespace:MiniTwitter"

    584. 

  584. @@ -183,7 +184,7 @@
    585. 

  585.              </StackPanel>

    586. 

  586.          </Grid>

    587. 

  587.      </DataTemplate>

    588. 

  588. -    

    589. 

  589. +

    590. 

  590.      <DataTemplate x:Key="BalloonStatusTemplate" DataType="{x:Type MiniTwitter_Net_Twitter:Status}">

    591. 

  591.          <Grid Margin="7,7,7,7" SnapsToDevicePixels="True">

    592. 

  592.              <Grid.RowDefinitions>

    593. 

  593. @@ -436,4 +437,181 @@
    594. 

  594.          </Grid>

    595. 

  595.      </DataTemplate>

    596. 

  596.  

    597. 

  597. +    <DataTemplate x:Key="TightStatusTemplate" DataType="{x:Type MiniTwitter_Net_Twitter:Status}">

    598. 

  598. +        <Grid Margin="3,3,3,3" SnapsToDevicePixels="True">

    599. 

  599. +            <Grid.ColumnDefinitions>

    600. 

  600. +                <ColumnDefinition Width="Auto"/>

    601. 

  601. +                <ColumnDefinition Width="*"/>

    602. 

  602. +            </Grid.ColumnDefinitions>

    603. 

  603. +            <Image Width="36" Height="36" Margin="0,0,8,0" Grid.Column="0" VerticalAlignment="Top"

    604. 

  604. +                   Source="{Binding Path=Sender.ImageUrl}"

    605. 

  605. +                   Visibility="{Binding Source={x:Static MiniTwitter_Properties:Settings.Default}, Path=IsIconVisible, Converter={StaticResource BooleanToVisibilityConverter}}">

    606. 

  606. +                <Image.ToolTip>

    607. 

  607. +                    <StackPanel MaxWidth="400">

    608. 

  608. +                        <TextBlock FontWeight="Bold">

    609. 

  609. +                            <TextBlock.Text>

    610. 

  610. +                                <MultiBinding StringFormat="{}{0} / {1}">

    611. 

  611. +                                    <Binding Path="Sender.Name" />

    612. 

  612. +                                    <Binding Path="Sender.Location" />

    613. 

  613. +                                </MultiBinding>

    614. 

  614. +                            </TextBlock.Text>

    615. 

  615. +                        </TextBlock>

    616. 

  616. +                        <TextBlock Text="{Binding Path=Sender.Description}" TextWrapping="Wrap" />

    617. 

  617. +                    </StackPanel>

    618. 

  618. +                </Image.ToolTip>

    619. 

  619. +            </Image>

    620. 

  620. +            <StackPanel Grid.Column="1">

    621. 

  621. +                <StackPanel Orientation="Horizontal">

    622. 

  622. +                    <MiniTwitter_Controls:HyperlinkButton Text="{Binding Path=Sender.ScreenName}" ToolTip="{Binding Path=Sender.Name}"

    623. 

  623. +                                                          FontWeight="Bold" FontSize="11" HorizontalAlignment="Left" VerticalAlignment="Center"

    624. 

  624. +                                                          Command="MiniTwitter_Input:Commands.MoveToUserPage" CommandParameter="{Binding}"/>

    625. 

  625. +                    <Image Width="12" Height="12" Margin="3,0,0,0" Visibility="{Binding Path=Sender.Protected, Converter={StaticResource BooleanToVisibilityConverter}}"

    626. 

  626. +                           Style="{DynamicResource ProtectImageStyle}"/>

    627. 

  627. +                    <Image Width="12" Height="12" Margin="3,0,0,0" Visibility="{Binding Path=IsNewest, Converter={StaticResource BooleanToVisibilityConverter}}"

    628. 

  628. +                           Style="{DynamicResource NewImageStyle}"/>

    629. 

  629. +                </StackPanel>

    630. 

  630. +                <MiniTwitter_Controls:TextViewer Text="{Binding Path=Text}" Style="{StaticResource TightTimelineTextStyle}"/>

    631. 

  631. +                <WrapPanel>

    632. 

  632. +                    <MiniTwitter_Controls:HyperlinkButton Text="{Binding Path=RelativeTime}" FontSize="10" Margin="0,0,3,0" VerticalAlignment="Center"

    633. 

  633. +                                                          Command="MiniTwitter_Input:Commands.MoveToStatusPage" CommandParameter="{Binding}">

    634. 

  634. +                        <MiniTwitter_Controls:HyperlinkButton.ToolTip>

    635. 

  635. +                            <TextBlock Text="{Binding Path=CreatedAt, StringFormat=yyyy/MM/dd HH:mm:ss}"/>

    636. 

  636. +                        </MiniTwitter_Controls:HyperlinkButton.ToolTip>

    637. 

  637. +                    </MiniTwitter_Controls:HyperlinkButton>

    638. 

  638. +                    <TextBlock Margin="0,0,3,0" FontSize="10" VerticalAlignment="Center" Text="{Binding Path=Source, StringFormat=from \{0\}}"/>

    639. 

  639. +                    <Button Margin="0,0,3,0" Padding="0" Visibility="{Binding Path=IsAuthor, Converter={StaticResource BooleanToVisibilityConverter}}"

    640. 

  640. +                            Command="MiniTwitter_Input:Commands.Delete" CommandParameter="{Binding}" Style="{DynamicResource ImageButtonStyle}">

    641. 

  641. +                        <Image Width="14" Height="14" Style="{DynamicResource CrossImageStyle}"/>

    642. 

  642. +                    </Button>

    643. 

  643. +                    <Button Margin="0,0,3,0" Padding="0" Command="MiniTwitter_Input:Commands.Favorite"

    644. 

  644. +                            CommandParameter="{Binding}" Style="{DynamicResource ImageButtonStyle}">

    645. 

  645. +                        <Image Width="14" Height="14" Style="{DynamicResource FavoriteImageStyle}"/>

    646. 

  646. +                    </Button>

    647. 

  647. +                    <Button Margin="0,0,3,0" Padding="0" Command="MiniTwitter_Input:Commands.Reply" ToolTip="Reply"

    648. 

  648. +                            CommandParameter="{Binding}" Style="{DynamicResource ImageButtonStyle}">

    649. 

  649. +                        <Image Width="14" Height="14" Style="{DynamicResource ArrowReplyImageStyle}"/>

    650. 

  650. +                    </Button>

    651. 

  651. +                    <Button Margin="0,0,3,0" Padding="0" Command="MiniTwitter_Input:Commands.ReTweet" ToolTip="?????? ReTweet"

    652. 

  652. +                            CommandParameter="{Binding}" Style="{DynamicResource ImageButtonStyle}">

    653. 

  653. +                        <Image Width="14" Height="14" Style="{DynamicResource ArrowReTweetImageStyle}"/>

    654. 

  654. +                    </Button>

    655. 

  655. +                </WrapPanel>

    656. 

  656. +            </StackPanel>

    657. 

  657. +        </Grid>

    658. 

  658. +    </DataTemplate>

    659. 

  659. +

    660. 

  660. +    <DataTemplate x:Key="TightReTweetTemplate" DataType="{x:Type MiniTwitter_Net_Twitter:Status}">

    661. 

  661. +        <Grid Margin="3,3,3,3" SnapsToDevicePixels="True">

    662. 

  662. +            <Grid.ColumnDefinitions>

    663. 

  663. +                <ColumnDefinition Width="Auto"/>

    664. 

  664. +                <ColumnDefinition Width="*"/>

    665. 

  665. +            </Grid.ColumnDefinitions>

    666. 

  666. +            <Grid Width="36" Height="36" Margin="0,0,8,0" Grid.Column="0" VerticalAlignment="Top"

    667. 

  667. +                  Visibility="{Binding Source={x:Static MiniTwitter_Properties:Settings.Default}, Path=IsIconVisible, Converter={StaticResource BooleanToVisibilityConverter}}">

    668. 

  668. +                <Image Width="24" Height="24" VerticalAlignment="Top" HorizontalAlignment="Left" Source="{Binding Path=ReTweetedStatus.Sender.ImageUrl}">

    669. 

  669. +                    <Image.ToolTip>

    670. 

  670. +                        <StackPanel MaxWidth="400">

    671. 

  671. +                            <TextBlock FontWeight="Bold">

    672. 

  672. +                            <TextBlock.Text>

    673. 

  673. +                                <MultiBinding StringFormat="{}{0} / {1}">

    674. 

  674. +                                    <Binding Path="ReTweetedStatus.Sender.Name" />

    675. 

  675. +                                    <Binding Path="ReTweetedStatus.Sender.Location" />

    676. 

  676. +                                </MultiBinding>

    677. 

  677. +                            </TextBlock.Text>

    678. 

  678. +                            </TextBlock>

    679. 

  679. +                            <TextBlock Text="{Binding Path=ReTweetedStatus.Sender.Description}" TextWrapping="Wrap" />

    680. 

  680. +                        </StackPanel>

    681. 

  681. +                    </Image.ToolTip>

    682. 

  682. +                </Image>

    683. 

  683. +                <Image Width="12" Height="12" VerticalAlignment="Bottom" HorizontalAlignment="Right" Source="{Binding Path=Sender.ImageUrl}">

    684. 

  684. +                    <Image.ToolTip>

    685. 

  685. +                        <StackPanel MaxWidth="400">

    686. 

  686. +                            <TextBlock FontWeight="Bold">

    687. 

  687. +                            <TextBlock.Text>

    688. 

  688. +                                <MultiBinding StringFormat="{}{0} / {1}">

    689. 

  689. +                                    <Binding Path="Sender.Name" />

    690. 

  690. +                                    <Binding Path="Sender.Location" />

    691. 

  691. +                                </MultiBinding>

    692. 

  692. +                            </TextBlock.Text>

    693. 

  693. +                            </TextBlock>

    694. 

  694. +                            <TextBlock Text="{Binding Path=Sender.Description}" TextWrapping="Wrap" />

    695. 

  695. +                        </StackPanel>

    696. 

  696. +                    </Image.ToolTip>

    697. 

  697. +                </Image>

    698. 

  698. +            </Grid>

    699. 

  699. +            <StackPanel Grid.Column="1">

    700. 

  700. +                <StackPanel Orientation="Horizontal">

    701. 

  701. +                    <MiniTwitter_Controls:HyperlinkButton Text="{Binding Path=Sender.ScreenName}" ToolTip="{Binding Path=Sender.Name}"

    702. 

  702. +                                                          FontWeight="Bold" FontSize="11" HorizontalAlignment="Left" VerticalAlignment="Center"

    703. 

  703. +                                                          Command="MiniTwitter_Input:Commands.MoveToUserPage" CommandParameter="{Binding}"/>

    704. 

  704. +                    <Image Width="12" Height="12" Margin="3,0,0,0" Visibility="{Binding Path=Sender.Protected, Converter={StaticResource BooleanToVisibilityConverter}}"

    705. 

  705. +                           Style="{DynamicResource ProtectImageStyle}"/>

    706. 

  706. +                    <Image Width="12" Height="12" Margin="3,0,0,0" Visibility="{Binding Path=IsNewest, Converter={StaticResource BooleanToVisibilityConverter}}"

    707. 

  707. +                           Style="{DynamicResource NewImageStyle}"/>

    708. 

  708. +                </StackPanel>

    709. 

  709. +                <MiniTwitter_Controls:TextViewer Text="{Binding Path=Text}" Style="{StaticResource TightTimelineTextStyle}"/>

    710. 

  710. +                <WrapPanel>

    711. 

  711. +                    <MiniTwitter_Controls:HyperlinkButton Text="{Binding Path=RelativeTime}" FontSize="10" Margin="0,0,3,0" VerticalAlignment="Center"

    712. 

  712. +                                                          Command="MiniTwitter_Input:Commands.MoveToStatusPage" CommandParameter="{Binding}">

    713. 

  713. +                        <MiniTwitter_Controls:HyperlinkButton.ToolTip>

    714. 

  714. +                            <TextBlock Text="{Binding Path=CreatedAt, StringFormat=yyyy/MM/dd HH:mm:ss}"/>

    715. 

  715. +                        </MiniTwitter_Controls:HyperlinkButton.ToolTip>

    716. 

  716. +                    </MiniTwitter_Controls:HyperlinkButton>

    717. 

  717. +                    <TextBlock Margin="0,0,3,0" FontSize="10" VerticalAlignment="Center" Text="{Binding Path=Source, StringFormat=from \{0\}}"/>

    718. 

  718. +                    <Button Margin="0,0,3,0" Padding="0" Visibility="{Binding Path=IsAuthor, Converter={StaticResource BooleanToVisibilityConverter}}"

    719. 

  719. +                            Command="MiniTwitter_Input:Commands.Delete" CommandParameter="{Binding}" Style="{DynamicResource ImageButtonStyle}">

    720. 

  720. +                        <Image Width="14" Height="14" Style="{DynamicResource CrossImageStyle}"/>

    721. 

  721. +                    </Button>

    722. 

  722. +                    <Button Margin="0,0,3,0" Padding="0" Command="MiniTwitter_Input:Commands.Favorite"

    723. 

  723. +                            CommandParameter="{Binding}" Style="{DynamicResource ImageButtonStyle}">

    724. 

  724. +                        <Image Width="14" Height="14" Style="{DynamicResource FavoriteImageStyle}"/>

    725. 

  725. +                    </Button>

    726. 

  726. +                    <Button Margin="0,0,3,0" Padding="0" Command="MiniTwitter_Input:Commands.Reply" ToolTip="Reply"

    727. 

  727. +                            CommandParameter="{Binding}" Style="{DynamicResource ImageButtonStyle}">

    728. 

  728. +                        <Image Width="14" Height="14" Style="{DynamicResource ArrowReplyImageStyle}"/>

    729. 

  729. +                    </Button>

    730. 

  730. +                    <Button Margin="0,0,3,0" Padding="0" Command="MiniTwitter_Input:Commands.ReTweet" ToolTip="?????? ReTweet"

    731. 

  731. +                            CommandParameter="{Binding}" Style="{DynamicResource ImageButtonStyle}">

    732. 

  732. +                        <Image Width="14" Height="14" Style="{DynamicResource ArrowReTweetImageStyle}"/>

    733. 

  733. +                    </Button>

    734. 

  734. +                </WrapPanel>

    735. 

  735. +            </StackPanel>

    736. 

  736. +        </Grid>

    737. 

  737. +    </DataTemplate>

    738. 

  738. +

    739. 

  739. +    <DataTemplate x:Key="TightMessageTemplate" DataType="{x:Type MiniTwitter_Net_Twitter:DirectMessage}">

    740. 

  740. +        <Grid Margin="3,3,3,3" SnapsToDevicePixels="True">

    741. 

  741. +            <Grid.ColumnDefinitions>

    742. 

  742. +                <ColumnDefinition Width="Auto"/>

    743. 

  743. +                <ColumnDefinition Width="*"/>

    744. 

  744. +            </Grid.ColumnDefinitions>

    745. 

  745. +            <Grid Width="36" Height="36" Margin="0,0,8,0" Grid.Column="0" VerticalAlignment="Top"

    746. 

  746. +                  Visibility="{Binding Source={x:Static MiniTwitter_Properties:Settings.Default}, Path=IsIconVisible, Converter={StaticResource BooleanToVisibilityConverter}}">

    747. 

  747. +                <Image Width="24" Height="24" VerticalAlignment="Top" HorizontalAlignment="Left" Source="{Binding Path=Sender.ImageUrl}" ToolTip="{Binding Path=Sender.Name}"/>

    748. 

  748. +                <Image Width="12" Height="12" VerticalAlignment="Bottom" HorizontalAlignment="Right" Source="{Binding Path=Recipient.ImageUrl}" ToolTip="{Binding Path=Recipient.Name}"/>

    749. 

  749. +            </Grid>

    750. 

  750. +            <StackPanel Grid.Column="1">

    751. 

  751. +                <StackPanel Orientation="Horizontal">

    752. 

  752. +                    <MiniTwitter_Controls:HyperlinkButton Text="{Binding Path=Sender.ScreenName}" ToolTip="{Binding Path=Sender.Name}" FontWeight="Bold" FontSize="11" HorizontalAlignment="Left" VerticalAlignment="Center" Command="MiniTwitter_Input:Commands.MoveToUserPage" CommandParameter="{Binding}"/>

    753. 

  753. +                    <Image Width="12" Height="12" Margin="3,0,0,0" Visibility="{Binding Path=Sender.Protected, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{DynamicResource ProtectImageStyle}"/>

    754. 

  754. +                    <Image Width="12" Height="12" Margin="3,0,0,0" Visibility="{Binding Path=IsNewest, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{DynamicResource NewImageStyle}"/>

    755. 

  755. +                </StackPanel>

    756. 

  756. +                <MiniTwitter_Controls:TextViewer Text="{Binding Path=Text}" Style="{StaticResource TightTimelineTextStyle}"/>

    757. 

  757. +                <WrapPanel>

    758. 

  758. +                    <TextBlock Text="{Binding Path=RelativeTime}" FontSize="10" Margin="0,0,3,0" VerticalAlignment="Center">

    759. 

  759. +                        <TextBlock.ToolTip>

    760. 

  760. +                            <TextBlock Text="{Binding Path=CreatedAt, StringFormat=yyyy/MM/dd HH:mm:ss}"/>

    761. 

  761. +                        </TextBlock.ToolTip>

    762. 

  762. +                    </TextBlock>

    763. 

  763. +                    <Button Margin="0,0,3,0" Padding="0" Command="MiniTwitter_Input:Commands.Delete" CommandParameter="{Binding}" Style="{DynamicResource ImageButtonStyle}">

    764. 

  764. +                        <Image Width="14" Height="14" Style="{DynamicResource CrossImageStyle}"/>

    765. 

  765. +                    </Button>

    766. 

  766. +                    <Button Margin="0,0,3,0" Padding="0" Command="MiniTwitter_Input:Commands.ReplyMessage" CommandParameter="{Binding}" Style="{DynamicResource ImageButtonStyle}">

    767. 

  767. +                        <Image Width="14" Height="14" Style="{DynamicResource ArrowReplyImageStyle}"/>

    768. 

  768. +                    </Button>

    769. 

  769. +                </WrapPanel>

    770. 

  770. +            </StackPanel>

    771. 

  771. +        </Grid>

    772. 

  772. +    </DataTemplate>

    773. 

  773. +

    774. 

  774.  </ResourceDictionary>
    775. 

  775. \ No newline at end of file
    776. 

  776. diff -urN -xobj -xbin -xmodified-files.diff MiniTwitter/MiniTwitter/SettingDialog.xaml MiniTwitter-ma/MiniTwitter/SettingDialog.xaml
    777. 

  777. --- MiniTwitter/MiniTwitter/SettingDialog.xaml	2010-01-16 19:32:35.000000000 +0900
    778. 

  778. +++ MiniTwitter-ma/MiniTwitter/SettingDialog.xaml	2010-01-22 22:32:26.015625000 +0900
    779. 

  779. @@ -1,4 +1,5 @@
    780. 

  780. -?<Window

    781. 

  781. +?<!-- modified by ksksts. see modified-files.diff -->

    782. 

  782. +<Window

    783. 

  783.      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

    784. 

  784.      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

    785. 

  785.      xmlns:MiniTwitter="clr-namespace:MiniTwitter"

    786. 

  786. @@ -103,11 +104,34 @@
    787. 

  787.              <Button Content="?????" Width="90" IsCancel="True" Click="CancelButton_Click"/>

    788. 

  788.          </StackPanel>

    789. 

  789.          <Canvas Grid.Column="2" Grid.Row="0" Visibility="{Binding Path=IsSelected, ElementName=AccountListBoxItem, Converter={StaticResource BooleanToVisibilityConverter}}">

    790. 

  790. -            <TextBlock Text="?????" TextWrapping="Wrap" Canvas.Left="14" Canvas.Top="17"/>

    791. 

  791. -            <TextBlock Text="?????" TextWrapping="Wrap" Canvas.Left="14" Canvas.Top="45"/>

    792. 

  792. -            <TextBox Width="200" InputMethod.IsInputMethodEnabled="False" Canvas.Left="110" Canvas.Top="14" Text="{Binding Path=Username}"/>

    793. 

  793. -            <PasswordBox x:Name="PasswordBox" Width="200" Canvas.Left="110" Canvas.Top="42"/>

    794. 

  794. -        </Canvas>

    795. 

  795. +            <ListView x:Name="AccountListView" Width="347" Height="162" IsSynchronizedWithCurrentItem="True" SelectedIndex="0"

    796. 

  796. +                      VerticalContentAlignment="Center" Canvas.Left="14" Canvas.Top="14" SelectionChanged="AccountListView_SelectionChanged">

    797. 

  797. +                <ListView.View>

    798. 

  798. +                    <GridView AllowsColumnReorder="False">

    799. 

  799. +                        <GridViewColumn Header="?????" Width="120">

    800. 

  800. +                            <GridViewColumn.CellTemplate>

    801. 

  801. +                                <DataTemplate>

    802. 

  802. +                                    <TextBlock Text="{Binding Path=Username}" Margin="4,0,0,0" VerticalAlignment="Center"/>

    803. 

  803. +                                </DataTemplate>

    804. 

  804. +                            </GridViewColumn.CellTemplate>

    805. 

  805. +                        </GridViewColumn>

    806. 

  806. +                        <GridViewColumn Header="?????" Width="180">

    807. 

  807. +                            <GridViewColumn.CellTemplate>

    808. 

  808. +                                <DataTemplate>

    809. 

  809. +                                    <TextBlock Text="{Binding Path=HiddenPassword}" Margin="4,0,0,0" VerticalAlignment="Center"/>

    810. 

  810. +                                </DataTemplate>

    811. 

  811. +                            </GridViewColumn.CellTemplate>

    812. 

  812. +                        </GridViewColumn>

    813. 

  813. +                    </GridView>

    814. 

  814. +                </ListView.View>

    815. 

  815. +            </ListView>

    816. 

  816. +            <TextBlock Text="?????" TextWrapping="Wrap" Canvas.Left="14" Canvas.Top="185"/>

    817. 

  817. +            <TextBlock Text="?????" TextWrapping="Wrap" Canvas.Left="14" Canvas.Top="213"/>

    818. 

  818. +            <TextBox x:Name="EditingUsernameBox" Width="251" InputMethod.IsInputMethodEnabled="False" Canvas.Left="110" Canvas.Top="182"/>

    819. 

  819. +            <PasswordBox x:Name="EditingPasswordBox" Width="251" InputMethod.IsInputMethodEnabled="False" Canvas.Left="110" Canvas.Top="210"/>

    820. 

  820. +            <Button x:Name="AddAccountButton" Content="??" Width="75" Canvas.Left="128" Canvas.Top="238" Click="AddAccountButton_Click" />

    821. 

  821. +            <Button x:Name="UpdateAccountButton" Content="??" Width="75" Canvas.Left="207" Canvas.Top="238" Click="UpdateAccountButton_Click" />

    822. 

  822. +            <Button x:Name="DeleteAccountButton" Content="??" Width="75" Canvas.Left="286" Canvas.Top="238" Click="DeleteAccountButton_Click" />        </Canvas>

    823. 

  823.          <Canvas Grid.Column="2" Grid.Row="0" Visibility="{Binding Path=IsSelected, ElementName=NetworkListBoxItem, Converter={StaticResource BooleanToVisibilityConverter}}">

    824. 

  824.              <CheckBox x:Name="UseProxyCheckBox" Content="????????????" Canvas.Left="14" Canvas.Top="14" IsChecked="{Binding Path=UseProxy}"/>

    825. 

  825.              <CheckBox x:Name="UseIEProxyCheckBox" Content="Internet Explorer ????????" Canvas.Left="14" Canvas.Top="36" IsChecked="{Binding Path=UseIEProxy}" IsEnabled="{Binding Path=IsChecked, ElementName=UseProxyCheckBox}"/>

    826. 

  826. diff -urN -xobj -xbin -xmodified-files.diff MiniTwitter/MiniTwitter/SettingDialog.xaml.cs MiniTwitter-ma/MiniTwitter/SettingDialog.xaml.cs
    827. 

  827. --- MiniTwitter/MiniTwitter/SettingDialog.xaml.cs	2010-01-16 19:32:35.015625000 +0900
    828. 

  828. +++ MiniTwitter-ma/MiniTwitter/SettingDialog.xaml.cs	2010-01-22 22:33:56.953125000 +0900
    829. 

  829. @@ -1,4 +1,5 @@
    830. 

  830. -?using System;

    831. 

  831. +?/* modified by ksksts. see modified-files.diff */

    832. 

  832. +using System;

    833. 

  833.  using System.Collections.Generic;

    834. 

  834.  using System.Collections.ObjectModel;

    835. 

  835.  using System.Linq;

    836. 

  836. @@ -35,6 +36,7 @@
    837. 

  837.          private ObservableCollection<MiniTwitter.Input.KeyBinding> keyBindings;

    838. 

  838.          private ObservableCollection<SoundBinding> soundBindings;

    839. 

  839.          private ObservableCollection<KeywordBinding> keywordBindings;

    840. 

  840. +        private ObservableCollection<Account> accounts;

    841. 

  841.  

    842. 

  842.          private static readonly PopupLocation[] locations = new[]

    843. 

  843.          {

    844. 

  844. @@ -61,8 +63,7 @@
    845. 

  845.          {

    846. 

  846.              // ??????????????????

    847. 

  847.              Settings settings = Settings.Default;

    848. 

  848. -            // ???????????????

    849. 

  849. -            PasswordBox.Password = settings.Password;

    850. 

  850. +            // ?????????

    851. 

  851.              ProxyPasswordBox.Password = settings.ProxyPassword;

    852. 

  852.              // ??????????????

    853. 

  853.              var array = Enum.GetValues(typeof(KeyAction));

    854. 

  854. @@ -85,6 +86,15 @@
    855. 

  855.              keywordBindings = new ObservableCollection<KeywordBinding>(settings.KeywordBindings ?? Enumerable.Empty<KeywordBinding>());

    856. 

  856.              keywordBindings.BeginEdit();

    857. 

  857.              KeywordListView.ItemsSource = keywordBindings;

    858. 

  858. +            // ???????

    859. 

  859. +            accounts = new ObservableCollection<Account>(settings.Accounts ?? Enumerable.Empty<Account>());

    860. 

  860. +            accounts.BeginEdit();

    861. 

  861. +            AccountListView.ItemsSource = accounts;

    862. 

  862. +            // ???????????????

    863. 

  863. +            if (settings.CurrentAccountIndex < AccountListView.Items.Count)

    864. 

  864. +            {

    865. 

  865. +                AccountListView.SelectedIndex = settings.CurrentAccountIndex;

    866. 

  866. +            }

    867. 

  867.              // ??????????

    868. 

  868.              TweetFooterComboBox.ItemsSource = settings.TweetFooterHistory;

    869. 

  869.              BindingGroup.BeginEdit();

    870. 

  870. @@ -97,7 +107,6 @@
    871. 

  871.              // ?????????????????

    872. 

  872.              Settings settings = Settings.Default;

    873. 

  873.              // ????????

    874. 

  874. -            settings.Password = PasswordBox.Password;

    875. 

  875.              settings.ProxyPassword = ProxyPasswordBox.Password;

    876. 

  876.              // ???????????????

    877. 

  877.              if (KeyMappingComboBox.SelectedValue != null)

    878. 

  878. @@ -121,11 +130,19 @@
    879. 

  879.              {

    880. 

  880.                  settings.KeywordBindings.Add(item);

    881. 

  881.              }

    882. 

  882. +            // ??????????

    883. 

  883. +            settings.Accounts.Clear();

    884. 

  884. +            foreach (var item in accounts)

    885. 

  885. +            {

    886. 

  886. +                settings.Accounts.Add(item);

    887. 

  887. +            }

    888. 

  888.              // ??????????????

    889. 

  889.              if (!settings.TweetFooter.IsNullOrEmpty() && !settings.TweetFooterHistory.Contains(settings.TweetFooter))

    890. 

  890.              {

    891. 

  891.                  settings.TweetFooterHistory.Add(settings.TweetFooter);

    892. 

  892.              }

    893. 

  893. +            // ??????????????????

    894. 

  894. +            settings.CurrentAccountIndex = AccountListView.SelectedIndex;

    895. 

  895.              DialogResult = true;

    896. 

  896.          }

    897. 

  897.  

    898. 

  898. @@ -135,9 +152,58 @@
    899. 

  899.              keyBindings.CancelEdit();

    900. 

  900.              soundBindings.CancelEdit();

    901. 

  901.              keywordBindings.CancelEdit();

    902. 

  902. +            accounts.CancelEdit();

    903. 

  903.              DialogResult = false;

    904. 

  904.          }

    905. 

  905.  

    906. 

  906. +        private void AccountListView_SelectionChanged(object sender, SelectionChangedEventArgs e)

    907. 

  907. +        {

    908. 

  908. +            var item = (Account)AccountListView.SelectedItem;

    909. 

  909. +            EditingUsernameBox.Text = item != null ? item.Username : "";

    910. 

  910. +            EditingPasswordBox.Password = item != null ? item.Password : "";

    911. 

  911. +            UpdateAccountButton.IsEnabled = item != null;

    912. 

  912. +            DeleteAccountButton.IsEnabled = item != null;

    913. 

  913. +        }

    914. 

  914. +

    915. 

  915. +        private void AddAccountButton_Click(object sender, RoutedEventArgs e)

    916. 

  916. +        {

    917. 

  917. +            var username = EditingUsernameBox.Text;

    918. 

  918. +            var password = EditingPasswordBox.Password;

    919. 

  919. +            if (username.IsNullOrEmpty() || password.IsNullOrEmpty())

    920. 

  920. +            {

    921. 

  921. +                return;

    922. 

  922. +            }

    923. 

  923. +            var account = new Account { Username = username, Password = password };

    924. 

  924. +            accounts.Add(account);

    925. 

  925. +        }

    926. 

  926. +

    927. 

  927. +        private void UpdateAccountButton_Click(object sender, RoutedEventArgs e)

    928. 

  928. +        …
    929.

Large files files are truncated, but you can click here to view the full file