summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--win/C#/Functions/Common.cs8
-rw-r--r--win/C#/HandBrakeCS.csproj1
-rw-r--r--win/C#/frmDvdInfo.cs5
-rw-r--r--win/C#/frmMain.Designer.cs39
-rw-r--r--win/C#/frmMain.resx12
-rw-r--r--win/C#/frmReadDVD.cs32
6 files changed, 63 insertions, 34 deletions
diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index a0a7d72e9..ee4c4ca44 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -694,8 +694,7 @@ namespace Handbrake.Functions
}
else
{
- string path = Application.StartupPath.ToString();
- path = "\"" + path + "\\chapters.csv\" ";
+ string path = Path.Combine(Path.GetTempPath(), "chapters.csv");
ChapterMarkers = " --markers=" + path;
}
@@ -784,10 +783,7 @@ namespace Handbrake.Functions
{
try
{
- string appPath = Application.StartupPath.ToString();
- appPath = appPath + "\\";
-
- string path = appPath + "chapters.csv";
+ string path = Path.Combine(Path.GetTempPath(), "chapters.csv");
StringBuilder csv = new StringBuilder();
diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index bfdf2153e..c6b751240 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -65,6 +65,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
+ <Reference Include="System.Messaging" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
diff --git a/win/C#/frmDvdInfo.cs b/win/C#/frmDvdInfo.cs
index 60150419b..b37a12a94 100644
--- a/win/C#/frmDvdInfo.cs
+++ b/win/C#/frmDvdInfo.cs
@@ -42,9 +42,8 @@ namespace Handbrake
{
try
{
- string appPath = Application.StartupPath.ToString();
- appPath = appPath + "\\";
- StreamReader sr = new StreamReader(appPath + "dvdinfo.dat");
+ string dvdInfoPath = Path.Combine(Path.GetTempPath(), "dvdinfo.dat");
+ StreamReader sr = new StreamReader(dvdInfoPath);
string line = sr.ReadLine();
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 9a4721b8d..b2ebe3584 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -37,7 +37,7 @@ namespace Handbrake
this.components = new System.ComponentModel.Container();
System.Windows.Forms.Label Label38;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
this.DVD_Save = new System.Windows.Forms.SaveFileDialog();
this.File_Save = new System.Windows.Forms.SaveFileDialog();
this.ToolTip = new System.Windows.Forms.ToolTip(this.components);
@@ -483,7 +483,7 @@ namespace Handbrake
this.slider_videoQuality.Location = new System.Drawing.Point(435, 90);
this.slider_videoQuality.Maximum = 100;
this.slider_videoQuality.Name = "slider_videoQuality";
- this.slider_videoQuality.Size = new System.Drawing.Size(167, 42);
+ this.slider_videoQuality.Size = new System.Drawing.Size(167, 45);
this.slider_videoQuality.TabIndex = 14;
this.slider_videoQuality.TickFrequency = 17;
this.ToolTip.SetToolTip(this.slider_videoQuality, "Set the quality level of the video. (Around 70% is fine for most)");
@@ -594,7 +594,7 @@ namespace Handbrake
this.slider_drc.Location = new System.Drawing.Point(317, 137);
this.slider_drc.Maximum = 30;
this.slider_drc.Name = "slider_drc";
- this.slider_drc.Size = new System.Drawing.Size(241, 42);
+ this.slider_drc.Size = new System.Drawing.Size(241, 45);
this.slider_drc.TabIndex = 18;
this.slider_drc.TickFrequency = 10;
this.ToolTip.SetToolTip(this.slider_drc, "Dynamic Range Compression");
@@ -602,7 +602,7 @@ namespace Handbrake
//
// rtf_h264advanced
//
- this.rtf_h264advanced.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.rtf_h264advanced.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.rtf_h264advanced.Location = new System.Drawing.Point(16, 79);
this.rtf_h264advanced.Name = "rtf_h264advanced";
this.rtf_h264advanced.Size = new System.Drawing.Size(605, 123);
@@ -1077,6 +1077,7 @@ namespace Handbrake
// label30
//
this.label30.AutoSize = true;
+ this.label30.BackColor = System.Drawing.Color.Transparent;
this.label30.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label30.Location = new System.Drawing.Point(470, 169);
this.label30.Name = "label30";
@@ -1087,6 +1088,7 @@ namespace Handbrake
// label29
//
this.label29.AutoSize = true;
+ this.label29.BackColor = System.Drawing.Color.Transparent;
this.label29.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label29.Location = new System.Drawing.Point(398, 169);
this.label29.Name = "label29";
@@ -1097,6 +1099,7 @@ namespace Handbrake
// label23
//
this.label23.AutoSize = true;
+ this.label23.BackColor = System.Drawing.Color.Transparent;
this.label23.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label23.Location = new System.Drawing.Point(543, 169);
this.label23.Name = "label23";
@@ -1107,6 +1110,7 @@ namespace Handbrake
// label7
//
this.label7.AutoSize = true;
+ this.label7.BackColor = System.Drawing.Color.Transparent;
this.label7.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label7.Location = new System.Drawing.Point(321, 169);
this.label7.Name = "label7";
@@ -1139,13 +1143,14 @@ namespace Handbrake
// check_forced
//
this.check_forced.AutoSize = true;
+ this.check_forced.BackColor = System.Drawing.Color.Transparent;
this.check_forced.Enabled = false;
this.check_forced.Location = new System.Drawing.Point(332, 215);
this.check_forced.Name = "check_forced";
this.check_forced.Size = new System.Drawing.Size(147, 17);
this.check_forced.TabIndex = 17;
this.check_forced.Text = "Forced Subtitles Only";
- this.check_forced.UseVisualStyleBackColor = true;
+ this.check_forced.UseVisualStyleBackColor = false;
//
// drp_track2Audio
//
@@ -1425,6 +1430,7 @@ namespace Handbrake
// SliderValue
//
this.SliderValue.AutoSize = true;
+ this.SliderValue.BackColor = System.Drawing.Color.Transparent;
this.SliderValue.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.SliderValue.Location = new System.Drawing.Point(599, 96);
this.SliderValue.Name = "SliderValue";
@@ -1561,6 +1567,7 @@ namespace Handbrake
// Label56
//
this.Label56.AutoSize = true;
+ this.Label56.BackColor = System.Drawing.Color.Transparent;
this.Label56.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label56.ForeColor = System.Drawing.Color.Black;
this.Label56.Location = new System.Drawing.Point(483, 38);
@@ -1572,6 +1579,7 @@ namespace Handbrake
// lbl_Aspect
//
this.lbl_Aspect.AutoSize = true;
+ this.lbl_Aspect.BackColor = System.Drawing.Color.Transparent;
this.lbl_Aspect.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbl_Aspect.Location = new System.Drawing.Point(412, 62);
this.lbl_Aspect.Name = "lbl_Aspect";
@@ -1582,6 +1590,7 @@ namespace Handbrake
// Label91
//
this.Label91.AutoSize = true;
+ this.Label91.BackColor = System.Drawing.Color.Transparent;
this.Label91.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label91.Location = new System.Drawing.Point(311, 61);
this.Label91.Name = "Label91";
@@ -1592,6 +1601,7 @@ namespace Handbrake
// Label55
//
this.Label55.AutoSize = true;
+ this.Label55.BackColor = System.Drawing.Color.Transparent;
this.Label55.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label55.ForeColor = System.Drawing.Color.Black;
this.Label55.Location = new System.Drawing.Point(311, 37);
@@ -1900,9 +1910,9 @@ namespace Handbrake
//
// number
//
- dataGridViewCellStyle1.Format = "N0";
- dataGridViewCellStyle1.NullValue = null;
- this.number.DefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle3.Format = "N0";
+ dataGridViewCellStyle3.NullValue = null;
+ this.number.DefaultCellStyle = dataGridViewCellStyle3;
this.number.HeaderText = "Chapter Number";
this.number.MaxInputLength = 3;
this.number.Name = "number";
@@ -2017,6 +2027,7 @@ namespace Handbrake
//
// btn_clear
//
+ this.btn_clear.BackColor = System.Drawing.SystemColors.ControlLight;
this.btn_clear.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_clear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_clear.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -2026,11 +2037,12 @@ namespace Handbrake
this.btn_clear.Size = new System.Drawing.Size(75, 22);
this.btn_clear.TabIndex = 4;
this.btn_clear.Text = "Clear";
- this.btn_clear.UseVisualStyleBackColor = true;
+ this.btn_clear.UseVisualStyleBackColor = false;
this.btn_clear.Click += new System.EventHandler(this.btn_clear_Click);
//
// btn_copy2C
//
+ this.btn_copy2C.BackColor = System.Drawing.SystemColors.ControlLight;
this.btn_copy2C.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_copy2C.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_copy2C.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -2040,7 +2052,7 @@ namespace Handbrake
this.btn_copy2C.Size = new System.Drawing.Size(136, 22);
this.btn_copy2C.TabIndex = 3;
this.btn_copy2C.Text = "Copy to clipboard";
- this.btn_copy2C.UseVisualStyleBackColor = true;
+ this.btn_copy2C.UseVisualStyleBackColor = false;
this.btn_copy2C.Click += new System.EventHandler(this.btn_copy2C_Click);
//
// label34
@@ -2055,6 +2067,7 @@ namespace Handbrake
//
// btn_generate_Query
//
+ this.btn_generate_Query.BackColor = System.Drawing.SystemColors.ControlLight;
this.btn_generate_Query.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_generate_Query.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_generate_Query.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -2064,7 +2077,7 @@ namespace Handbrake
this.btn_generate_Query.Size = new System.Drawing.Size(126, 22);
this.btn_generate_Query.TabIndex = 1;
this.btn_generate_Query.Text = "Generate Query";
- this.btn_generate_Query.UseVisualStyleBackColor = true;
+ this.btn_generate_Query.UseVisualStyleBackColor = false;
this.btn_generate_Query.Click += new System.EventHandler(this.btn_generate_Query_Click);
//
// label33
@@ -2080,7 +2093,7 @@ namespace Handbrake
//
// rtf_query
//
- this.rtf_query.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.rtf_query.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.rtf_query.Location = new System.Drawing.Point(16, 103);
this.rtf_query.Name = "rtf_query";
this.rtf_query.Size = new System.Drawing.Size(614, 108);
@@ -2146,7 +2159,7 @@ namespace Handbrake
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlLight;
- this.ClientSize = new System.Drawing.Size(892, 582);
+ this.ClientSize = new System.Drawing.Size(892, 588);
this.Controls.Add(this.label6);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox_dest);
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index d8bc4d4b1..4f28a7713 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -141,10 +141,10 @@ Best used in conjunction with forced subtitles.</value>
<value>223, 15</value>
</metadata>
<metadata name="File_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>331, 15</value>
+ <value>430, 18</value>
</metadata>
<metadata name="ISO_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>432, 15</value>
+ <value>329, 15</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="mnu_open.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -181,7 +181,13 @@ Best used in conjunction with forced subtitles.</value>
</value>
</data>
<metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>94, 17</value>
+ <value>106, 15</value>
+ </metadata>
+ <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
</metadata>
<metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index d6da8fe43..d7a074938 100644
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -81,17 +81,31 @@ namespace Handbrake
{
try
{
- string appPath = Application.StartupPath.ToString() + "\\";
- string strCmdLine = "cmd /c " + '"' + '"' + appPath + "HandBrakeCLI.exe" + '"' + " -i " + '"' + inputFile + '"' + " -t0 -v >" + '"' + appPath + "dvdinfo.dat" + '"' + " 2>&1" + '"';
- Process hbproc = Process.Start("CMD.exe", strCmdLine);
- hbproc.WaitForExit();
- hbproc.Dispose();
- hbproc.Close();
+ string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe");
+ string dvdInfoPath = Path.Combine(Path.GetTempPath(), "dvdinfo.dat");
+ // Make we don't pick up a stale dvdinfo.dat (and that we have rights to the file)
+ if (File.Exists(dvdInfoPath))
+ File.Delete(dvdInfoPath);
- StreamReader sr = new StreamReader(appPath + "dvdinfo.dat");
- thisDvd = Parsing.DVD.Parse(sr);
- sr.Close();
+ string strCmdLine = String.Format(@"cmd /c """"{0}"" -i ""{1}"" -t0 -v >""{2}"" 2>&1""", handbrakeCLIPath, inputFile, dvdInfoPath);
+
+ using (Process hbproc = Process.Start("CMD.exe", strCmdLine))
+ {
+ hbproc.WaitForExit();
+ // TODO: Verify exit code if the CLI supports it properly
+ }
+
+
+ if (!File.Exists(dvdInfoPath))
+ {
+ throw new Exception("Unable to retrieve the DVD Info. dvdinfo.dat missing.");
+ }
+
+ using (StreamReader sr = new StreamReader(dvdInfoPath))
+ {
+ thisDvd = Parsing.DVD.Parse(sr);
+ }
updateUIElements();
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 17:29:44 +0000