OSDN -- Desenvolver e Download de Software Open Source
Estado tradução de Português translation status for pt
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

mAgicAnime 俺用改造版


Commit MetaInfo

Revisãof1737d1511f6ab4bd057541a73c55dc855866136 (tree)
Hora2016-10-30 07:29:44
Autoryoshy <yoshy@user...>
Commiteryoshy

Mensagem de Log

[ADD] ver.7sh 2.0.14.1 話数が割り当てられていないデータも1話として扱うようにした
[FIX] ver.7sh 2.0.14.1 エンコード失敗時にファイルを削除しないようにした
[FIX] ver.7sh 2.0.14.3 ウィンドウサイズが極端に小さくならないように限定した
[ADD] ver.7sh 2.0.14.4 タイトルバーにVer.7shを追加
[ADD] ver.7sh 2.0.14.5 番組プロパティの上部のURLでブラウザを開くようにした
[ADD] 特番対応（ななし版とは別アルゴリズム）
[ADD] 複数話数連続放送時に予約を分割しないように修正

Mudança Sumário

Diff

--- a/OnLine DataBase/SyoboiCalender.cs
+++ b/OnLine DataBase/SyoboiCalender.cs
@@ -31,6 +31,9 @@ namespace magicAnime
3131 //=========================================================================
3232 class SyoboiCalender
3333 {
34+ // mod. yossiepon_20150705
35+ public const int UNNUMBERED_EPISODE = int.MinValue;
36+
3437 DateTime? prevUpdateListGetTime = null; // 前回の更新リスト取得時刻
3538
3639 // タイトルリストテーブル(http://cal.syoboi.jp/titlelist.php)
@@ -78,6 +81,8 @@ namespace magicAnime
7881 //=========================================================================
7982 public class SyoboiRecord : ICloneable
8083 {
84+ // mod. yossiepon_20150705
85+ public string episode;
8186 public int number;
8287 public string subtitle;
8388 public string tvStation;
@@ -89,6 +94,21 @@ namespace magicAnime
8994 {
9095 return this.MemberwiseClone();
9196 }
97+
98+ // mod. yossiepon_20150705 begin
99+ //=========================================================================
100+ /// <summary>
101+ /// フォーマットされた番組エピソード文字列を返す
102+ /// </summary>
103+ /// <remarks>
104+ /// </remarks>
105+ /// <history>2006/XX/XX 新規作成</history>
106+ //=========================================================================
107+ public override string ToString()
108+ {
109+ return tvStation + "-No." + number + "(" + episode + ")「" + subtitle + "」(" + length + " min.)/" + onAirDateTime;
110+ }
111+ // mod. yossiepon_20150705 end
92112 }
93113
94114 public class SyoboiUpdate
@@ -383,7 +403,8 @@ namespace magicAnime
383403 Match matchTitle = parseTitle.Match(line);
384404
385405 if( matchTitle.Success )
386- title = matchTitle.Groups["Title"].Value;
406+ // mod. yossiepon_20150705
407+ title = HttpUtility.HtmlDecode( matchTitle.Groups["Title"].Value );
387408 }
388409
389410 allLine += line;
@@ -449,6 +470,10 @@ namespace magicAnime
449470 ArrayList Cols;
450471 string temp;
451472
473+ // mod. yossiepon_20150705 begin
474+
475+ List<decimal> dummyNums = new List<decimal>();
476+
452477 //---------------------------------------------------------------------------------
453478 // チャンネル 開始日時 分 回数 サブタイトル/コメント フラグ 更新日 -
454479 //---------------------------------------------------------------------------------
@@ -456,127 +481,187 @@ namespace magicAnime
456481
457482 syoboiRecord = new SyoboiRecord();
458483
459- syoboiRecord.tvStation = (string)Cols[0]; // TV局名
484+ syoboiRecord.tvStation = (string)Cols[0]; // TV局名
485+ syoboiRecord.onAirDateTime = ConvertToDateTime((string)Cols[1]); // 開始日時
486+ syoboiRecord.length = int.Parse( (string)Cols[ 2 ] ); // 尺
460487
488+ // 回数が無い場合
461489 if ( Cols[ 3 ].Equals( "" ) )
462490 {
463491 //-----------------------------
464492 // 複数話連続放送の対策
465493 //-----------------------------
466494
467- // #nn〜#mm
468- Regex parser = new Regex( "^#(?<FirstEpisode>[0-9]+)〜#(?<LastEpisode>[0-9]+)" );
495+ // サブタイトルから#nn〜#mmを抽出
496+ Regex parser = new Regex( "^#(?<FirstEpisode>[0-9.]+)〜#(?<LastEpisode>[0-9.]+)" );
469497 Match match = parser.Match( (string)Cols[ 4 ] );
470498
499+ // マッチした場合
471500 if (match.Success)
472501 {
473- int firstEpisode, lastEpisode;
474- int episodeCount = 1;
475- DateTime onairDateTime;
476-
477- firstEpisode = int.Parse(match.Groups["FirstEpisode"].Value);
478- lastEpisode = int.Parse(match.Groups["LastEpisode"].Value);
502+ // 最初と最後が端数だった場合、それぞれ１話増えるようにfloorとceilingにしておく
503+ // ※中間に端数が含まれる場合、放送データからだけでは判別がつかず極めて稀なパターンと思われるので考慮しない
504+ decimal firstEpisode = Decimal.Parse(match.Groups["FirstEpisode"].Value);
505+ decimal lastEpisode = Decimal.Parse(match.Groups["LastEpisode"].Value);
479506
480- syoboiRecord.number = firstEpisode;
481- episodeCount = (lastEpisode - firstEpisode + 1); // 連続放送数
507+ // 連続話数は分割せずにまとめて録画する
508+ syoboiRecord.episode = firstEpisode + "〜" + lastEpisode; // 話番号文字列（マッチ結果全体をそのまま入れる）
509+ syoboiRecord.number = convertDecimalEpisodeNoToInt(firstEpisode); // 話番号（１つ目）
482510
483- // 尺=全放送時間/話数
484- syoboiRecord.length = int.Parse((string)Cols[2]) / episodeCount;
511+ // HTMLエンコード文字をデコード
512+ syoboiRecord.subtitle = HttpUtility.HtmlDecode(MakeNaked((string)Cols[4])); // サブタイトル
485513
486- onairDateTime = ConvertToDateTime( (string)Cols[1] );
487-
488- //-----------------------------
489- // 連続話数分、データを追加
490- //-----------------------------
491- for (int i = firstEpisode; i <= lastEpisode; ++i)
514+ // 最初の話数が端数だった場合
515+ if ( convertDecimalEpisodeNoToInt(firstEpisode) == UNNUMBERED_EPISODE )
492516 {
493- SyoboiRecord newRecord;
494-
495- newRecord = (SyoboiRecord)syoboiRecord.Clone();
496-
497- newRecord.number = i; // 話番号
498- newRecord.subtitle = ""; // サブタイトル
517+ // 端数のままダミー話数リストに追加する
518+ dummyNums.Add(firstEpisode);
519+ }
499520
500- // 開始時刻
501- newRecord.onAirDateTime = onairDateTime.AddMinutes(newRecord.length * (i - firstEpisode));
521+ // 最初の話数から最後の話数までをダミー話数リストに追加する
522+ // 最後の話数が端数の場合は、その前までが追加される
523+ for(int i = Decimal.ToInt32(Decimal.Ceiling(firstEpisode)); i <= Decimal.ToInt32(Decimal.Floor(lastEpisode)); i++)
524+ {
525+ dummyNums.Add(i);
526+ }
502527
503- recordList.Add(newRecord);
528+ // 最後の話数が端数だった場合
529+ if ( convertDecimalEpisodeNoToInt(lastEpisode) == UNNUMBERED_EPISODE )
530+ {
531+ // 端数のままダミー話数リストに追加する
532+ dummyNums.Add(lastEpisode);
504533 }
505534 }
506535 else
507536 {
508537 //------------------------------------------------
509- // 2話連続「#1、#2」
538+ // 複数話連続「#1(「〜」)(、#2(「〜」))...」
539+ // ※1話のみで回数が無い場合もここで処理される(#10.5等)
510540 //------------------------------------------------
511- DateTime onairDateTime;
512- string dateTag;
513- List<int> episodeNums = new List<int>();
541+ //List<string> episodeStrs = new List<string>();
514542 List<string> subTitles = new List<string>();
515-
516- // 連続放送時間
517- int totalLen = int.Parse((string)Cols[2]);
518-
519- onairDateTime = ConvertToDateTime( (string)Cols[1] );
520543
521- // 前後編の場合、サブタイトルが一緒になっている
522- // #nn「サブタイトル」、#mm「サブタイトル」...
523- parser = new Regex("#(?<EpisodeNumber>[0-9]+)((｢|「)(?<Subtitle>.*?)(｣|」))?(、)?");
544+ // サブタイトルから#nn「サブタイトル」、#mm「サブタイトル」...を抽出
545+ // ※「」をつけずにサブタイトルが入る場合があるので、その場合は繰り返しを考慮せずにすべて抜き出す
546+ parser = new Regex("#(?<EpisodeNumber>[0-9.]+)( (?<Subtitle>.+)|(｢|「)(?<Subtitle>.*?)(｣|」))?(、)?");
524547 match = parser.Match((string)Cols[4]);
525548
526549 // エピソード番号とタイトルを全て切り出す
527550 while(match.Success)
528551 {
529- int episodeNum = int.Parse(match.Groups["EpisodeNumber"].Value);
530- string subTitle = (string)match.Groups["Subtitle"].Value;
552+ string episodeStr = match.Groups["EpisodeNumber"].Value;
553+ decimal episodeNum = Decimal.Parse(episodeStr);
554+ string subTitle = HttpUtility.HtmlDecode( (string)match.Groups["Subtitle"].Value );
531555
532- episodeNums.Add( episodeNum );
556+ //episodeStrs.Add( episodeStr );
557+ dummyNums.Add( episodeNum );
533558 subTitles.Add( subTitle );
534559
535- match = match.NextMatch();
560+ match = match.NextMatch();
536561 }
537562
538- // 前後編の場合のサブタイトル処理
539- if( subTitles.Count == 2 )
563+ // 抽出できなかった場合
564+ if (dummyNums.Count == 0)
540565 {
541- if( string.IsNullOrEmpty( subTitles[0] ) &&
542- !string.IsNullOrEmpty( subTitles[1] ) )
566+ syoboiRecord.episode = ""; // 話番号文字列
567+ syoboiRecord.number = UNNUMBERED_EPISODE; // 話番号 = 特別編（UNNUMBERED_EPISODE）
568+
569+ // HTMLエンコード文字をデコード
570+ syoboiRecord.subtitle = HttpUtility.HtmlDecode(MakeNaked((string)Cols[4])); // サブタイトル
571+ }
572+ else
573+ {
574+ int firstEpisode = convertDecimalEpisodeNoToInt( dummyNums[0] );
575+ string episodeStr = "";
576+
577+ // 話番号が複数存在する場合
578+ if (dummyNums.Count > 1)
543579 {
544- subTitles[0] = subTitles[1];
580+ int lastEpisode = convertDecimalEpisodeNoToInt( dummyNums[dummyNums.Count -1] );
581+ Boolean isEntireNums = true;
582+
583+ // 区切り内の番号が連番になっているかチェックする
584+ for(int i = 1; i < dummyNums.Count; i++) {
585+
586+ if( dummyNums[i] != firstEpisode + i ) {
587+
588+ isEntireNums = false;
589+ break;
590+ }
591+ }
592+
593+ // 連番の場合、「nn〜mm」にする
594+ if ( isEntireNums )
595+ {
596+ episodeStr = firstEpisode + "〜" + lastEpisode;
597+ }
545598 }
546- }
547599
548- // 各エピソードを追加
549- for( int i = 0 ; i < episodeNums.Count ; ++i )
550- {
551- int episodeNum = episodeNums[i];
552- string subTitle = subTitles[i];
600+ // 連番でない場合、「nn(、mm、...)」にする
601+ if( episodeStr.Length == 0 )
602+ {
603+ StringBuilder episodeStrBuf = new StringBuilder();
553604
554- SyoboiRecord newRecord = (SyoboiRecord)syoboiRecord.Clone();
605+ for(int i = 0; i < dummyNums.Count; i++) {
555606
556- // 尺=全放送時間/話数
557- newRecord.length = totalLen / episodeNums.Count;
558- newRecord.number = episodeNum; // エピソード番号
559- newRecord.subtitle = subTitle; // サブタイトル
607+ if( episodeStrBuf.Length > 0 )
608+ {
609+ episodeStrBuf.Append('、');
610+ }
611+ episodeStrBuf.Append(dummyNums[i]);
612+ }
560613
561- // 開始時刻
562- newRecord.onAirDateTime = onairDateTime.AddMinutes(newRecord.length * i);
614+ episodeStr = episodeStrBuf.ToString();
615+ }
616+
617+ // サブタイトルを「〜(｜〜｜…)」にする
618+ StringBuilder subtitleBuf = new StringBuilder();
563619
564- recordList.Add(newRecord);
620+ for(int i = 0; i < subTitles.Count; i++) {
621+
622+ if( subtitleBuf.Length > 0 )
623+ {
624+ subtitleBuf.Append('｜');
625+ }
626+ subtitleBuf.Append(subTitles[i]);
627+ }
628+
629+ syoboiRecord.episode = episodeStr; // 話番号文字列
630+ syoboiRecord.number = firstEpisode; // 話番号
631+
632+ syoboiRecord.subtitle = subtitleBuf.ToString(); // サブタイトル
565633 }
566634 }
567635 }
568636 else
569637 {
570- syoboiRecord.length = int.Parse( (string)Cols[ 2 ] ); // 尺
571- syoboiRecord.number = int.Parse( (string)Cols[ 3 ] ); // 話番号
638+ syoboiRecord.episode = (string)Cols[3]; // 話番号文字列
639+ syoboiRecord.number = convertDecimalEpisodeNoToInt( decimal.Parse( (string)Cols[ 3 ] ) ); // 話番号
572640
573641 // HTMLエンコード文字をデコード
574642 syoboiRecord.subtitle = HttpUtility.HtmlDecode( MakeNaked( (string)Cols[ 4 ] ) ); // サブタイトル
575- syoboiRecord.onAirDateTime = ConvertToDateTime( (string)Cols[1] ); // 開始日時
576643
577- recordList.Add( syoboiRecord );
578644 }
579645
646+ recordList.Add( syoboiRecord );
647+
648+ //-----------------------------
649+ // 連続話数の残り分、データを追加
650+ //-----------------------------
651+ for (int i = 1; i < dummyNums.Count; ++i)
652+ {
653+ SyoboiRecord newRecord;
654+
655+ newRecord = (SyoboiRecord)syoboiRecord.Clone();
656+
657+ newRecord.length = 0; // 尺を0にして無効扱いにする
658+ newRecord.number = convertDecimalEpisodeNoToInt(dummyNums[i]); // 話番号
659+ //newRecord.subtitle = ""; // サブタイトルをクリアする
660+
661+ recordList.Add(newRecord);
662+ }
663+
664+ // mod. yossiepon_20150705 end
580665 }
581666 catch(Exception)
582667 {
@@ -728,6 +813,30 @@ namespace magicAnime
728813 {
729814 string nakedContext = context;
730815
816+ // mod. yossiepon_20150705 begin
817+ {
818+ Regex regex = new Regex("<div class=\"peComment\">(?<Content>(.*?))</div>");
819+ Match match = regex.Match(nakedContext);
820+
821+ if (match.Groups["Content"].Success)
822+ {
823+ string content = " " + match.Groups["Content"].Value;
824+
825+ {
826+ Regex regex2 = new Regex("<a(.*?)>(?<Content>(.*?))</a>");
827+ Match match2 = regex2.Match(content);
828+
829+ if (match2.Groups["Content"].Success)
830+ {
831+ content = regex2.Replace(content, "");
832+ }
833+ }
834+
835+ nakedContext = regex.Replace(nakedContext, content);
836+ }
837+ }
838+ // mod. yossiepon_20150705 end
839+
731840 {
732841 Regex regex = new Regex("<a(.*?)>(?<Content>(.*?))</a>");
733842 Match match = regex.Match(nakedContext);
@@ -754,7 +863,8 @@ namespace magicAnime
754863 }
755864 }
756865
757- return nakedContext;
866+ // mod. yossiepon_20150705
867+ return nakedContext.Trim();
758868 }
759869
760870 //=========================================================================
@@ -833,6 +943,114 @@ namespace magicAnime
833943 remain = line;
834944 return "";
835945 }
946+
947+
948+ //=========================================================================
949+ /// <summary>
950+ /// 未対応話を最終話以降に連結する
951+ /// </summary>
952+ /// <remarks>
953+ /// </remarks>
954+ /// <history>2006/XX/XX 新規作成</history>
955+ //=========================================================================
956+ static public int Unnumbers( string _tvstasion, ref List<SyoboiCalender.SyoboiRecord> _syoboi)
957+ {
958+ // mod. yossiepon_20150705 begin
959+
960+ int maxEpNo = int.MinValue;
961+ int curSpEpNo = 1;
962+
963+ Dictionary<string, int> specialEpNos = new Dictionary<string, int>();
964+
965+ // 放送分の最大話数を取得
966+ for(int i = 0; i < _syoboi.Count; i++)
967+ {
968+ if (_syoboi[i].tvStation.Equals(_tvstasion))
969+ {
970+ int epNo = _syoboi[i].number;
971+
972+ if(epNo != UNNUMBERED_EPISODE)
973+ {
974+ maxEpNo = Math.Max(maxEpNo, epNo);
975+ }
976+ }
977+ }
978+
979+ // 最大話数が見つからない場合（すべて未付番の場合）
980+ if(maxEpNo == int.MinValue)
981+ {
982+ // 特別編の話数を1から付番する
983+ maxEpNo = 0;
984+ }
985+
986+ // 特別編に話数を振る
987+ for(int i = 0; i < _syoboi.Count; i++)
988+ {
989+ if (_syoboi[i].tvStation.Equals(_tvstasion))
990+ {
991+ int epNo = _syoboi[i].number;
992+ string subtitle = _syoboi[i].subtitle;
993+
994+ // 話数が特別編（UNNUMBERED_EPISODE）なら
995+ if (epNo == UNNUMBERED_EPISODE)
996+ {
997+ // 特別編の話数がディクショナリに存在したら
998+ if ( specialEpNos.ContainsKey(subtitle) )
999+ {
1000+ // 保存済みの話数を使用する
1001+ epNo = specialEpNos[subtitle];
1002+ }
1003+ else
1004+ {
1005+ // 存在しなければ、新しい話数を発番して保存する
1006+ epNo = maxEpNo + curSpEpNo ++;
1007+ specialEpNos.Add(subtitle, epNo);
1008+ }
1009+
1010+ // 話数文字列が振られていなければ「SPn」にする
1011+ if(_syoboi[i].episode.Length == 0)
1012+ {
1013+ _syoboi[i].episode = "SP" + (epNo - maxEpNo);
1014+ }
1015+
1016+ // 特別編に話数をつける
1017+ _syoboi[i].number = epNo;
1018+ }
1019+ }
1020+ }
1021+
1022+ // 付番した最大話数を返す
1023+ return maxEpNo + curSpEpNo - 1;
1024+
1025+ // mod. yossiepon_20150705 end
1026+ }
1027+
1028+ // mod. yossiepon_20150705 begin
1029+ //=========================================================================
1030+ /// <summary>
1031+ /// 話番号を整数に変換する
1032+ /// </summary>
1033+ /// <param name="no">話番号（実数）</param>
1034+ /// <returns>1以上の整数の場合そのまま、0または実数の場合は UNNUMBERED_EPISODE にする</returns>
1035+ //=========================================================================
1036+ private int convertDecimalEpisodeNoToInt(decimal no)
1037+ {
1038+ // 端数回は特別編（UNNUMBERED_EPISODE）として処理
1039+ if( no.CompareTo(Decimal.Round(no)) != 0 )
1040+ {
1041+ return UNNUMBERED_EPISODE;
1042+ }
1043+ // 0話は特別編（UNNUMBERED_EPISODE）として処理
1044+ else if( no.Equals(Decimal.Zero) )
1045+ {
1046+ return UNNUMBERED_EPISODE;
1047+ }
1048+
1049+ // 端数でなければ整数なので、そのまま変換して返す
1050+ return Decimal.ToInt32(no);
1051+ }
1052+ // mod. yossiepon_20150705 end
1053+
8361054
8371055 }
8381056
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
55 // アセンブリに関する一般情報は以下の属性セットをとおして制御されます。
66 // アセンブリに関連付けられている情報を変更するには、
77 // これらの属性値を変更してください。
8-[assembly: AssemblyTitle("mAgicAnime")]
8+[assembly: AssemblyTitle("mAgicAnime Ver.7sh mod. yossiepon_20150705")]
99 [assembly: AssemblyDescription("")]
1010 [assembly: AssemblyConfiguration("")]
1111 [assembly: AssemblyCompany("")]
12-[assembly: AssemblyProduct("mAgicAnime.NET")]
12+[assembly: AssemblyProduct("mAgicAnime.NET (ななし版, mod. yossiepon_20150705)")]
1313 [assembly: AssemblyCopyright("Copyright (C) 2006-2010 mAgicAnime Project")]
1414 [assembly: AssemblyTrademark("")]
1515 [assembly: AssemblyCulture("")]
@@ -30,4 +30,4 @@ using System.Runtime.InteropServices;
3030 // Revision
3131 //
3232 [assembly: AssemblyVersion("2.0.0.0")]
33-[assembly: AssemblyFileVersion("2.0.14.0")]
33+[assembly: AssemblyFileVersion("2.0.14.20150705")]
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
11 //------------------------------------------------------------------------------
22 // <auto-generated>
33 // このコードはツールによって生成されました。
4-// ランタイム バージョン:2.0.50727.4927
4+// ランタイム バージョン:4.0.30319.34209
55 //
66 // このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
77 // コードが再生成されるときに損失したりします。
@@ -17,9 +17,9 @@ namespace magicAnime.Properties {
1717 /// </summary>
1818 // このクラスは StronglyTypedResourceBuilder クラスが ResGen
1919 // または Visual Studio のようなツールを使用して自動生成されました。
20- // メンバを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に
20+ // メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に
2121 // ResGen を実行し直すか、または VS プロジェクトをビルドし直します。
22- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
22+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
2323 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
2424 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
2525 internal class Resources {
@@ -60,6 +60,9 @@ namespace magicAnime.Properties {
6060 }
6161 }
6262
63+ /// <summary>
64+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
65+ /// </summary>
6366 internal static System.Drawing.Bitmap CalenderMode {
6467 get {
6568 object obj = ResourceManager.GetObject("CalenderMode", resourceCulture);
@@ -67,6 +70,9 @@ namespace magicAnime.Properties {
6770 }
6871 }
6972
73+ /// <summary>
74+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
75+ /// </summary>
7076 internal static System.Drawing.Bitmap Config {
7177 get {
7278 object obj = ResourceManager.GetObject("Config", resourceCulture);
@@ -74,6 +80,9 @@ namespace magicAnime.Properties {
7480 }
7581 }
7682
83+ /// <summary>
84+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
85+ /// </summary>
7786 internal static System.Drawing.Bitmap DateTime {
7887 get {
7988 object obj = ResourceManager.GetObject("DateTime", resourceCulture);
@@ -81,6 +90,9 @@ namespace magicAnime.Properties {
8190 }
8291 }
8392
93+ /// <summary>
94+ /// (アイコン) に類似した型 System.Drawing.Icon のローカライズされたリソースを検索します。
95+ /// </summary>
8496 internal static System.Drawing.Icon DoubleBooking {
8597 get {
8698 object obj = ResourceManager.GetObject("DoubleBooking", resourceCulture);
@@ -88,6 +100,9 @@ namespace magicAnime.Properties {
88100 }
89101 }
90102
103+ /// <summary>
104+ /// (アイコン) に類似した型 System.Drawing.Icon のローカライズされたリソースを検索します。
105+ /// </summary>
91106 internal static System.Drawing.Icon DoubleBookingReserved {
92107 get {
93108 object obj = ResourceManager.GetObject("DoubleBookingReserved", resourceCulture);
@@ -95,6 +110,9 @@ namespace magicAnime.Properties {
95110 }
96111 }
97112
113+ /// <summary>
114+ /// (アイコン) に類似した型 System.Drawing.Icon のローカライズされたリソースを検索します。
115+ /// </summary>
98116 internal static System.Drawing.Icon Encoded {
99117 get {
100118 object obj = ResourceManager.GetObject("Encoded", resourceCulture);
@@ -102,6 +120,9 @@ namespace magicAnime.Properties {
102120 }
103121 }
104122
123+ /// <summary>
124+ /// (アイコン) に類似した型 System.Drawing.Icon のローカライズされたリソースを検索します。
125+ /// </summary>
105126 internal static System.Drawing.Icon Error {
106127 get {
107128 object obj = ResourceManager.GetObject("Error", resourceCulture);
@@ -109,6 +130,9 @@ namespace magicAnime.Properties {
109130 }
110131 }
111132
133+ /// <summary>
134+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
135+ /// </summary>
112136 internal static System.Drawing.Bitmap Flag {
113137 get {
114138 object obj = ResourceManager.GetObject("Flag", resourceCulture);
@@ -116,6 +140,9 @@ namespace magicAnime.Properties {
116140 }
117141 }
118142
143+ /// <summary>
144+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
145+ /// </summary>
119146 internal static System.Drawing.Bitmap FullUpdate {
120147 get {
121148 object obj = ResourceManager.GetObject("FullUpdate", resourceCulture);
@@ -123,6 +150,9 @@ namespace magicAnime.Properties {
123150 }
124151 }
125152
153+ /// <summary>
154+ /// (アイコン) に類似した型 System.Drawing.Icon のローカライズされたリソースを検索します。
155+ /// </summary>
126156 internal static System.Drawing.Icon Log {
127157 get {
128158 object obj = ResourceManager.GetObject("Log", resourceCulture);
@@ -130,6 +160,9 @@ namespace magicAnime.Properties {
130160 }
131161 }
132162
163+ /// <summary>
164+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
165+ /// </summary>
133166 internal static System.Drawing.Bitmap Log1 {
134167 get {
135168 object obj = ResourceManager.GetObject("Log1", resourceCulture);
@@ -137,6 +170,9 @@ namespace magicAnime.Properties {
137170 }
138171 }
139172
173+ /// <summary>
174+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
175+ /// </summary>
140176 internal static System.Drawing.Bitmap mAgicAnime {
141177 get {
142178 object obj = ResourceManager.GetObject("mAgicAnime", resourceCulture);
@@ -144,6 +180,9 @@ namespace magicAnime.Properties {
144180 }
145181 }
146182
183+ /// <summary>
184+ /// (アイコン) に類似した型 System.Drawing.Icon のローカライズされたリソースを検索します。
185+ /// </summary>
147186 internal static System.Drawing.Icon mAigcAnimeLogo {
148187 get {
149188 object obj = ResourceManager.GetObject("mAigcAnimeLogo", resourceCulture);
@@ -151,6 +190,9 @@ namespace magicAnime.Properties {
151190 }
152191 }
153192
193+ /// <summary>
194+ /// (アイコン) に類似した型 System.Drawing.Icon のローカライズされたリソースを検索します。
195+ /// </summary>
154196 internal static System.Drawing.Icon mAigcAnimeLogoBusy {
155197 get {
156198 object obj = ResourceManager.GetObject("mAigcAnimeLogoBusy", resourceCulture);
@@ -158,6 +200,9 @@ namespace magicAnime.Properties {
158200 }
159201 }
160202
203+ /// <summary>
204+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
205+ /// </summary>
161206 internal static System.Drawing.Bitmap Movie {
162207 get {
163208 object obj = ResourceManager.GetObject("Movie", resourceCulture);
@@ -165,6 +210,9 @@ namespace magicAnime.Properties {
165210 }
166211 }
167212
213+ /// <summary>
214+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
215+ /// </summary>
168216 internal static System.Drawing.Bitmap NewProgram {
169217 get {
170218 object obj = ResourceManager.GetObject("NewProgram", resourceCulture);
@@ -172,6 +220,9 @@ namespace magicAnime.Properties {
172220 }
173221 }
174222
223+ /// <summary>
224+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
225+ /// </summary>
175226 internal static System.Drawing.Bitmap NumberingMode {
176227 get {
177228 object obj = ResourceManager.GetObject("NumberingMode", resourceCulture);
@@ -179,6 +230,9 @@ namespace magicAnime.Properties {
179230 }
180231 }
181232
233+ /// <summary>
234+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
235+ /// </summary>
182236 internal static System.Drawing.Bitmap PlayUnread {
183237 get {
184238 object obj = ResourceManager.GetObject("PlayUnread", resourceCulture);
@@ -186,6 +240,9 @@ namespace magicAnime.Properties {
186240 }
187241 }
188242
243+ /// <summary>
244+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
245+ /// </summary>
189246 internal static System.Drawing.Bitmap ProgramProperty {
190247 get {
191248 object obj = ResourceManager.GetObject("ProgramProperty", resourceCulture);
@@ -193,6 +250,9 @@ namespace magicAnime.Properties {
193250 }
194251 }
195252
253+ /// <summary>
254+ /// (アイコン) に類似した型 System.Drawing.Icon のローカライズされたリソースを検索します。
255+ /// </summary>
196256 internal static System.Drawing.Icon Question {
197257 get {
198258 object obj = ResourceManager.GetObject("Question", resourceCulture);
@@ -200,6 +260,9 @@ namespace magicAnime.Properties {
200260 }
201261 }
202262
263+ /// <summary>
264+ /// (アイコン) に類似した型 System.Drawing.Icon のローカライズされたリソースを検索します。
265+ /// </summary>
203266 internal static System.Drawing.Icon Reserved {
204267 get {
205268 object obj = ResourceManager.GetObject("Reserved", resourceCulture);
@@ -207,6 +270,9 @@ namespace magicAnime.Properties {
207270 }
208271 }
209272
273+ /// <summary>
274+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
275+ /// </summary>
210276 internal static System.Drawing.Bitmap SaveAll {
211277 get {
212278 object obj = ResourceManager.GetObject("SaveAll", resourceCulture);
@@ -214,6 +280,9 @@ namespace magicAnime.Properties {
214280 }
215281 }
216282
283+ /// <summary>
284+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
285+ /// </summary>
217286 internal static System.Drawing.Bitmap Thumbnail {
218287 get {
219288 object obj = ResourceManager.GetObject("Thumbnail", resourceCulture);
@@ -221,6 +290,9 @@ namespace magicAnime.Properties {
221290 }
222291 }
223292
293+ /// <summary>
294+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
295+ /// </summary>
224296 internal static System.Drawing.Bitmap Title {
225297 get {
226298 object obj = ResourceManager.GetObject("Title", resourceCulture);
@@ -228,6 +300,9 @@ namespace magicAnime.Properties {
228300 }
229301 }
230302
303+ /// <summary>
304+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
305+ /// </summary>
231306 internal static System.Drawing.Bitmap Update {
232307 get {
233308 object obj = ResourceManager.GetObject("Update", resourceCulture);
@@ -235,6 +310,9 @@ namespace magicAnime.Properties {
235310 }
236311 }
237312
313+ /// <summary>
314+ /// (アイコン) に類似した型 System.Drawing.Icon のローカライズされたリソースを検索します。
315+ /// </summary>
238316 internal static System.Drawing.Icon VideoFile {
239317 get {
240318 object obj = ResourceManager.GetObject("VideoFile", resourceCulture);
@@ -242,6 +320,9 @@ namespace magicAnime.Properties {
242320 }
243321 }
244322
323+ /// <summary>
324+ /// (アイコン) に類似した型 System.Drawing.Icon のローカライズされたリソースを検索します。
325+ /// </summary>
245326 internal static System.Drawing.Icon Warning {
246327 get {
247328 object obj = ResourceManager.GetObject("Warning", resourceCulture);
@@ -249,6 +330,9 @@ namespace magicAnime.Properties {
249330 }
250331 }
251332
333+ /// <summary>
334+ /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
335+ /// </summary>
252336 internal static System.Drawing.Bitmap window {
253337 get {
254338 object obj = ResourceManager.GetObject("window", resourceCulture);
--- a/Properties/Settings.Designer.cs
+++ b/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
11 //------------------------------------------------------------------------------
22 // <auto-generated>
33 // このコードはツールによって生成されました。
4-// ランタイム バージョン:2.0.50727.4927
4+// ランタイム バージョン:4.0.30319.34209
55 //
66 // このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
77 // コードが再生成されるときに損失したりします。
@@ -12,7 +12,7 @@ namespace magicAnime.Properties {
1212
1313
1414 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
15- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
15+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
1616 internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
1717
1818 private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -23,6 +23,33 @@ namespace magicAnime.Properties {
2323 }
2424 }
2525
26+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
27+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
28+ [global::System.Configuration.DefaultSettingValueAttribute("http://members2.jcom.home.ne.jp/kurusugawa/mAgicAnime/")]
29+ public string helpUrl {
30+ get {
31+ return ((string)(this["helpUrl"]));
32+ }
33+ }
34+
35+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
36+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
37+ [global::System.Configuration.DefaultSettingValueAttribute("A{0:0}_{1:0}")]
38+ public string specifiedNameFormat {
39+ get {
40+ return ((string)(this["specifiedNameFormat"]));
41+ }
42+ }
43+
44+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
45+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
46+ [global::System.Configuration.DefaultSettingValueAttribute("13")]
47+ public int thumbnailWhitebar {
48+ get {
49+ return ((int)(this["thumbnailWhitebar"]));
50+ }
51+ }
52+
2653 [global::System.Configuration.UserScopedSettingAttribute()]
2754 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
2855 [global::System.Configuration.DefaultSettingValueAttribute("")]
@@ -157,7 +184,7 @@ namespace magicAnime.Properties {
157184
158185 [global::System.Configuration.UserScopedSettingAttribute()]
159186 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
160- [global::System.Configuration.DefaultSettingValueAttribute("{0:0} 第{1:00}話 「{2:0}」")]
187+ [global::System.Configuration.DefaultSettingValueAttribute("{0} 第{6}話 「{2}」")]
161188 public string saveNameFormat {
162189 get {
163190 return ((string)(this["saveNameFormat"]));
@@ -383,15 +410,6 @@ namespace magicAnime.Properties {
383410 }
384411 }
385412
386- [global::System.Configuration.ApplicationScopedSettingAttribute()]
387- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
388- [global::System.Configuration.DefaultSettingValueAttribute("http://members2.jcom.home.ne.jp/kurusugawa/mAgicAnime/")]
389- public string helpUrl {
390- get {
391- return ((string)(this["helpUrl"]));
392- }
393- }
394-
395413 [global::System.Configuration.UserScopedSettingAttribute()]
396414 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
397415 [global::System.Configuration.DefaultSettingValueAttribute("False")]
@@ -562,34 +580,15 @@ namespace magicAnime.Properties {
562580
563581 [global::System.Configuration.UserScopedSettingAttribute()]
564582 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
565- [global::System.Configuration.DefaultSettingValueAttribute("0")]
566-// <MOD> 2010/01/18 ->
567- public IdentifyFileMethod specifiedFile {
583+ [global::System.Configuration.DefaultSettingValueAttribute("ByFileNameWithID")]
584+ public global::magicAnime.IdentifyFileMethod specifiedFile {
568585 get {
569- return ((IdentifyFileMethod)(this["specifiedFile"]));
586+ return ((global::magicAnime.IdentifyFileMethod)(this["specifiedFile"]));
570587 }
571588 set {
572589 this["specifiedFile"] = value;
573590 }
574591 }
575-// public int specifiedFile {
576-// get {
577-// return ((int)(this["specifiedFile"]));
578-// }
579-// set {
580-// this["specifiedFile"] = value;
581-// }
582-// }
583-// <MOD> 2010/01/18 <-
584-
585- [global::System.Configuration.ApplicationScopedSettingAttribute()]
586- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
587- [global::System.Configuration.DefaultSettingValueAttribute("A{0:0}_{1:0}")]
588- public string specifiedNameFormat {
589- get {
590- return ((string)(this["specifiedNameFormat"]));
591- }
592- }
593592
594593 [global::System.Configuration.UserScopedSettingAttribute()]
595594 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -627,21 +626,12 @@ namespace magicAnime.Properties {
627626 }
628627 }
629628
630- [global::System.Configuration.ApplicationScopedSettingAttribute()]
631- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
632- [global::System.Configuration.DefaultSettingValueAttribute("13")]
633- public int thumbnailWhitebar {
634- get {
635- return ((int)(this["thumbnailWhitebar"]));
636- }
637- }
638-
639629 [global::System.Configuration.UserScopedSettingAttribute()]
640630 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
641631 [global::System.Configuration.DefaultSettingValueAttribute("600")]
642- public int thumbnailSecond {
632+ public long thumbnailSecond {
643633 get {
644- return ((int)(this["thumbnailSecond"]));
634+ return ((long)(this["thumbnailSecond"]));
645635 }
646636 set {
647637 this["thumbnailSecond"] = value;
@@ -782,17 +772,6 @@ namespace magicAnime.Properties {
782772
783773 [global::System.Configuration.UserScopedSettingAttribute()]
784774 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
785- public global::System.Drawing.Rectangle rectWindow {
786- get {
787- return ((global::System.Drawing.Rectangle)(this["rectWindow"]));
788- }
789- set {
790- this["rectWindow"] = value;
791- }
792- }
793-
794- [global::System.Configuration.UserScopedSettingAttribute()]
795- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
796775 [global::System.Configuration.DefaultSettingValueAttribute("True")]
797776 public bool maximizeWindow {
798777 get {
@@ -986,9 +965,9 @@ namespace magicAnime.Properties {
986965 [global::System.Configuration.UserScopedSettingAttribute()]
987966 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
988967 [global::System.Configuration.DefaultSettingValueAttribute("noAutoReserve")]
989- public ReserveControl reserveControl {
968+ public global::magicAnime.ReserveControl reserveControl {
990969 get {
991- return ((ReserveControl)(this["reserveControl"]));
970+ return ((global::magicAnime.ReserveControl)(this["reserveControl"]));
992971 }
993972 set {
994973 this["reserveControl"] = value;
@@ -1021,197 +1000,194 @@ namespace magicAnime.Properties {
10211000
10221001 [global::System.Configuration.UserScopedSettingAttribute()]
10231002 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1024- public ExternalToolsSetting externalTools {
1003+ [global::System.Configuration.DefaultSettingValueAttribute("1")]
1004+ public int overlapThreshould {
10251005 get {
1026- return ((ExternalToolsSetting)(this["externalTools"]));
1006+ return ((int)(this["overlapThreshould"]));
10271007 }
10281008 set {
1029- this["externalTools"] = value;
1009+ this["overlapThreshould"] = value;
1010+ }
1011+ }
1012+
1013+ [global::System.Configuration.UserScopedSettingAttribute()]
1014+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1015+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
1016+ public bool thumbnailMode {
1017+ get {
1018+ return ((bool)(this["thumbnailMode"]));
1019+ }
1020+ set {
1021+ this["thumbnailMode"] = value;
10301022 }
10311023 }
10321024
10331025 [global::System.Configuration.UserScopedSettingAttribute()]
10341026 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
10351027 [global::System.Configuration.DefaultSettingValueAttribute("1")]
1036- public int overlapThreshould {
1028+ public uint fileTitleMode {
10371029 get {
1038- return ((int)(this["overlapThreshould"]));
1030+ return ((uint)(this["fileTitleMode"]));
10391031 }
10401032 set {
1041- this["overlapThreshould"] = value;
1033+ this["fileTitleMode"] = value;
10421034 }
10431035 }
1044-
1045- [global::System.Configuration.UserScopedSettingAttribute()]
1046- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1047- [global::System.Configuration.DefaultSettingValueAttribute("False")]
1048- public bool enablePriority
1049- {
1050- get
1051- {
1052- return ((bool)(this["enablePriority"]));
1053- }
1054- set
1055- {
1056- this["enablePriority"] = value;
1057- }
1058- }
1059-
1060- [global::System.Configuration.UserScopedSettingAttribute()]
1061- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1062- [global::System.Configuration.DefaultSettingValueAttribute("5")]
1063- public int overlapMargin
1064- {
1065- get
1066- {
1067- return ((int)(this["overlapMargin"]));
1068- }
1069- set
1070- {
1071- this["overlapMargin"] = value;
1072- }
1073- }
1074-
1075- [global::System.Configuration.UserScopedSettingAttribute()]
1076- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1077- [global::System.Configuration.DefaultSettingValueAttribute("False")]
1078- public bool thumbnailMode
1079- {
1080- get
1081- {
1082- return (bool)this["ThumbnailMode"];
1083- }
1084- set
1085- {
1086- this["ThumbnailMode"] = value;
1087- }
1088- }
1089-
1090-// <ADD> 2010/01/27 ->
1091- [global::System.Configuration.UserScopedSettingAttribute()]
1092- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1093- [global::System.Configuration.DefaultSettingValueAttribute("True")]
1094- public bool updateOnAirSoon
1095- {
1096- get
1097- {
1098- return (bool)this["updateOnAirSoon"];
1099- }
1100- set
1101- {
1102- this["updateOnAirSoon"] = value;
1103- }
1104- }
1105- [global::System.Configuration.UserScopedSettingAttribute()]
1106- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1107- [global::System.Configuration.DefaultSettingValueAttribute("<ArrayOfInt><int>10</int><int>30</int></ArrayOfInt>")]
1108- public System.Collections.Generic.List<int> untilOnAirMinutes
1109- {
1110- get
1111- {
1112- return (System.Collections.Generic.List<int>)this["untilOnAirMinutes"];
1113- }
1114- set
1115- {
1116- this["untilOnAirMinutes"] = value;
1117- }
1118- }
1119-// <ADD> 2010/01/27 <-
1120-// <ADD> 2010/01/29 ->
1121- [global::System.Configuration.UserScopedSettingAttribute()]
1122- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1123- [global::System.Configuration.DefaultSettingValueAttribute("False")]
1124- public bool showLogPane
1125- {
1126- get
1127- {
1128- return (bool)this["showLogPane"];
1129- }
1130- set
1131- {
1132- this["showLogPane"] = value;
1133- }
1134- }
1135-
1136- [global::System.Configuration.UserScopedSettingAttribute()]
1137- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1138- [global::System.Configuration.DefaultSettingValueAttribute("100")]
1139- public int logPaneSize
1140- {
1141- get
1142- {
1143- return (int)this["logPaneSize"];
1144- }
1145- set
1146- {
1147- this["logPaneSize"] = value;
1148- }
1149- }
1150-// <ADD> 2010/01/29 <-
1151-// <ADD> 2010/01/31 ->
1152- [global::System.Configuration.UserScopedSettingAttribute()]
1153- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1154- [global::System.Configuration.DefaultSettingValueAttribute("False")]
1155- public bool disableUnread
1156- {
1157- get
1158- {
1159- return (bool)this["disableUnread"];
1160- }
1161- set
1162- {
1163- this["disableUnread"] = value;
1164- }
1165- }
1166-// <ADD> 2010/01/31 <-
1167-// <ADD> 2010/04/17 ->
1168- [global::System.Configuration.UserScopedSettingAttribute()]
1169- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1170- [global::System.Configuration.DefaultSettingValueAttribute("True")]
1171- public bool keepPlan
1172- {
1173- get
1174- {
1175- return (bool)this["keepPlan"];
1176- }
1177- set
1178- {
1179- this["keepPlan"] = value;
1180- }
1181- }
1182-// <ADD> 2010/04/17 <-
1183-// <ADD> 2010/04/20 ->
1184- [global::System.Configuration.UserScopedSettingAttribute()]
1185- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1186- [global::System.Configuration.DefaultSettingValueAttribute("2")]
1187- public int retryDownload
1188- {
1189- get
1190- {
1191- return (int)this["retryDownload"];
1192- }
1193- set
1194- {
1195- this["retryDownload"] = value;
1196- }
1197- }
1198-// <ADD> 2010/04/20 <-
1199-// <ADD> 2010/08/01 ->
1200- [global::System.Configuration.UserScopedSettingAttribute()]
1201- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1202- [global::System.Configuration.DefaultSettingValueAttribute("1")]
1203- public uint fileTitleMode
1204- {
1205- get
1206- {
1207- return (uint)this["fileTitleMode"];
1208- }
1209- set
1210- {
1211- this["fileTitleMode"] = value;
1212- }
1213- }
1214-// <ADD> 2010/08/01 <-
1215-
1216- }
1036+
1037+ [global::System.Configuration.UserScopedSettingAttribute()]
1038+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1039+ [global::System.Configuration.DefaultSettingValueAttribute("True")]
1040+ public bool disableUnread {
1041+ get {
1042+ return ((bool)(this["disableUnread"]));
1043+ }
1044+ set {
1045+ this["disableUnread"] = value;
1046+ }
1047+ }
1048+
1049+ [global::System.Configuration.UserScopedSettingAttribute()]
1050+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1051+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
1052+ public bool enablePriority {
1053+ get {
1054+ return ((bool)(this["enablePriority"]));
1055+ }
1056+ set {
1057+ this["enablePriority"] = value;
1058+ }
1059+ }
1060+
1061+ [global::System.Configuration.UserScopedSettingAttribute()]
1062+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1063+ [global::System.Configuration.DefaultSettingValueAttribute("5")]
1064+ public int overlapMargin {
1065+ get {
1066+ return ((int)(this["overlapMargin"]));
1067+ }
1068+ set {
1069+ this["overlapMargin"] = value;
1070+ }
1071+ }
1072+
1073+ [global::System.Configuration.UserScopedSettingAttribute()]
1074+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1075+ public global::magicAnime.ExternalToolsSetting externalTools {
1076+ get {
1077+ return ((global::magicAnime.ExternalToolsSetting)(this["externalTools"]));
1078+ }
1079+ set {
1080+ this["externalTools"] = value;
1081+ }
1082+ }
1083+
1084+ [global::System.Configuration.UserScopedSettingAttribute()]
1085+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1086+ [global::System.Configuration.DefaultSettingValueAttribute("True")]
1087+ public bool keepPlan {
1088+ get {
1089+ return ((bool)(this["keepPlan"]));
1090+ }
1091+ set {
1092+ this["keepPlan"] = value;
1093+ }
1094+ }
1095+
1096+ [global::System.Configuration.UserScopedSettingAttribute()]
1097+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1098+ [global::System.Configuration.DefaultSettingValueAttribute("100")]
1099+ public int logPaneSize {
1100+ get {
1101+ return ((int)(this["logPaneSize"]));
1102+ }
1103+ set {
1104+ this["logPaneSize"] = value;
1105+ }
1106+ }
1107+
1108+ [global::System.Configuration.UserScopedSettingAttribute()]
1109+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1110+ [global::System.Configuration.DefaultSettingValueAttribute("0, 0, 0, 0")]
1111+ public global::System.Drawing.Rectangle rectWindow {
1112+ get {
1113+ return ((global::System.Drawing.Rectangle)(this["rectWindow"]));
1114+ }
1115+ set {
1116+ this["rectWindow"] = value;
1117+ }
1118+ }
1119+
1120+ [global::System.Configuration.UserScopedSettingAttribute()]
1121+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1122+ [global::System.Configuration.DefaultSettingValueAttribute("2")]
1123+ public int retryDownload {
1124+ get {
1125+ return ((int)(this["retryDownload"]));
1126+ }
1127+ set {
1128+ this["retryDownload"] = value;
1129+ }
1130+ }
1131+
1132+ [global::System.Configuration.UserScopedSettingAttribute()]
1133+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1134+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
1135+ public bool showLogPane {
1136+ get {
1137+ return ((bool)(this["showLogPane"]));
1138+ }
1139+ set {
1140+ this["showLogPane"] = value;
1141+ }
1142+ }
1143+
1144+ [global::System.Configuration.UserScopedSettingAttribute()]
1145+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1146+ [global::System.Configuration.DefaultSettingValueAttribute("<ArrayOfInt xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http" +
1147+ "://www.w3.org/2001/XMLSchema\">\r\n\t<int>10</int>\r\n\t<int>30</int>\r\n</ArrayOfInt>\r\n")]
1148+ public global::System.Collections.Generic.List<int> untilOnAirMinutes {
1149+ get {
1150+ return ((global::System.Collections.Generic.List<int>)(this["untilOnAirMinutes"]));
1151+ }
1152+ set {
1153+ this["untilOnAirMinutes"] = value;
1154+ }
1155+ }
1156+
1157+ [global::System.Configuration.UserScopedSettingAttribute()]
1158+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1159+ [global::System.Configuration.DefaultSettingValueAttribute("True")]
1160+ public bool updateOnAirSoon {
1161+ get {
1162+ return ((bool)(this["updateOnAirSoon"]));
1163+ }
1164+ set {
1165+ this["updateOnAirSoon"] = value;
1166+ }
1167+ }
1168+
1169+ [global::System.Configuration.UserScopedSettingAttribute()]
1170+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1171+ [global::System.Configuration.DefaultSettingValueAttribute("5")]
1172+ public int titlePast {
1173+ get {
1174+ return ((int)(this["titlePast"]));
1175+ }
1176+ set {
1177+ this["titlePast"] = value;
1178+ }
1179+ }
1180+
1181+ [global::System.Configuration.UserScopedSettingAttribute()]
1182+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1183+ [global::System.Configuration.DefaultSettingValueAttribute("8")]
1184+ public int titleFuture {
1185+ get {
1186+ return ((int)(this["titleFuture"]));
1187+ }
1188+ set {
1189+ this["titleFuture"] = value;
1190+ }
1191+ }
1192+ }
12171193 }
--- /dev/null
+++ b/Properties/Settings.settings
@@ -0,0 +1,304 @@
1+<?xml version='1.0' encoding='utf-8'?>
2+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="magicAnime.Properties" GeneratedClassName="Settings">
3+ <Profiles />
4+ <Settings>
5+ <Setting Name="helpUrl" Type="System.String" Scope="Application">
6+ <Value Profile="(Default)">http://members2.jcom.home.ne.jp/kurusugawa/mAgicAnime/</Value>
7+ </Setting>
8+ <Setting Name="specifiedNameFormat" Type="System.String" Scope="Application">
9+ <Value Profile="(Default)">A{0:0}_{1:0}</Value>
10+ </Setting>
11+ <Setting Name="thumbnailWhitebar" Type="System.Int32" Scope="Application">
12+ <Value Profile="(Default)">13</Value>
13+ </Setting>
14+ <Setting Name="captureFolder" Type="System.String" Scope="User">
15+ <Value Profile="(Default)" />
16+ </Setting>
17+ <Setting Name="captureMergin" Type="System.Int32" Scope="User">
18+ <Value Profile="(Default)">5</Value>
19+ </Setting>
20+ <Setting Name="encoderFolder" Type="System.String" Scope="User">
21+ <Value Profile="(Default)" />
22+ </Setting>
23+ <Setting Name="encodedFolder" Type="System.String" Scope="User">
24+ <Value Profile="(Default)" />
25+ </Setting>
26+ <Setting Name="captureSubDir" Type="System.Boolean" Scope="User">
27+ <Value Profile="(Default)">False</Value>
28+ </Setting>
29+ <Setting Name="captureExtension" Type="System.Int32" Scope="User">
30+ <Value Profile="(Default)">0</Value>
31+ </Setting>
32+ <Setting Name="autoUpdate" Type="System.Boolean" Scope="User">
33+ <Value Profile="(Default)">True</Value>
34+ </Setting>
35+ <Setting Name="prohibitUpdateWhileRecording" Type="System.Boolean" Scope="User">
36+ <Value Profile="(Default)">True</Value>
37+ </Setting>
38+ <Setting Name="removeSourceWhenEncoded" Type="System.Boolean" Scope="User">
39+ <Value Profile="(Default)">True</Value>
40+ </Setting>
41+ <Setting Name="saveFolder" Type="System.String" Scope="User">
42+ <Value Profile="(Default)" />
43+ </Setting>
44+ <Setting Name="classificatePrograms" Type="System.Boolean" Scope="User">
45+ <Value Profile="(Default)">True</Value>
46+ </Setting>
47+ <Setting Name="saveNameFormat" Type="System.String" Scope="User">
48+ <Value Profile="(Default)">{0} 第{6}話 「{2}」</Value>
49+ </Setting>
50+ <Setting Name="scheduleFirstHour" Type="System.Int32" Scope="User">
51+ <Value Profile="(Default)">23</Value>
52+ </Setting>
53+ <Setting Name="scheduleTimeZone" Type="System.Int32" Scope="User">
54+ <Value Profile="(Default)">4</Value>
55+ </Setting>
56+ <Setting Name="scheduleEncodeEveryday" Type="System.Boolean" Scope="User">
57+ <Value Profile="(Default)">False</Value>
58+ </Setting>
59+ <Setting Name="scheduleEncodeTime" Type="System.Int32" Scope="User">
60+ <Value Profile="(Default)">0</Value>
61+ </Setting>
62+ <Setting Name="autoShutdownAtEncoded" Type="System.Boolean" Scope="User">
63+ <Value Profile="(Default)">False</Value>
64+ </Setting>
65+ <Setting Name="autoShutdownType" Type="System.Int32" Scope="User">
66+ <Value Profile="(Default)">0</Value>
67+ </Setting>
68+ <Setting Name="minimizeAtStartup" Type="System.Boolean" Scope="User">
69+ <Value Profile="(Default)">False</Value>
70+ </Setting>
71+ <Setting Name="minimizeAtPlayer" Type="System.Boolean" Scope="User">
72+ <Value Profile="(Default)">False</Value>
73+ </Setting>
74+ <Setting Name="syoboiTitleList" Type="System.String" Scope="User">
75+ <Value Profile="(Default)">http://cal.syoboi.jp/list.php</Value>
76+ </Setting>
77+ <Setting Name="syoboiTid" Type="System.String" Scope="User">
78+ <Value Profile="(Default)">http://cal.syoboi.jp/tid/</Value>
79+ </Setting>
80+ <Setting Name="reserveStart" Type="System.Int32" Scope="User">
81+ <Value Profile="(Default)">0</Value>
82+ </Setting>
83+ <Setting Name="reserveEnd" Type="System.Int32" Scope="User">
84+ <Value Profile="(Default)">0</Value>
85+ </Setting>
86+ <Setting Name="bootupTimeUnification" Type="System.UInt32" Scope="User">
87+ <Value Profile="(Default)">15</Value>
88+ </Setting>
89+ <Setting Name="autoPowerManagement" Type="System.Boolean" Scope="User">
90+ <Value Profile="(Default)">False</Value>
91+ </Setting>
92+ <Setting Name="shutdownMethod" Type="System.UInt32" Scope="User">
93+ <Value Profile="(Default)">1</Value>
94+ </Setting>
95+ <Setting Name="bootupHasten" Type="System.UInt32" Scope="User">
96+ <Value Profile="(Default)">5</Value>
97+ </Setting>
98+ <Setting Name="shutdownPutoff" Type="System.UInt32" Scope="User">
99+ <Value Profile="(Default)">2</Value>
100+ </Setting>
101+ <Setting Name="schedulerType" Type="System.String" Scope="User">
102+ <Value Profile="(Default)" />
103+ </Setting>
104+ <Setting Name="autoRefresh" Type="System.Boolean" Scope="User">
105+ <Value Profile="(Default)">False</Value>
106+ </Setting>
107+ <Setting Name="autoRefreshMinute" Type="System.Int32" Scope="User">
108+ <Value Profile="(Default)">45</Value>
109+ </Setting>
110+ <Setting Name="inTaskTray" Type="System.Boolean" Scope="User">
111+ <Value Profile="(Default)">False</Value>
112+ </Setting>
113+ <Setting Name="firstRun" Type="System.Boolean" Scope="User">
114+ <Value Profile="(Default)">True</Value>
115+ </Setting>
116+ <Setting Name="syoboiRss" Type="System.String" Scope="User">
117+ <Value Profile="(Default)">http://cal.syoboi.jp/rss.php</Value>
118+ </Setting>
119+ <Setting Name="syoboiProg" Type="System.String" Scope="User">
120+ <Value Profile="(Default)">http://cal.syoboi.jp/proginfo.xml</Value>
121+ </Setting>
122+ <Setting Name="hideRefreshDialog" Type="System.Boolean" Scope="User">
123+ <Value Profile="(Default)">False</Value>
124+ </Setting>
125+ <Setting Name="notifyUnreadBalloon" Type="System.Boolean" Scope="User">
126+ <Value Profile="(Default)">True</Value>
127+ </Setting>
128+ <Setting Name="dayPast" Type="System.Int32" Scope="User">
129+ <Value Profile="(Default)">7</Value>
130+ </Setting>
131+ <Setting Name="dayFuture" Type="System.Int32" Scope="User">
132+ <Value Profile="(Default)">14</Value>
133+ </Setting>
134+ <Setting Name="weekPast" Type="System.Int32" Scope="User">
135+ <Value Profile="(Default)">3</Value>
136+ </Setting>
137+ <Setting Name="weekFuture" Type="System.Int32" Scope="User">
138+ <Value Profile="(Default)">18</Value>
139+ </Setting>
140+ <Setting Name="viewMode" Type="System.Int32" Scope="User">
141+ <Value Profile="(Default)">0</Value>
142+ </Setting>
143+ <Setting Name="calenderMode" Type="System.Int32" Scope="User">
144+ <Value Profile="(Default)">0</Value>
145+ </Setting>
146+ <Setting Name="specifiedFile" Type="magicAnime.IdentifyFileMethod" Scope="User">
147+ <Value Profile="(Default)">ByFileNameWithID</Value>
148+ </Setting>
149+ <Setting Name="thumbnailWidth" Type="System.Int32" Scope="User">
150+ <Value Profile="(Default)">60</Value>
151+ </Setting>
152+ <Setting Name="thumbnailHeight" Type="System.Int32" Scope="User">
153+ <Value Profile="(Default)">45</Value>
154+ </Setting>
155+ <Setting Name="thumbnailSubtitle" Type="System.Boolean" Scope="User">
156+ <Value Profile="(Default)">False</Value>
157+ </Setting>
158+ <Setting Name="thumbnailSecond" Type="System.Int64" Scope="User">
159+ <Value Profile="(Default)">600</Value>
160+ </Setting>
161+ <Setting Name="thumbnailSize" Type="System.Int32" Scope="User">
162+ <Value Profile="(Default)">0</Value>
163+ </Setting>
164+ <Setting Name="updateInterval" Type="System.Int32" Scope="User">
165+ <Value Profile="(Default)">15</Value>
166+ </Setting>
167+ <Setting Name="forbiddenThumbnail" Type="System.Boolean" Scope="User">
168+ <Value Profile="(Default)">False</Value>
169+ </Setting>
170+ <Setting Name="bootRefresh" Type="System.Boolean" Scope="User">
171+ <Value Profile="(Default)">True</Value>
172+ </Setting>
173+ <Setting Name="ignoreExist" Type="System.Boolean" Scope="User">
174+ <Value Profile="(Default)">False</Value>
175+ </Setting>
176+ <Setting Name="copyWithOthers" Type="System.Boolean" Scope="User">
177+ <Value Profile="(Default)">False</Value>
178+ </Setting>
179+ <Setting Name="removeSubdir" Type="System.Boolean" Scope="User">
180+ <Value Profile="(Default)">False</Value>
181+ </Setting>
182+ <Setting Name="autoTransferAtBoot" Type="System.Boolean" Scope="User">
183+ <Value Profile="(Default)">False</Value>
184+ </Setting>
185+ <Setting Name="autoTransferAtAfterRecord" Type="System.Boolean" Scope="User">
186+ <Value Profile="(Default)">False</Value>
187+ </Setting>
188+ <Setting Name="autoTransferTime" Type="System.Int32" Scope="User">
189+ <Value Profile="(Default)">1</Value>
190+ </Setting>
191+ <Setting Name="hoursPerDay" Type="System.Int32" Scope="User">
192+ <Value Profile="(Default)">27</Value>
193+ </Setting>
194+ <Setting Name="maximizeWindow" Type="System.Boolean" Scope="User">
195+ <Value Profile="(Default)">True</Value>
196+ </Setting>
197+ <Setting Name="strExtension" Type="System.String" Scope="User">
198+ <Value Profile="(Default)">.mpg</Value>
199+ </Setting>
200+ <Setting Name="autoMoveWithoutFirstEpisode" Type="System.Boolean" Scope="User">
201+ <Value Profile="(Default)">False</Value>
202+ </Setting>
203+ <Setting Name="reserveDays" Type="System.Int32" Scope="User">
204+ <Value Profile="(Default)">7</Value>
205+ </Setting>
206+ <Setting Name="autoEncodeInAfterRecord" Type="System.Boolean" Scope="User">
207+ <Value Profile="(Default)">False</Value>
208+ </Setting>
209+ <Setting Name="autoEncodeMergin" Type="System.Int32" Scope="User">
210+ <Value Profile="(Default)">10</Value>
211+ </Setting>
212+ <Setting Name="showSoonBalloon" Type="System.Boolean" Scope="User">
213+ <Value Profile="(Default)">False</Value>
214+ </Setting>
215+ <Setting Name="timeSoonBalloon" Type="System.Int32" Scope="User">
216+ <Value Profile="(Default)">15</Value>
217+ </Setting>
218+ <Setting Name="concurrentNums" Type="System.Int32" Scope="User">
219+ <Value Profile="(Default)">1</Value>
220+ </Setting>
221+ <Setting Name="makeThumbnailAfterEncode" Type="System.Boolean" Scope="User">
222+ <Value Profile="(Default)">False</Value>
223+ </Setting>
224+ <Setting Name="startupWait" Type="System.Int64" Scope="User">
225+ <Value Profile="(Default)">3</Value>
226+ </Setting>
227+ <Setting Name="MigrateVer1900" Type="System.Boolean" Scope="User">
228+ <Value Profile="(Default)">False</Value>
229+ </Setting>
230+ <Setting Name="dontBeginEncodeLessThanMinutes" Type="System.Boolean" Scope="User">
231+ <Value Profile="(Default)">False</Value>
232+ </Setting>
233+ <Setting Name="maxDelayTimeDontBeginEncode" Type="System.Int32" Scope="User">
234+ <Value Profile="(Default)">60</Value>
235+ </Setting>
236+ <Setting Name="autoBootup" Type="System.Boolean" Scope="User">
237+ <Value Profile="(Default)">True</Value>
238+ </Setting>
239+ <Setting Name="autoShutdown" Type="System.Boolean" Scope="User">
240+ <Value Profile="(Default)">True</Value>
241+ </Setting>
242+ <Setting Name="reserveControl" Type="magicAnime.ReserveControl" Scope="User">
243+ <Value Profile="(Default)">noAutoReserve</Value>
244+ </Setting>
245+ <Setting Name="reserveImmediatlyBeforeMinutes" Type="System.Int32" Scope="User">
246+ <Value Profile="(Default)">10</Value>
247+ </Setting>
248+ <Setting Name="autoBootNDays" Type="System.Int32" Scope="User">
249+ <Value Profile="(Default)">30</Value>
250+ </Setting>
251+ <Setting Name="overlapThreshould" Type="System.Int32" Scope="User">
252+ <Value Profile="(Default)">1</Value>
253+ </Setting>
254+ <Setting Name="thumbnailMode" Type="System.Boolean" Scope="User">
255+ <Value Profile="(Default)">False</Value>
256+ </Setting>
257+ <Setting Name="fileTitleMode" Type="System.UInt32" Scope="User">
258+ <Value Profile="(Default)">1</Value>
259+ </Setting>
260+ <Setting Name="disableUnread" Type="System.Boolean" Scope="User">
261+ <Value Profile="(Default)">True</Value>
262+ </Setting>
263+ <Setting Name="enablePriority" Type="System.Boolean" Scope="User">
264+ <Value Profile="(Default)">False</Value>
265+ </Setting>
266+ <Setting Name="overlapMargin" Type="System.Int32" Scope="User">
267+ <Value Profile="(Default)">5</Value>
268+ </Setting>
269+ <Setting Name="externalTools" Type="magicAnime.ExternalToolsSetting" Scope="User">
270+ <Value Profile="(Default)" />
271+ </Setting>
272+ <Setting Name="keepPlan" Type="System.Boolean" Scope="User">
273+ <Value Profile="(Default)">True</Value>
274+ </Setting>
275+ <Setting Name="logPaneSize" Type="System.Int32" Scope="User">
276+ <Value Profile="(Default)">100</Value>
277+ </Setting>
278+ <Setting Name="rectWindow" Type="System.Drawing.Rectangle" Scope="User">
279+ <Value Profile="(Default)">0, 0, 0, 0</Value>
280+ </Setting>
281+ <Setting Name="retryDownload" Type="System.Int32" Scope="User">
282+ <Value Profile="(Default)">2</Value>
283+ </Setting>
284+ <Setting Name="showLogPane" Type="System.Boolean" Scope="User">
285+ <Value Profile="(Default)">False</Value>
286+ </Setting>
287+ <Setting Name="untilOnAirMinutes" Type="System.Collections.Generic.List&lt;int&gt;" Scope="User">
288+ <Value Profile="(Default)">&lt;ArrayOfInt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
289+ &lt;int&gt;10&lt;/int&gt;
290+ &lt;int&gt;30&lt;/int&gt;
291+&lt;/ArrayOfInt&gt;
292+</Value>
293+ </Setting>
294+ <Setting Name="updateOnAirSoon" Type="System.Boolean" Scope="User">
295+ <Value Profile="(Default)">True</Value>
296+ </Setting>
297+ <Setting Name="titlePast" Type="System.Int32" Scope="User">
298+ <Value Profile="(Default)">5</Value>
299+ </Setting>
300+ <Setting Name="titleFuture" Type="System.Int32" Scope="User">
301+ <Value Profile="(Default)">8</Value>
302+ </Setting>
303+ </Settings>
304+</SettingsFile>
\ No newline at end of file
--- a/RecordingManager/AnimeEpisode.cs
+++ b/RecordingManager/AnimeEpisode.cs
@@ -96,40 +96,14 @@ namespace magicAnime
9696 private bool mIsBusy = false; // 処理中フラグ
9797 public string mSubTitle = ""; // サブタイトル
9898 private bool mIsDirty = false; // データ変更フラグ
99- private int mStoryNumber = 0; // エピソード番号
99+ private int mStoryNumber = 0; // エピソード番号
100+ // mod. yossiepon_20150705
101+ private string mStoryNoStr = ""; // エピソード番号文字列
100102 private int mRepeatNumber = -1; // n回目の放送
101103 private bool mPlanError = false; // 放送プランデータ異常
102104
103105 private Encoder encoding = null; // エンコード処理中のエンコーダオブジェクト
104106
105-
106- //=========================================================================
107- /// <summary>
108- /// コンストラクタ
109- /// </summary>
110- /// <remarks>
111- /// </remarks>
112- /// <history>2006/XX/XX 新規作成</history>
113- //========================================================================
114- public AnimeEpisode(
115- AnimeProgram animeProgram ,
116- State initialState ,
117- string inFilePath ,
118- DateTime inDateTime ,
119- int inStoryNumber ,
120- string inSubTitle )
121- {
122-
123-
124- this.mStoryNumber = inStoryNumber;
125- this.mSubTitle = inSubTitle;
126- this.mIsUnread = true;
127-
128- this.mParent = animeProgram;
129-
130- this.Dirty = true;
131- }
132-
133107 //=========================================================================
134108 /// <summary>
135109 /// コンストラクタ
@@ -477,6 +451,8 @@ namespace magicAnime
477451 }
478452
479453 public int StoryNumber { get { return mStoryNumber; } }
454+ // mod. yossiepon_20150705
455+ public string StoryNoStr { get { return mStoryNoStr; } }
480456
481457 //=========================================================================
482458 /// <summary>
@@ -667,11 +643,16 @@ namespace magicAnime
667643 // 取得した放送プランで上書き
668644 if( !mHasPlan
669645 || (mStartTime != syoboiRecord.onAirDateTime)
670- || (mLength != syoboiRecord.length) )
646+ || (mLength != syoboiRecord.length)
647+ // mod. yossiepon_20150705
648+ || !mStoryNoStr.Equals(syoboiRecord.episode) )
671649 {
672- mHasPlan = true;
650+ // mod. yossiepon_20150705
651+ mHasPlan = syoboiRecord.length != 0;
673652 mStartTime = syoboiRecord.onAirDateTime;
674653 mLength = syoboiRecord.length;
654+ // mod. yossiepon_20150705
655+ mStoryNoStr = syoboiRecord.episode;
675656 Dirty = true;
676657 }
677658
@@ -1281,7 +1262,10 @@ namespace magicAnime
12811262 subTitleName,
12821263 dateStr,
12831264 timeStr,
1284- station);
1265+ // mod. yossiepon_20150705 begin
1266+ station,
1267+ mStoryNoStr.Length > 0 ? mStoryNoStr : mStoryNumber.ToString("00"));
1268+ // mod. yossiepon_20150705 end
12851269 }
12861270 catch(Exception ex)
12871271 {
@@ -1328,7 +1312,10 @@ namespace magicAnime
13281312 mSubTitle,
13291313 dateStr,
13301314 timeStr,
1331- station);
1315+ // mod. yossiepon_20150705 begin
1316+ station,
1317+ mStoryNoStr.Length > 0 ? mStoryNoStr : mStoryNumber.ToString("00"));
1318+ // mod. yossiepon_20150705 end
13321319 }
13331320 catch(Exception ex)
13341321 {
@@ -1518,6 +1505,8 @@ namespace magicAnime
15181505 xw.WriteStartElement("Records");
15191506
15201507 xw.WriteElementString("StoryNumber" , Convert.ToString(mStoryNumber));
1508+ // mod. yossiepon_20150705
1509+ xw.WriteElementString("StoryNoStr" , mStoryNoStr);
15211510 xw.WriteElementString("FilePath" , mFilePath);
15221511 xw.WriteElementString("DateTime" , Convert.ToString(mStartTime.Ticks));
15231512 xw.WriteElementString("SubTitle" , mSubTitle);
@@ -1555,6 +1544,9 @@ namespace magicAnime
15551544 {
15561545 if (xr.LocalName.Equals("StoryNumber"))
15571546 mStoryNumber = xr.ReadElementContentAsInt();
1547+ // mod. yossiepon_20150705
1548+ else if (xr.LocalName.Equals("StoryNoStr"))
1549+ mStoryNoStr = xr.ReadElementContentAsString();
15581550 else if (xr.LocalName.Equals("FilePath"))
15591551 mFilePath = xr.ReadElementContentAsString();
15601552 // Ver1.9.18以前からの以降
@@ -1597,6 +1589,12 @@ namespace magicAnime
15971589 break;
15981590 }
15991591
1592+ // mod. yossiepon_20150705 begin
1593+ if (mStoryNoStr.Length == 0)
1594+ {
1595+ mStoryNoStr = mStoryNumber.ToString();
1596+ }
1597+ // mod. yossiepon_20150705 end
16001598 }
16011599
16021600 // Ver1.9.18以前からのデータ移行用
--- a/RecordingManager/AnimeProgram.cs
+++ b/RecordingManager/AnimeProgram.cs
@@ -573,6 +573,7 @@ namespace magicAnime
573573 if( Episodes.Count == 0 )
574574 return NextEpisode.NextUnknown;
575575
576+ /* しょぼカルは、すべて登録されていな場合がある
576577 AnimeEpisode lastEpisode = Episodes[Episodes.Count-1];
577578
578579 if ( lastEpisode.HasPlan &&
@@ -581,6 +582,7 @@ namespace magicAnime
581582 earlyOnAir = null;
582583 return NextEpisode.EndProgram;
583584 }
585+ */
584586
585587 //
586588 // dateTime以降、リストの中で最も早く放送するEpisodeを見つける
@@ -606,7 +608,7 @@ namespace magicAnime
606608 }
607609
608610 if (earlyOnAir==null)
609- return NextEpisode.NextUnknown;
611+ return NextEpisode.EndProgram;
610612
611613 return NextEpisode.NextDecided;
612614 }
@@ -668,6 +670,16 @@ namespace magicAnime
668670 if (StoryCount < maxNumber)
669671 StoryCount = maxNumber; // 話数が増えた場合だけ増やす
670672
673+ //------------------------------------
674+ // 話数未設定項目の確認
675+ //------------------------------------
676+ foreach (AnimeEpisode episode in Episodes)
677+ {
678+ maxNumber = SyoboiCalender.Unnumbers(episode.Parent.syoboiTvStation, ref syoboiList);
679+ }
680+ if (StoryCount < maxNumber)
681+ StoryCount = maxNumber; // 話数が増えた場合だけ増やす
682+
671683 //-------------------------------
672684 // エピソードごと放送データ更新
673685 //-------------------------------
--- a/RecordingManager/EncodeManager/CmdLineEncoder/CmdLineEncoderPlugin.cs
+++ b/RecordingManager/EncodeManager/CmdLineEncoder/CmdLineEncoderPlugin.cs
@@ -331,6 +331,9 @@ namespace magicAnime.RecordingManager.EncodeManager.CmdLineEncoder
331331
332332 process.WaitForExit();
333333
334+ if (process.ExitCode != 0)
335+ throw new Exception("エンコードに失敗した (終了コード: " + process.ExitCode + ")");
336+
334337 if (abortEncode)
335338 throw new AbortException();
336339
--- a/User32API.cs
+++ b/User32API.cs
@@ -126,8 +126,6 @@ namespace User32API
126126
127127 gctext.Free();
128128
129- string aa;
130-
131129 text = Encoding.GetEncoding( 932 ).GetString( buffer, 0, 250 );
132130
133131 Console.Write( text );
--- a/UserInterface/AnimeDialog.Designer.cs
+++ b/UserInterface/AnimeDialog.Designer.cs
@@ -132,6 +132,7 @@
132132 this.linkLabel2.TabIndex = 6;
133133 this.linkLabel2.TabStop = true;
134134 this.linkLabel2.Text = "しょぼいカレンダー(http://cal.syoboi.jp/)";
135+ this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked);
135136 //
136137 // label17
137138 //
--- a/UserInterface/AnimeDialog.cs
+++ b/UserInterface/AnimeDialog.cs
@@ -537,13 +537,19 @@ namespace magicAnime
537537 syoboiTvStationComboBox.Items.Add("(指定なし)");
538538 syoboiTvStationComboBox.SelectedIndex = 0;
539539
540+ // 話数を表示
541+ int maxNumber = 0;
542+
540543 if( 0 < mZappingTid )
541544 {
542545 syoboiTitleTextBox.Text = title;
543546 titleTextBox.Text = title;
544547
545548 foreach (string tvStation in tvStationList)
549+ {
546550 syoboiTvStationComboBox.Items.Add(tvStation);
551+ maxNumber = System.Math.Max(maxNumber, SyoboiCalender.Unnumbers(tvStation, ref recordList) );
552+ }
547553
548554 if (mSelectTvStation != null)
549555 {
@@ -551,12 +557,6 @@ namespace magicAnime
551557 mSelectTvStation = null;
552558 }
553559
554- // 話数を表示
555- int maxNumber = 0;
556-
557- foreach (SyoboiCalender.SyoboiRecord record in recordList)
558- maxNumber = System.Math.Max(maxNumber, record.number);
559-
560560 storyCountComboBox.Text = Convert.ToString(maxNumber);
561561
562562 if (mInputTitle != null)
@@ -659,6 +659,7 @@ namespace magicAnime
659659
660660 dlg.ShowDialog();
661661 }
662+
662663 //=========================================================================
663664 /// <summary>
664665 /// コントロールの状態更新
@@ -681,6 +682,27 @@ namespace magicAnime
681682 recordTvStationCheckBox.Enabled = mLinkOnline;
682683 }
683684
685+ //=========================================================================
686+ /// <summary>
687+ /// しょぼカルを開く
688+ /// </summary>
689+ /// <remarks>
690+ /// </remarks>
691+ /// <history>2012/03/19 新規作成</history>
692+ //=========================================================================
693+ private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
694+ {
695+ int tid = (int)syoboiTidUpdown.Value;
696+ if (tid != 0)
697+ {
698+ System.Diagnostics.Process.Start("http://cal.syoboi.jp/tid/" + tid.ToString());
699+ }
700+ else
701+ {
702+ System.Diagnostics.Process.Start("http://cal.syoboi.jp/");
703+ }
704+ }
705+
684706 }
685707
686708 }
--- a/UserInterface/CalenderOptionDialog.cs
+++ b/UserInterface/CalenderOptionDialog.cs
@@ -37,7 +37,7 @@ namespace magicAnime
3737 Settings.Default.dayPast = (int)dayPastUpdown.Value;
3838 Settings.Default.dayFuture = (int)dayFutureUpdown.Value;
3939 Settings.Default.weekPast = (int)weekPastUpdown.Value;
40- Settings.Default.weekFuture= (int)weekFutureUpdown.Value;
40+ Settings.Default.weekFuture = (int)weekFutureUpdown.Value;
4141
4242 this.DialogResult = DialogResult.OK;
4343
--- a/UserInterface/EpisodeDialog.Designer.cs
+++ b/UserInterface/EpisodeDialog.Designer.cs
@@ -56,6 +56,7 @@
5656 this.SubtitleTextBox = new System.Windows.Forms.TextBox();
5757 this.label1 = new System.Windows.Forms.Label();
5858 this.tabPage2 = new System.Windows.Forms.TabPage();
59+ this.planErrorCheckbox = new System.Windows.Forms.CheckBox();
5960 this.thumbnailMakedCheckBox = new System.Windows.Forms.CheckBox();
6061 this.groupBox1 = new System.Windows.Forms.GroupBox();
6162 this.timeChangedCheckBox = new System.Windows.Forms.CheckBox();
@@ -67,7 +68,6 @@
6768 this.isStartedOnairCheckBox = new System.Windows.Forms.CheckBox();
6869 this.isRecordedCheckBox = new System.Windows.Forms.CheckBox();
6970 this.label6 = new System.Windows.Forms.Label();
70- this.planErrorCheckbox = new System.Windows.Forms.CheckBox();
7171 this.tabControl1.SuspendLayout();
7272 this.tabPage1.SuspendLayout();
7373 ((System.ComponentModel.ISupportInitialize)(this.lengthUpdown)).BeginInit();
@@ -79,10 +79,9 @@
7979 // OkButton
8080 //
8181 this.OkButton.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
82- this.OkButton.Location = new System.Drawing.Point(421, 535);
83- this.OkButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
82+ this.OkButton.Location = new System.Drawing.Point(316, 428);
8483 this.OkButton.Name = "OkButton";
85- this.OkButton.Size = new System.Drawing.Size(155, 39);
84+ this.OkButton.Size = new System.Drawing.Size(116, 31);
8685 this.OkButton.TabIndex = 1;
8786 this.OkButton.Text = "&Ok";
8887 this.OkButton.UseVisualStyleBackColor = true;
@@ -99,11 +98,10 @@
9998 this.tabControl1.Controls.Add(this.tabPage1);
10099 this.tabControl1.Controls.Add(this.tabPage2);
101100 this.tabControl1.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
102- this.tabControl1.Location = new System.Drawing.Point(11, 15);
103- this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
101+ this.tabControl1.Location = new System.Drawing.Point(8, 12);
104102 this.tabControl1.Name = "tabControl1";
105103 this.tabControl1.SelectedIndex = 0;
106- this.tabControl1.Size = new System.Drawing.Size(565, 512);
104+ this.tabControl1.Size = new System.Drawing.Size(424, 410);
107105 this.tabControl1.TabIndex = 0;
108106 //
109107 // tabPage1
@@ -131,11 +129,10 @@
131129 this.tabPage1.Controls.Add(this.label5);
132130 this.tabPage1.Controls.Add(this.SubtitleTextBox);
133131 this.tabPage1.Controls.Add(this.label1);
134- this.tabPage1.Location = new System.Drawing.Point(4, 29);
135- this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
132+ this.tabPage1.Location = new System.Drawing.Point(4, 25);
136133 this.tabPage1.Name = "tabPage1";
137- this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
138- this.tabPage1.Size = new System.Drawing.Size(557, 479);
134+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
135+ this.tabPage1.Size = new System.Drawing.Size(416, 381);
139136 this.tabPage1.TabIndex = 0;
140137 this.tabPage1.Text = "プロパティ";
141138 this.tabPage1.UseVisualStyleBackColor = true;
@@ -143,11 +140,10 @@
143140 // repeatNumberTextBox
144141 //
145142 this.repeatNumberTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
146- this.repeatNumberTextBox.Location = new System.Drawing.Point(161, 200);
147- this.repeatNumberTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
143+ this.repeatNumberTextBox.Location = new System.Drawing.Point(121, 160);
148144 this.repeatNumberTextBox.Name = "repeatNumberTextBox";
149145 this.repeatNumberTextBox.ReadOnly = true;
150- this.repeatNumberTextBox.Size = new System.Drawing.Size(219, 19);
146+ this.repeatNumberTextBox.Size = new System.Drawing.Size(164, 15);
151147 this.repeatNumberTextBox.TabIndex = 11;
152148 this.repeatNumberTextBox.Text = "第n回目の放送です。";
153149 //
@@ -155,29 +151,22 @@
155151 //
156152 this.label9.AutoSize = true;
157153 this.label9.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
158- this.label9.Location = new System.Drawing.Point(476, 168);
159- this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
154+ this.label9.Location = new System.Drawing.Point(357, 134);
160155 this.label9.Name = "label9";
161- this.label9.Size = new System.Drawing.Size(28, 19);
156+ this.label9.Size = new System.Drawing.Size(22, 15);
162157 this.label9.TabIndex = 10;
163158 this.label9.Text = "分";
164159 //
165160 // lengthUpdown
166161 //
167- this.lengthUpdown.Location = new System.Drawing.Point(405, 164);
168- this.lengthUpdown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
162+ this.lengthUpdown.Location = new System.Drawing.Point(304, 131);
169163 this.lengthUpdown.Maximum = new decimal(new int[] {
170164 999,
171165 0,
172166 0,
173167 0});
174- this.lengthUpdown.Minimum = new decimal(new int[] {
175- 1,
176- 0,
177- 0,
178- 0});
179168 this.lengthUpdown.Name = "lengthUpdown";
180- this.lengthUpdown.Size = new System.Drawing.Size(67, 26);
169+ this.lengthUpdown.Size = new System.Drawing.Size(50, 22);
181170 this.lengthUpdown.TabIndex = 9;
182171 this.lengthUpdown.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
183172 this.lengthUpdown.Value = new decimal(new int[] {
@@ -190,10 +179,9 @@
190179 //
191180 this.label8.AutoSize = true;
192181 this.label8.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
193- this.label8.Location = new System.Drawing.Point(35, 291);
194- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
182+ this.label8.Location = new System.Drawing.Point(26, 233);
195183 this.label8.Name = "label8";
196- this.label8.Size = new System.Drawing.Size(287, 19);
184+ this.label8.Size = new System.Drawing.Size(227, 15);
197185 this.label8.TabIndex = 15;
198186 this.label8.Text = "(録画ソフトに予約している放送時刻)";
199187 //
@@ -201,10 +189,9 @@
201189 //
202190 this.isReserveErrorCheckBox.AutoSize = true;
203191 this.isReserveErrorCheckBox.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
204- this.isReserveErrorCheckBox.Location = new System.Drawing.Point(21, 316);
205- this.isReserveErrorCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
192+ this.isReserveErrorCheckBox.Location = new System.Drawing.Point(16, 253);
206193 this.isReserveErrorCheckBox.Name = "isReserveErrorCheckBox";
207- this.isReserveErrorCheckBox.Size = new System.Drawing.Size(380, 23);
194+ this.isReserveErrorCheckBox.Size = new System.Drawing.Size(301, 19);
208195 this.isReserveErrorCheckBox.TabIndex = 16;
209196 this.isReserveErrorCheckBox.Text = "録画予約エラー (予約に異常が発生した場合)";
210197 this.isReserveErrorCheckBox.UseVisualStyleBackColor = true;
@@ -213,10 +200,9 @@
213200 //
214201 this.isStoredCheckBox.AutoSize = true;
215202 this.isStoredCheckBox.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
216- this.isStoredCheckBox.Location = new System.Drawing.Point(21, 441);
217- this.isStoredCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
203+ this.isStoredCheckBox.Location = new System.Drawing.Point(16, 353);
218204 this.isStoredCheckBox.Name = "isStoredCheckBox";
219- this.isStoredCheckBox.Size = new System.Drawing.Size(160, 23);
205+ this.isStoredCheckBox.Size = new System.Drawing.Size(128, 19);
220206 this.isStoredCheckBox.TabIndex = 22;
221207 this.isStoredCheckBox.Text = "保存先に転送済";
222208 this.isStoredCheckBox.UseVisualStyleBackColor = true;
@@ -225,10 +211,9 @@
225211 //
226212 this.isEncodedCheckBox.AutoSize = true;
227213 this.isEncodedCheckBox.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
228- this.isEncodedCheckBox.Location = new System.Drawing.Point(21, 410);
229- this.isEncodedCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
214+ this.isEncodedCheckBox.Location = new System.Drawing.Point(16, 328);
230215 this.isEncodedCheckBox.Name = "isEncodedCheckBox";
231- this.isEncodedCheckBox.Size = new System.Drawing.Size(140, 23);
216+ this.isEncodedCheckBox.Size = new System.Drawing.Size(111, 19);
232217 this.isEncodedCheckBox.TabIndex = 21;
233218 this.isEncodedCheckBox.Text = "再エンコード済";
234219 this.isEncodedCheckBox.UseVisualStyleBackColor = true;
@@ -237,10 +222,9 @@
237222 //
238223 this.isReservedCheckBox.AutoSize = true;
239224 this.isReservedCheckBox.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
240- this.isReservedCheckBox.Location = new System.Drawing.Point(23, 226);
241- this.isReservedCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
225+ this.isReservedCheckBox.Location = new System.Drawing.Point(17, 181);
242226 this.isReservedCheckBox.Name = "isReservedCheckBox";
243- this.isReservedCheckBox.Size = new System.Drawing.Size(126, 23);
227+ this.isReservedCheckBox.Size = new System.Drawing.Size(101, 19);
244228 this.isReservedCheckBox.TabIndex = 12;
245229 this.isReservedCheckBox.Text = "録画予約済";
246230 this.isReservedCheckBox.UseVisualStyleBackColor = true;
@@ -250,22 +234,20 @@
250234 //
251235 this.reserveDateTimePicker.CustomFormat = "yyyy/MM/dd HH:mm";
252236 this.reserveDateTimePicker.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
253- this.reserveDateTimePicker.Location = new System.Drawing.Point(161, 255);
254- this.reserveDateTimePicker.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
237+ this.reserveDateTimePicker.Location = new System.Drawing.Point(121, 204);
255238 this.reserveDateTimePicker.MaxDate = new System.DateTime(2100, 12, 31, 0, 0, 0, 0);
256239 this.reserveDateTimePicker.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
257240 this.reserveDateTimePicker.Name = "reserveDateTimePicker";
258- this.reserveDateTimePicker.Size = new System.Drawing.Size(217, 26);
241+ this.reserveDateTimePicker.Size = new System.Drawing.Size(164, 22);
259242 this.reserveDateTimePicker.TabIndex = 14;
260243 //
261244 // label4
262245 //
263246 this.label4.AutoSize = true;
264247 this.label4.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
265- this.label4.Location = new System.Drawing.Point(39, 259);
266- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
248+ this.label4.Location = new System.Drawing.Point(29, 207);
267249 this.label4.Name = "label4";
268- this.label4.Size = new System.Drawing.Size(112, 19);
250+ this.label4.Size = new System.Drawing.Size(89, 15);
269251 this.label4.TabIndex = 13;
270252 this.label4.Text = "予約日時(&T):";
271253 //
@@ -273,10 +255,9 @@
273255 //
274256 this.hasFileCheckBox.AutoSize = true;
275257 this.hasFileCheckBox.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
276- this.hasFileCheckBox.Location = new System.Drawing.Point(21, 348);
277- this.hasFileCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
258+ this.hasFileCheckBox.Location = new System.Drawing.Point(16, 278);
278259 this.hasFileCheckBox.Name = "hasFileCheckBox";
279- this.hasFileCheckBox.Size = new System.Drawing.Size(151, 23);
260+ this.hasFileCheckBox.Size = new System.Drawing.Size(119, 19);
280261 this.hasFileCheckBox.TabIndex = 17;
281262 this.hasFileCheckBox.Text = "録画ファイルあり";
282263 this.hasFileCheckBox.UseVisualStyleBackColor = true;
@@ -286,10 +267,9 @@
286267 //
287268 this.hasPlanCheckBox.AutoSize = true;
288269 this.hasPlanCheckBox.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
289- this.hasPlanCheckBox.Location = new System.Drawing.Point(23, 136);
290- this.hasPlanCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
270+ this.hasPlanCheckBox.Location = new System.Drawing.Point(17, 109);
291271 this.hasPlanCheckBox.Name = "hasPlanCheckBox";
292- this.hasPlanCheckBox.Size = new System.Drawing.Size(148, 23);
272+ this.hasPlanCheckBox.Size = new System.Drawing.Size(118, 19);
293273 this.hasPlanCheckBox.TabIndex = 6;
294274 this.hasPlanCheckBox.Text = "放送プラン確定";
295275 this.hasPlanCheckBox.UseVisualStyleBackColor = true;
@@ -299,32 +279,29 @@
299279 //
300280 this.dateTimePicker.CustomFormat = "yyyy/MM/dd HH:mm";
301281 this.dateTimePicker.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
302- this.dateTimePicker.Location = new System.Drawing.Point(161, 165);
303- this.dateTimePicker.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
282+ this.dateTimePicker.Location = new System.Drawing.Point(121, 132);
304283 this.dateTimePicker.MaxDate = new System.DateTime(2100, 12, 31, 0, 0, 0, 0);
305284 this.dateTimePicker.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
306285 this.dateTimePicker.Name = "dateTimePicker";
307- this.dateTimePicker.Size = new System.Drawing.Size(217, 26);
286+ this.dateTimePicker.Size = new System.Drawing.Size(164, 22);
308287 this.dateTimePicker.TabIndex = 8;
309288 //
310289 // label7
311290 //
312291 this.label7.AutoSize = true;
313292 this.label7.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
314- this.label7.Location = new System.Drawing.Point(35, 168);
315- this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
293+ this.label7.Location = new System.Drawing.Point(26, 134);
316294 this.label7.Name = "label7";
317- this.label7.Size = new System.Drawing.Size(112, 19);
295+ this.label7.Size = new System.Drawing.Size(89, 15);
318296 this.label7.TabIndex = 7;
319297 this.label7.Text = "放送日時(&T):";
320298 //
321299 // OpenFileButton
322300 //
323301 this.OpenFileButton.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
324- this.OpenFileButton.Location = new System.Drawing.Point(480, 375);
325- this.OpenFileButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
302+ this.OpenFileButton.Location = new System.Drawing.Point(360, 300);
326303 this.OpenFileButton.Name = "OpenFileButton";
327- this.OpenFileButton.Size = new System.Drawing.Size(44, 26);
304+ this.OpenFileButton.Size = new System.Drawing.Size(33, 21);
328305 this.OpenFileButton.TabIndex = 20;
329306 this.OpenFileButton.Text = "..";
330307 this.OpenFileButton.UseVisualStyleBackColor = true;
@@ -333,20 +310,18 @@
333310 // FileTextBox
334311 //
335312 this.FileTextBox.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
336- this.FileTextBox.Location = new System.Drawing.Point(161, 375);
337- this.FileTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
313+ this.FileTextBox.Location = new System.Drawing.Point(121, 300);
338314 this.FileTextBox.Name = "FileTextBox";
339- this.FileTextBox.Size = new System.Drawing.Size(309, 26);
315+ this.FileTextBox.Size = new System.Drawing.Size(233, 22);
340316 this.FileTextBox.TabIndex = 19;
341317 //
342318 // label3
343319 //
344320 this.label3.AutoSize = true;
345321 this.label3.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
346- this.label3.Location = new System.Drawing.Point(35, 379);
347- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
322+ this.label3.Location = new System.Drawing.Point(26, 303);
348323 this.label3.Name = "label3";
349- this.label3.Size = new System.Drawing.Size(89, 19);
324+ this.label3.Size = new System.Drawing.Size(70, 15);
350325 this.label3.TabIndex = 18;
351326 this.label3.Text = "ファイル(&F):";
352327 //
@@ -354,8 +329,7 @@
354329 //
355330 this.StoryNumberUpdown.Enabled = false;
356331 this.StoryNumberUpdown.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
357- this.StoryNumberUpdown.Location = new System.Drawing.Point(161, 52);
358- this.StoryNumberUpdown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
332+ this.StoryNumberUpdown.Location = new System.Drawing.Point(121, 42);
359333 this.StoryNumberUpdown.Maximum = new decimal(new int[] {
360334 2000,
361335 0,
@@ -363,58 +337,53 @@
363337 0});
364338 this.StoryNumberUpdown.Name = "StoryNumberUpdown";
365339 this.StoryNumberUpdown.ReadOnly = true;
366- this.StoryNumberUpdown.Size = new System.Drawing.Size(65, 26);
340+ this.StoryNumberUpdown.Size = new System.Drawing.Size(49, 22);
367341 this.StoryNumberUpdown.TabIndex = 3;
368342 //
369343 // label2
370344 //
371345 this.label2.AutoSize = true;
372346 this.label2.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
373- this.label2.Location = new System.Drawing.Point(19, 56);
374- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
347+ this.label2.Location = new System.Drawing.Point(14, 45);
375348 this.label2.Name = "label2";
376- this.label2.Size = new System.Drawing.Size(85, 19);
349+ this.label2.Size = new System.Drawing.Size(68, 15);
377350 this.label2.TabIndex = 2;
378351 this.label2.Text = "第n話(&N):";
379352 //
380353 // TitleTextBox
381354 //
382355 this.TitleTextBox.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
383- this.TitleTextBox.Location = new System.Drawing.Point(161, 20);
384- this.TitleTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
356+ this.TitleTextBox.Location = new System.Drawing.Point(121, 16);
385357 this.TitleTextBox.Name = "TitleTextBox";
386358 this.TitleTextBox.ReadOnly = true;
387- this.TitleTextBox.Size = new System.Drawing.Size(363, 26);
359+ this.TitleTextBox.Size = new System.Drawing.Size(273, 22);
388360 this.TitleTextBox.TabIndex = 1;
389361 //
390362 // label5
391363 //
392364 this.label5.AutoSize = true;
393365 this.label5.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
394- this.label5.Location = new System.Drawing.Point(19, 22);
395- this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
366+ this.label5.Location = new System.Drawing.Point(14, 18);
396367 this.label5.Name = "label5";
397- this.label5.Size = new System.Drawing.Size(86, 19);
368+ this.label5.Size = new System.Drawing.Size(68, 15);
398369 this.label5.TabIndex = 0;
399370 this.label5.Text = "タイトル(&I):";
400371 //
401372 // SubtitleTextBox
402373 //
403374 this.SubtitleTextBox.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
404- this.SubtitleTextBox.Location = new System.Drawing.Point(161, 91);
405- this.SubtitleTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
375+ this.SubtitleTextBox.Location = new System.Drawing.Point(121, 73);
406376 this.SubtitleTextBox.Name = "SubtitleTextBox";
407- this.SubtitleTextBox.Size = new System.Drawing.Size(363, 26);
377+ this.SubtitleTextBox.Size = new System.Drawing.Size(273, 22);
408378 this.SubtitleTextBox.TabIndex = 5;
409379 //
410380 // label1
411381 //
412382 this.label1.AutoSize = true;
413383 this.label1.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
414- this.label1.Location = new System.Drawing.Point(17, 95);
415- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
384+ this.label1.Location = new System.Drawing.Point(13, 76);
416385 this.label1.Name = "label1";
417- this.label1.Size = new System.Drawing.Size(122, 19);
386+ this.label1.Size = new System.Drawing.Size(96, 15);
418387 this.label1.TabIndex = 4;
419388 this.label1.Text = "サブタイトル(&S):";
420389 //
@@ -423,23 +392,32 @@
423392 this.tabPage2.Controls.Add(this.planErrorCheckbox);
424393 this.tabPage2.Controls.Add(this.thumbnailMakedCheckBox);
425394 this.tabPage2.Controls.Add(this.groupBox1);
426- this.tabPage2.Location = new System.Drawing.Point(4, 29);
427- this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
395+ this.tabPage2.Location = new System.Drawing.Point(4, 25);
428396 this.tabPage2.Name = "tabPage2";
429- this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
430- this.tabPage2.Size = new System.Drawing.Size(557, 479);
397+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
398+ this.tabPage2.Size = new System.Drawing.Size(416, 381);
431399 this.tabPage2.TabIndex = 1;
432400 this.tabPage2.Text = "詳細";
433401 this.tabPage2.UseVisualStyleBackColor = true;
434402 //
403+ // planErrorCheckbox
404+ //
405+ this.planErrorCheckbox.AutoSize = true;
406+ this.planErrorCheckbox.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
407+ this.planErrorCheckbox.Location = new System.Drawing.Point(19, 50);
408+ this.planErrorCheckbox.Name = "planErrorCheckbox";
409+ this.planErrorCheckbox.Size = new System.Drawing.Size(153, 19);
410+ this.planErrorCheckbox.TabIndex = 19;
411+ this.planErrorCheckbox.Text = "放送データに異常あり";
412+ this.planErrorCheckbox.UseVisualStyleBackColor = true;
413+ //
435414 // thumbnailMakedCheckBox
436415 //
437416 this.thumbnailMakedCheckBox.AutoSize = true;
438417 this.thumbnailMakedCheckBox.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
439- this.thumbnailMakedCheckBox.Location = new System.Drawing.Point(25, 31);
440- this.thumbnailMakedCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
418+ this.thumbnailMakedCheckBox.Location = new System.Drawing.Point(19, 25);
441419 this.thumbnailMakedCheckBox.Name = "thumbnailMakedCheckBox";
442- this.thumbnailMakedCheckBox.Size = new System.Drawing.Size(166, 23);
420+ this.thumbnailMakedCheckBox.Size = new System.Drawing.Size(130, 19);
443421 this.thumbnailMakedCheckBox.TabIndex = 18;
444422 this.thumbnailMakedCheckBox.Text = "サムネイル作成済";
445423 this.thumbnailMakedCheckBox.UseVisualStyleBackColor = true;
@@ -454,11 +432,9 @@
454432 this.groupBox1.Controls.Add(this.isStorableCheckBox);
455433 this.groupBox1.Controls.Add(this.isStartedOnairCheckBox);
456434 this.groupBox1.Controls.Add(this.isRecordedCheckBox);
457- this.groupBox1.Location = new System.Drawing.Point(25, 218);
458- this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
435+ this.groupBox1.Location = new System.Drawing.Point(19, 174);
459436 this.groupBox1.Name = "groupBox1";
460- this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
461- this.groupBox1.Size = new System.Drawing.Size(500, 236);
437+ this.groupBox1.Size = new System.Drawing.Size(375, 189);
462438 this.groupBox1.TabIndex = 0;
463439 this.groupBox1.TabStop = false;
464440 this.groupBox1.Text = "読み取り専用プロパティ";
@@ -467,10 +443,9 @@
467443 //
468444 this.timeChangedCheckBox.AutoSize = true;
469445 this.timeChangedCheckBox.Enabled = false;
470- this.timeChangedCheckBox.Location = new System.Drawing.Point(28, 125);
471- this.timeChangedCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
446+ this.timeChangedCheckBox.Location = new System.Drawing.Point(21, 100);
472447 this.timeChangedCheckBox.Name = "timeChangedCheckBox";
473- this.timeChangedCheckBox.Size = new System.Drawing.Size(346, 23);
448+ this.timeChangedCheckBox.Size = new System.Drawing.Size(273, 19);
474449 this.timeChangedCheckBox.TabIndex = 7;
475450 this.timeChangedCheckBox.Text = "録画すべき時刻と予約した時刻にずれあり";
476451 this.timeChangedCheckBox.UseVisualStyleBackColor = true;
@@ -480,22 +455,20 @@
480455 this.recordEndDateTime.CustomFormat = "yyyy/MM/dd HH:mm";
481456 this.recordEndDateTime.Enabled = false;
482457 this.recordEndDateTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
483- this.recordEndDateTime.Location = new System.Drawing.Point(163, 189);
484- this.recordEndDateTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
458+ this.recordEndDateTime.Location = new System.Drawing.Point(122, 151);
485459 this.recordEndDateTime.MaxDate = new System.DateTime(2100, 12, 31, 0, 0, 0, 0);
486460 this.recordEndDateTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
487461 this.recordEndDateTime.Name = "recordEndDateTime";
488- this.recordEndDateTime.Size = new System.Drawing.Size(195, 26);
462+ this.recordEndDateTime.Size = new System.Drawing.Size(147, 22);
489463 this.recordEndDateTime.TabIndex = 6;
490464 //
491465 // label11
492466 //
493467 this.label11.AutoSize = true;
494468 this.label11.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
495- this.label11.Location = new System.Drawing.Point(21, 191);
496- this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
469+ this.label11.Location = new System.Drawing.Point(16, 153);
497470 this.label11.Name = "label11";
498- this.label11.Size = new System.Drawing.Size(127, 19);
471+ this.label11.Size = new System.Drawing.Size(100, 15);
499472 this.label11.TabIndex = 5;
500473 this.label11.Text = "録画終了日時:";
501474 //
@@ -504,22 +477,20 @@
504477 this.recordStartDateTime.CustomFormat = "yyyy/MM/dd HH:mm";
505478 this.recordStartDateTime.Enabled = false;
506479 this.recordStartDateTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
507- this.recordStartDateTime.Location = new System.Drawing.Point(163, 154);
508- this.recordStartDateTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
480+ this.recordStartDateTime.Location = new System.Drawing.Point(122, 123);
509481 this.recordStartDateTime.MaxDate = new System.DateTime(2100, 12, 31, 0, 0, 0, 0);
510482 this.recordStartDateTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
511483 this.recordStartDateTime.Name = "recordStartDateTime";
512- this.recordStartDateTime.Size = new System.Drawing.Size(195, 26);
484+ this.recordStartDateTime.Size = new System.Drawing.Size(147, 22);
513485 this.recordStartDateTime.TabIndex = 4;
514486 //
515487 // label10
516488 //
517489 this.label10.AutoSize = true;
518490 this.label10.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
519- this.label10.Location = new System.Drawing.Point(21, 156);
520- this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
491+ this.label10.Location = new System.Drawing.Point(16, 125);
521492 this.label10.Name = "label10";
522- this.label10.Size = new System.Drawing.Size(127, 19);
493+ this.label10.Size = new System.Drawing.Size(100, 15);
523494 this.label10.TabIndex = 3;
524495 this.label10.Text = "録画開始日時:";
525496 //
@@ -527,10 +498,9 @@
527498 //
528499 this.isStorableCheckBox.AutoSize = true;
529500 this.isStorableCheckBox.Enabled = false;
530- this.isStorableCheckBox.Location = new System.Drawing.Point(28, 94);
531- this.isStorableCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
501+ this.isStorableCheckBox.Location = new System.Drawing.Point(21, 75);
532502 this.isStorableCheckBox.Name = "isStorableCheckBox";
533- this.isStorableCheckBox.Size = new System.Drawing.Size(223, 23);
503+ this.isStorableCheckBox.Size = new System.Drawing.Size(177, 19);
534504 this.isStorableCheckBox.TabIndex = 2;
535505 this.isStorableCheckBox.Text = "保存先に転送できる状態";
536506 this.isStorableCheckBox.UseVisualStyleBackColor = true;
@@ -539,10 +509,9 @@
539509 //
540510 this.isStartedOnairCheckBox.AutoSize = true;
541511 this.isStartedOnairCheckBox.Enabled = false;
542- this.isStartedOnairCheckBox.Location = new System.Drawing.Point(28, 62);
543- this.isStartedOnairCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
512+ this.isStartedOnairCheckBox.Location = new System.Drawing.Point(21, 50);
544513 this.isStartedOnairCheckBox.Name = "isStartedOnairCheckBox";
545- this.isStartedOnairCheckBox.Size = new System.Drawing.Size(208, 23);
514+ this.isStartedOnairCheckBox.Size = new System.Drawing.Size(166, 19);
546515 this.isStartedOnairCheckBox.TabIndex = 1;
547516 this.isStartedOnairCheckBox.Text = "放送開始時間を過ぎた";
548517 this.isStartedOnairCheckBox.UseVisualStyleBackColor = true;
@@ -551,10 +520,9 @@
551520 //
552521 this.isRecordedCheckBox.AutoSize = true;
553522 this.isRecordedCheckBox.Enabled = false;
554- this.isRecordedCheckBox.Location = new System.Drawing.Point(28, 31);
555- this.isRecordedCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
523+ this.isRecordedCheckBox.Location = new System.Drawing.Point(21, 25);
556524 this.isRecordedCheckBox.Name = "isRecordedCheckBox";
557- this.isRecordedCheckBox.Size = new System.Drawing.Size(236, 23);
525+ this.isRecordedCheckBox.Size = new System.Drawing.Size(187, 19);
558526 this.isRecordedCheckBox.TabIndex = 0;
559527 this.isRecordedCheckBox.Text = "放送中または録画済である";
560528 this.isRecordedCheckBox.UseVisualStyleBackColor = true;
@@ -563,35 +531,21 @@
563531 //
564532 this.label6.AutoSize = true;
565533 this.label6.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
566- this.label6.Location = new System.Drawing.Point(16, 545);
567- this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
534+ this.label6.Location = new System.Drawing.Point(12, 436);
568535 this.label6.Name = "label6";
569- this.label6.Size = new System.Drawing.Size(310, 19);
536+ this.label6.Size = new System.Drawing.Size(243, 15);
570537 this.label6.TabIndex = 0;
571538 this.label6.Text = "手動で変更する必要は通常ありません。";
572539 //
573- // planErrorCheckbox
574- //
575- this.planErrorCheckbox.AutoSize = true;
576- this.planErrorCheckbox.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
577- this.planErrorCheckbox.Location = new System.Drawing.Point(25, 62);
578- this.planErrorCheckbox.Margin = new System.Windows.Forms.Padding(4);
579- this.planErrorCheckbox.Name = "planErrorCheckbox";
580- this.planErrorCheckbox.Size = new System.Drawing.Size(195, 23);
581- this.planErrorCheckbox.TabIndex = 19;
582- this.planErrorCheckbox.Text = "放送データに異常あり";
583- this.planErrorCheckbox.UseVisualStyleBackColor = true;
584- //
585540 // RecordDialog
586541 //
587- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
542+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
588543 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
589- this.ClientSize = new System.Drawing.Size(593, 584);
544+ this.ClientSize = new System.Drawing.Size(445, 467);
590545 this.Controls.Add(this.label6);
591546 this.Controls.Add(this.tabControl1);
592547 this.Controls.Add(this.OkButton);
593548 this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
594- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
595549 this.MaximizeBox = false;
596550 this.MinimizeBox = false;
597551 this.Name = "RecordDialog";
--- a/UserInterface/MainForm.Designer.cs
+++ b/UserInterface/MainForm.Designer.cs
@@ -1173,11 +1173,12 @@
11731173 this.MainMenuStrip = this.menuStrip;
11741174 this.Name = "MainForm";
11751175 this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
1176- this.Text = "mAgicAnime.NET";
1176+ this.Text = "mAgicAnime.NET Ver.7sh mod. yossiepon_20150705";
11771177 this.Load += new System.EventHandler(this.MainForm_Load);
11781178 this.Shown += new System.EventHandler(this.MainForm_Shown);
11791179 this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed);
11801180 this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
1181+ this.Resize += new System.EventHandler(this.MainForm_Resize);
11811182 ((System.ComponentModel.ISupportInitialize)(this.filePictureBox)).EndInit();
11821183 ((System.ComponentModel.ISupportInitialize)(this.titlePictureBox)).EndInit();
11831184 ((System.ComponentModel.ISupportInitialize)(this.statusPictureBox)).EndInit();
--- a/UserInterface/MainForm.cs
+++ b/UserInterface/MainForm.cs
@@ -1063,7 +1063,8 @@ namespace magicAnime
10631063 ty = newRect.Y;
10641064 }
10651065
1066- text = string.Format( "{0:0}", episode.StoryNumber );
1066+ // mod. yossiepon_20150705
1067+ text = string.Format( "{0}", episode.StoryNoStr.Length > 0 ? episode.StoryNoStr : episode.StoryNumber.ToString("0") );
10671068
10681069 g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias; // アンチエイリアス有効
10691070
@@ -1564,8 +1565,10 @@ namespace magicAnime
15641565
15651566 titleLabel.Text = prog.title +
15661567 string.Format(
1567- " 第{0:0}話 {1:0}" ,
1568- episode.StoryNumber ,
1568+ // mod. yossiepon_20150705 begin
1569+ " 第{0}話 {1}" ,
1570+ episode.StoryNoStr.Length > 0 ? episode.StoryNoStr : episode.StoryNumber.ToString("0"),
1571+ // mod. yossiepon_20150705 end
15691572 episode.mSubTitle );
15701573
15711574 filePathLabel.Text = episode.FilePath;
@@ -2973,6 +2976,22 @@ namespace magicAnime
29732976 }
29742977 }
29752978
2979+ //=========================================================================
2980+ /// <summary>
2981+ /// リサイズの限定
2982+ /// </summary>
2983+ /// <remarks>
2984+ /// </remarks>
2985+ /// <history>2012/02/23 新規作成</history>
2986+ //========================================================================
2987+ private void MainForm_Resize(object sender, EventArgs e)
2988+ {
2989+ if (this.WindowState == FormWindowState.Minimized) { return; }
2990+ if (this.Width < 758) { this.Width = 758; }
2991+ if (this.Height < 310) { this.Height = 310; }
2992+ }
2993+
2994+
29762995 }
29772996
29782997 }
--- a/UserInterface/OptionDialog.cs
+++ b/UserInterface/OptionDialog.cs
@@ -562,7 +562,10 @@ namespace magicAnime
562562 "東奔西走アニメライフ",
563563 "20070401",
564564 "2500",
565- "東都テレビ");
565+ // mod. yossiepon_20150705 begin
566+ "東都テレビ",
567+ "SP1");
568+ // mod. yossiepon_20150705 end
566569
567570 sampleNameFormatTextBox.Text = sampleText;
568571 }
--- a/UserInterface/TransferDialog.Designer.cs
+++ b/UserInterface/TransferDialog.Designer.cs
@@ -1,7 +1,7 @@
11 //------------------------------------------------------------------------------
22 // <auto-generated>
33 // このコードはツールによって生成されました。
4-// ランタイム バージョン:2.0.50727.4927
4+// ランタイム バージョン:4.0.30319.34209
55 //
66 // このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
77 // コードが再生成されるときに損失したりします。
@@ -17,9 +17,9 @@ namespace magicAnime.UserInterface {
1717 /// </summary>
1818 // このクラスは StronglyTypedResourceBuilder クラスが ResGen
1919 // または Visual Studio のようなツールを使用して自動生成されました。
20- // メンバを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に
20+ // メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に
2121 // ResGen を実行し直すか、または VS プロジェクトをビルドし直します。
22- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
22+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
2323 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
2424 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
2525 internal class TransferDialog {
@@ -60,6 +60,9 @@ namespace magicAnime.UserInterface {
6060 }
6161 }
6262
63+ /// <summary>
64+ /// {X=17,Y=17} に類似した型 System.Drawing.Point のローカライズされたリソースを検索します。
65+ /// </summary>
6366 internal static System.Drawing.Point bgWorker_TrayLocation {
6467 get {
6568 object obj = ResourceManager.GetObject("bgWorker.TrayLocation", resourceCulture);
@@ -67,6 +70,9 @@ namespace magicAnime.UserInterface {
6770 }
6871 }
6972
73+ /// <summary>
74+ /// {X=116,Y=17} に類似した型 System.Drawing.Point のローカライズされたリソースを検索します。
75+ /// </summary>
7076 internal static System.Drawing.Point folderBrowser_TrayLocation {
7177 get {
7278 object obj = ResourceManager.GetObject("folderBrowser.TrayLocation", resourceCulture);
--- a/UserInterface/TrayIcon.cs
+++ b/UserInterface/TrayIcon.cs
@@ -64,7 +64,7 @@ namespace magicAnime.UserInterface
6464 mNotifyIcon.DoubleClick += notifyIcon_DoubleClick;
6565 mNotifyIcon.BalloonTipIcon = ToolTipIcon.Info;
6666 mNotifyIcon.BalloonTipTitle = "mAgicAnime";
67- mNotifyIcon.Text = "mAgicAnime";
67+ mNotifyIcon.Text = "mAgicAnime Ver.7sh mod. yossiepon_20150705";
6868 // trayIcon.Icon = ((System.Drawing.Icon)(resources.GetObject( "notifyIcon.Icon" )));
6969
7070 //---------------------------
--- a/app.config
+++ b/app.config
@@ -1,277 +1,307 @@
11 <?xml version="1.0"?>
22 <configuration>
3- <configSections>
4- <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5- <section name="magicAnime.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
6- </sectionGroup>
7- <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
8- <section name="magicAnime.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
9- </sectionGroup>
10- </configSections>
11- <userSettings>
12- <magicAnime.Properties.Settings>
13- <setting name="captureFolder" serializeAs="String">
14- <value/>
15- </setting>
16- <setting name="captureMergin" serializeAs="String">
17- <value>5</value>
18- </setting>
19- <setting name="encoderFolder" serializeAs="String">
20- <value/>
21- </setting>
22- <setting name="encodedFolder" serializeAs="String">
23- <value/>
24- </setting>
25- <setting name="captureSubDir" serializeAs="String">
26- <value>False</value>
27- </setting>
28- <setting name="captureExtension" serializeAs="String">
29- <value>0</value>
30- </setting>
31- <setting name="autoUpdate" serializeAs="String">
32- <value>True</value>
33- </setting>
34- <setting name="prohibitUpdateWhileRecording" serializeAs="String">
35- <value>True</value>
36- </setting>
37- <setting name="removeSourceWhenEncoded" serializeAs="String">
38- <value>True</value>
39- </setting>
40- <setting name="saveFolder" serializeAs="String">
41- <value/>
42- </setting>
43- <setting name="classificatePrograms" serializeAs="String">
44- <value>True</value>
45- </setting>
46- <setting name="saveNameFormat" serializeAs="String">
47- <value>{0:0} 第{1:00}話 「{2:0}」</value>
48- </setting>
49- <setting name="scheduleFirstHour" serializeAs="String">
50- <value>23</value>
51- </setting>
52- <setting name="scheduleTimeZone" serializeAs="String">
53- <value>4</value>
54- </setting>
55- <setting name="scheduleEncodeEveryday" serializeAs="String">
56- <value>False</value>
57- </setting>
58- <setting name="scheduleEncodeTime" serializeAs="String">
59- <value>0</value>
60- </setting>
61- <setting name="autoShutdownAtEncoded" serializeAs="String">
62- <value>False</value>
63- </setting>
64- <setting name="autoShutdownType" serializeAs="String">
65- <value>0</value>
66- </setting>
67- <setting name="minimizeAtStartup" serializeAs="String">
68- <value>False</value>
69- </setting>
70- <setting name="minimizeAtPlayer" serializeAs="String">
71- <value>False</value>
72- </setting>
73- <setting name="syoboiTitleList" serializeAs="String">
74- <value>http://cal.syoboi.jp/list.php</value>
75- </setting>
76- <setting name="syoboiTid" serializeAs="String">
77- <value>http://cal.syoboi.jp/tid/</value>
78- </setting>
79- <setting name="reserveStart" serializeAs="String">
80- <value>0</value>
81- </setting>
82- <setting name="reserveEnd" serializeAs="String">
83- <value>0</value>
84- </setting>
85- <setting name="bootupTimeUnification" serializeAs="String">
86- <value>15</value>
87- </setting>
88- <setting name="autoPowerManagement" serializeAs="String">
89- <value>False</value>
90- </setting>
91- <setting name="shutdownMethod" serializeAs="String">
92- <value>1</value>
93- </setting>
94- <setting name="bootupHasten" serializeAs="String">
95- <value>5</value>
96- </setting>
97- <setting name="shutdownPutoff" serializeAs="String">
98- <value>2</value>
99- </setting>
100- <setting name="schedulerType" serializeAs="String">
101- <value/>
102- </setting>
103- <setting name="autoRefresh" serializeAs="String">
104- <value>False</value>
105- </setting>
106- <setting name="autoRefreshMinute" serializeAs="String">
107- <value>45</value>
108- </setting>
109- <setting name="inTaskTray" serializeAs="String">
110- <value>False</value>
111- </setting>
112- <setting name="firstRun" serializeAs="String">
113- <value>True</value>
114- </setting>
115- <setting name="syoboiRss" serializeAs="String">
116- <value>http://cal.syoboi.jp/rss.php</value>
117- </setting>
118- <setting name="syoboiProg" serializeAs="String">
119- <value>http://cal.syoboi.jp/proginfo.xml</value>
120- </setting>
121- <setting name="hideRefreshDialog" serializeAs="String">
122- <value>False</value>
123- </setting>
124- <setting name="notifyUnreadBalloon" serializeAs="String">
125- <value>True</value>
126- </setting>
127- <setting name="dayPast" serializeAs="String">
128- <value>7</value>
129- </setting>
130- <setting name="dayFuture" serializeAs="String">
131- <value>14</value>
132- </setting>
133- <setting name="weekPast" serializeAs="String">
134- <value>3</value>
135- </setting>
136- <setting name="weekFuture" serializeAs="String">
137- <value>18</value>
138- </setting>
139- <setting name="viewMode" serializeAs="String">
140- <value>0</value>
141- </setting>
142- <setting name="calenderMode" serializeAs="String">
143- <value>0</value>
144- </setting>
145- <setting name="specifiedFile" serializeAs="String">
146- <value>0</value>
147- </setting>
148- <setting name="thumbnailWidth" serializeAs="String">
149- <value>60</value>
150- </setting>
151- <setting name="thumbnailHeight" serializeAs="String">
152- <value>45</value>
153- </setting>
154- <setting name="thumbnailSubtitle" serializeAs="String">
155- <value>False</value>
156- </setting>
157- <setting name="thumbnailSecond" serializeAs="String">
158- <value>600</value>
159- </setting>
160- <setting name="thumbnailSize" serializeAs="String">
161- <value>0</value>
162- </setting>
163- <setting name="updateInterval" serializeAs="String">
164- <value>15</value>
165- </setting>
166- <setting name="forbiddenThumbnail" serializeAs="String">
167- <value>False</value>
168- </setting>
169- <setting name="bootRefresh" serializeAs="String">
170- <value>True</value>
171- </setting>
172- <setting name="ignoreExist" serializeAs="String">
173- <value>False</value>
174- </setting>
175- <setting name="copyWithOthers" serializeAs="String">
176- <value>False</value>
177- </setting>
178- <setting name="removeSubdir" serializeAs="String">
179- <value>False</value>
180- </setting>
181- <setting name="autoTransferAtBoot" serializeAs="String">
182- <value>False</value>
183- </setting>
184- <setting name="autoTransferAtAfterRecord" serializeAs="String">
185- <value>False</value>
186- </setting>
187- <setting name="autoTransferTime" serializeAs="String">
188- <value>1</value>
189- </setting>
190- <setting name="hoursPerDay" serializeAs="String">
191- <value>27</value>
192- </setting>
193- <setting name="maximizeWindow" serializeAs="String">
194- <value>True</value>
195- </setting>
196- <setting name="strExtension" serializeAs="String">
197- <value>.mpg</value>
198- </setting>
199- <setting name="autoMoveWithoutFirstEpisode" serializeAs="String">
200- <value>False</value>
201- </setting>
202- <setting name="reserveDays" serializeAs="String">
203- <value>7</value>
204- </setting>
205- <setting name="autoEncodeInAfterRecord" serializeAs="String">
206- <value>False</value>
207- </setting>
208- <setting name="autoEncodeMergin" serializeAs="String">
209- <value>10</value>
210- </setting>
211- <setting name="showSoonBalloon" serializeAs="String">
212- <value>False</value>
213- </setting>
214- <setting name="timeSoonBalloon" serializeAs="String">
215- <value>15</value>
216- </setting>
217- <setting name="concurrentNums" serializeAs="String">
218- <value>1</value>
219- </setting>
220- <setting name="makeThumbnailAfterEncode" serializeAs="String">
221- <value>False</value>
222- </setting>
223- <setting name="startupWait" serializeAs="String">
224- <value>3</value>
225- </setting>
226- <setting name="MigrateVer1900" serializeAs="String">
227- <value>False</value>
228- </setting>
229- <setting name="dontBeginEncodeLessThanMinutes" serializeAs="String">
230- <value>False</value>
231- </setting>
232- <setting name="maxDelayTimeDontBeginEncode" serializeAs="String">
233- <value>60</value>
234- </setting>
235- <setting name="autoBootup" serializeAs="String">
236- <value>True</value>
237- </setting>
238- <setting name="autoShutdown" serializeAs="String">
239- <value>True</value>
240- </setting>
241- <setting name="reserveControl" serializeAs="String">
242- <value>2</value>
243- </setting>
244- <setting name="reserveImmediatlyBeforeMinutes" serializeAs="String">
245- <value>10</value>
246- </setting>
247- <setting name="autoBootNDays" serializeAs="String">
248- <value>30</value>
249- </setting>
250- <setting name="overlapThreshould" serializeAs="String">
251- <value>1</value>
252- </setting>
253- <setting name="productVersion" serializeAs="String">
254- <value></value>
255- </setting>
256- <setting name="thumbnailMode" serializeAs="String">
257- <value>False</value>
258- </setting>
259- <setting name="fileTitleMode" serializeAs="String">
260- <value>1</value>
261- </setting>
262- </magicAnime.Properties.Settings>
263- </userSettings>
264- <applicationSettings>
265- <magicAnime.Properties.Settings>
266- <setting name="helpUrl" serializeAs="String">
267- <value>http://members2.jcom.home.ne.jp/kurusugawa/mAgicAnime/</value>
268- </setting>
269- <setting name="specifiedNameFormat" serializeAs="String">
270- <value>A{0:0}_{1:0}</value>
271- </setting>
272- <setting name="thumbnailWhitebar" serializeAs="String">
273- <value>13</value>
274- </setting>
275- </magicAnime.Properties.Settings>
276- </applicationSettings>
3+ <configSections>
4+ <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+ <section name="magicAnime.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
6+ </sectionGroup>
7+ <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
8+ <section name="magicAnime.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
9+ </sectionGroup>
10+ </configSections>
11+ <userSettings>
12+ <magicAnime.Properties.Settings>
13+ <setting name="captureFolder" serializeAs="String">
14+ <value />
15+ </setting>
16+ <setting name="captureMergin" serializeAs="String">
17+ <value>5</value>
18+ </setting>
19+ <setting name="encoderFolder" serializeAs="String">
20+ <value />
21+ </setting>
22+ <setting name="encodedFolder" serializeAs="String">
23+ <value />
24+ </setting>
25+ <setting name="captureSubDir" serializeAs="String">
26+ <value>False</value>
27+ </setting>
28+ <setting name="captureExtension" serializeAs="String">
29+ <value>0</value>
30+ </setting>
31+ <setting name="autoUpdate" serializeAs="String">
32+ <value>True</value>
33+ </setting>
34+ <setting name="prohibitUpdateWhileRecording" serializeAs="String">
35+ <value>True</value>
36+ </setting>
37+ <setting name="removeSourceWhenEncoded" serializeAs="String">
38+ <value>True</value>
39+ </setting>
40+ <setting name="saveFolder" serializeAs="String">
41+ <value />
42+ </setting>
43+ <setting name="classificatePrograms" serializeAs="String">
44+ <value>True</value>
45+ </setting>
46+ <setting name="saveNameFormat" serializeAs="String">
47+ <value>{0} 第{6}話 「{2}」</value>
48+ </setting>
49+ <setting name="scheduleFirstHour" serializeAs="String">
50+ <value>23</value>
51+ </setting>
52+ <setting name="scheduleTimeZone" serializeAs="String">
53+ <value>4</value>
54+ </setting>
55+ <setting name="scheduleEncodeEveryday" serializeAs="String">
56+ <value>False</value>
57+ </setting>
58+ <setting name="scheduleEncodeTime" serializeAs="String">
59+ <value>0</value>
60+ </setting>
61+ <setting name="autoShutdownAtEncoded" serializeAs="String">
62+ <value>False</value>
63+ </setting>
64+ <setting name="autoShutdownType" serializeAs="String">
65+ <value>0</value>
66+ </setting>
67+ <setting name="minimizeAtStartup" serializeAs="String">
68+ <value>False</value>
69+ </setting>
70+ <setting name="minimizeAtPlayer" serializeAs="String">
71+ <value>False</value>
72+ </setting>
73+ <setting name="syoboiTitleList" serializeAs="String">
74+ <value>http://cal.syoboi.jp/list.php</value>
75+ </setting>
76+ <setting name="syoboiTid" serializeAs="String">
77+ <value>http://cal.syoboi.jp/tid/</value>
78+ </setting>
79+ <setting name="reserveStart" serializeAs="String">
80+ <value>0</value>
81+ </setting>
82+ <setting name="reserveEnd" serializeAs="String">
83+ <value>0</value>
84+ </setting>
85+ <setting name="bootupTimeUnification" serializeAs="String">
86+ <value>15</value>
87+ </setting>
88+ <setting name="autoPowerManagement" serializeAs="String">
89+ <value>False</value>
90+ </setting>
91+ <setting name="shutdownMethod" serializeAs="String">
92+ <value>1</value>
93+ </setting>
94+ <setting name="bootupHasten" serializeAs="String">
95+ <value>5</value>
96+ </setting>
97+ <setting name="shutdownPutoff" serializeAs="String">
98+ <value>2</value>
99+ </setting>
100+ <setting name="schedulerType" serializeAs="String">
101+ <value />
102+ </setting>
103+ <setting name="autoRefresh" serializeAs="String">
104+ <value>False</value>
105+ </setting>
106+ <setting name="autoRefreshMinute" serializeAs="String">
107+ <value>45</value>
108+ </setting>
109+ <setting name="inTaskTray" serializeAs="String">
110+ <value>False</value>
111+ </setting>
112+ <setting name="firstRun" serializeAs="String">
113+ <value>True</value>
114+ </setting>
115+ <setting name="syoboiRss" serializeAs="String">
116+ <value>http://cal.syoboi.jp/rss.php</value>
117+ </setting>
118+ <setting name="syoboiProg" serializeAs="String">
119+ <value>http://cal.syoboi.jp/proginfo.xml</value>
120+ </setting>
121+ <setting name="hideRefreshDialog" serializeAs="String">
122+ <value>False</value>
123+ </setting>
124+ <setting name="notifyUnreadBalloon" serializeAs="String">
125+ <value>True</value>
126+ </setting>
127+ <setting name="dayPast" serializeAs="String">
128+ <value>7</value>
129+ </setting>
130+ <setting name="dayFuture" serializeAs="String">
131+ <value>14</value>
132+ </setting>
133+ <setting name="weekPast" serializeAs="String">
134+ <value>3</value>
135+ </setting>
136+ <setting name="weekFuture" serializeAs="String">
137+ <value>18</value>
138+ </setting>
139+ <setting name="viewMode" serializeAs="String">
140+ <value>0</value>
141+ </setting>
142+ <setting name="calenderMode" serializeAs="String">
143+ <value>0</value>
144+ </setting>
145+ <setting name="specifiedFile" serializeAs="String">
146+ <value>ByFileNameWithID</value>
147+ </setting>
148+ <setting name="thumbnailWidth" serializeAs="String">
149+ <value>60</value>
150+ </setting>
151+ <setting name="thumbnailHeight" serializeAs="String">
152+ <value>45</value>
153+ </setting>
154+ <setting name="thumbnailSubtitle" serializeAs="String">
155+ <value>False</value>
156+ </setting>
157+ <setting name="thumbnailSecond" serializeAs="String">
158+ <value>600</value>
159+ </setting>
160+ <setting name="thumbnailSize" serializeAs="String">
161+ <value>0</value>
162+ </setting>
163+ <setting name="updateInterval" serializeAs="String">
164+ <value>15</value>
165+ </setting>
166+ <setting name="forbiddenThumbnail" serializeAs="String">
167+ <value>False</value>
168+ </setting>
169+ <setting name="bootRefresh" serializeAs="String">
170+ <value>True</value>
171+ </setting>
172+ <setting name="ignoreExist" serializeAs="String">
173+ <value>False</value>
174+ </setting>
175+ <setting name="copyWithOthers" serializeAs="String">
176+ <value>False</value>
177+ </setting>
178+ <setting name="removeSubdir" serializeAs="String">
179+ <value>False</value>
180+ </setting>
181+ <setting name="autoTransferAtBoot" serializeAs="String">
182+ <value>False</value>
183+ </setting>
184+ <setting name="autoTransferAtAfterRecord" serializeAs="String">
185+ <value>False</value>
186+ </setting>
187+ <setting name="autoTransferTime" serializeAs="String">
188+ <value>1</value>
189+ </setting>
190+ <setting name="hoursPerDay" serializeAs="String">
191+ <value>27</value>
192+ </setting>
193+ <setting name="maximizeWindow" serializeAs="String">
194+ <value>True</value>
195+ </setting>
196+ <setting name="strExtension" serializeAs="String">
197+ <value>.mpg</value>
198+ </setting>
199+ <setting name="autoMoveWithoutFirstEpisode" serializeAs="String">
200+ <value>False</value>
201+ </setting>
202+ <setting name="reserveDays" serializeAs="String">
203+ <value>7</value>
204+ </setting>
205+ <setting name="autoEncodeInAfterRecord" serializeAs="String">
206+ <value>False</value>
207+ </setting>
208+ <setting name="autoEncodeMergin" serializeAs="String">
209+ <value>10</value>
210+ </setting>
211+ <setting name="showSoonBalloon" serializeAs="String">
212+ <value>False</value>
213+ </setting>
214+ <setting name="timeSoonBalloon" serializeAs="String">
215+ <value>15</value>
216+ </setting>
217+ <setting name="concurrentNums" serializeAs="String">
218+ <value>1</value>
219+ </setting>
220+ <setting name="makeThumbnailAfterEncode" serializeAs="String">
221+ <value>False</value>
222+ </setting>
223+ <setting name="startupWait" serializeAs="String">
224+ <value>3</value>
225+ </setting>
226+ <setting name="MigrateVer1900" serializeAs="String">
227+ <value>False</value>
228+ </setting>
229+ <setting name="dontBeginEncodeLessThanMinutes" serializeAs="String">
230+ <value>False</value>
231+ </setting>
232+ <setting name="maxDelayTimeDontBeginEncode" serializeAs="String">
233+ <value>60</value>
234+ </setting>
235+ <setting name="autoBootup" serializeAs="String">
236+ <value>True</value>
237+ </setting>
238+ <setting name="autoShutdown" serializeAs="String">
239+ <value>True</value>
240+ </setting>
241+ <setting name="reserveControl" serializeAs="String">
242+ <value>noAutoReserve</value>
243+ </setting>
244+ <setting name="reserveImmediatlyBeforeMinutes" serializeAs="String">
245+ <value>10</value>
246+ </setting>
247+ <setting name="autoBootNDays" serializeAs="String">
248+ <value>30</value>
249+ </setting>
250+ <setting name="overlapThreshould" serializeAs="String">
251+ <value>1</value>
252+ </setting>
253+ <setting name="thumbnailMode" serializeAs="String">
254+ <value>False</value>
255+ </setting>
256+ <setting name="fileTitleMode" serializeAs="String">
257+ <value>1</value>
258+ </setting>
259+ <setting name="disableUnread" serializeAs="String">
260+ <value>True</value>
261+ </setting>
262+ <setting name="enablePriority" serializeAs="String">
263+ <value>False</value>
264+ </setting>
265+ <setting name="overlapMargin" serializeAs="String">
266+ <value>5</value>
267+ </setting>
268+ <setting name="keepPlan" serializeAs="String">
269+ <value>True</value>
270+ </setting>
271+ <setting name="logPaneSize" serializeAs="String">
272+ <value>100</value>
273+ </setting>
274+ <setting name="rectWindow" serializeAs="String">
275+ <value>0, 0, 0, 0</value>
276+ </setting>
277+ <setting name="retryDownload" serializeAs="String">
278+ <value>2</value>
279+ </setting>
280+ <setting name="showLogPane" serializeAs="String">
281+ <value>False</value>
282+ </setting>
283+ <setting name="updateOnAirSoon" serializeAs="String">
284+ <value>True</value>
285+ </setting>
286+ <setting name="titlePast" serializeAs="String">
287+ <value>5</value>
288+ </setting>
289+ <setting name="titleFuture" serializeAs="String">
290+ <value>8</value>
291+ </setting>
292+ </magicAnime.Properties.Settings>
293+ </userSettings>
294+ <applicationSettings>
295+ <magicAnime.Properties.Settings>
296+ <setting name="helpUrl" serializeAs="String">
297+ <value>http://members2.jcom.home.ne.jp/kurusugawa/mAgicAnime/</value>
298+ </setting>
299+ <setting name="specifiedNameFormat" serializeAs="String">
300+ <value>A{0:0}_{1:0}</value>
301+ </setting>
302+ <setting name="thumbnailWhitebar" serializeAs="String">
303+ <value>13</value>
304+ </setting>
305+ </magicAnime.Properties.Settings>
306+ </applicationSettings>
277307 <startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
--- a/magicAnime.csproj
+++ b/magicAnime.csproj
@@ -1,4 +1,5 @@
1-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
1+<?xml version="1.0" encoding="utf-8"?>
2+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
23 <PropertyGroup>
34 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
45 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,10 +17,8 @@
1617 </FileUpgradeFlags>
1718 <UpgradeBackupLocation>
1819 </UpgradeBackupLocation>
19- <OldToolsVersion>2.0</OldToolsVersion>
20+ <OldToolsVersion>3.5</OldToolsVersion>
2021 <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
21- <TargetFrameworkSubset>
22- </TargetFrameworkSubset>
2322 <PublishUrl>publish\</PublishUrl>
2423 <Install>true</Install>
2524 <InstallFrom>Disk</InstallFrom>
--- /dev/null
+++ b/magicAnime.sln
@@ -0,0 +1,22 @@
1+
2+Microsoft Visual Studio Solution File, Format Version 12.00
3+# Visual Studio 2013
4+VisualStudioVersion = 12.0.30723.0
5+MinimumVisualStudioVersion = 10.0.40219.1
6+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "magicAnime", "magicAnime.csproj", "{236A610C-9446-4987-9468-856A60E79B5B}"
7+EndProject
8+Global
9+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+ Debug|Any CPU = Debug|Any CPU
11+ Release|Any CPU = Release|Any CPU
12+ EndGlobalSection
13+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+ {236A610C-9446-4987-9468-856A60E79B5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+ {236A610C-9446-4987-9468-856A60E79B5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+ {236A610C-9446-4987-9468-856A60E79B5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+ {236A610C-9446-4987-9468-856A60E79B5B}.Release|Any CPU.Build.0 = Release|Any CPU
18+ EndGlobalSection
19+ GlobalSection(SolutionProperties) = preSolution
20+ HideSolutionNode = FALSE
21+ EndGlobalSection
22+EndGlobal