Commit: d2ee911960f560acc41c22624588de6b18068186 - mAgicAnimeMod (git)

mAgicAnime 俺用改造版

Commit MetaInfo

• Revisión: d2ee911960f560acc41c22624588de6b18068186 (tree)
• Tiempo: 2016-10-30 07:13:26
• Autor: yoshy <yoshy@user...>
• Commiter: yoshy

Log Message

[ADD] 放送プランデータ異常時に警告アイコンを表示する機能を追加
[ADD] 通常回・特番回末尾のデータが未定・異常時に削除する機能を追加
[ADD] 選択した番組のみデータ更新する機能を追加

Cambiar Resumen

• modified: Properties/AssemblyInfo.cs
• modified: RecordingManager/ReserveManager.cs
• modified: UserInterface/MainForm.Designer.cs
• modified: UserInterface/MainForm.cs
• modified: UserInterface/TrayIcon.cs

Diferencia incremental

--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // アセンブリに関する一般情報は以下の属性セットをとおして制御されます。 
 // アセンブリに関連付けられている情報を変更するには、
 // これらの属性値を変更してください。
-[assembly: AssemblyTitle("mAgicAnime fix. yossiepon_20151025")]
+[assembly: AssemblyTitle("mAgicAnime fix. yossiepon_20160925")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("mAgicAnime.NET (fix. yossiepon_20151025)")]
+[assembly: AssemblyProduct("mAgicAnime.NET (fix. yossiepon_20160925)")]
 [assembly: AssemblyCopyright("Copyright (C) 2006-2010 mAgicAnime Project")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -30,4 +30,4 @@ using System.Runtime.InteropServices;
 //      Revision
 //
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.14.20151025")]
+[assembly: AssemblyFileVersion("2.0.14.20160925")]

--- a/RecordingManager/ReserveManager.cs
+++ b/RecordingManager/ReserveManager.cs
@@ -302,7 +302,7 @@ namespace magicAnime
 
 			if ( sched == null ) return ChangeResult.Dontcare;
 
-			// mod. yossiepon_20150815 begin
+			// add yossiepon 20150815 begin
 
 			// ファイル名によって録画ファイルを特定？
 			if ( Settings.Default.specifiedFile == IdentifyFileMethod.ByFileNameWithID )
@@ -313,7 +313,7 @@ namespace magicAnime
 					title									); // IDを含んだ録画タイトルにする
 			}
 
-			// mod. yossiepon_20150815 end
+			// add yossiepon 20150815 end
 
 			Logger.Output("(予約)時間変更操作 " + start.ToString() + "(" + title + ")" );
 
@@ -358,7 +358,7 @@ namespace magicAnime
 				//-----------------------
 				try
 				{
-					// mod. yossiepon_20150815 begin
+					// del yossiepon 20150815 begin
 
 					//// ファイル名によって録画ファイルを特定？
 					//if ( Settings.Default.specifiedFile == IdentifyFileMethod.ByFileNameWithID )
@@ -369,7 +369,7 @@ namespace magicAnime
 					//		title									); // IDを含んだ録画タイトルにする
 					//}
 
-					// mod. yossiepon_20150815 end
+					// del yossiepon 20150815 end
 
 					sched.MakeReservation(
 						title									,

--- a/UserInterface/MainForm.Designer.cs
+++ b/UserInterface/MainForm.Designer.cs
@@ -98,6 +98,9 @@
 			this.encodeGroupSeparator = new System.Windows.Forms.ToolStripSeparator();
 			this.encodeMenu = new System.Windows.Forms.ToolStripMenuItem();
 			this.storeMenu = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+            this.updateProgramPlanMenu = new System.Windows.Forms.ToolStripMenuItem();
+            this.deleteInvalidEpisode = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripSeparator();
 			this.renameFileMenu = new System.Windows.Forms.ToolStripMenuItem();
 			this.unreadMenu = new System.Windows.Forms.ToolStripMenuItem();
@@ -745,12 +748,15 @@
             this.encodeGroupSeparator,
             this.encodeMenu,
             this.storeMenu,
+            this.toolStripSeparator9,
+            this.updateProgramPlanMenu,
+            this.deleteInvalidEpisode,
             this.toolStripMenuItem6,
             this.renameFileMenu,
             this.unreadMenu,
             this.RecordPropertyMenu});
 			this.contextMenuStrip.Name = "contextMenuStrip";
