開発に使用するリポジトリ
Revisão | ddfb30b6112bad1addab05679c0d6d903f1e298b (tree) |
---|---|
Hora | 2014-08-04 00:27:01 |
Autor | Kimura Youichi <kim.upsilon@bucy...> |
Commiter | Kimura Youichi |
プロパティ等の並び順を修正, コメントアウトされた不要な記述を除去
@@ -45,15 +45,25 @@ namespace OpenTween | ||
45 | 45 | { |
46 | 46 | public partial class AppendSettingDialog : OTBaseForm |
47 | 47 | { |
48 | + public event EventHandler<IntervalChangedEventArgs> IntervalChanged; | |
49 | + | |
48 | 50 | internal Twitter tw; |
49 | 51 | |
50 | 52 | private bool _ValidationError = false; |
51 | - | |
52 | 53 | private long? InitialUserId; |
53 | - | |
54 | 54 | private string _pin; |
55 | 55 | |
56 | - public event EventHandler<IntervalChangedEventArgs> IntervalChanged; | |
56 | + public AppendSettingDialog() | |
57 | + { | |
58 | + this.InitializeComponent(); | |
59 | + | |
60 | + this.BasedPanel.StartAuthButton.Click += this.StartAuthButton_Click; | |
61 | + this.BasedPanel.CreateAccountButton.Click += this.CreateAccountButton_Click; | |
62 | + this.GetPeriodPanel.CheckPostAndGet.CheckedChanged += this.CheckPostAndGet_CheckedChanged; | |
63 | + this.ActionPanel.UReadMng.CheckedChanged += this.UReadMng_CheckedChanged; | |
64 | + | |
65 | + this.Icon = Properties.Resources.MIcon; | |
66 | + } | |
57 | 67 | |
58 | 68 | public void LoadConfig(SettingCommon settingCommon, SettingLocal settingLocal) |
59 | 69 | { |
@@ -184,34 +194,6 @@ namespace OpenTween | ||
184 | 194 | { |
185 | 195 | _ValidationError = false; |
186 | 196 | } |
187 | - | |
188 | -#if UA | |
189 | - //フォロー | |
190 | - if (this.FollowCheckBox.Checked) | |
191 | - { | |
192 | - //現在の設定内容で通信 | |
193 | - HttpConnection.ProxyType ptype; | |
194 | - if (RadioProxyNone.Checked) | |
195 | - { | |
196 | - ptype = HttpConnection.ProxyType.None; | |
197 | - } | |
198 | - else if (RadioProxyIE.Checked) | |
199 | - { | |
200 | - ptype = HttpConnection.ProxyType.IE; | |
201 | - } | |
202 | - else | |
203 | - { | |
204 | - ptype = HttpConnection.ProxyType.Specified; | |
205 | - } | |
206 | - string padr = TextProxyAddress.Text.Trim(); | |
207 | - int pport = int.Parse(TextProxyPort.Text.Trim()); | |
208 | - string pusr = TextProxyUser.Text.Trim(); | |
209 | - string ppw = TextProxyPassword.Text.Trim(); | |
210 | - HttpConnection.InitializeConnection(20, ptype, padr, pport, pusr, ppw); | |
211 | - | |
212 | - string ret = tw.PostFollowCommand(ApplicationSettings.FeedbackTwitterName); | |
213 | - } | |
214 | -#endif | |
215 | 197 | } |
216 | 198 | |
217 | 199 | private void Setting_FormClosing(object sender, FormClosingEventArgs e) |
@@ -243,7 +225,6 @@ namespace OpenTween | ||
243 | 225 | this.TreeViewSetting.Nodes["BasedNode"].Nodes["PeriodNode"].Tag = GetPeriodPanel; |
244 | 226 | this.TreeViewSetting.Nodes["BasedNode"].Nodes["StartUpNode"].Tag = StartupPanel; |
245 | 227 | this.TreeViewSetting.Nodes["BasedNode"].Nodes["GetCountNode"].Tag = GetCountPanel; |
246 | - //this.TreeViewSetting.Nodes["BasedNode"].Nodes["UserStreamNode"].Tag = UserStreamPanel; | |
247 | 228 | this.TreeViewSetting.Nodes["ActionNode"].Tag = ActionPanel; |
248 | 229 | this.TreeViewSetting.Nodes["ActionNode"].Nodes["TweetActNode"].Tag = TweetActPanel; |
249 | 230 | this.TreeViewSetting.Nodes["PreviewNode"].Tag = PreviewPanel; |
@@ -259,7 +240,6 @@ namespace OpenTween | ||
259 | 240 | this.TreeViewSetting.SelectedNode = this.TreeViewSetting.Nodes[0]; |
260 | 241 | this.TreeViewSetting.ExpandAll(); |
261 | 242 | |
262 | - //TreeViewSetting.SelectedNode = TreeViewSetting.TopNode; | |
263 | 243 | ActiveControl = BasedPanel.StartAuthButton; |
264 | 244 | } |
265 | 245 |
@@ -301,8 +281,6 @@ namespace OpenTween | ||
301 | 281 | Networking.SetWebProxy(ptype, padr, pport, pusr, ppw); |
302 | 282 | HttpTwitter.TwitterUrl = this.ConnectionPanel.TwitterAPIText.Text.Trim(); |
303 | 283 | tw.Initialize("", "", "", 0); |
304 | - //this.AuthStateLabel.Text = Properties.Resources.AuthorizeButton_Click4; | |
305 | - //this.AuthUserLabel.Text = ""; | |
306 | 284 | string pinPageUrl = ""; |
307 | 285 | string rslt = tw.StartAuthentication(ref pinPageUrl); |
308 | 286 | if (string.IsNullOrEmpty(rslt)) |
@@ -333,8 +311,6 @@ namespace OpenTween | ||
333 | 311 | if (string.IsNullOrEmpty(rslt)) |
334 | 312 | { |
335 | 313 | MessageBox.Show(Properties.Resources.AuthorizeButton_Click1, "Authenticate", MessageBoxButtons.OK); |
336 | - //this.AuthStateLabel.Text = Properties.Resources.AuthorizeButton_Click3; | |
337 | - //this.AuthUserLabel.Text = tw.Username; | |
338 | 314 | int idx = -1; |
339 | 315 | UserAccount user = new UserAccount(); |
340 | 316 | user.Username = tw.Username; |
@@ -360,33 +336,21 @@ namespace OpenTween | ||
360 | 336 | { |
361 | 337 | this.BasedPanel.AuthUserCombo.SelectedIndex = this.BasedPanel.AuthUserCombo.Items.Add(user); |
362 | 338 | } |
363 | - //if (TwitterApiInfo.AccessLevel = ApiAccessLevel.ReadWrite) | |
364 | - //{ | |
365 | - // this.AuthStateLabel.Text += "(xAuth)"; | |
366 | - //} | |
367 | - //else if (TwitterApiInfo.AccessLevel == ApiAccessLevel.ReadWriteAndDirectMessage) | |
368 | - //{ | |
369 | - // this.AuthStateLabel.Text += "(OAuth)"; | |
370 | - //} | |
371 | 339 | return true; |
372 | 340 | } |
373 | 341 | else |
374 | 342 | { |
375 | 343 | MessageBox.Show(Properties.Resources.AuthorizeButton_Click2 + Environment.NewLine + rslt, "Authenticate", MessageBoxButtons.OK); |
376 | - //this.AuthStateLabel.Text = Properties.Resources.AuthorizeButton_Click4; | |
377 | - //this.AuthUserLabel.Text = ""; | |
378 | 344 | return false; |
379 | 345 | } |
380 | 346 | } |
381 | 347 | |
382 | 348 | private void StartAuthButton_Click(object sender, EventArgs e) |
383 | 349 | { |
384 | - //this.Save.Enabled = false; | |
385 | 350 | if (StartAuth()) |
386 | 351 | { |
387 | 352 | if (PinAuth()) |
388 | 353 | { |
389 | - //this.Save.Enabled = true; | |
390 | 354 | } |
391 | 355 | } |
392 | 356 | } |
@@ -449,44 +413,6 @@ namespace OpenTween | ||
449 | 413 | _ValidationError = false; |
450 | 414 | } |
451 | 415 | |
452 | - //private void CheckEventNotify_CheckedChanged(object sender, EventArgs e) | |
453 | - // Handles CheckEventNotify.CheckedChanged, CheckFavoritesEvent.CheckStateChanged, | |
454 | - // CheckUnfavoritesEvent.CheckStateChanged, CheckFollowEvent.CheckStateChanged, | |
455 | - // CheckListMemberAddedEvent.CheckStateChanged, CheckListMemberRemovedEvent.CheckStateChanged, | |
456 | - // CheckListCreatedEvent.CheckStateChanged, CheckUserUpdateEvent.CheckStateChanged | |
457 | - //{ | |
458 | - // EventNotifyEnabled = CheckEventNotify.Checked; | |
459 | - // GetEventNotifyFlag(EventNotifyFlag, IsMyEventNotifyFlag); | |
460 | - // ApplyEventNotifyFlag(EventNotifyEnabled, EventNotifyFlag, IsMyEventNotifyFlag); | |
461 | - //} | |
462 | - | |
463 | - //private void CheckForceEventNotify_CheckedChanged(object sender, EventArgs e) | |
464 | - //{ | |
465 | - // _MyForceEventNotify = CheckEventNotify.Checked; | |
466 | - //} | |
467 | - | |
468 | - //private void CheckFavEventUnread_CheckedChanged(object sender, EventArgs e) | |
469 | - //{ | |
470 | - // _MyFavEventUnread = CheckFavEventUnread.Checked; | |
471 | - //} | |
472 | - | |
473 | - //private void ComboBoxTranslateLanguage_SelectedIndexChanged(object sender, EventArgs e) | |
474 | - //{ | |
475 | - // _MyTranslateLanguage = (new Google()).GetLanguageEnumFromIndex(ComboBoxTranslateLanguage.SelectedIndex); | |
476 | - //} | |
477 | - | |
478 | - //private void ComboBoxEventNotifySound_VisibleChanged(object sender, EventArgs e) | |
479 | - //{ | |
480 | - // SoundFileListup(); | |
481 | - //} | |
482 | - | |
483 | - //private void ComboBoxEventNotifySound_SelectedIndexChanged(object sender, EventArgs e) | |
484 | - //{ | |
485 | - // if (_soundfileListup) return; | |
486 | - | |
487 | - // _MyEventSoundFile = (string)ComboBoxEventNotifySound.SelectedItem; | |
488 | - //} | |
489 | - | |
490 | 416 | private void OpenUrl(string url) |
491 | 417 | { |
492 | 418 | string myPath = url; |
@@ -519,7 +445,6 @@ namespace OpenTween | ||
519 | 445 | } |
520 | 446 | catch(Exception) |
521 | 447 | { |
522 | -// MessageBox.Show("ブラウザの起動に失敗、またはタイムアウトしました。" + ex.ToString()); | |
523 | 448 | } |
524 | 449 | } |
525 | 450 |
@@ -528,18 +453,6 @@ namespace OpenTween | ||
528 | 453 | this.OpenUrl("https://twitter.com/signup"); |
529 | 454 | } |
530 | 455 | |
531 | - public AppendSettingDialog() | |
532 | - { | |
533 | - InitializeComponent(); | |
534 | - | |
535 | - this.BasedPanel.StartAuthButton.Click += this.StartAuthButton_Click; | |
536 | - this.BasedPanel.CreateAccountButton.Click += this.CreateAccountButton_Click; | |
537 | - this.GetPeriodPanel.CheckPostAndGet.CheckedChanged += this.CheckPostAndGet_CheckedChanged; | |
538 | - this.ActionPanel.UReadMng.CheckedChanged += this.UReadMng_CheckedChanged; | |
539 | - | |
540 | - this.Icon = Properties.Resources.MIcon; | |
541 | - } | |
542 | - | |
543 | 456 | private void GetPeriodPanel_IntervalChanged(object sender, IntervalChangedEventArgs e) |
544 | 457 | { |
545 | 458 | if (this.IntervalChanged != null) |