OSDN -- 开发和下载开源软件
简体中文翻译状态 translation status for zh
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

提交

标签
No Tags

Frequently used words (click to add to your profile)

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

mAgicAnime 俺用改造版


Commit MetaInfo

修订版7ba1e5ec75d9dac8034b1829d22b742bc91f6062 (tree)
时间2016-10-30 07:42:05
作者yoshy <yoshy@user...>
Commiteryoshy

Log Message

[FIX] 予約データ更新時にファイル名から一意のIDが抜ける不具合を修正
[ADD] 話数文字列をエピソードダイアログに表示する機能を追加
[UPDATE] 話数文字列の書式設定を設定ファイルに外だし
[UPDATE] 特番話数の接頭辞を設定ファイルに外だし

更改概述

差异

--- a/OnLine DataBase/SyoboiCalender.cs
+++ b/OnLine DataBase/SyoboiCalender.cs
@@ -635,8 +635,8 @@ namespace magicAnime
635635 }
636636 else
637637 {
638- syoboiRecord.episode = (string)Cols[3]; // 話番号文字列
639638 syoboiRecord.number = convertDecimalEpisodeNoToInt( decimal.Parse( (string)Cols[ 3 ] ) ); // 話番号
639+ syoboiRecord.episode = syoboiRecord.number.ToString(Settings.Default.storyNoFormat); // 話番号文字列
640640
641641 // HTMLエンコード文字をデコード
642642 syoboiRecord.subtitle = HttpUtility.HtmlDecode( MakeNaked( (string)Cols[ 4 ] ) ); // サブタイトル
@@ -1010,7 +1010,7 @@ namespace magicAnime
10101010 // 話数文字列が振られていなければ「SPn」にする
10111011 if(_syoboi[i].episode.Length == 0)
10121012 {
1013- _syoboi[i].episode = "SP" + (epNo - maxEpNo);
1013+ _syoboi[i].episode = Settings.Default.unnumberedEpisodePrefix + (epNo - maxEpNo);
10141014 }
10151015
10161016 // 特別編に話数をつける
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
55 // アセンブリに関する一般情報は以下の属性セットをとおして制御されます。
66 // アセンブリに関連付けられている情報を変更するには、
77 // これらの属性値を変更してください。
8-[assembly: AssemblyTitle("mAgicAnime Ver.7sh mod. yossiepon_20150705")]
8+[assembly: AssemblyTitle("mAgicAnime Ver.7sh mod. yossiepon_20150815")]
99 [assembly: AssemblyDescription("")]
1010 [assembly: AssemblyConfiguration("")]
1111 [assembly: AssemblyCompany("")]
12-[assembly: AssemblyProduct("mAgicAnime.NET (ななし版, mod. yossiepon_20150705)")]
12+[assembly: AssemblyProduct("mAgicAnime.NET (ななし版, mod. yossiepon_20150815)")]
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.20150705")]
33+[assembly: AssemblyFileVersion("2.0.14.20150815")]
--- a/Properties/Settings.Designer.cs
+++ b/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
11 //------------------------------------------------------------------------------
22 // <auto-generated>
33 // このコードはツールによって生成されました。
4-// ランタイム バージョン:4.0.30319.34209
4+// ランタイム バージョン:4.0.30319.42000
55 //
66 // このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
77 // コードが再生成されるときに損失したりします。
@@ -34,7 +34,7 @@ namespace magicAnime.Properties {
3434
3535 [global::System.Configuration.ApplicationScopedSettingAttribute()]
3636 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
37- [global::System.Configuration.DefaultSettingValueAttribute("A{0:0}_{1:0}")]
37+ [global::System.Configuration.DefaultSettingValueAttribute("A{0}_{1}")]
3838 public string specifiedNameFormat {
3939 get {
4040 return ((string)(this["specifiedNameFormat"]));
@@ -1189,5 +1189,23 @@ namespace magicAnime.Properties {
11891189 this["titleFuture"] = value;
11901190 }
11911191 }
1192+
1193+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
1194+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1195+ [global::System.Configuration.DefaultSettingValueAttribute("00")]
1196+ public string storyNoFormat {
1197+ get {
1198+ return ((string)(this["storyNoFormat"]));
1199+ }
1200+ }
1201+
1202+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
1203+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
1204+ [global::System.Configuration.DefaultSettingValueAttribute("SP")]
1205+ public string unnumberedEpisodePrefix {
1206+ get {
1207+ return ((string)(this["unnumberedEpisodePrefix"]));
1208+ }
1209+ }
11921210 }
11931211 }
--- a/Properties/Settings.settings
+++ b/Properties/Settings.settings
@@ -6,7 +6,7 @@
66 <Value Profile="(Default)">http://members2.jcom.home.ne.jp/kurusugawa/mAgicAnime/</Value>
77 </Setting>
88 <Setting Name="specifiedNameFormat" Type="System.String" Scope="Application">
9- <Value Profile="(Default)">A{0:0}_{1:0}</Value>
9+ <Value Profile="(Default)">A{0}_{1}</Value>
1010 </Setting>
1111 <Setting Name="thumbnailWhitebar" Type="System.Int32" Scope="Application">
1212 <Value Profile="(Default)">13</Value>
@@ -300,5 +300,11 @@
300300 <Setting Name="titleFuture" Type="System.Int32" Scope="User">
301301 <Value Profile="(Default)">8</Value>
302302 </Setting>
303+ <Setting Name="storyNoFormat" Type="System.String" Scope="Application">
304+ <Value Profile="(Default)">00</Value>
305+ </Setting>
306+ <Setting Name="unnumberedEpisodePrefix" Type="System.String" Scope="Application">
307+ <Value Profile="(Default)">SP</Value>
308+ </Setting>
303309 </Settings>
304310 </SettingsFile>
\ No newline at end of file
--- a/RecordingManager/AnimeEpisode.cs
+++ b/RecordingManager/AnimeEpisode.cs
@@ -452,7 +452,7 @@ namespace magicAnime
452452
453453 public int StoryNumber { get { return mStoryNumber; } }
454454 // mod. yossiepon_20150705
455- public string StoryNoStr { get { return mStoryNoStr; } }
455+ public string StoryNoStr { get { return mStoryNoStr; } }
456456
457457 //=========================================================================
458458 /// <summary>
@@ -1264,7 +1264,7 @@ namespace magicAnime
12641264 timeStr,
12651265 // mod. yossiepon_20150705 begin
12661266 station,
1267- mStoryNoStr.Length > 0 ? mStoryNoStr : mStoryNumber.ToString("00"));
1267+ mStoryNoStr.Length > 0 ? mStoryNoStr : mStoryNumber.ToString(Settings.Default.storyNoFormat));
12681268 // mod. yossiepon_20150705 end
12691269 }
12701270 catch(Exception ex)
@@ -1314,7 +1314,7 @@ namespace magicAnime
13141314 timeStr,
13151315 // mod. yossiepon_20150705 begin
13161316 station,
1317- mStoryNoStr.Length > 0 ? mStoryNoStr : mStoryNumber.ToString("00"));
1317+ mStoryNoStr.Length > 0 ? mStoryNoStr : mStoryNumber.ToString(Settings.Default.storyNoFormat));
13181318 // mod. yossiepon_20150705 end
13191319 }
13201320 catch(Exception ex)
@@ -1592,7 +1592,7 @@ namespace magicAnime
15921592 // mod. yossiepon_20150705 begin
15931593 if (mStoryNoStr.Length == 0)
15941594 {
1595- mStoryNoStr = mStoryNumber.ToString();
1595+ mStoryNoStr = mStoryNumber.ToString(Settings.Default.storyNoFormat);
15961596 }
15971597 // mod. yossiepon_20150705 end
15981598 }
--- a/RecordingManager/ReserveManager.cs
+++ b/RecordingManager/ReserveManager.cs
@@ -302,6 +302,19 @@ namespace magicAnime
302302
303303 if ( sched == null ) return ChangeResult.Dontcare;
304304
305+ // mod. yossiepon_20150815 begin
306+
307+ // ファイル名によって録画ファイルを特定？
308+ if ( Settings.Default.specifiedFile == IdentifyFileMethod.ByFileNameWithID )
309+ {
310+ title = string.Format(
311+ Settings.Default.specifiedNameFormat ,
312+ uniqueID ,
313+ title ); // IDを含んだ録画タイトルにする
314+ }
315+
316+ // mod. yossiepon_20150815 end
317+
305318 Logger.Output("(予約)時間変更操作 " + start.ToString() + "(" + title + ")" );
306319
307320 //----------------------------
@@ -345,14 +358,18 @@ namespace magicAnime
345358 //-----------------------
346359 try
347360 {
348- // ファイル名によって録画ファイルを特定？
349- if ( Settings.Default.specifiedFile == IdentifyFileMethod.ByFileNameWithID )
350- {
351- title = string.Format(
352- Settings.Default.specifiedNameFormat ,
353- uniqueID ,
354- title ); // IDを含んだ録画タイトルにする
355- }
361+ // mod. yossiepon_20150815 begin
362+
363+ //// ファイル名によって録画ファイルを特定？
364+ //if ( Settings.Default.specifiedFile == IdentifyFileMethod.ByFileNameWithID )
365+ //{
366+ // title = string.Format(
367+ // Settings.Default.specifiedNameFormat ,
368+ // uniqueID ,
369+ // title ); // IDを含んだ録画タイトルにする
370+ //}
371+
372+ // mod. yossiepon_20150815 end
356373
357374 sched.MakeReservation(
358375 title ,
--- a/UserInterface/EpisodeDialog.Designer.cs
+++ b/UserInterface/EpisodeDialog.Designer.cs
@@ -32,6 +32,8 @@
3232 this.OpenFileDialog = new System.Windows.Forms.OpenFileDialog();
3333 this.tabControl1 = new System.Windows.Forms.TabControl();
3434 this.tabPage1 = new System.Windows.Forms.TabPage();
35+ this.StoryNoTextBox = new System.Windows.Forms.TextBox();
36+ this.label12 = new System.Windows.Forms.Label();
3537 this.repeatNumberTextBox = new System.Windows.Forms.TextBox();
3638 this.label9 = new System.Windows.Forms.Label();
3739 this.lengthUpdown = new System.Windows.Forms.NumericUpDown();
@@ -106,6 +108,8 @@
106108 //
107109 // tabPage1
108110 //
111+ this.tabPage1.Controls.Add(this.StoryNoTextBox);
112+ this.tabPage1.Controls.Add(this.label12);
109113 this.tabPage1.Controls.Add(this.repeatNumberTextBox);
110114 this.tabPage1.Controls.Add(this.label9);
111115 this.tabPage1.Controls.Add(this.lengthUpdown);
@@ -131,12 +135,29 @@
131135 this.tabPage1.Controls.Add(this.label1);
132136 this.tabPage1.Location = new System.Drawing.Point(4, 25);
133137 this.tabPage1.Name = "tabPage1";
134- this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
138+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
135139 this.tabPage1.Size = new System.Drawing.Size(416, 381);
136140 this.tabPage1.TabIndex = 0;
137141 this.tabPage1.Text = "プロパティ";
138142 this.tabPage1.UseVisualStyleBackColor = true;
139143 //
144+ // StoryNoTextBox
145+ //
146+ this.StoryNoTextBox.Location = new System.Drawing.Point(288, 44);
147+ this.StoryNoTextBox.Name = "StoryNoTextBox";
148+ this.StoryNoTextBox.ReadOnly = true;
149+ this.StoryNoTextBox.Size = new System.Drawing.Size(105, 22);
150+ this.StoryNoTextBox.TabIndex = 24;
151+ //
152+ // label12
153+ //
154+ this.label12.AutoSize = true;
155+ this.label12.Location = new System.Drawing.Point(200, 45);
156+ this.label12.Name = "label12";
157+ this.label12.Size = new System.Drawing.Size(85, 15);
158+ this.label12.TabIndex = 23;
159+ this.label12.Text = "話数文字列:";
160+ //
140161 // repeatNumberTextBox
141162 //
142163 this.repeatNumberTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
@@ -394,7 +415,7 @@
394415 this.tabPage2.Controls.Add(this.groupBox1);
395416 this.tabPage2.Location = new System.Drawing.Point(4, 25);
396417 this.tabPage2.Name = "tabPage2";
397- this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
418+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
398419 this.tabPage2.Size = new System.Drawing.Size(416, 381);
399420 this.tabPage2.TabIndex = 1;
400421 this.tabPage2.Text = "詳細";
@@ -607,5 +628,7 @@
607628 private System.Windows.Forms.CheckBox timeChangedCheckBox;
608629 private System.Windows.Forms.CheckBox thumbnailMakedCheckBox;
609630 private System.Windows.Forms.CheckBox planErrorCheckbox;
631+ private System.Windows.Forms.TextBox StoryNoTextBox;
632+ private System.Windows.Forms.Label label12;
610633 }
611634 }
\ No newline at end of file
--- a/UserInterface/EpisodeDialog.cs
+++ b/UserInterface/EpisodeDialog.cs
@@ -44,6 +44,8 @@ namespace magicAnime
4444 SubtitleTextBox.Text = r.mSubTitle;
4545 FileTextBox.Text = r.FilePath;
4646 StoryNumberUpdown.Value = r.StoryNumber;
47+ // mod. yossipon_20150815 begin
48+ StoryNoTextBox.Text = r.StoryNoStr;
4749
4850 hasPlanCheckBox.Checked = r.HasPlan;
4951 if( r.HasPlan )
--- a/UserInterface/MainForm.Designer.cs
+++ b/UserInterface/MainForm.Designer.cs
@@ -185,12 +185,12 @@
185185 // toolStripMenuItem5
186186 //
187187 toolStripMenuItem5.Name = "toolStripMenuItem5";
188- toolStripMenuItem5.Size = new System.Drawing.Size(171, 6);
188+ toolStripMenuItem5.Size = new System.Drawing.Size(177, 6);
189189 //
190190 // toolStripSeparator6
191191 //
192192 toolStripSeparator6.Name = "toolStripSeparator6";
193- toolStripSeparator6.Size = new System.Drawing.Size(171, 6);
193+ toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
194194 //
195195 // filePictureBox
196196 //
@@ -241,9 +241,9 @@
241241 this.dataGrid.AllowUserToAddRows = false;
242242 this.dataGrid.AllowUserToDeleteRows = false;
243243 this.dataGrid.AllowUserToResizeRows = false;
244- this.dataGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
245- | System.Windows.Forms.AnchorStyles.Left)
246- | System.Windows.Forms.AnchorStyles.Right)));
244+ this.dataGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
245+ | System.Windows.Forms.AnchorStyles.Left)
246+ | System.Windows.Forms.AnchorStyles.Right)));
247247 this.dataGrid.BackgroundColor = System.Drawing.SystemColors.Window;
248248 this.dataGrid.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
249249 this.dataGrid.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;
@@ -277,15 +277,15 @@
277277 this.dataGrid.ShowEditingIcon = false;
278278 this.dataGrid.Size = new System.Drawing.Size(750, 286);
279279 this.dataGrid.TabIndex = 0;
280- this.dataGrid.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGrid_CellMouseUp);
281- this.dataGrid.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGrid_CellLeave);
280+ this.dataGrid.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGrid_CellClick);
282281 this.dataGrid.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGrid_CellDoubleClick);
283- this.dataGrid.MouseMove += new System.Windows.Forms.MouseEventHandler(this.dataGrid_MouseMove);
284- this.dataGrid.CellStateChanged += new System.Windows.Forms.DataGridViewCellStateChangedEventHandler(this.dataGrid_CellStateChanged);
285- this.dataGrid.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dataGrid_MouseUp);
282+ this.dataGrid.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGrid_CellLeave);
283+ this.dataGrid.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGrid_CellMouseUp);
286284 this.dataGrid.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.dataGrid_CellPainting);
287- this.dataGrid.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGrid_CellClick);
285+ this.dataGrid.CellStateChanged += new System.Windows.Forms.DataGridViewCellStateChangedEventHandler(this.dataGrid_CellStateChanged);
288286 this.dataGrid.SelectionChanged += new System.EventHandler(this.dataGrid_SelectionChanged);
287+ this.dataGrid.MouseMove += new System.Windows.Forms.MouseEventHandler(this.dataGrid_MouseMove);
288+ this.dataGrid.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dataGrid_MouseUp);
289289 //
290290 // Column1
291291 //
@@ -340,7 +340,7 @@
340340 this.menuStrip.Location = new System.Drawing.Point(0, 0);
341341 this.menuStrip.Name = "menuStrip";
342342 this.menuStrip.Padding = new System.Windows.Forms.Padding(6, 2, 0, 4);
343- this.menuStrip.Size = new System.Drawing.Size(750, 24);
343+ this.menuStrip.Size = new System.Drawing.Size(750, 27);
344344 this.menuStrip.TabIndex = 1;
345345 this.menuStrip.Text = "menuStrip";
346346 //
@@ -366,7 +366,7 @@
366366 this.ExitMenu});
367367 this.fileMenu.ForeColor = System.Drawing.SystemColors.ControlText;
368368 this.fileMenu.Name = "fileMenu";
369- this.fileMenu.Size = new System.Drawing.Size(71, 18);
369+ this.fileMenu.Size = new System.Drawing.Size(76, 21);
370370 this.fileMenu.Text = "ファイル(&F)";
371371 //
372372 // NewAnimeMenu
@@ -375,7 +375,7 @@
375375 this.NewAnimeMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia;
376376 this.NewAnimeMenu.Name = "NewAnimeMenu";
377377 this.NewAnimeMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
378- this.NewAnimeMenu.Size = new System.Drawing.Size(256, 22);
378+ this.NewAnimeMenu.Size = new System.Drawing.Size(266, 22);
379379 this.NewAnimeMenu.Text = "新しい番組(&N)";
380380 this.NewAnimeMenu.Click += new System.EventHandler(this.NewAnimeMenu_Click);
381381 //
@@ -385,7 +385,7 @@
385385 this.DeleteAnimeMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia;
386386 this.DeleteAnimeMenu.Name = "DeleteAnimeMenu";
387387 this.DeleteAnimeMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));
388- this.DeleteAnimeMenu.Size = new System.Drawing.Size(256, 22);
388+ this.DeleteAnimeMenu.Size = new System.Drawing.Size(266, 22);
389389 this.DeleteAnimeMenu.Text = "番組の削除(&D)";
390390 this.DeleteAnimeMenu.Click += new System.EventHandler(this.DeleteAnimeMenu_Click);
391391 //
@@ -395,14 +395,14 @@
395395 this.programPropertyMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia;
396396 this.programPropertyMenu.Name = "programPropertyMenu";
397397 this.programPropertyMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)));
398- this.programPropertyMenu.Size = new System.Drawing.Size(256, 22);
398+ this.programPropertyMenu.Size = new System.Drawing.Size(266, 22);
399399 this.programPropertyMenu.Text = "番組のプロパティ(&P)";
400400 this.programPropertyMenu.Click += new System.EventHandler(this.programPropertyMenu_Click);
401401 //
402402 // toolStripMenuItem1
403403 //
404404 this.toolStripMenuItem1.Name = "toolStripMenuItem1";
405- this.toolStripMenuItem1.Size = new System.Drawing.Size(253, 6);
405+ this.toolStripMenuItem1.Size = new System.Drawing.Size(263, 6);
406406 //
407407 // RefreshMenu
408408 //
@@ -410,7 +410,7 @@
410410 this.RefreshMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia;
411411 this.RefreshMenu.Name = "RefreshMenu";
412412 this.RefreshMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R)));
413- this.RefreshMenu.Size = new System.Drawing.Size(256, 22);
413+ this.RefreshMenu.Size = new System.Drawing.Size(266, 22);
414414 this.RefreshMenu.Text = "新着データ更新(&R)";
415415 this.RefreshMenu.Click += new System.EventHandler(this.RefreshMenu_Clicked);
416416 //
@@ -419,21 +419,21 @@
419419 this.ForceRefreshMenu.Image = global::magicAnime.Properties.Resources.FullUpdate;
420420 this.ForceRefreshMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia;
421421 this.ForceRefreshMenu.Name = "ForceRefreshMenu";
422- this.ForceRefreshMenu.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
423- | System.Windows.Forms.Keys.R)));
424- this.ForceRefreshMenu.Size = new System.Drawing.Size(256, 22);
422+ this.ForceRefreshMenu.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
423+ | System.Windows.Forms.Keys.R)));
424+ this.ForceRefreshMenu.Size = new System.Drawing.Size(266, 22);
425425 this.ForceRefreshMenu.Text = "完全データ更新(&E)";
426426 this.ForceRefreshMenu.Click += new System.EventHandler(this.ForceRefreshMenu_Click);
427427 //
428428 // toolStripSeparator1
429429 //
430430 this.toolStripSeparator1.Name = "toolStripSeparator1";
431- this.toolStripSeparator1.Size = new System.Drawing.Size(253, 6);
431+ this.toolStripSeparator1.Size = new System.Drawing.Size(263, 6);
432432 //
433433 // SortMenu
434434 //
435435 this.SortMenu.Name = "SortMenu";
436- this.SortMenu.Size = new System.Drawing.Size(256, 22);
436+ this.SortMenu.Size = new System.Drawing.Size(266, 22);
437437 this.SortMenu.Text = "番組をソート(&S)";
438438 this.SortMenu.Click += new System.EventHandler(this.SortMenu_Click);
439439 //
@@ -441,14 +441,14 @@
441441 //
442442 this.OnReleaseUnreadMenu.Name = "OnReleaseUnreadMenu";
443443 this.OnReleaseUnreadMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
444- this.OnReleaseUnreadMenu.Size = new System.Drawing.Size(256, 22);
444+ this.OnReleaseUnreadMenu.Size = new System.Drawing.Size(266, 22);
445445 this.OnReleaseUnreadMenu.Text = "全ての未読フラグを解除(&F)";
446446 this.OnReleaseUnreadMenu.Click += new System.EventHandler(this.OnReleaseUnreadMenu_Click);
447447 //
448448 // toolStripMenuItem4
449449 //
450450 this.toolStripMenuItem4.Name = "toolStripMenuItem4";
451- this.toolStripMenuItem4.Size = new System.Drawing.Size(253, 6);
451+ this.toolStripMenuItem4.Size = new System.Drawing.Size(263, 6);
452452 this.toolStripMenuItem4.Visible = false;
453453 //
454454 // StoreAllMenu
@@ -457,20 +457,20 @@
457457 this.StoreAllMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia;
458458 this.StoreAllMenu.Name = "StoreAllMenu";
459459 this.StoreAllMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T)));
460- this.StoreAllMenu.Size = new System.Drawing.Size(256, 22);
460+ this.StoreAllMenu.Size = new System.Drawing.Size(266, 22);
461461 this.StoreAllMenu.Text = "最終保存先へ転送(&M)";
462462 this.StoreAllMenu.Click += new System.EventHandler(this.StoreAllMenu_Click);
463463 //
464464 // toolStripMenuItem2
465465 //
466466 this.toolStripMenuItem2.Name = "toolStripMenuItem2";
467- this.toolStripMenuItem2.Size = new System.Drawing.Size(253, 6);
467+ this.toolStripMenuItem2.Size = new System.Drawing.Size(263, 6);
468468 //
469469 // OptionMenu
470470 //
471471 this.OptionMenu.Name = "OptionMenu";
472472 this.OptionMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
473- this.OptionMenu.Size = new System.Drawing.Size(256, 22);
473+ this.OptionMenu.Size = new System.Drawing.Size(266, 22);
474474 this.OptionMenu.Text = "オプション(&O)";
475475 this.OptionMenu.Click += new System.EventHandler(this.OptionMenu_Click);
476476 //
@@ -478,20 +478,20 @@
478478 //
479479 this.LogShowMenuItem.Name = "LogShowMenuItem";
480480 this.LogShowMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.K)));
481- this.LogShowMenuItem.Size = new System.Drawing.Size(256, 22);
481+ this.LogShowMenuItem.Size = new System.Drawing.Size(266, 22);
482482 this.LogShowMenuItem.Text = "ログ表示(&L)";
483483 this.LogShowMenuItem.Click += new System.EventHandler(this.LogShowMenuItem_Click);
484484 //
485485 // toolStripMenuItem3
486486 //
487487 this.toolStripMenuItem3.Name = "toolStripMenuItem3";
488- this.toolStripMenuItem3.Size = new System.Drawing.Size(253, 6);
488+ this.toolStripMenuItem3.Size = new System.Drawing.Size(263, 6);
489489 //
490490 // ExitMenu
491491 //
492492 this.ExitMenu.Name = "ExitMenu";
493493 this.ExitMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X)));
494- this.ExitMenu.Size = new System.Drawing.Size(256, 22);
494+ this.ExitMenu.Size = new System.Drawing.Size(266, 22);
495495 this.ExitMenu.Text = "終了(&X)";
496496 this.ExitMenu.Click += new System.EventHandler(this.ExitMenu_Click);
497497 //
@@ -504,7 +504,7 @@
504504 this.toolStripMenuItem7,
505505 this.AutoShutdownMenu});
506506 this.PowerMenuItem.Name = "PowerMenuItem";
507- this.PowerMenuItem.Size = new System.Drawing.Size(83, 18);
507+ this.PowerMenuItem.Size = new System.Drawing.Size(89, 21);
508508 this.PowerMenuItem.Text = "エンコード(&E)";
509509 this.PowerMenuItem.DropDownOpened += new System.EventHandler(this.PowerMenuItem_DropDownOpened);
510510 this.PowerMenuItem.Click += new System.EventHandler(this.PowerMenuItem_Click);
@@ -512,9 +512,9 @@
512512 // BatchEncodeAllMenu
513513 //
514514 this.BatchEncodeAllMenu.Name = "BatchEncodeAllMenu";
515- this.BatchEncodeAllMenu.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
516- | System.Windows.Forms.Keys.B)));
517- this.BatchEncodeAllMenu.Size = new System.Drawing.Size(354, 22);
515+ this.BatchEncodeAllMenu.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
516+ | System.Windows.Forms.Keys.B)));
517+ this.BatchEncodeAllMenu.Size = new System.Drawing.Size(370, 22);
518518 this.BatchEncodeAllMenu.Text = "未処理分をエンコードキューに入れる(&E)";
519519 this.BatchEncodeAllMenu.Click += new System.EventHandler(this.BatchEncodeAllMenu_Click);
520520 //
@@ -527,13 +527,13 @@
527527 toolStripSeparator6,
528528 this.BatchListNothingMenuItem});
529529 this.BatchListMenuItem.Name = "BatchListMenuItem";
530- this.BatchListMenuItem.Size = new System.Drawing.Size(354, 22);
530+ this.BatchListMenuItem.Size = new System.Drawing.Size(370, 22);
531531 this.BatchListMenuItem.Text = "バッチエンコードキュー";
532532 //
533533 // JobsCancelMenu
534534 //
535535 this.JobsCancelMenu.Name = "JobsCancelMenu";
536- this.JobsCancelMenu.Size = new System.Drawing.Size(174, 22);
536+ this.JobsCancelMenu.Size = new System.Drawing.Size(180, 22);
537537 this.JobsCancelMenu.Text = "全てキャンセル";
538538 this.JobsCancelMenu.Click += new System.EventHandler(this.JobsCancelMenu_Click);
539539 //
@@ -541,7 +541,7 @@
541541 //
542542 this.EncodingNothingMenuItem.Enabled = false;
543543 this.EncodingNothingMenuItem.Name = "EncodingNothingMenuItem";
544- this.EncodingNothingMenuItem.Size = new System.Drawing.Size(174, 22);
544+ this.EncodingNothingMenuItem.Size = new System.Drawing.Size(180, 22);
545545 this.EncodingNothingMenuItem.Text = "(エンコード中なし)";
546546 this.EncodingNothingMenuItem.Visible = false;
547547 //
@@ -549,19 +549,19 @@
549549 //
550550 this.BatchListNothingMenuItem.Enabled = false;
551551 this.BatchListNothingMenuItem.Name = "BatchListNothingMenuItem";
552- this.BatchListNothingMenuItem.Size = new System.Drawing.Size(174, 22);
552+ this.BatchListNothingMenuItem.Size = new System.Drawing.Size(180, 22);
553553 this.BatchListNothingMenuItem.Text = "(エンコード待ちなし)";
554554 this.BatchListNothingMenuItem.Visible = false;
555555 //
556556 // toolStripMenuItem7
557557 //
558558 this.toolStripMenuItem7.Name = "toolStripMenuItem7";
559- this.toolStripMenuItem7.Size = new System.Drawing.Size(351, 6);
559+ this.toolStripMenuItem7.Size = new System.Drawing.Size(367, 6);
560560 //
561561 // AutoShutdownMenu
562562 //
563563 this.AutoShutdownMenu.Name = "AutoShutdownMenu";
564- this.AutoShutdownMenu.Size = new System.Drawing.Size(354, 22);
564+ this.AutoShutdownMenu.Size = new System.Drawing.Size(370, 22);
565565 this.AutoShutdownMenu.Text = "エンコード完了時にシャットダウン(&S)";
566566 this.AutoShutdownMenu.Click += new System.EventHandler(this.AutoShutdownMenu_Click);
567567 //
@@ -574,37 +574,37 @@
574574 this.toolStripSeparator7,
575575 this.AboutMenu});
576576 this.ヘルプHToolStripMenuItem.Name = "ヘルプHToolStripMenuItem";
577- this.ヘルプHToolStripMenuItem.Size = new System.Drawing.Size(67, 18);
577+ this.ヘルプHToolStripMenuItem.Size = new System.Drawing.Size(74, 21);
578578 this.ヘルプHToolStripMenuItem.Text = "ヘルプ(&H)";
579579 //
580580 // helpMenu
581581 //
582582 this.helpMenu.Name = "helpMenu";
583- this.helpMenu.Size = new System.Drawing.Size(182, 22);
583+ this.helpMenu.Size = new System.Drawing.Size(188, 22);
584584 this.helpMenu.Text = "公式サイト(&W)";
585585 this.helpMenu.Click += new System.EventHandler(this.helpMenu_Click);
586586 //
587587 // toolStripMenuItem8
588588 //
589589 this.toolStripMenuItem8.Name = "toolStripMenuItem8";
590- this.toolStripMenuItem8.Size = new System.Drawing.Size(179, 6);
590+ this.toolStripMenuItem8.Size = new System.Drawing.Size(185, 6);
591591 //
592592 // applicationDataMenuItem
593593 //
594594 this.applicationDataMenuItem.Name = "applicationDataMenuItem";
595- this.applicationDataMenuItem.Size = new System.Drawing.Size(182, 22);
595+ this.applicationDataMenuItem.Size = new System.Drawing.Size(188, 22);
596596 this.applicationDataMenuItem.Text = "アプリケーションデータ";
597597 this.applicationDataMenuItem.Click += new System.EventHandler(this.applicationDataMenuItem_Click);
598598 //
599599 // toolStripSeparator7
600600 //
601601 this.toolStripSeparator7.Name = "toolStripSeparator7";
602- this.toolStripSeparator7.Size = new System.Drawing.Size(179, 6);
602+ this.toolStripSeparator7.Size = new System.Drawing.Size(185, 6);
603603 //
604604 // AboutMenu
605605 //
606606 this.AboutMenu.Name = "AboutMenu";
607- this.AboutMenu.Size = new System.Drawing.Size(182, 22);
607+ this.AboutMenu.Size = new System.Drawing.Size(188, 22);
608608 this.AboutMenu.Text = "バージョン情報(&A)...";
609609 this.AboutMenu.Click += new System.EventHandler(this.AboutMenu_Click);
610610 //
@@ -615,7 +615,7 @@
615615 this.toolStripMenuItem10,
616616 this.debugForceEmptyMenu});
617617 this.debugMenu.Name = "debugMenu";
618- this.debugMenu.Size = new System.Drawing.Size(75, 18);
618+ this.debugMenu.Size = new System.Drawing.Size(82, 21);
619619 this.debugMenu.Text = "デバッグ(&D)";
620620 this.debugMenu.Visible = false;
621621 this.debugMenu.DropDownOpening += new System.EventHandler(this.debugMenu_DropDownOpening);
@@ -623,19 +623,19 @@
623623 // debugShutdownMenu
624624 //
625625 this.debugShutdownMenu.Name = "debugShutdownMenu";
626- this.debugShutdownMenu.Size = new System.Drawing.Size(331, 22);
626+ this.debugShutdownMenu.Size = new System.Drawing.Size(333, 22);
627627 this.debugShutdownMenu.Text = "シャットダウンテスト";
628628 this.debugShutdownMenu.Click += new System.EventHandler(this.debugShutdownMenu_Click);
629629 //
630630 // toolStripMenuItem10
631631 //
632632 this.toolStripMenuItem10.Name = "toolStripMenuItem10";
633- this.toolStripMenuItem10.Size = new System.Drawing.Size(328, 6);
633+ this.toolStripMenuItem10.Size = new System.Drawing.Size(330, 6);
634634 //
635635 // debugForceEmptyMenu
636636 //
637637 this.debugForceEmptyMenu.Name = "debugForceEmptyMenu";
638- this.debugForceEmptyMenu.Size = new System.Drawing.Size(331, 22);
638+ this.debugForceEmptyMenu.Size = new System.Drawing.Size(333, 22);
639639 this.debugForceEmptyMenu.Text = "更新時、しょぼかる放送データを強制的に空にする";
640640 this.debugForceEmptyMenu.Click += new System.EventHandler(this.debugForceEmptyMenu_Click);
641641 //
@@ -648,9 +648,9 @@
648648 this.todayOnAirLabel,
649649 this.storeFolderLabel,
650650 this.recordDriveFreeSpaceLabel});
651- this.statusBar.Location = new System.Drawing.Point(0, 571);
651+ this.statusBar.Location = new System.Drawing.Point(0, 570);
652652 this.statusBar.Name = "statusBar";
653- this.statusBar.Size = new System.Drawing.Size(750, 29);
653+ this.statusBar.Size = new System.Drawing.Size(750, 30);
654654 this.statusBar.Stretch = false;
655655 this.statusBar.TabIndex = 2;
656656 this.statusBar.Text = "statusStrip1";
@@ -659,15 +659,15 @@
659659 //
660660 this.logStatusLabel.ActiveLinkColor = System.Drawing.SystemColors.ControlText;
661661 this.logStatusLabel.BackColor = System.Drawing.SystemColors.Control;
662- this.logStatusLabel.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)
663- | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
664- | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
662+ this.logStatusLabel.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)
663+ | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
664+ | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
665665 this.logStatusLabel.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter;
666666 this.logStatusLabel.Font = new System.Drawing.Font("メイリオ", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
667667 this.logStatusLabel.ForeColor = System.Drawing.SystemColors.ControlText;
668668 this.logStatusLabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
669669 this.logStatusLabel.Name = "logStatusLabel";
670- this.logStatusLabel.Size = new System.Drawing.Size(447, 24);
670+ this.logStatusLabel.Size = new System.Drawing.Size(437, 25);
671671 this.logStatusLabel.Spring = true;
672672 this.logStatusLabel.Text = "起動中・・・";
673673 this.logStatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -675,31 +675,31 @@
675675 //
676676 // toolStripStatusLabel1
677677 //
678- this.toolStripStatusLabel1.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)
679- | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
680- | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
678+ this.toolStripStatusLabel1.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)
679+ | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
680+ | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
681681 this.toolStripStatusLabel1.BorderStyle = System.Windows.Forms.Border3DStyle.Etched;
682682 this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
683683 this.toolStripStatusLabel1.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
684- this.toolStripStatusLabel1.Size = new System.Drawing.Size(94, 24);
684+ this.toolStripStatusLabel1.Size = new System.Drawing.Size(95, 25);
685685 this.toolStripStatusLabel1.Text = "今度の放送";
686686 //
687687 // todayOnAirLabel
688688 //
689- this.todayOnAirLabel.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)
690- | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
691- | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
689+ this.todayOnAirLabel.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)
690+ | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
691+ | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
692692 this.todayOnAirLabel.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter;
693693 this.todayOnAirLabel.Name = "todayOnAirLabel";
694694 this.todayOnAirLabel.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
695- this.todayOnAirLabel.Size = new System.Drawing.Size(24, 24);
695+ this.todayOnAirLabel.Size = new System.Drawing.Size(24, 25);
696696 //
697697 // storeFolderLabel
698698 //
699699 this.storeFolderLabel.AutoToolTip = true;
700- this.storeFolderLabel.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)
701- | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
702- | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
700+ this.storeFolderLabel.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)
701+ | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
702+ | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
703703 this.storeFolderLabel.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter;
704704 this.storeFolderLabel.Image = ((System.Drawing.Image)(resources.GetObject("storeFolderLabel.Image")));
705705 this.storeFolderLabel.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
@@ -709,7 +709,7 @@
709709 this.storeFolderLabel.LinkColor = System.Drawing.SystemColors.HotTrack;
710710 this.storeFolderLabel.Name = "storeFolderLabel";
711711 this.storeFolderLabel.Padding = new System.Windows.Forms.Padding(10, 2, 10, 2);
712- this.storeFolderLabel.Size = new System.Drawing.Size(86, 24);
712+ this.storeFolderLabel.Size = new System.Drawing.Size(87, 25);
713713 this.storeFolderLabel.Text = "保存先";
714714 this.storeFolderLabel.ToolTipText = "保存先";
715715 this.storeFolderLabel.Click += new System.EventHandler(this.storeFolderLabel_Click);
@@ -717,9 +717,9 @@
717717 // recordDriveFreeSpaceLabel
718718 //
719719 this.recordDriveFreeSpaceLabel.AutoToolTip = true;
720- this.recordDriveFreeSpaceLabel.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)
721- | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
722- | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
720+ this.recordDriveFreeSpaceLabel.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)
721+ | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
722+ | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
723723 this.recordDriveFreeSpaceLabel.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter;
724724 this.recordDriveFreeSpaceLabel.Image = ((System.Drawing.Image)(resources.GetObject("recordDriveFreeSpaceLabel.Image")));
725725 this.recordDriveFreeSpaceLabel.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
@@ -729,7 +729,7 @@
729729 this.recordDriveFreeSpaceLabel.LinkColor = System.Drawing.SystemColors.HotTrack;
730730 this.recordDriveFreeSpaceLabel.Name = "recordDriveFreeSpaceLabel";
731731 this.recordDriveFreeSpaceLabel.Padding = new System.Windows.Forms.Padding(10, 2, 10, 2);
732- this.recordDriveFreeSpaceLabel.Size = new System.Drawing.Size(84, 24);
732+ this.recordDriveFreeSpaceLabel.Size = new System.Drawing.Size(92, 25);
733733 this.recordDriveFreeSpaceLabel.Text = "0 [MB]";
734734 this.recordDriveFreeSpaceLabel.ToolTipText = "録画フォルダの空き容量";
735735 this.recordDriveFreeSpaceLabel.Click += new System.EventHandler(this.recordDriveFreeSpaceLabel_Click);
@@ -750,14 +750,14 @@
750750 this.unreadMenu,
751751 this.RecordPropertyMenu});
752752 this.contextMenuStrip.Name = "contextMenuStrip";
753- this.contextMenuStrip.Size = new System.Drawing.Size(219, 220);
753+ this.contextMenuStrip.Size = new System.Drawing.Size(225, 220);
754754 //
755755 // playMovieMenu
756756 //
757757 this.playMovieMenu.Image = ((System.Drawing.Image)(resources.GetObject("playMovieMenu.Image")));
758758 this.playMovieMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia;
759759 this.playMovieMenu.Name = "playMovieMenu";
760- this.playMovieMenu.Size = new System.Drawing.Size(218, 22);
760+ this.playMovieMenu.Size = new System.Drawing.Size(224, 22);
761761 this.playMovieMenu.Text = "再生(&P)";
762762 this.playMovieMenu.Click += new System.EventHandler(this.playMovieMenu_Click);
763763 //
@@ -766,40 +766,40 @@
766766 this.reserveMenu.Image = ((System.Drawing.Image)(resources.GetObject("reserveMenu.Image")));
767767 this.reserveMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia;
768768 this.reserveMenu.Name = "reserveMenu";
769- this.reserveMenu.Size = new System.Drawing.Size(218, 22);
769+ this.reserveMenu.Size = new System.Drawing.Size(224, 22);
770770 this.reserveMenu.Text = "録画予約(&R)";
771771 this.reserveMenu.Click += new System.EventHandler(this.reserveMenu_Click);
772772 //
773773 // cancelReserveMenu
774774 //
775775 this.cancelReserveMenu.Name = "cancelReserveMenu";
776- this.cancelReserveMenu.Size = new System.Drawing.Size(218, 22);
776+ this.cancelReserveMenu.Size = new System.Drawing.Size(224, 22);
777777 this.cancelReserveMenu.Text = "予約キャンセル";
778778 this.cancelReserveMenu.Click += new System.EventHandler(this.cancelReserveMenu_Click);
779779 //
780780 // extToolsGroupSeparator
781781 //
782782 this.extToolsGroupSeparator.Name = "extToolsGroupSeparator";
783- this.extToolsGroupSeparator.Size = new System.Drawing.Size(215, 6);
783+ this.extToolsGroupSeparator.Size = new System.Drawing.Size(221, 6);
784784 this.extToolsGroupSeparator.Visible = false;
785785 //
786786 // 拡張ツールToolStripMenuItem
787787 //
788788 this.拡張ツールToolStripMenuItem.Enabled = false;
789789 this.拡張ツールToolStripMenuItem.Name = "拡張ツールToolStripMenuItem";
790- this.拡張ツールToolStripMenuItem.Size = new System.Drawing.Size(218, 22);
790+ this.拡張ツールToolStripMenuItem.Size = new System.Drawing.Size(224, 22);
791791 this.拡張ツールToolStripMenuItem.Text = "拡張ツール";
792792 this.拡張ツールToolStripMenuItem.Visible = false;
793793 //
794794 // encodeGroupSeparator
795795 //
796796 this.encodeGroupSeparator.Name = "encodeGroupSeparator";
797- this.encodeGroupSeparator.Size = new System.Drawing.Size(215, 6);
797+ this.encodeGroupSeparator.Size = new System.Drawing.Size(221, 6);
798798 //
799799 // encodeMenu
800800 //
801801 this.encodeMenu.Name = "encodeMenu";
802- this.encodeMenu.Size = new System.Drawing.Size(218, 22);
802+ this.encodeMenu.Size = new System.Drawing.Size(224, 22);
803803 this.encodeMenu.Text = "エンコードキューに入れる(&E)";
804804 this.encodeMenu.Click += new System.EventHandler(this.encodeMenu_Click);
805805 //
@@ -808,19 +808,19 @@
808808 this.storeMenu.Image = global::magicAnime.Properties.Resources.SaveAll;
809809 this.storeMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia;
810810 this.storeMenu.Name = "storeMenu";
811- this.storeMenu.Size = new System.Drawing.Size(218, 22);
811+ this.storeMenu.Size = new System.Drawing.Size(224, 22);
812812 this.storeMenu.Text = "最終保存先へ転送(&M)";
813813 this.storeMenu.Click += new System.EventHandler(this.storeMenu_Click);
814814 //
815815 // toolStripMenuItem6
816816 //
817817 this.toolStripMenuItem6.Name = "toolStripMenuItem6";
818- this.toolStripMenuItem6.Size = new System.Drawing.Size(215, 6);
818+ this.toolStripMenuItem6.Size = new System.Drawing.Size(221, 6);
819819 //
820820 // renameFileMenu
821821 //
822822 this.renameFileMenu.Name = "renameFileMenu";
823- this.renameFileMenu.Size = new System.Drawing.Size(218, 22);
823+ this.renameFileMenu.Size = new System.Drawing.Size(224, 22);
824824 this.renameFileMenu.Text = "保存ファイル名にリネーム(&C)";
825825 this.renameFileMenu.Click += new System.EventHandler(this.renameFileMenu_Click);
826826 //
@@ -830,7 +830,7 @@
830830 this.unreadMenu.CheckState = System.Windows.Forms.CheckState.Checked;
831831 this.unreadMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia;
832832 this.unreadMenu.Name = "unreadMenu";
833- this.unreadMenu.Size = new System.Drawing.Size(218, 22);
833+ this.unreadMenu.Size = new System.Drawing.Size(224, 22);
834834 this.unreadMenu.Text = "未読フラグ(&U)";
835835 this.unreadMenu.Click += new System.EventHandler(this.unreadMenu_Click);
836836 //
@@ -839,14 +839,14 @@
839839 this.RecordPropertyMenu.Image = global::magicAnime.Properties.Resources.ProgramProperty;
840840 this.RecordPropertyMenu.ImageTransparentColor = System.Drawing.Color.Fuchsia;
841841 this.RecordPropertyMenu.Name = "RecordPropertyMenu";
842- this.RecordPropertyMenu.Size = new System.Drawing.Size(218, 22);
842+ this.RecordPropertyMenu.Size = new System.Drawing.Size(224, 22);
843843 this.RecordPropertyMenu.Text = "エピソードのプロパティ(&O)";
844844 this.RecordPropertyMenu.Click += new System.EventHandler(this.RecordPropertyMenu_Clicked);
845845 //
846846 // panel3
847847 //
848- this.panel3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
849- | System.Windows.Forms.AnchorStyles.Right)));
848+ this.panel3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
849+ | System.Windows.Forms.AnchorStyles.Right)));
850850 this.panel3.BackColor = System.Drawing.Color.Transparent;
851851 this.panel3.Controls.Add(this.datePictureBox);
852852 this.panel3.Controls.Add(this.statusPictureBox);
@@ -867,8 +867,8 @@
867867 //
868868 // titleLabel
869869 //
870- this.titleLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
871- | System.Windows.Forms.AnchorStyles.Right)));
870+ this.titleLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
871+ | System.Windows.Forms.AnchorStyles.Right)));
872872 this.titleLabel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
873873 this.titleLabel.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
874874 this.titleLabel.Location = new System.Drawing.Point(97, 7);
@@ -888,8 +888,8 @@
888888 //
889889 // dateTimeLabel
890890 //
891- this.dateTimeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
892- | System.Windows.Forms.AnchorStyles.Right)));
891+ this.dateTimeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
892+ | System.Windows.Forms.AnchorStyles.Right)));
893893 this.dateTimeLabel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
894894 this.dateTimeLabel.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
895895 this.dateTimeLabel.Location = new System.Drawing.Point(412, 60);
@@ -909,8 +909,8 @@
909909 //
910910 // filePathLabel
911911 //
912- this.filePathLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
913- | System.Windows.Forms.AnchorStyles.Right)));
912+ this.filePathLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
913+ | System.Windows.Forms.AnchorStyles.Right)));
914914 this.filePathLabel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
915915 this.filePathLabel.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
916916 this.filePathLabel.Location = new System.Drawing.Point(97, 31);
@@ -939,7 +939,7 @@
939939 this.toolStripSeparator4,
940940 this.thumbnailModeButton,
941941 this.logButton});
942- this.mainToolBar.Location = new System.Drawing.Point(0, 24);
942+ this.mainToolBar.Location = new System.Drawing.Point(0, 27);
943943 this.mainToolBar.Name = "mainToolBar";
944944 this.mainToolBar.Size = new System.Drawing.Size(750, 39);
945945 this.mainToolBar.Stretch = true;
@@ -1022,7 +1022,7 @@
10221022 //
10231023 this.unreadListMenu.Enabled = false;
10241024 this.unreadListMenu.Name = "unreadListMenu";
1025- this.unreadListMenu.Size = new System.Drawing.Size(102, 22);
1025+ this.unreadListMenu.Size = new System.Drawing.Size(108, 22);
10261026 this.unreadListMenu.Text = "(なし)";
10271027 //
10281028 // toolStripSeparator5
@@ -1069,26 +1069,26 @@
10691069 // weekModeMenu
10701070 //
10711071 this.weekModeMenu.Name = "weekModeMenu";
1072- this.weekModeMenu.Size = new System.Drawing.Size(168, 22);
1072+ this.weekModeMenu.Size = new System.Drawing.Size(177, 22);
10731073 this.weekModeMenu.Text = "週単位で表示(&W)";
10741074 this.weekModeMenu.Click += new System.EventHandler(this.weakModeMenu_Click);
10751075 //
10761076 // dayModeMenu
10771077 //
10781078 this.dayModeMenu.Name = "dayModeMenu";
1079- this.dayModeMenu.Size = new System.Drawing.Size(168, 22);
1079+ this.dayModeMenu.Size = new System.Drawing.Size(177, 22);
10801080 this.dayModeMenu.Text = "日単位で表示(&D)";
10811081 this.dayModeMenu.Click += new System.EventHandler(this.dayModeMenu_Click);
10821082 //
10831083 // toolStripMenuItem9
10841084 //
10851085 this.toolStripMenuItem9.Name = "toolStripMenuItem9";
1086- this.toolStripMenuItem9.Size = new System.Drawing.Size(165, 6);
1086+ this.toolStripMenuItem9.Size = new System.Drawing.Size(174, 6);
10871087 //
10881088 // calenderModeOptionMenu
10891089 //
10901090 this.calenderModeOptionMenu.Name = "calenderModeOptionMenu";
1091- this.calenderModeOptionMenu.Size = new System.Drawing.Size(168, 22);
1091+ this.calenderModeOptionMenu.Size = new System.Drawing.Size(177, 22);
10921092 this.calenderModeOptionMenu.Text = "設定(&S)";
10931093 this.calenderModeOptionMenu.Click += new System.EventHandler(this.calenderModeOptionMenu_Click);
10941094 //
@@ -1126,9 +1126,9 @@
11261126 //
11271127 // viewSplitContainer
11281128 //
1129- this.viewSplitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
1130- | System.Windows.Forms.AnchorStyles.Left)
1131- | System.Windows.Forms.AnchorStyles.Right)));
1129+ this.viewSplitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
1130+ | System.Windows.Forms.AnchorStyles.Left)
1131+ | System.Windows.Forms.AnchorStyles.Right)));
11321132 this.viewSplitContainer.Location = new System.Drawing.Point(0, 149);
11331133 this.viewSplitContainer.Name = "viewSplitContainer";
11341134 this.viewSplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
@@ -1146,9 +1146,9 @@
11461146 //
11471147 // logListBox
11481148 //
1149- this.logListBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
1150- | System.Windows.Forms.AnchorStyles.Left)
1151- | System.Windows.Forms.AnchorStyles.Right)));
1149+ this.logListBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
1150+ | System.Windows.Forms.AnchorStyles.Left)
1151+ | System.Windows.Forms.AnchorStyles.Right)));
11521152 this.logListBox.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
11531153 this.logListBox.FormattingEnabled = true;
11541154 this.logListBox.IntegralHeight = false;
@@ -1173,12 +1173,12 @@
11731173 this.MainMenuStrip = this.menuStrip;
11741174 this.Name = "MainForm";
11751175 this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
1176- this.Text = "mAgicAnime.NET Ver.7sh mod. yossiepon_20150705";
1176+ this.Text = "mAgicAnime.NET Ver.7sh mod. yossiepon_20150815";
1177+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
1178+ this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed);
11771179 this.Load += new System.EventHandler(this.MainForm_Load);
11781180 this.Shown += new System.EventHandler(this.MainForm_Shown);
1179- this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed);
1180- this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
1181- this.Resize += new System.EventHandler(this.MainForm_Resize);
1181+ this.Resize += new System.EventHandler(this.MainForm_Resize);
11821182 ((System.ComponentModel.ISupportInitialize)(this.filePictureBox)).EndInit();
11831183 ((System.ComponentModel.ISupportInitialize)(this.titlePictureBox)).EndInit();
11841184 ((System.ComponentModel.ISupportInitialize)(this.statusPictureBox)).EndInit();
--- a/UserInterface/MainForm.cs
+++ b/UserInterface/MainForm.cs
@@ -1064,7 +1064,7 @@ namespace magicAnime
10641064 }
10651065
10661066 // mod. yossiepon_20150705
1067- text = string.Format( "{0}", episode.StoryNoStr.Length > 0 ? episode.StoryNoStr : episode.StoryNumber.ToString("0") );
1067+ text = episode.StoryNoStr.Length > 0 ? episode.StoryNoStr : episode.StoryNumber.ToString("0");
10681068
10691069 g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias; // アンチエイリアス有効
10701070
--- a/UserInterface/MainForm.resx
+++ b/UserInterface/MainForm.resx
@@ -154,9 +154,9 @@
154154 <data name="DeleteAnimeMenu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
155155 <value>
156156 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
157- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABUSURBVDhPY2AYNOA/A8P/BiDG5yCQPEgdVjUwSVyGEJIH
158- G4pLEVGaYc5CV0ySZmyGEBM2ZIUJ3thHdjbJLqAoDCiKBUKhTUgelLwoS4mDJk+R7BAAPHRfs0KbtpEA
159- AAAASUVORK5CYII=
157+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABQSURBVDhP3YzRCgAgCAP99P68UhyUYCr0EB1ByLajd+jz
158+ Nfl8OOeenjsIPUmUC14pNQa2XBqDdVQeg2vjssSOShKvnJJEpVByDBVI9PwDogE8dF+zRMASNwAAAABJ
159+ RU5ErkJggg==
160160 </value>
161161 </data>
162162 <metadata name="statusBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -165,19 +165,19 @@
165165 <data name="storeFolderLabel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
166166 <value>
167167 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
168- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACuSURBVDhPrZILDsIwCIZ3QKdH6tkU35vPaDwO/lS7tKV0
169- alzyJYPC143QNP9+nHMc85VfGvkxSZDcR5JSc5CNSnzzDTcL9zJViRcYjSGfzyYResG5Tbkgtri2ftBE
170- 9JqPFxzREHNCXEELejTkHJAz0IL9lLlEh3wCpF3pF7YotNjhLEN/wQpF6wobnEVoAaFAWFaQS95owXzG
171- HFjg3YJwBpSgtChjuWEPZBck+IUn4Ow3AwFXGwoAAAAASUVORK5CYII=
168+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACXSURBVDhPrc1bEoIwDEBRFyi6pK5No7wEXwPDckpSCrRN
169+ CeDYmfMBaW4Pfz9KKe2yv7cdWtDd0bM5ElserUbMcoOXSRsnRkwgsuSiOyG7bgPvxPcRfBMTAIAhYgJP
170+ HLheMh6ocBCql/FAeYp7hDCAeCDH4ZKC44E7DlJB5uMBwAG5CegRiwcu59lVAAMW+MUUoEMf+4HuAeDs
171+ NwPpmKMNAAAAAElFTkSuQmCC
172172 </value>
173173 </data>
174174 <data name="recordDriveFreeSpaceLabel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
175175 <value>
176176 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
177- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACuSURBVDhPrZILDsIwCIZ3QKdH6tkU35vPaDwO/lS7tKV0
178- alzyJYPC143QNP9+nHMc85VfGvkxSZDcR5JSc5CNSnzzDTcL9zJViRcYjSGfzyYResG5Tbkgtri2ftBE
179- 9JqPFxzREHNCXEELejTkHJAz0IL9lLlEh3wCpF3pF7YotNjhLEN/wQpF6wobnEVoAaFAWFaQS95owXzG
180- HFjg3YJwBpSgtChjuWEPZBck+IUn4Ow3AwFXGwoAAAAASUVORK5CYII=
177+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACXSURBVDhPrc1bEoIwDEBRFyi6pK5No7wEXwPDckpSCrRN
178+ CeDYmfMBaW4Pfz9KKe2yv7cdWtDd0bM5ElserUbMcoOXSRsnRkwgsuSiOyG7bgPvxPcRfBMTAIAhYgJP
179+ HLheMh6ocBCql/FAeYp7hDCAeCDH4ZKC44E7DlJB5uMBwAG5CegRiwcu59lVAAMW+MUUoEMf+4HuAeDs
180+ NwPpmKMNAAAAAElFTkSuQmCC
181181 </value>
182182 </data>
183183 <metadata name="contextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -186,19 +186,19 @@
186186 <data name="playMovieMenu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
187187 <value>
188188 iVBORw0KGgoAAAANSUhEUgAAABAAAAAPCAYAAADtc08vAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
189- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD2SURBVDhPrZLJTgJBFEX7R1C6m1F+hX8lhCCRiMosEEUG
190- IzIZokZCggs2hJ6utzq96IVANVrrOue+d6sU5b/PdpfCn5wbCtZGEl9G4jTR9+4CSwrejThmZiy4ZEX4
191- g+lzM45XM4qBFcGDpcuLPgm/ER4zfWhF8UhBy9ZQtVU5yYLwhPAz4SfCbVtHjYJbO4wr5xw55+ywaEr4
192- haP3CHc4eoPwHdOLThh5whmEoGXT+yUjwn1v7ybhMuFrwpdMF+BBWLz/wN1bxz3hCuES4YIHS/2Prlua
193- 2FvFDWGpVL9Z7F13S1OPj/vbSKK0wKl+0dGSpIoIcOkHMFbE8bhqLLoAAAAASUVORK5CYII=
189+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADySURBVDhPrdDJTsJgFAXgvojQgVqVV+FdCTFoJIrKPERR
190+ qwEZNEYNhAQWbgidDudvStKNTdtwVl30O/e/Vzp4Nts8gs90+WPByjrF3DpJV7TenmHBgm/LwMw+Tl6y
191+ JP7h9A/bwLutw3RyeHC0+EW/xJ/EY05/dXQ8sqDrqqi7SrySL+IJ8RvxE3HP1dBgwa0r48rL4tzLRBdN
192+ iYd8+jNxn09vEd9xesWTUSYu4ghqqfB/yYj4Jdi7TXxPfE18wekCRmIR099bQ4e4RnxDfBng4JfoDPyj
193+ ib0VVIljTQ1H7N30j6Ykg/uIoyWeGk5qmC6StAMwVsTxitghiQAAAABJRU5ErkJggg==
194194 </value>
195195 </data>
196196 <data name="reserveMenu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
197197 <value>
198198 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
199- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAB+SURBVDhPtZNhDsAwBEYdvUdzM5sNMaWRNmviR8v3qCrA
200- X2sAkLd2HhXRDfCm50sQB5mIwhIfx6QQFSNilNr+8cnVJohlL+QA4/VkgLZY4RGyAlhmX1kXwGJvxugC
201- ym7u9KHMrs9x/IwMOhokX8kH5CawnMJsNLc/U/vXSeAFxyWgDd4W+t4AAAAASUVORK5CYII=
199+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABzSURBVDhPtZGBCoAwCAX99D5tf1Z74RtTs7mgAyFsdwuS
200+ 3zhEznl0vYZCN8yUQkb06D6NUG6tqRG532WRcXtCP8GHGCjLxEfeAkEG1QDkeQbVQIoPgHLkSQYMfP6N
201+ YHwFxqP7VCY4YEI63OuxNRS2xT1ELscloA08hCwWAAAAAElFTkSuQmCC
202202 </value>
203203 </data>
204204 <metadata name="mainToolBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/UserInterface/OptionDialog.Designer.cs
+++ b/UserInterface/OptionDialog.Designer.cs
@@ -658,7 +658,7 @@
658658 this.label64.Size = new System.Drawing.Size(468, 45);
659659 this.label64.TabIndex = 3;
660660 this.label64.Text = "放送時間が重複したとき、優先度が高い番組を録画(予約)します。\r\nチューナが足りない番組は最初から予約しません。(重複アイコンが表示されます)\r\n無効にすると、チ" +
661- "ューナ数に関係なく予約を試みます、";
661+ "ューナ数に関係なく予約を試みます、";
662662 //
663663 // label63
664664 //
@@ -849,7 +849,7 @@
849849 this.label10.Size = new System.Drawing.Size(502, 47);
850850 this.label10.TabIndex = 10;
851851 this.label10.Text = "mAgicAnimeが録画ソフトに渡す識別ＩＤ(番組名に含む)を利用して検索します。\r\n録画ソフト側でID(番組名)がファイル名に反映されるよう設定しておく必要が" +
852- "あります。\r\n※ 複数の番組を同時に予約録画する場合はこちらを選択して下さい。";
852+ "あります。\r\n※ 複数の番組を同時に予約録画する場合はこちらを選択して下さい。";
853853 //
854854 // specifiedByNameRadioButton
855855 //
@@ -1013,7 +1013,7 @@
10131013 this.label46.Size = new System.Drawing.Size(405, 45);
10141014 this.label46.TabIndex = 2;
10151015 this.label46.Text = "複数のエンコード処理を同時に行います。\r\n(同時処理が安全かどうかはエンコードソフトやスクリプトに依存します)\r\n※ mAgicAnimeを再起動した後に有効とな" +
1016- "ります。";
1016+ "ります。";
10171017 //
10181018 // label45
10191019 //
@@ -1471,7 +1471,9 @@
14711471 this.saveNameFormatComboBox.Items.AddRange(new object[] {
14721472 "{0} 第{1:00}話 「{2}」",
14731473 "{0}{1:0} - {2}",
1474- "{0}_{1}_{2}_{3}_{4}_{5}"});
1474+ "{0} 第{6}話 「{2}」",
1475+ "{0}{6} - {2}",
1476+ "{0}_{1}_{2}_{3}_{4}_{5}_{6}"});
14751477 this.saveNameFormatComboBox.Location = new System.Drawing.Point(104, 52);
14761478 this.saveNameFormatComboBox.Name = "saveNameFormatComboBox";
14771479 this.saveNameFormatComboBox.Size = new System.Drawing.Size(294, 23);
--- 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 Ver.7sh mod. yossiepon_20150705";
67+ mNotifyIcon.Text = "mAgicAnime Ver.7sh mod. yossiepon_20150815";
6868 // trayIcon.Icon = ((System.Drawing.Icon)(resources.GetObject( "notifyIcon.Icon" )));
6969
7070 //---------------------------
--- a/app.config
+++ b/app.config
@@ -297,11 +297,17 @@
297297 <value>http://members2.jcom.home.ne.jp/kurusugawa/mAgicAnime/</value>
298298 </setting>
299299 <setting name="specifiedNameFormat" serializeAs="String">
300- <value>A{0:0}_{1:0}</value>
300+ <value>A{0}_{1}</value>
301301 </setting>
302302 <setting name="thumbnailWhitebar" serializeAs="String">
303303 <value>13</value>
304304 </setting>
305+ <setting name="storyNoFormat" serializeAs="String">
306+ <value>00</value>
307+ </setting>
308+ <setting name="unnumberedEpisodePrefix" serializeAs="String">
309+ <value>SP</value>
310+ </setting>
305311 </magicAnime.Properties.Settings>
306312 </applicationSettings>
307313 <startup><supportedRuntime version="v2.0.50727"/></startup></configuration>