mAgicAnime 俺用改造版
Révision | 75cb0086ae5a7e91042b0bb2670c41847dbf06b9 (tree) |
---|---|
l'heure | 2017-01-22 01:07:34 |
Auteur | yoshy <yoshy@user...> |
Commiter | yoshy |
[ADD] 通常回・特番回の放送データ異常時に放送日時を未確定に戻す機能
[ADD] 選択回を強制的に録画済みにする機能
[FIX] 0話が-2147483648話になる不具合を修正
@@ -617,8 +617,17 @@ namespace magicAnime | ||
617 | 617 | { |
618 | 618 | episodeStrBuf.Append('、'); |
619 | 619 | } |
620 | + | |
621 | + // ナンバリングできない話数は書式化しない | |
622 | + if(convertDecimalEpisodeNoToInt(dummyNums[i]) == UNNUMBERED_EPISODE) | |
623 | + { | |
624 | + episodeStrBuf.Append(dummyNums[i]); | |
625 | + } | |
626 | + else | |
627 | + { | |
620 | 628 | episodeStrBuf.Append(formatEpisodeNo(dummyNums[i])); |
621 | 629 | } |
630 | + } | |
622 | 631 | |
623 | 632 | episodeStr = episodeStrBuf.ToString(); |
624 | 633 | } |
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices; | ||
5 | 5 | // アセンブリに関する一般情報は以下の属性セットをとおして制御されます。 |
6 | 6 | // アセンブリに関連付けられている情報を変更するには、 |
7 | 7 | // これらの属性値を変更してください。 |
8 | -[assembly: AssemblyTitle("mAgicAnime Ver.7sh mod. yossiepon_20160924")] | |
8 | +[assembly: AssemblyTitle("mAgicAnime Ver.7sh mod. yossiepon_20170121")] | |
9 | 9 | [assembly: AssemblyDescription("")] |
10 | 10 | [assembly: AssemblyConfiguration("")] |
11 | 11 | [assembly: AssemblyCompany("")] |
12 | -[assembly: AssemblyProduct("mAgicAnime.NET (ななし版, mod. yossiepon_20160924)")] | |
12 | +[assembly: AssemblyProduct("mAgicAnime.NET (ななし版, mod. yossiepon_20170121)")] | |
13 | 13 | [assembly: AssemblyCopyright("Copyright (C) 2006-2010 mAgicAnime Project")] |
14 | 14 | [assembly: AssemblyTrademark("")] |
15 | 15 | [assembly: AssemblyCulture("")] |
@@ -30,4 +30,4 @@ using System.Runtime.InteropServices; | ||
30 | 30 | // Revision |
31 | 31 | // |
32 | 32 | [assembly: AssemblyVersion("2.0.0.0")] |
33 | -[assembly: AssemblyFileVersion("2.0.14.20160924")] | |
33 | +[assembly: AssemblyFileVersion("2.0.14.20170121")] |
@@ -100,7 +100,9 @@ | ||
100 | 100 | this.storeMenu = new System.Windows.Forms.ToolStripMenuItem(); |
101 | 101 | this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); |
102 | 102 | this.updateProgramPlanMenu = new System.Windows.Forms.ToolStripMenuItem(); |
103 | - this.deleteInvalidEpisode = new System.Windows.Forms.ToolStripMenuItem(); | |
103 | + this.enforceRecordedStatusMenu = new System.Windows.Forms.ToolStripMenuItem(); | |
104 | + this.unfixedInvalidEpisodeMenu = new System.Windows.Forms.ToolStripMenuItem(); | |
105 | + this.deleteInvalidEpisodeMenu = new System.Windows.Forms.ToolStripMenuItem(); | |
104 | 106 | this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripSeparator(); |
105 | 107 | this.renameFileMenu = new System.Windows.Forms.ToolStripMenuItem(); |
106 | 108 | this.unreadMenu = new System.Windows.Forms.ToolStripMenuItem(); |
@@ -188,12 +190,12 @@ | ||
188 | 190 | // toolStripMenuItem5 |
189 | 191 | // |
190 | 192 | toolStripMenuItem5.Name = "toolStripMenuItem5"; |
191 | - toolStripMenuItem5.Size = new System.Drawing.Size(177, 6); | |
193 | + toolStripMenuItem5.Size = new System.Drawing.Size(171, 6); | |
192 | 194 | // |
193 | 195 | // toolStripSeparator6 |
194 | 196 | // |
195 | 197 | toolStripSeparator6.Name = "toolStripSeparator6"; |
196 | - toolStripSeparator6.Size = new System.Drawing.Size(177, 6); | |
198 | + toolStripSeparator6.Size = new System.Drawing.Size(171, 6); | |
197 | 199 | // |
198 | 200 | // filePictureBox |
199 | 201 | // |
@@ -280,15 +282,15 @@ | ||
280 | 282 | this.dataGrid.ShowEditingIcon = false; |
281 | 283 | this.dataGrid.Size = new System.Drawing.Size(750, 286); |
282 | 284 | this.dataGrid.TabIndex = 0; |
283 | - this.dataGrid.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGrid_CellClick); | |
284 | - this.dataGrid.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGrid_CellDoubleClick); | |
285 | - this.dataGrid.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGrid_CellLeave); | |
286 | 285 | this.dataGrid.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGrid_CellMouseUp); |
287 | - this.dataGrid.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.dataGrid_CellPainting); | |
288 | - this.dataGrid.CellStateChanged += new System.Windows.Forms.DataGridViewCellStateChangedEventHandler(this.dataGrid_CellStateChanged); | |
289 | - this.dataGrid.SelectionChanged += new System.EventHandler(this.dataGrid_SelectionChanged); | |
286 | + this.dataGrid.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGrid_CellLeave); | |
287 | + this.dataGrid.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGrid_CellDoubleClick); | |
290 | 288 | this.dataGrid.MouseMove += new System.Windows.Forms.MouseEventHandler(this.dataGrid_MouseMove); |
289 | + this.dataGrid.CellStateChanged += new System.Windows.Forms.DataGridViewCellStateChangedEventHandler(this.dataGrid_CellStateChanged); | |
291 | 290 | this.dataGrid.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dataGrid_MouseUp); |
291 | + this.dataGrid.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.dataGrid_CellPainting); | |
292 | + this.dataGrid.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGrid_CellClick); | |
293 | + this.dataGrid.SelectionChanged += new System.EventHandler(this.dataGrid_SelectionChanged); | |
292 | 294 | // |
293 | 295 | // Column1 |
294 | 296 | // |
@@ -343,7 +345,7 @@ | ||
343 | 345 | this.menuStrip.Location = new System.Drawing.Point(0, 0); |
344 | 346 | this.menuStrip.Name = "menuStrip"; |
345 | 347 | this.menuStrip.Padding = new System.Windows.Forms.Padding(6, 2, 0, 4); |
346 | - this.menuStrip.Size = new System.Drawing.Size(750, 27); | |
348 | + this.menuStrip.Size = new System.Drawing.Size(750, 24); | |
347 | 349 | this.menuStrip.TabIndex = 1; |
348 | 350 | this.menuStrip.Text = "menuStrip"; |
349 | 351 | // |
@@ -369,7 +371,7 @@ | ||
369 | 371 | this.ExitMenu}); |
370 | 372 | this.fileMenu.ForeColor = System.Drawing.SystemColors.ControlText; |
371 | 373 | this.fileMenu.Name = "fileMenu"; |
372 | - this.fileMenu.Size = new System.Drawing.Size(76, 21); | |
374 | + this.fileMenu.Size = new System.Drawing.Size(71, 18); | |
373 | 375 | this.fileMenu.Text = "ファイル(&F)"; |
374 | 376 | // |
375 | 377 | // NewAnimeMenu |
@@ -378,7 +380,7 @@ | ||
378 | 380 | this.NewAnimeMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia; |
379 | 381 | this.NewAnimeMenu.Name = "NewAnimeMenu"; |
380 | 382 | this.NewAnimeMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); |
381 | - this.NewAnimeMenu.Size = new System.Drawing.Size(266, 22); | |
383 | + this.NewAnimeMenu.Size = new System.Drawing.Size(256, 22); | |
382 | 384 | this.NewAnimeMenu.Text = "新しい番組(&N)"; |
383 | 385 | this.NewAnimeMenu.Click += new System.EventHandler(this.NewAnimeMenu_Click); |
384 | 386 | // |
@@ -388,7 +390,7 @@ | ||
388 | 390 | this.DeleteAnimeMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia; |
389 | 391 | this.DeleteAnimeMenu.Name = "DeleteAnimeMenu"; |
390 | 392 | this.DeleteAnimeMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); |
391 | - this.DeleteAnimeMenu.Size = new System.Drawing.Size(266, 22); | |
393 | + this.DeleteAnimeMenu.Size = new System.Drawing.Size(256, 22); | |
392 | 394 | this.DeleteAnimeMenu.Text = "番組の削除(&D)"; |
393 | 395 | this.DeleteAnimeMenu.Click += new System.EventHandler(this.DeleteAnimeMenu_Click); |
394 | 396 | // |
@@ -398,14 +400,14 @@ | ||
398 | 400 | this.programPropertyMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia; |
399 | 401 | this.programPropertyMenu.Name = "programPropertyMenu"; |
400 | 402 | this.programPropertyMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); |
401 | - this.programPropertyMenu.Size = new System.Drawing.Size(266, 22); | |
403 | + this.programPropertyMenu.Size = new System.Drawing.Size(256, 22); | |
402 | 404 | this.programPropertyMenu.Text = "番組のプロパティ(&P)"; |
403 | 405 | this.programPropertyMenu.Click += new System.EventHandler(this.programPropertyMenu_Click); |
404 | 406 | // |
405 | 407 | // toolStripMenuItem1 |
406 | 408 | // |
407 | 409 | this.toolStripMenuItem1.Name = "toolStripMenuItem1"; |
408 | - this.toolStripMenuItem1.Size = new System.Drawing.Size(263, 6); | |
410 | + this.toolStripMenuItem1.Size = new System.Drawing.Size(253, 6); | |
409 | 411 | // |
410 | 412 | // RefreshMenu |
411 | 413 | // |
@@ -413,7 +415,7 @@ | ||
413 | 415 | this.RefreshMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia; |
414 | 416 | this.RefreshMenu.Name = "RefreshMenu"; |
415 | 417 | this.RefreshMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); |
416 | - this.RefreshMenu.Size = new System.Drawing.Size(266, 22); | |
418 | + this.RefreshMenu.Size = new System.Drawing.Size(256, 22); | |
417 | 419 | this.RefreshMenu.Text = "新着データ更新(&R)"; |
418 | 420 | this.RefreshMenu.Click += new System.EventHandler(this.RefreshMenu_Clicked); |
419 | 421 | // |
@@ -424,19 +426,19 @@ | ||
424 | 426 | this.ForceRefreshMenu.Name = "ForceRefreshMenu"; |
425 | 427 | this.ForceRefreshMenu.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) |
426 | 428 | | System.Windows.Forms.Keys.R))); |
427 | - this.ForceRefreshMenu.Size = new System.Drawing.Size(266, 22); | |
429 | + this.ForceRefreshMenu.Size = new System.Drawing.Size(256, 22); | |
428 | 430 | this.ForceRefreshMenu.Text = "完全データ更新(&E)"; |
429 | 431 | this.ForceRefreshMenu.Click += new System.EventHandler(this.ForceRefreshMenu_Click); |
430 | 432 | // |
431 | 433 | // toolStripSeparator1 |
432 | 434 | // |
433 | 435 | this.toolStripSeparator1.Name = "toolStripSeparator1"; |
434 | - this.toolStripSeparator1.Size = new System.Drawing.Size(263, 6); | |
436 | + this.toolStripSeparator1.Size = new System.Drawing.Size(253, 6); | |
435 | 437 | // |
436 | 438 | // SortMenu |
437 | 439 | // |
438 | 440 | this.SortMenu.Name = "SortMenu"; |
439 | - this.SortMenu.Size = new System.Drawing.Size(266, 22); | |
441 | + this.SortMenu.Size = new System.Drawing.Size(256, 22); | |
440 | 442 | this.SortMenu.Text = "番組をソート(&S)"; |
441 | 443 | this.SortMenu.Click += new System.EventHandler(this.SortMenu_Click); |
442 | 444 | // |
@@ -444,14 +446,14 @@ | ||
444 | 446 | // |
445 | 447 | this.OnReleaseUnreadMenu.Name = "OnReleaseUnreadMenu"; |
446 | 448 | this.OnReleaseUnreadMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); |
447 | - this.OnReleaseUnreadMenu.Size = new System.Drawing.Size(266, 22); | |
449 | + this.OnReleaseUnreadMenu.Size = new System.Drawing.Size(256, 22); | |
448 | 450 | this.OnReleaseUnreadMenu.Text = "全ての未読フラグを解除(&F)"; |
449 | 451 | this.OnReleaseUnreadMenu.Click += new System.EventHandler(this.OnReleaseUnreadMenu_Click); |
450 | 452 | // |
451 | 453 | // toolStripMenuItem4 |
452 | 454 | // |
453 | 455 | this.toolStripMenuItem4.Name = "toolStripMenuItem4"; |
454 | - this.toolStripMenuItem4.Size = new System.Drawing.Size(263, 6); | |
456 | + this.toolStripMenuItem4.Size = new System.Drawing.Size(253, 6); | |
455 | 457 | this.toolStripMenuItem4.Visible = false; |
456 | 458 | // |
457 | 459 | // StoreAllMenu |
@@ -460,20 +462,20 @@ | ||
460 | 462 | this.StoreAllMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia; |
461 | 463 | this.StoreAllMenu.Name = "StoreAllMenu"; |
462 | 464 | this.StoreAllMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); |
463 | - this.StoreAllMenu.Size = new System.Drawing.Size(266, 22); | |
465 | + this.StoreAllMenu.Size = new System.Drawing.Size(256, 22); | |
464 | 466 | this.StoreAllMenu.Text = "最終保存先へ転送(&M)"; |
465 | 467 | this.StoreAllMenu.Click += new System.EventHandler(this.StoreAllMenu_Click); |
466 | 468 | // |
467 | 469 | // toolStripMenuItem2 |
468 | 470 | // |
469 | 471 | this.toolStripMenuItem2.Name = "toolStripMenuItem2"; |
470 | - this.toolStripMenuItem2.Size = new System.Drawing.Size(263, 6); | |
472 | + this.toolStripMenuItem2.Size = new System.Drawing.Size(253, 6); | |
471 | 473 | // |
472 | 474 | // OptionMenu |
473 | 475 | // |
474 | 476 | this.OptionMenu.Name = "OptionMenu"; |
475 | 477 | this.OptionMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); |
476 | - this.OptionMenu.Size = new System.Drawing.Size(266, 22); | |
478 | + this.OptionMenu.Size = new System.Drawing.Size(256, 22); | |
477 | 479 | this.OptionMenu.Text = "オプション(&O)"; |
478 | 480 | this.OptionMenu.Click += new System.EventHandler(this.OptionMenu_Click); |
479 | 481 | // |
@@ -481,20 +483,20 @@ | ||
481 | 483 | // |
482 | 484 | this.LogShowMenuItem.Name = "LogShowMenuItem"; |
483 | 485 | this.LogShowMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.K))); |
484 | - this.LogShowMenuItem.Size = new System.Drawing.Size(266, 22); | |
486 | + this.LogShowMenuItem.Size = new System.Drawing.Size(256, 22); | |
485 | 487 | this.LogShowMenuItem.Text = "ログ表示(&L)"; |
486 | 488 | this.LogShowMenuItem.Click += new System.EventHandler(this.LogShowMenuItem_Click); |
487 | 489 | // |
488 | 490 | // toolStripMenuItem3 |
489 | 491 | // |
490 | 492 | this.toolStripMenuItem3.Name = "toolStripMenuItem3"; |
491 | - this.toolStripMenuItem3.Size = new System.Drawing.Size(263, 6); | |
493 | + this.toolStripMenuItem3.Size = new System.Drawing.Size(253, 6); | |
492 | 494 | // |
493 | 495 | // ExitMenu |
494 | 496 | // |
495 | 497 | this.ExitMenu.Name = "ExitMenu"; |
496 | 498 | this.ExitMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X))); |
497 | - this.ExitMenu.Size = new System.Drawing.Size(266, 22); | |
499 | + this.ExitMenu.Size = new System.Drawing.Size(256, 22); | |
498 | 500 | this.ExitMenu.Text = "終了(&X)"; |
499 | 501 | this.ExitMenu.Click += new System.EventHandler(this.ExitMenu_Click); |
500 | 502 | // |
@@ -507,7 +509,7 @@ | ||
507 | 509 | this.toolStripMenuItem7, |
508 | 510 | this.AutoShutdownMenu}); |
509 | 511 | this.PowerMenuItem.Name = "PowerMenuItem"; |
510 | - this.PowerMenuItem.Size = new System.Drawing.Size(89, 21); | |
512 | + this.PowerMenuItem.Size = new System.Drawing.Size(83, 18); | |
511 | 513 | this.PowerMenuItem.Text = "エンコード(&E)"; |
512 | 514 | this.PowerMenuItem.DropDownOpened += new System.EventHandler(this.PowerMenuItem_DropDownOpened); |
513 | 515 | this.PowerMenuItem.Click += new System.EventHandler(this.PowerMenuItem_Click); |
@@ -517,7 +519,7 @@ | ||
517 | 519 | this.BatchEncodeAllMenu.Name = "BatchEncodeAllMenu"; |
518 | 520 | this.BatchEncodeAllMenu.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) |
519 | 521 | | System.Windows.Forms.Keys.B))); |
520 | - this.BatchEncodeAllMenu.Size = new System.Drawing.Size(370, 22); | |
522 | + this.BatchEncodeAllMenu.Size = new System.Drawing.Size(354, 22); | |
521 | 523 | this.BatchEncodeAllMenu.Text = "未処理分をエンコードキューに入れる(&E)"; |
522 | 524 | this.BatchEncodeAllMenu.Click += new System.EventHandler(this.BatchEncodeAllMenu_Click); |
523 | 525 | // |
@@ -530,13 +532,13 @@ | ||
530 | 532 | toolStripSeparator6, |
531 | 533 | this.BatchListNothingMenuItem}); |
532 | 534 | this.BatchListMenuItem.Name = "BatchListMenuItem"; |
533 | - this.BatchListMenuItem.Size = new System.Drawing.Size(370, 22); | |
535 | + this.BatchListMenuItem.Size = new System.Drawing.Size(354, 22); | |
534 | 536 | this.BatchListMenuItem.Text = "バッチエンコードキュー"; |
535 | 537 | // |
536 | 538 | // JobsCancelMenu |
537 | 539 | // |
538 | 540 | this.JobsCancelMenu.Name = "JobsCancelMenu"; |
539 | - this.JobsCancelMenu.Size = new System.Drawing.Size(180, 22); | |
541 | + this.JobsCancelMenu.Size = new System.Drawing.Size(174, 22); | |
540 | 542 | this.JobsCancelMenu.Text = "全てキャンセル"; |
541 | 543 | this.JobsCancelMenu.Click += new System.EventHandler(this.JobsCancelMenu_Click); |
542 | 544 | // |
@@ -544,7 +546,7 @@ | ||
544 | 546 | // |
545 | 547 | this.EncodingNothingMenuItem.Enabled = false; |
546 | 548 | this.EncodingNothingMenuItem.Name = "EncodingNothingMenuItem"; |
547 | - this.EncodingNothingMenuItem.Size = new System.Drawing.Size(180, 22); | |
549 | + this.EncodingNothingMenuItem.Size = new System.Drawing.Size(174, 22); | |
548 | 550 | this.EncodingNothingMenuItem.Text = "(エンコード中なし)"; |
549 | 551 | this.EncodingNothingMenuItem.Visible = false; |
550 | 552 | // |
@@ -552,19 +554,19 @@ | ||
552 | 554 | // |
553 | 555 | this.BatchListNothingMenuItem.Enabled = false; |
554 | 556 | this.BatchListNothingMenuItem.Name = "BatchListNothingMenuItem"; |
555 | - this.BatchListNothingMenuItem.Size = new System.Drawing.Size(180, 22); | |
557 | + this.BatchListNothingMenuItem.Size = new System.Drawing.Size(174, 22); | |
556 | 558 | this.BatchListNothingMenuItem.Text = "(エンコード待ちなし)"; |
557 | 559 | this.BatchListNothingMenuItem.Visible = false; |
558 | 560 | // |
559 | 561 | // toolStripMenuItem7 |
560 | 562 | // |
561 | 563 | this.toolStripMenuItem7.Name = "toolStripMenuItem7"; |
562 | - this.toolStripMenuItem7.Size = new System.Drawing.Size(367, 6); | |
564 | + this.toolStripMenuItem7.Size = new System.Drawing.Size(351, 6); | |
563 | 565 | // |
564 | 566 | // AutoShutdownMenu |
565 | 567 | // |
566 | 568 | this.AutoShutdownMenu.Name = "AutoShutdownMenu"; |
567 | - this.AutoShutdownMenu.Size = new System.Drawing.Size(370, 22); | |
569 | + this.AutoShutdownMenu.Size = new System.Drawing.Size(354, 22); | |
568 | 570 | this.AutoShutdownMenu.Text = "エンコード完了時にシャットダウン(&S)"; |
569 | 571 | this.AutoShutdownMenu.Click += new System.EventHandler(this.AutoShutdownMenu_Click); |
570 | 572 | // |
@@ -577,37 +579,37 @@ | ||
577 | 579 | this.toolStripSeparator7, |
578 | 580 | this.AboutMenu}); |
579 | 581 | this.ヘルプHToolStripMenuItem.Name = "ヘルプHToolStripMenuItem"; |
580 | - this.ヘルプHToolStripMenuItem.Size = new System.Drawing.Size(74, 21); | |
582 | + this.ヘルプHToolStripMenuItem.Size = new System.Drawing.Size(67, 18); | |
581 | 583 | this.ヘルプHToolStripMenuItem.Text = "ヘルプ(&H)"; |
582 | 584 | // |
583 | 585 | // helpMenu |
584 | 586 | // |
585 | 587 | this.helpMenu.Name = "helpMenu"; |
586 | - this.helpMenu.Size = new System.Drawing.Size(188, 22); | |
588 | + this.helpMenu.Size = new System.Drawing.Size(182, 22); | |
587 | 589 | this.helpMenu.Text = "公式サイト(&W)"; |
588 | 590 | this.helpMenu.Click += new System.EventHandler(this.helpMenu_Click); |
589 | 591 | // |
590 | 592 | // toolStripMenuItem8 |
591 | 593 | // |
592 | 594 | this.toolStripMenuItem8.Name = "toolStripMenuItem8"; |
593 | - this.toolStripMenuItem8.Size = new System.Drawing.Size(185, 6); | |
595 | + this.toolStripMenuItem8.Size = new System.Drawing.Size(179, 6); | |
594 | 596 | // |
595 | 597 | // applicationDataMenuItem |
596 | 598 | // |
597 | 599 | this.applicationDataMenuItem.Name = "applicationDataMenuItem"; |
598 | - this.applicationDataMenuItem.Size = new System.Drawing.Size(188, 22); | |
600 | + this.applicationDataMenuItem.Size = new System.Drawing.Size(182, 22); | |
599 | 601 | this.applicationDataMenuItem.Text = "アプリケーションデータ"; |
600 | 602 | this.applicationDataMenuItem.Click += new System.EventHandler(this.applicationDataMenuItem_Click); |
601 | 603 | // |
602 | 604 | // toolStripSeparator7 |
603 | 605 | // |
604 | 606 | this.toolStripSeparator7.Name = "toolStripSeparator7"; |
605 | - this.toolStripSeparator7.Size = new System.Drawing.Size(185, 6); | |
607 | + this.toolStripSeparator7.Size = new System.Drawing.Size(179, 6); | |
606 | 608 | // |
607 | 609 | // AboutMenu |
608 | 610 | // |
609 | 611 | this.AboutMenu.Name = "AboutMenu"; |
610 | - this.AboutMenu.Size = new System.Drawing.Size(188, 22); | |
612 | + this.AboutMenu.Size = new System.Drawing.Size(182, 22); | |
611 | 613 | this.AboutMenu.Text = "バージョン情報(&A)..."; |
612 | 614 | this.AboutMenu.Click += new System.EventHandler(this.AboutMenu_Click); |
613 | 615 | // |
@@ -618,7 +620,7 @@ | ||
618 | 620 | this.toolStripMenuItem10, |
619 | 621 | this.debugForceEmptyMenu}); |
620 | 622 | this.debugMenu.Name = "debugMenu"; |
621 | - this.debugMenu.Size = new System.Drawing.Size(82, 21); | |
623 | + this.debugMenu.Size = new System.Drawing.Size(75, 18); | |
622 | 624 | this.debugMenu.Text = "デバッグ(&D)"; |
623 | 625 | this.debugMenu.Visible = false; |
624 | 626 | this.debugMenu.DropDownOpening += new System.EventHandler(this.debugMenu_DropDownOpening); |
@@ -626,19 +628,19 @@ | ||
626 | 628 | // debugShutdownMenu |
627 | 629 | // |
628 | 630 | this.debugShutdownMenu.Name = "debugShutdownMenu"; |
629 | - this.debugShutdownMenu.Size = new System.Drawing.Size(333, 22); | |
631 | + this.debugShutdownMenu.Size = new System.Drawing.Size(331, 22); | |
630 | 632 | this.debugShutdownMenu.Text = "シャットダウンテスト"; |
631 | 633 | this.debugShutdownMenu.Click += new System.EventHandler(this.debugShutdownMenu_Click); |
632 | 634 | // |
633 | 635 | // toolStripMenuItem10 |
634 | 636 | // |
635 | 637 | this.toolStripMenuItem10.Name = "toolStripMenuItem10"; |
636 | - this.toolStripMenuItem10.Size = new System.Drawing.Size(330, 6); | |
638 | + this.toolStripMenuItem10.Size = new System.Drawing.Size(328, 6); | |
637 | 639 | // |
638 | 640 | // debugForceEmptyMenu |
639 | 641 | // |
640 | 642 | this.debugForceEmptyMenu.Name = "debugForceEmptyMenu"; |
641 | - this.debugForceEmptyMenu.Size = new System.Drawing.Size(333, 22); | |
643 | + this.debugForceEmptyMenu.Size = new System.Drawing.Size(331, 22); | |
642 | 644 | this.debugForceEmptyMenu.Text = "更新時、しょぼかる放送データを強制的に空にする"; |
643 | 645 | this.debugForceEmptyMenu.Click += new System.EventHandler(this.debugForceEmptyMenu_Click); |
644 | 646 | // |
@@ -651,9 +653,9 @@ | ||
651 | 653 | this.todayOnAirLabel, |
652 | 654 | this.storeFolderLabel, |
653 | 655 | this.recordDriveFreeSpaceLabel}); |
654 | - this.statusBar.Location = new System.Drawing.Point(0, 570); | |
656 | + this.statusBar.Location = new System.Drawing.Point(0, 571); | |
655 | 657 | this.statusBar.Name = "statusBar"; |
656 | - this.statusBar.Size = new System.Drawing.Size(750, 30); | |
658 | + this.statusBar.Size = new System.Drawing.Size(750, 29); | |
657 | 659 | this.statusBar.Stretch = false; |
658 | 660 | this.statusBar.TabIndex = 2; |
659 | 661 | this.statusBar.Text = "statusStrip1"; |
@@ -670,7 +672,7 @@ | ||
670 | 672 | this.logStatusLabel.ForeColor = System.Drawing.SystemColors.ControlText; |
671 | 673 | this.logStatusLabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; |
672 | 674 | this.logStatusLabel.Name = "logStatusLabel"; |
673 | - this.logStatusLabel.Size = new System.Drawing.Size(437, 25); | |
675 | + this.logStatusLabel.Size = new System.Drawing.Size(447, 24); | |
674 | 676 | this.logStatusLabel.Spring = true; |
675 | 677 | this.logStatusLabel.Text = "起動中・・・"; |
676 | 678 | this.logStatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; |
@@ -684,7 +686,7 @@ | ||
684 | 686 | this.toolStripStatusLabel1.BorderStyle = System.Windows.Forms.Border3DStyle.Etched; |
685 | 687 | this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; |
686 | 688 | this.toolStripStatusLabel1.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0); |
687 | - this.toolStripStatusLabel1.Size = new System.Drawing.Size(95, 25); | |
689 | + this.toolStripStatusLabel1.Size = new System.Drawing.Size(94, 24); | |
688 | 690 | this.toolStripStatusLabel1.Text = "今度の放送"; |
689 | 691 | // |
690 | 692 | // todayOnAirLabel |
@@ -695,7 +697,7 @@ | ||
695 | 697 | this.todayOnAirLabel.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter; |
696 | 698 | this.todayOnAirLabel.Name = "todayOnAirLabel"; |
697 | 699 | this.todayOnAirLabel.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0); |
698 | - this.todayOnAirLabel.Size = new System.Drawing.Size(24, 25); | |
700 | + this.todayOnAirLabel.Size = new System.Drawing.Size(24, 24); | |
699 | 701 | // |
700 | 702 | // storeFolderLabel |
701 | 703 | // |
@@ -712,7 +714,7 @@ | ||
712 | 714 | this.storeFolderLabel.LinkColor = System.Drawing.SystemColors.HotTrack; |
713 | 715 | this.storeFolderLabel.Name = "storeFolderLabel"; |
714 | 716 | this.storeFolderLabel.Padding = new System.Windows.Forms.Padding(10, 2, 10, 2); |
715 | - this.storeFolderLabel.Size = new System.Drawing.Size(87, 25); | |
717 | + this.storeFolderLabel.Size = new System.Drawing.Size(86, 24); | |
716 | 718 | this.storeFolderLabel.Text = "保存先"; |
717 | 719 | this.storeFolderLabel.ToolTipText = "保存先"; |
718 | 720 | this.storeFolderLabel.Click += new System.EventHandler(this.storeFolderLabel_Click); |
@@ -732,7 +734,7 @@ | ||
732 | 734 | this.recordDriveFreeSpaceLabel.LinkColor = System.Drawing.SystemColors.HotTrack; |
733 | 735 | this.recordDriveFreeSpaceLabel.Name = "recordDriveFreeSpaceLabel"; |
734 | 736 | this.recordDriveFreeSpaceLabel.Padding = new System.Windows.Forms.Padding(10, 2, 10, 2); |
735 | - this.recordDriveFreeSpaceLabel.Size = new System.Drawing.Size(92, 25); | |
737 | + this.recordDriveFreeSpaceLabel.Size = new System.Drawing.Size(84, 24); | |
736 | 738 | this.recordDriveFreeSpaceLabel.Text = "0 [MB]"; |
737 | 739 | this.recordDriveFreeSpaceLabel.ToolTipText = "録画フォルダの空き容量"; |
738 | 740 | this.recordDriveFreeSpaceLabel.Click += new System.EventHandler(this.recordDriveFreeSpaceLabel_Click); |
@@ -750,20 +752,22 @@ | ||
750 | 752 | this.storeMenu, |
751 | 753 | this.toolStripSeparator9, |
752 | 754 | this.updateProgramPlanMenu, |
753 | - this.deleteInvalidEpisode, | |
755 | + this.enforceRecordedStatusMenu, | |
756 | + this.unfixedInvalidEpisodeMenu, | |
757 | + this.deleteInvalidEpisodeMenu, | |
754 | 758 | this.toolStripMenuItem6, |
755 | 759 | this.renameFileMenu, |
756 | 760 | this.unreadMenu, |
757 | 761 | this.RecordPropertyMenu}); |
758 | 762 | this.contextMenuStrip.Name = "contextMenuStrip"; |
759 | - this.contextMenuStrip.Size = new System.Drawing.Size(225, 292); | |
763 | + this.contextMenuStrip.Size = new System.Drawing.Size(221, 314); | |
760 | 764 | // |
761 | 765 | // playMovieMenu |
762 | 766 | // |
763 | 767 | this.playMovieMenu.Image = ((System.Drawing.Image)(resources.GetObject("playMovieMenu.Image"))); |
764 | 768 | this.playMovieMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia; |
765 | 769 | this.playMovieMenu.Name = "playMovieMenu"; |
766 | - this.playMovieMenu.Size = new System.Drawing.Size(224, 22); | |
770 | + this.playMovieMenu.Size = new System.Drawing.Size(220, 22); | |
767 | 771 | this.playMovieMenu.Text = "再生(&P)"; |
768 | 772 | this.playMovieMenu.Click += new System.EventHandler(this.playMovieMenu_Click); |
769 | 773 | // |
@@ -772,40 +776,40 @@ | ||
772 | 776 | this.reserveMenu.Image = ((System.Drawing.Image)(resources.GetObject("reserveMenu.Image"))); |
773 | 777 | this.reserveMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia; |
774 | 778 | this.reserveMenu.Name = "reserveMenu"; |
775 | - this.reserveMenu.Size = new System.Drawing.Size(224, 22); | |
779 | + this.reserveMenu.Size = new System.Drawing.Size(220, 22); | |
776 | 780 | this.reserveMenu.Text = "録画予約(&R)"; |
777 | 781 | this.reserveMenu.Click += new System.EventHandler(this.reserveMenu_Click); |
778 | 782 | // |
779 | 783 | // cancelReserveMenu |
780 | 784 | // |
781 | 785 | this.cancelReserveMenu.Name = "cancelReserveMenu"; |
782 | - this.cancelReserveMenu.Size = new System.Drawing.Size(224, 22); | |
786 | + this.cancelReserveMenu.Size = new System.Drawing.Size(220, 22); | |
783 | 787 | this.cancelReserveMenu.Text = "予約キャンセル"; |
784 | 788 | this.cancelReserveMenu.Click += new System.EventHandler(this.cancelReserveMenu_Click); |
785 | 789 | // |
786 | 790 | // extToolsGroupSeparator |
787 | 791 | // |
788 | 792 | this.extToolsGroupSeparator.Name = "extToolsGroupSeparator"; |
789 | - this.extToolsGroupSeparator.Size = new System.Drawing.Size(221, 6); | |
793 | + this.extToolsGroupSeparator.Size = new System.Drawing.Size(217, 6); | |
790 | 794 | this.extToolsGroupSeparator.Visible = false; |
791 | 795 | // |
792 | 796 | // 拡張ツールToolStripMenuItem |
793 | 797 | // |
794 | 798 | this.拡張ツールToolStripMenuItem.Enabled = false; |
795 | 799 | this.拡張ツールToolStripMenuItem.Name = "拡張ツールToolStripMenuItem"; |
796 | - this.拡張ツールToolStripMenuItem.Size = new System.Drawing.Size(224, 22); | |
800 | + this.拡張ツールToolStripMenuItem.Size = new System.Drawing.Size(220, 22); | |
797 | 801 | this.拡張ツールToolStripMenuItem.Text = "拡張ツール"; |
798 | 802 | this.拡張ツールToolStripMenuItem.Visible = false; |
799 | 803 | // |
800 | 804 | // encodeGroupSeparator |
801 | 805 | // |
802 | 806 | this.encodeGroupSeparator.Name = "encodeGroupSeparator"; |
803 | - this.encodeGroupSeparator.Size = new System.Drawing.Size(221, 6); | |
807 | + this.encodeGroupSeparator.Size = new System.Drawing.Size(217, 6); | |
804 | 808 | // |
805 | 809 | // encodeMenu |
806 | 810 | // |
807 | 811 | this.encodeMenu.Name = "encodeMenu"; |
808 | - this.encodeMenu.Size = new System.Drawing.Size(224, 22); | |
812 | + this.encodeMenu.Size = new System.Drawing.Size(220, 22); | |
809 | 813 | this.encodeMenu.Text = "エンコードキューに入れる(&E)"; |
810 | 814 | this.encodeMenu.Click += new System.EventHandler(this.encodeMenu_Click); |
811 | 815 | // |
@@ -814,38 +818,52 @@ | ||
814 | 818 | this.storeMenu.Image = global::magicAnime.Properties.Resources.SaveAll; |
815 | 819 | this.storeMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia; |
816 | 820 | this.storeMenu.Name = "storeMenu"; |
817 | - this.storeMenu.Size = new System.Drawing.Size(224, 22); | |
821 | + this.storeMenu.Size = new System.Drawing.Size(220, 22); | |
818 | 822 | this.storeMenu.Text = "最終保存先へ転送(&M)"; |
819 | 823 | this.storeMenu.Click += new System.EventHandler(this.storeMenu_Click); |
820 | 824 | // |
821 | 825 | // toolStripSeparator9 |
822 | 826 | // |
823 | 827 | this.toolStripSeparator9.Name = "toolStripSeparator9"; |
824 | - this.toolStripSeparator9.Size = new System.Drawing.Size(199, 6); | |
828 | + this.toolStripSeparator9.Size = new System.Drawing.Size(217, 6); | |
825 | 829 | // |
826 | 830 | // updateProgramPlanMenu |
827 | 831 | // |
828 | 832 | this.updateProgramPlanMenu.Name = "updateProgramPlanMenu"; |
829 | - this.updateProgramPlanMenu.Size = new System.Drawing.Size(202, 22); | |
833 | + this.updateProgramPlanMenu.Size = new System.Drawing.Size(220, 22); | |
830 | 834 | this.updateProgramPlanMenu.Text = "この番組のみデータ更新(&P)"; |
831 | 835 | this.updateProgramPlanMenu.Click += new System.EventHandler(this.updateProgramPlanMenu_Click); |
832 | 836 | // |
833 | - // deleteInvalidEpisode | |
837 | + // enforceRecordedStatusMenu | |
834 | 838 | // |
835 | - this.deleteInvalidEpisode.Name = "deleteInvalidEpisode"; | |
836 | - this.deleteInvalidEpisode.Size = new System.Drawing.Size(202, 22); | |
837 | - this.deleteInvalidEpisode.Text = "無効な最終回を削除(&D)"; | |
838 | - this.deleteInvalidEpisode.Click += new System.EventHandler(this.deleteInvalidEpisode_Click); | |
839 | + this.enforceRecordedStatusMenu.Name = "enforceRecordedStatusMenu"; | |
840 | + this.enforceRecordedStatusMenu.Size = new System.Drawing.Size(220, 22); | |
841 | + this.enforceRecordedStatusMenu.Text = "強制的に録画済み状態にする"; | |
842 | + this.enforceRecordedStatusMenu.Click += new System.EventHandler(this.enforceRecordedStatusMenu_Click); | |
843 | + // | |
844 | + // unfixedInvalidEpisodeMenu | |
845 | + // | |
846 | + this.unfixedInvalidEpisodeMenu.Name = "unfixedInvalidEpisodeMenu"; | |
847 | + this.unfixedInvalidEpisodeMenu.Size = new System.Drawing.Size(220, 22); | |
848 | + this.unfixedInvalidEpisodeMenu.Text = "無効な途中回を未確定に戻す"; | |
849 | + this.unfixedInvalidEpisodeMenu.Click += new System.EventHandler(this.unfixedInvalidEpisodeMenu_Click); | |
850 | + // | |
851 | + // deleteInvalidEpisodeMenu | |
852 | + // | |
853 | + this.deleteInvalidEpisodeMenu.Name = "deleteInvalidEpisodeMenu"; | |
854 | + this.deleteInvalidEpisodeMenu.Size = new System.Drawing.Size(220, 22); | |
855 | + this.deleteInvalidEpisodeMenu.Text = "無効な最終回を削除(&D)"; | |
856 | + this.deleteInvalidEpisodeMenu.Click += new System.EventHandler(this.deleteInvalidEpisode_Click); | |
839 | 857 | // |
840 | 858 | // toolStripMenuItem6 |
841 | 859 | // |
842 | 860 | this.toolStripMenuItem6.Name = "toolStripMenuItem6"; |
843 | - this.toolStripMenuItem6.Size = new System.Drawing.Size(221, 6); | |
861 | + this.toolStripMenuItem6.Size = new System.Drawing.Size(217, 6); | |
844 | 862 | // |
845 | 863 | // renameFileMenu |
846 | 864 | // |
847 | 865 | this.renameFileMenu.Name = "renameFileMenu"; |
848 | - this.renameFileMenu.Size = new System.Drawing.Size(224, 22); | |
866 | + this.renameFileMenu.Size = new System.Drawing.Size(220, 22); | |
849 | 867 | this.renameFileMenu.Text = "保存ファイル名にリネーム(&C)"; |
850 | 868 | this.renameFileMenu.Click += new System.EventHandler(this.renameFileMenu_Click); |
851 | 869 | // |
@@ -855,7 +873,7 @@ | ||
855 | 873 | this.unreadMenu.CheckState = System.Windows.Forms.CheckState.Checked; |
856 | 874 | this.unreadMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia; |
857 | 875 | this.unreadMenu.Name = "unreadMenu"; |
858 | - this.unreadMenu.Size = new System.Drawing.Size(224, 22); | |
876 | + this.unreadMenu.Size = new System.Drawing.Size(220, 22); | |
859 | 877 | this.unreadMenu.Text = "未読フラグ(&U)"; |
860 | 878 | this.unreadMenu.Click += new System.EventHandler(this.unreadMenu_Click); |
861 | 879 | // |
@@ -864,7 +882,7 @@ | ||
864 | 882 | this.RecordPropertyMenu.Image = global::magicAnime.Properties.Resources.ProgramProperty; |
865 | 883 | this.RecordPropertyMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia; |
866 | 884 | this.RecordPropertyMenu.Name = "RecordPropertyMenu"; |
867 | - this.RecordPropertyMenu.Size = new System.Drawing.Size(224, 22); | |
885 | + this.RecordPropertyMenu.Size = new System.Drawing.Size(220, 22); | |
868 | 886 | this.RecordPropertyMenu.Text = "エピソードのプロパティ(&O)"; |
869 | 887 | this.RecordPropertyMenu.Click += new System.EventHandler(this.RecordPropertyMenu_Clicked); |
870 | 888 | // |
@@ -964,7 +982,7 @@ | ||
964 | 982 | this.toolStripSeparator4, |
965 | 983 | this.thumbnailModeButton, |
966 | 984 | this.logButton}); |
967 | - this.mainToolBar.Location = new System.Drawing.Point(0, 27); | |
985 | + this.mainToolBar.Location = new System.Drawing.Point(0, 24); | |
968 | 986 | this.mainToolBar.Name = "mainToolBar"; |
969 | 987 | this.mainToolBar.Size = new System.Drawing.Size(750, 39); |
970 | 988 | this.mainToolBar.Stretch = true; |
@@ -1047,7 +1065,7 @@ | ||
1047 | 1065 | // |
1048 | 1066 | this.unreadListMenu.Enabled = false; |
1049 | 1067 | this.unreadListMenu.Name = "unreadListMenu"; |
1050 | - this.unreadListMenu.Size = new System.Drawing.Size(108, 22); | |
1068 | + this.unreadListMenu.Size = new System.Drawing.Size(102, 22); | |
1051 | 1069 | this.unreadListMenu.Text = "(なし)"; |
1052 | 1070 | // |
1053 | 1071 | // toolStripSeparator5 |
@@ -1094,26 +1112,26 @@ | ||
1094 | 1112 | // weekModeMenu |
1095 | 1113 | // |
1096 | 1114 | this.weekModeMenu.Name = "weekModeMenu"; |
1097 | - this.weekModeMenu.Size = new System.Drawing.Size(177, 22); | |
1115 | + this.weekModeMenu.Size = new System.Drawing.Size(168, 22); | |
1098 | 1116 | this.weekModeMenu.Text = "週単位で表示(&W)"; |
1099 | 1117 | this.weekModeMenu.Click += new System.EventHandler(this.weakModeMenu_Click); |
1100 | 1118 | // |
1101 | 1119 | // dayModeMenu |
1102 | 1120 | // |
1103 | 1121 | this.dayModeMenu.Name = "dayModeMenu"; |
1104 | - this.dayModeMenu.Size = new System.Drawing.Size(177, 22); | |
1122 | + this.dayModeMenu.Size = new System.Drawing.Size(168, 22); | |
1105 | 1123 | this.dayModeMenu.Text = "日単位で表示(&D)"; |
1106 | 1124 | this.dayModeMenu.Click += new System.EventHandler(this.dayModeMenu_Click); |
1107 | 1125 | // |
1108 | 1126 | // toolStripMenuItem9 |
1109 | 1127 | // |
1110 | 1128 | this.toolStripMenuItem9.Name = "toolStripMenuItem9"; |
1111 | - this.toolStripMenuItem9.Size = new System.Drawing.Size(174, 6); | |
1129 | + this.toolStripMenuItem9.Size = new System.Drawing.Size(165, 6); | |
1112 | 1130 | // |
1113 | 1131 | // calenderModeOptionMenu |
1114 | 1132 | // |
1115 | 1133 | this.calenderModeOptionMenu.Name = "calenderModeOptionMenu"; |
1116 | - this.calenderModeOptionMenu.Size = new System.Drawing.Size(177, 22); | |
1134 | + this.calenderModeOptionMenu.Size = new System.Drawing.Size(168, 22); | |
1117 | 1135 | this.calenderModeOptionMenu.Text = "設定(&S)"; |
1118 | 1136 | this.calenderModeOptionMenu.Click += new System.EventHandler(this.calenderModeOptionMenu_Click); |
1119 | 1137 | // |
@@ -1198,11 +1216,11 @@ | ||
1198 | 1216 | this.MainMenuStrip = this.menuStrip; |
1199 | 1217 | this.Name = "MainForm"; |
1200 | 1218 | this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; |
1201 | - this.Text = "mAgicAnime.NET Ver.7sh mod. yossiepon_20160924"; | |
1202 | - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); | |
1203 | - this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed); | |
1219 | + this.Text = "mAgicAnime.NET Ver.7sh mod. yossiepon_20170121"; | |
1204 | 1220 | this.Load += new System.EventHandler(this.MainForm_Load); |
1205 | 1221 | this.Shown += new System.EventHandler(this.MainForm_Shown); |
1222 | + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed); | |
1223 | + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); | |
1206 | 1224 | this.Resize += new System.EventHandler(this.MainForm_Resize); |
1207 | 1225 | ((System.ComponentModel.ISupportInitialize)(this.filePictureBox)).EndInit(); |
1208 | 1226 | ((System.ComponentModel.ISupportInitialize)(this.titlePictureBox)).EndInit(); |
@@ -1325,7 +1343,9 @@ | ||
1325 | 1343 | private System.Windows.Forms.ToolStripSeparator toolStripMenuItem10; |
1326 | 1344 | private System.Windows.Forms.ToolStripSeparator toolStripSeparator9; |
1327 | 1345 | private System.Windows.Forms.ToolStripMenuItem updateProgramPlanMenu; |
1328 | - private System.Windows.Forms.ToolStripMenuItem deleteInvalidEpisode; | |
1346 | + private System.Windows.Forms.ToolStripMenuItem deleteInvalidEpisodeMenu; | |
1347 | + private System.Windows.Forms.ToolStripMenuItem unfixedInvalidEpisodeMenu; | |
1348 | + private System.Windows.Forms.ToolStripMenuItem enforceRecordedStatusMenu; | |
1329 | 1349 | } |
1330 | 1350 | } |
1331 | 1351 |
@@ -1603,8 +1603,10 @@ namespace magicAnime | ||
1603 | 1603 | titleLabel.Text = prog.title + |
1604 | 1604 | string.Format( |
1605 | 1605 | // mod yossiepon 20150705 begin |
1606 | + // " 第{0:0}話 {1:0}" , | |
1606 | 1607 | " 第{0}話 {1}" , |
1607 | 1608 | // mod yossiepon 20160924 begin |
1609 | + // // episode.StoryNumber , | |
1608 | 1610 | // episode.StoryNoStr.Length > 0 ? episode.StoryNoStr : episode.StoryNumber.ToString("0"), |
1609 | 1611 | episode.StoryNoStr.Length > 0 ? episode.StoryNoStr : episode.StoryNumber.ToString(Settings.Default.storyNoFormat), |
1610 | 1612 | // mod yossiepon 20160924 end |
@@ -1701,6 +1703,10 @@ namespace magicAnime | ||
1701 | 1703 | bool enableUpdateProg = true; |
1702 | 1704 | bool enableDeleteInv = false; |
1703 | 1705 | // add yossiepon 20160924 end |
1706 | + // add yossiepon 20170121 begin | |
1707 | + bool enableEnforceRec = true; | |
1708 | + bool enableUnfixedInv = true; | |
1709 | + // add yossiepon 20170121 end | |
1704 | 1710 | |
1705 | 1711 | foreach (AnimeEpisode ep in episodes) |
1706 | 1712 | { |
@@ -1721,6 +1727,14 @@ namespace magicAnime | ||
1721 | 1727 | enableUnread &= !isMulti; |
1722 | 1728 | |
1723 | 1729 | enableProp &= !isMulti; |
1730 | + | |
1731 | + // add yossiepon 20170121 begin | |
1732 | + // 強制録画済み化判定:予約可能か? | |
1733 | + enableEnforceRec = enableReserve; | |
1734 | + | |
1735 | + // 無効データ未確定化判定:選択中のセルが放送プランデータ異常、かつプランあり、かつ未予約、かつファイルなしか? | |
1736 | + enableUnfixedInv &= ep.PlanError && ep.HasPlan && !ep.IsReserved && !ep.HasFile; | |
1737 | + // add yossiepon 20170121 end | |
1724 | 1738 | } |
1725 | 1739 | |
1726 | 1740 | // add yossiepon 20160924 begin |
@@ -1805,8 +1819,12 @@ namespace magicAnime | ||
1805 | 1819 | RecordPropertyMenu.Enabled = enableProp; |
1806 | 1820 | // add yossiepon 20160924 begin |
1807 | 1821 | updateProgramPlanMenu.Enabled = enableUpdateProg; |
1808 | - deleteInvalidEpisode.Enabled = enableDeleteInv; | |
1822 | + deleteInvalidEpisodeMenu.Enabled = enableDeleteInv; | |
1809 | 1823 | // add yossiepon 20160924 end |
1824 | + // add yossiepon 20170121 begin | |
1825 | + enforceRecordedStatusMenu.Enabled = enableEnforceRec; | |
1826 | + unfixedInvalidEpisodeMenu.Enabled = enableUnfixedInv; | |
1827 | + // add yossiepon 20170121 end | |
1810 | 1828 | |
1811 | 1829 | unreadMenu.Checked = !isMulti && episodes[0].Unread; |
1812 | 1830 | unreadMenu.Visible = !Settings.Default.disableUnread; |
@@ -3056,6 +3074,7 @@ namespace magicAnime | ||
3056 | 3074 | } |
3057 | 3075 | } |
3058 | 3076 | |
3077 | + // add 7sh 2.0.14.10 2012-03-30 begin | |
3059 | 3078 | //========================================================================= |
3060 | 3079 | /// <summary> |
3061 | 3080 | /// リサイズの限定 |
@@ -3070,6 +3089,7 @@ namespace magicAnime | ||
3070 | 3089 | if (this.Width < 758) { this.Width = 758; } |
3071 | 3090 | if (this.Height < 310) { this.Height = 310; } |
3072 | 3091 | } |
3092 | + // add 7sh 2.0.14.10 2012-03-30 end | |
3073 | 3093 | |
3074 | 3094 | // add yossiepon 20160924 begin |
3075 | 3095 | //========================================================================= |
@@ -3078,7 +3098,7 @@ namespace magicAnime | ||
3078 | 3098 | /// </summary> |
3079 | 3099 | /// <remarks> |
3080 | 3100 | /// </remarks> |
3081 | - /// <history>2006/XX/XX 新規作成</history> | |
3101 | + /// <history>2016/09/24 新規作成</history> | |
3082 | 3102 | //======================================================================== |
3083 | 3103 | private void updateProgramPlanMenu_Click(object sender, EventArgs e) |
3084 | 3104 | { |
@@ -3102,7 +3122,7 @@ namespace magicAnime | ||
3102 | 3122 | /// </summary> |
3103 | 3123 | /// <remarks> |
3104 | 3124 | /// </remarks> |
3105 | - /// <history>2006/XX/XX 新規作成</history> | |
3125 | + /// <history>2016/09/24 新規作成</history> | |
3106 | 3126 | //======================================================================== |
3107 | 3127 | private void deleteInvalidEpisode_Click(object sender, EventArgs e) |
3108 | 3128 | { |
@@ -3132,6 +3152,47 @@ namespace magicAnime | ||
3132 | 3152 | } |
3133 | 3153 | } |
3134 | 3154 | // add yossiepon 20160924 end |
3155 | + | |
3156 | + // add yossiepon 20170121 begin | |
3157 | + //========================================================================= | |
3158 | + /// <summary> | |
3159 | + /// 録画済み状態強制設定メニュー項目のクリック処理 | |
3160 | + /// </summary> | |
3161 | + /// <remarks> | |
3162 | + /// </remarks> | |
3163 | + /// <history>2017/01/21 新規作成</history> | |
3164 | + //======================================================================== | |
3165 | + private void enforceRecordedStatusMenu_Click(object sender, EventArgs e) | |
3166 | + { | |
3167 | + var episodes = GridSelectEpisodes; | |
3168 | + | |
3169 | + foreach(var ep in episodes) | |
3170 | + { | |
3171 | + // 選択された回を最終保存先に転送済みにする | |
3172 | + ep.HasFile = true; | |
3173 | + ep.IsStored = true; | |
3174 | + } | |
3175 | + } | |
3176 | + | |
3177 | + //========================================================================= | |
3178 | + /// <summary> | |
3179 | + /// 無効途中回プラン未確定状態設定メニュー項目のクリック処理 | |
3180 | + /// </summary> | |
3181 | + /// <remarks> | |
3182 | + /// </remarks> | |
3183 | + /// <history>2017/01/21 新規作成</history> | |
3184 | + //======================================================================== | |
3185 | + private void unfixedInvalidEpisodeMenu_Click(object sender, EventArgs e) | |
3186 | + { | |
3187 | + var episodes = GridSelectEpisodes; | |
3188 | + | |
3189 | + foreach(var ep in episodes) | |
3190 | + { | |
3191 | + // 選択された回の放送プランを未確定に戻す | |
3192 | + ep.HasPlan = false; | |
3193 | + } | |
3194 | + } | |
3195 | + // add yossiepon 20170121 end | |
3135 | 3196 | } |
3136 | 3197 | |
3137 | 3198 | } |
@@ -64,7 +64,7 @@ namespace magicAnime.UserInterface | ||
64 | 64 | mNotifyIcon.DoubleClick += notifyIcon_DoubleClick; |
65 | 65 | mNotifyIcon.BalloonTipIcon = ToolTipIcon.Info; |
66 | 66 | mNotifyIcon.BalloonTipTitle = "mAgicAnime"; |
67 | - mNotifyIcon.Text = "mAgicAnime Ver.7sh mod. yossiepon_20160924"; | |
67 | + mNotifyIcon.Text = "mAgicAnime Ver.7sh mod. yossiepon_20170121"; | |
68 | 68 | // trayIcon.Icon = ((System.Drawing.Icon)(resources.GetObject( "notifyIcon.Icon" ))); |
69 | 69 | |
70 | 70 | //--------------------------- |
@@ -250,6 +250,9 @@ | ||
250 | 250 | <setting name="overlapThreshould" serializeAs="String"> |
251 | 251 | <value>1</value> |
252 | 252 | </setting> |
253 | + <setting name="productVersion" serializeAs="String"> | |
254 | + <value></value> | |
255 | + </setting> | |
253 | 256 | <setting name="thumbnailMode" serializeAs="String"> |
254 | 257 | <value>False</value> |
255 | 258 | </setting> |