-			this.contextMenuStrip.Size = new System.Drawing.Size(219, 220);
+			this.contextMenuStrip.Size = new System.Drawing.Size(219, 292);
 			// 
 			// playMovieMenu
 			// 
@@ -812,6 +818,25 @@
 			this.storeMenu.Text = "最終保存先へ転送(&M)";
 			this.storeMenu.Click += new System.EventHandler(this.storeMenu_Click);
 			// 
+            // toolStripSeparator9
+            // 
+            this.toolStripSeparator9.Name = "toolStripSeparator9";
+            this.toolStripSeparator9.Size = new System.Drawing.Size(199, 6);
+            // 
+            // updateProgramPlanMenu
+            // 
+            this.updateProgramPlanMenu.Name = "updateProgramPlanMenu";
+            this.updateProgramPlanMenu.Size = new System.Drawing.Size(202, 22);
+            this.updateProgramPlanMenu.Text = "この番組のみデータ更新(&P)";
+            this.updateProgramPlanMenu.Click += new System.EventHandler(this.updateProgramPlanMenu_Click);
+            // 
+            // deleteInvalidEpisode
+            // 
+            this.deleteInvalidEpisode.Name = "deleteInvalidEpisode";
+            this.deleteInvalidEpisode.Size = new System.Drawing.Size(202, 22);
+            this.deleteInvalidEpisode.Text = "無効な最終回を削除(&D)";
+            this.deleteInvalidEpisode.Click += new System.EventHandler(this.deleteInvalidEpisode_Click);
+            // 
 			// toolStripMenuItem6
 			// 
 			this.toolStripMenuItem6.Name = "toolStripMenuItem6";
@@ -1173,7 +1198,7 @@
 			this.MainMenuStrip = this.menuStrip;
 			this.Name = "MainForm";
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-			this.Text = "mAgicAnime.NET fix. yossiepon_20151025";
+			this.Text = "mAgicAnime.NET fix. yossiepon_20160925";
 			this.Load += new System.EventHandler(this.MainForm_Load);
 			this.Shown += new System.EventHandler(this.MainForm_Shown);
 			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed);
@@ -1297,6 +1322,9 @@
 		private System.Windows.Forms.PictureBox datePictureBox;
 		private System.Windows.Forms.ToolStripMenuItem debugForceEmptyMenu;
 		private System.Windows.Forms.ToolStripSeparator toolStripMenuItem10;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
+        private System.Windows.Forms.ToolStripMenuItem updateProgramPlanMenu;
+        private System.Windows.Forms.ToolStripMenuItem deleteInvalidEpisode;
 	}
 }
 

--- a/UserInterface/MainForm.cs
+++ b/UserInterface/MainForm.cs
@@ -805,6 +805,9 @@ namespace magicAnime
 			AnimeEpisode	episode		= null;
 			int				storyNumber	= 0;
 			Icon			icon		= null;
+            // add yossiepon 20160924 begin
+            Icon            icon2       = null;
+            // add yossiepon 20160924 end
 			string			text;
 			int				cellX,	cellY;
 			bool			border		= false;
@@ -1044,6 +1047,19 @@ namespace magicAnime
 								g.DrawIcon( icon, new Rectangle( newRect.X + 24, newRect.Y + 12, 16, 16 ) );
 						}
 
+                        // add yossiepon 20160924 begin
+                        // 放送プランデータ異常のセルに警告アイコンを表示する
+                        if (episode.PlanError)
+                            icon2 = mViewIcons.warnIcon;
+
+                        if (icon2 != null)
+                        {
+                            if (thumbnailModeButton.Checked)
+                                g.DrawIcon(icon2, new Rectangle(newRect.X + 18, newRect.Y + 4, 12, 12));
+                            else
+                                g.DrawIcon(icon2, new Rectangle(newRect.X + 6, newRect.Y + 12, 16, 16));
+                        }
+                        // add yossiepon 20160924 end
 					}
 
 					//----------------------
@@ -1654,6 +1670,10 @@ namespace magicAnime
 					bool	enableCancel	= true;
 					bool	enableUnread	= true;
 					bool	enableProp		= true;
