コミット: 4a18770599868d431860c3b9c0da6eb33e112e5f - mAgicAnimeMod (git)

mAgicAnime 俺用改造版

コミットメタ情報

• リビジョン: 4a18770599868d431860c3b9c0da6eb33e112e5f (tree)
• 日時: 2019-11-24 18:55:13
• 作者: yoshy <yoshy@user...>
• コミッター: yoshy

ログメッセージ

[UPD] fix.版にもななし版の一部機能を取り込み（以下）

[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でブラウザを開くようにした

変更サマリ

• modified: PathHelper.cs
• modified: RecordingManager/EncodeManager/CmdLineEncoder/CmdLineEncoderPlugin.cs
• modified: User32API.cs
• modified: UserInterface/AnimeDialog.Designer.cs
• modified: UserInterface/AnimeDialog.cs
• modified: UserInterface/CalenderOptionDialog.cs
• modified: UserInterface/MainForm.Designer.cs
• modified: UserInterface/MainForm.cs

差分

--- a/PathHelper.cs
+++ b/PathHelper.cs
@@ -33,10 +33,10 @@ namespace Helpers
 			name = name.Replace( ':', '：' );
 			name = name.Replace( ':', '：' );
 			name = name.Replace( '\"', '”' );
-// mod. yossiepon_20151025 begin
+            // add yossiepon 20151025 begin
 			name = name.Replace( '|', '｜' );
 			name = name.Replace( '%', '％' );
-// mod. yossiepon_20151025 end
+            // add yossiepon 20151025 end
 
 			// 無効な文字を削除する
 			name = name.TrimStart( Path.GetInvalidFileNameChars() );

--- a/RecordingManager/EncodeManager/CmdLineEncoder/CmdLineEncoderPlugin.cs
+++ b/RecordingManager/EncodeManager/CmdLineEncoder/CmdLineEncoderPlugin.cs
@@ -331,6 +331,9 @@ namespace magicAnime.RecordingManager.EncodeManager.CmdLineEncoder
 
 			process.WaitForExit();
 
+            if (process.ExitCode != 0)
+                throw new Exception("エンコードに失敗した (終了コード: " + process.ExitCode + ")"); 
+
 			if (abortEncode)
 				throw new AbortException();
 

--- a/User32API.cs
+++ b/User32API.cs
@@ -126,8 +126,6 @@ namespace User32API
 
 				gctext.Free();
 
-				string aa;
-
 				text = Encoding.GetEncoding( 932 ).GetString( buffer, 0, 250 );
 
 				Console.Write( text );

--- a/UserInterface/AnimeDialog.Designer.cs
+++ b/UserInterface/AnimeDialog.Designer.cs
@@ -132,6 +132,7 @@
 			this.linkLabel2.TabIndex = 6;
 			this.linkLabel2.TabStop = true;
 			this.linkLabel2.Text = "しょぼいカレンダー(http://cal.syoboi.jp/)";
+            this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked);
 			// 
 			// label17
 			// 

--- a/UserInterface/AnimeDialog.cs
+++ b/UserInterface/AnimeDialog.cs
@@ -562,7 +562,7 @@ namespace magicAnime
 								if (mInputTitle != null)
 								{
 									titleTextBox.Text = mInputTitle;
-									mInputTitle=  null;
+                                    mInputTitle = null;
 								}
 							}
 						};
@@ -659,6 +659,7 @@ namespace magicAnime
 
 			dlg.ShowDialog();
 		}
+
 		//=========================================================================
 		///	<summary>
 		///		コントロールの状態更新
@@ -681,6 +682,27 @@ namespace magicAnime
 			recordTvStationCheckBox.Enabled	= mLinkOnline;
 		}
 
+        //=========================================================================
+        ///	<summary>
+        ///		しょぼカルを開く
+        ///	</summary>
+        /// <remarks>
+        /// </remarks>
+        /// <history>2012/03/19 新規作成</history>
+        //=========================================================================
+        private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            int tid  = (int)syoboiTidUpdown.Value;
+            if (tid != 0)
+            {
+                System.Diagnostics.Process.Start("http://cal.syoboi.jp/tid/" + tid.ToString());
+            }
+            else
+            {
+                System.Diagnostics.Process.Start("http://cal.syoboi.jp/");
+            }
+        }
+
 	}
 
 }

--- a/UserInterface/CalenderOptionDialog.cs
+++ b/UserInterface/CalenderOptionDialog.cs
@@ -37,7 +37,7 @@ namespace magicAnime
 			Settings.Default.dayPast	= (int)dayPastUpdown.Value;
 			Settings.Default.dayFuture	= (int)dayFutureUpdown.Value;
 			Settings.Default.weekPast	= (int)weekPastUpdown.Value;
-			Settings.Default.weekFuture= (int)weekFutureUpdown.Value;
+			Settings.Default.weekFuture = (int)weekFutureUpdown.Value;
 
 			this.DialogResult = DialogResult.OK;
 

--- a/UserInterface/MainForm.Designer.cs
+++ b/UserInterface/MainForm.Designer.cs
@@ -1221,6 +1221,7 @@
 			this.Shown += new System.EventHandler(this.MainForm_Shown);
 			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed);
 			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
+			this.Resize += new System.EventHandler(this.MainForm_Resize);
 			((System.ComponentModel.ISupportInitialize)(this.filePictureBox)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.titlePictureBox)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.statusPictureBox)).EndInit();

--- a/UserInterface/MainForm.cs
+++ b/UserInterface/MainForm.cs
@@ -3037,6 +3037,23 @@ namespace magicAnime
 			}
 		}
 
+		// add 7sh 2.0.14.10 2012-03-30 begin
+        //=========================================================================
+        ///	<summary>
+        ///		リサイズの限定
+        ///	</summary>
+        /// <remarks>
+        /// </remarks>
+        /// <history>2012/02/23 新規作成</history>
+        //========================================================================
+        private void MainForm_Resize(object sender, EventArgs e)
+        {
+            if (this.WindowState == FormWindowState.Minimized) { return; }
+            if (this.Width < 758) { this.Width = 758; }
+            if (this.Height < 310) { this.Height = 310; }
+        }
+		// add 7sh 2.0.14.10 2012-03-30 end
+
         // add yossiepon 20160924 begin
         //=========================================================================
         ///	<summary>