+                    // add yossiepon 20160924 begin
+                    bool    enableUpdateProg    = true;
+                    bool    enableDeleteInv     = false;
+                    // add yossiepon 20160924 end
 
 					foreach(AnimeEpisode ep in episodes)
 					{
@@ -1676,6 +1696,27 @@ namespace magicAnime
 						enableProp		&= !isMulti;
 					}
 
+                    // add yossiepon 20160925 begin
+                    // 無効データ削除判定１：選択セルが１つ
+                    if (!isMulti)
+                    {
+                        AnimeEpisode ep = episodes[0];
+                        AnimeEpisode lastEp;
+
+                        AnimeProgram prog = ep.Parent;
+
+                        // 通常回の最後を取得
+                        lastEp = prog.Episodes[prog.Episodes.Count - 1];
+
+                        // 無効データ削除判定２：選択中のセルが放送プランデータ異常またはプランなし、かつ未予約、かつファイルなし、かつ最終回か？
+                        if ( (ep.PlanError || !ep.HasPlan) && !ep.IsReserved && !ep.HasFile && (ep == lastEp) )
+                        {
+                            // メニュー有効
+                            enableDeleteInv = true;
+                        }
+                    }
+                    // add yossiepon 20160925 end
+
 					//--------------------------------
 					// 拡張ツール項目
 					//--------------------------------
@@ -1727,6 +1768,10 @@ namespace magicAnime
 					cancelReserveMenu.Enabled	= enableCancel;
 					unreadMenu.Enabled			= enableUnread;
 					RecordPropertyMenu.Enabled	= enableProp;
+                    // add yossiepon 20160924 begin
+                    updateProgramPlanMenu.Enabled   = enableUpdateProg;
+                    deleteInvalidEpisode.Enabled    = enableDeleteInv;
+                    // add yossiepon 20160924 end
 
 					unreadMenu.Checked = !isMulti && episodes[0].Unread;
 					unreadMenu.Visible = !Settings.Default.disableUnread;
@@ -2973,6 +3018,56 @@ namespace magicAnime
 			}
 		}
 
+        // add yossiepon 20160924 begin
+        //=========================================================================
+        ///	<summary>
+        ///		番組データ更新メニュー項目のクリック処理
+        ///	</summary>
+        /// <remarks>
+        /// </remarks>
+        /// <history>2006/XX/XX 新規作成</history>
+        //========================================================================
+        private void updateProgramPlanMenu_Click(object sender, EventArgs e)
+        {
+            var episodes = GridSelectEpisodes;
+
+            if (1 != episodes.Count)
+                return;
+
+            AnimeEpisode ep = episodes[0];
+            AnimeProgram prog = ep.Parent;
+            List<AnimeProgram> animes = new List<AnimeProgram>();
+            animes.Add(prog);
+
+            AnimeServer.GetInstance().BeginUpdate(updateOption.Force, animes);
+            RefreshContent();
+        }
+
+        //=========================================================================
+        ///	<summary>
+        ///		無効最終回削除メニュー項目のクリック処理
+        ///	</summary>
+        /// <remarks>
+        /// </remarks>
+        /// <history>2006/XX/XX 新規作成</history>
+        //========================================================================
+        private void deleteInvalidEpisode_Click(object sender, EventArgs e)
+        {
+            var episodes = GridSelectEpisodes;
+
+            if (1 != episodes.Count)
+                return;
+
+            AnimeEpisode ep = episodes[0];
+            AnimeProgram prog = ep.Parent;
+
+            // 通常回の最後を削除
+            if (prog.StoryCount > 0)
+            {
+                prog.StoryCount = prog.StoryCount - 1;
+            }
+        }
+        // add yossiepon 20160924 end
 	}
 	
 }

--- a/UserInterface/TrayIcon.cs
+++ b/UserInterface/TrayIcon.cs
@@ -64,7 +64,7 @@ namespace magicAnime.UserInterface
 			mNotifyIcon.DoubleClick		+= notifyIcon_DoubleClick;
 			mNotifyIcon.BalloonTipIcon	= ToolTipIcon.Info;
 			mNotifyIcon.BalloonTipTitle	= "mAgicAnime";
-			mNotifyIcon.Text			= "mAgicAnime fix. yossiepon_20151025";
+			mNotifyIcon.Text			= "mAgicAnime fix. yossiepon_20160925";
 //			trayIcon.Icon = ((System.Drawing.Icon)(resources.GetObject( "notifyIcon.Icon" )));
 
 			//---------------------------