diff options
| -rw-r--r-- | win/C#/Controls/x264Panel.Designer.cs | 8 | ||||
| -rw-r--r-- | win/C#/Functions/Encode.cs | 45 | ||||
| -rw-r--r-- | win/C#/Functions/Main.cs | 3 | ||||
| -rw-r--r-- | win/C#/Parsing/Title.cs | 12 | ||||
| -rw-r--r-- | win/C#/Presets/PresetsHandler.cs | 28 | ||||
| -rw-r--r-- | win/C#/Presets/preset.cs | 3 | ||||
| -rw-r--r-- | win/C#/Program.cs | 10 | ||||
| -rw-r--r-- | win/C#/Properties/Settings.Designer.cs | 8 | ||||
| -rw-r--r-- | win/C#/Properties/Settings.settings | 2 | ||||
| -rw-r--r-- | win/C#/app.config | 2 | ||||
| -rw-r--r-- | win/C#/frmAddPreset.Designer.cs | 4 | ||||
| -rw-r--r-- | win/C#/frmMain.cs | 10 | ||||
| -rw-r--r-- | win/C#/frmOptions.Designer.cs | 115 | ||||
| -rw-r--r-- | win/C#/frmOptions.cs | 22 | ||||
| -rw-r--r-- | win/C#/frmPreview.Designer.cs | 44 |
15 files changed, 165 insertions, 151 deletions
diff --git a/win/C#/Controls/x264Panel.Designer.cs b/win/C#/Controls/x264Panel.Designer.cs index 3e3c4a2c7..82d6977e7 100644 --- a/win/C#/Controls/x264Panel.Designer.cs +++ b/win/C#/Controls/x264Panel.Designer.cs @@ -77,7 +77,7 @@ //
this.slider_psytrellis.Location = new System.Drawing.Point(436, 194);
this.slider_psytrellis.Name = "slider_psytrellis";
- this.slider_psytrellis.Size = new System.Drawing.Size(131, 42);
+ this.slider_psytrellis.Size = new System.Drawing.Size(131, 45);
this.slider_psytrellis.TabIndex = 86;
this.ToolTip.SetToolTip(this.slider_psytrellis, "Psychovisual Trellis tries to retain more sharpness and detail, but can cause art" +
"ifacting. \r\nIt is considered experimental, which is why it\'s off by default. Goo" +
@@ -108,7 +108,7 @@ //
this.slider_psyrd.Location = new System.Drawing.Point(436, 153);
this.slider_psyrd.Name = "slider_psyrd";
- this.slider_psyrd.Size = new System.Drawing.Size(131, 42);
+ this.slider_psyrd.Size = new System.Drawing.Size(131, 45);
this.slider_psyrd.TabIndex = 83;
this.ToolTip.SetToolTip(this.slider_psyrd, resources.GetString("slider_psyrd.ToolTip"));
this.slider_psyrd.Scroll += new System.EventHandler(this.slider_psyrd_Scroll);
@@ -539,9 +539,9 @@ this.check_pyrmidalBFrames.Location = new System.Drawing.Point(18, 194);
this.check_pyrmidalBFrames.Name = "check_pyrmidalBFrames";
this.check_pyrmidalBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No;
- this.check_pyrmidalBFrames.Size = new System.Drawing.Size(112, 17);
+ this.check_pyrmidalBFrames.Size = new System.Drawing.Size(118, 17);
this.check_pyrmidalBFrames.TabIndex = 59;
- this.check_pyrmidalBFrames.Text = "Pyrmidal B-Frames:";
+ this.check_pyrmidalBFrames.Text = "Pyramidal B-Frames:";
this.check_pyrmidalBFrames.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.ToolTip.SetToolTip(this.check_pyrmidalBFrames, resources.GetString("check_pyrmidalBFrames.ToolTip"));
this.check_pyrmidalBFrames.UseVisualStyleBackColor = true;
diff --git a/win/C#/Functions/Encode.cs b/win/C#/Functions/Encode.cs index 6c30828c2..1579528a6 100644 --- a/win/C#/Functions/Encode.cs +++ b/win/C#/Functions/Encode.cs @@ -136,31 +136,38 @@ namespace Handbrake.Functions public void copyLog(string destination)
{
// The user may wish to do something with the log.
- if (Properties.Settings.Default.saveLog == "Checked")
+ if (Properties.Settings.Default.saveLogToSpecifiedPath == "Checked")
{
- string logPath = Path.Combine(Path.GetTempPath(), "hb_encode_log.dat");
-
- if (Properties.Settings.Default.saveLogWithVideo == "Checked")
+ try
{
- string[] destName = destination.Split('\\');
- string destinationFile = "";
- for (int i = 0; i < destName.Length - 1; i++)
- {
- destinationFile += destName[i] + "\\";
- }
+ string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
+ string tempLogFile = Path.Combine(Path.GetTempPath(), "hb_encode_log.dat");
- destinationFile += DateTime.Now.ToString().Replace("/", "-").Replace(":", "-") + " " + destName[destName.Length - 1] + ".txt";
+ string encodeDestinationPath = Path.GetDirectoryName(destination);
+ String[] destName = destination.Split('\\');
+ string destinationFile = destName[destName.Length - 1];
+ string encodeLogFile = DateTime.Now.ToString().Replace("/", "-").Replace(":", "-") + " " + destinationFile + ".txt";
- File.Copy(logPath, destinationFile);
+ // Make sure the log directory exists.
+ if (!Directory.Exists(logDir))
+ Directory.CreateDirectory(logDir);
+
+ // Copy the Log to HandBrakes log folder in the users applciation data folder.
+ File.Copy(tempLogFile, Path.Combine(logDir, encodeLogFile));
+
+ // Save a copy of the log file in the same location as the enocde.
+ if (Properties.Settings.Default.saveLogWithVideo == "Checked")
+ File.Copy(tempLogFile, Path.Combine(encodeDestinationPath, encodeLogFile));
+
+ // Save a copy of the log file to a user specified location
+ if (Directory.Exists(Properties.Settings.Default.saveLogPath))
+ if (Properties.Settings.Default.saveLogPath != String.Empty && Properties.Settings.Default.saveLogToSpecifiedPath == "Checked")
+ File.Copy(tempLogFile, Path.Combine(Properties.Settings.Default.saveLogPath, encodeLogFile));
}
- else if (Properties.Settings.Default.saveLogPath != String.Empty)
+ catch (Exception exc)
{
- string[] destName = destination.Split('\\');
- string dest = destName[destName.Length - 1];
- string filename = DateTime.Now.ToString().Replace("/", "-").Replace(":", "-") + " " + dest + ".txt";
- string useDefinedLogPath = Path.Combine(Properties.Settings.Default.saveLogPath, filename);
-
- File.Copy(logPath, useDefinedLogPath);
+ MessageBox.Show("Something went a bit wrong trying to copy your log file.\nError Information:\n\n" + exc, "Error",
+ MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs index 6c432208a..d7161205f 100644 --- a/win/C#/Functions/Main.cs +++ b/win/C#/Functions/Main.cs @@ -296,14 +296,13 @@ namespace Handbrake.Functions try
{
cliProcess.Start();
- cliProcess.Kill();
// Retrieve standard output and report back to parent thread until the process is complete
TextReader stdOutput = cliProcess.StandardError;
while (!cliProcess.HasExited)
{
line = stdOutput.ReadLine() ?? "";
- Match m = Regex.Match(line, @"HandBrake ([0-9\.]*)*(svn[0-9]*[M]*)* \([0-9]*\)");
+ Match m = Regex.Match(line, @"HandBrake ([0-9.]*)(svn[0-9M]*) \([0-9]*\)");
if (m.Success)
{
diff --git a/win/C#/Parsing/Title.cs b/win/C#/Parsing/Title.cs index 80736064b..39b8d3cfa 100644 --- a/win/C#/Parsing/Title.cs +++ b/win/C#/Parsing/Title.cs @@ -128,8 +128,18 @@ namespace Handbrake.Parsing output.ReadLine();
- // Get duration for this title
+ if (Properties.Settings.Default.dvdnav == "Checked")
+ {
+ // Get the Angles for the title.
+ m = Regex.Match(output.ReadLine(), @" \+ angle\(s\) ([0-9,])");
+ if (m.Success)
+ {
+ // + angle(s) 1
+ // Do nothing. Will add this later.
+ }
+ }
+ // Get duration for this title
m = Regex.Match(output.ReadLine(), @"^ \+ duration: ([0-9]{2}:[0-9]{2}:[0-9]{2})");
if (m.Success)
thisTitle.m_duration = TimeSpan.Parse(m.Groups[1].Value);
diff --git a/win/C#/Presets/PresetsHandler.cs b/win/C#/Presets/PresetsHandler.cs index 657807c10..064d4f320 100644 --- a/win/C#/Presets/PresetsHandler.cs +++ b/win/C#/Presets/PresetsHandler.cs @@ -12,9 +12,11 @@ namespace Handbrake.Presets {
public class PresetsHandler
{
- List<Preset> presets = new List<Preset>(); // Category+Level+Preset Name: Query
- List<Preset> user_presets = new List<Preset>(); // Preset Name: Query
+ List<Preset> presets = new List<Preset>();
+ List<Preset> user_presets = new List<Preset>();
private static readonly XmlSerializer ser = new XmlSerializer(typeof(List<Preset>));
+ String userPresetFile = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\user_presets.xml";
+ string hbPresetFile = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\presets.xml";
/// <summary>
/// Add a new preset to the system
@@ -202,10 +204,9 @@ namespace Handbrake.Presets user_presets.Clear();
// Load in the users presets from user_presets.xml
- string filePath = Application.StartupPath + "\\presets.xml";
- if (File.Exists(filePath))
+ if (File.Exists(hbPresetFile))
{
- using (FileStream strm = new FileStream(filePath, FileMode.Open, FileAccess.Read))
+ using (FileStream strm = new FileStream(hbPresetFile, FileMode.Open, FileAccess.Read))
{
if (strm.Length != 0)
{
@@ -219,10 +220,10 @@ namespace Handbrake.Presets }
// Load in the users presets from user_presets.xml
- filePath = Application.StartupPath + "\\user_presets.xml";
- if (File.Exists(filePath))
+
+ if (File.Exists(userPresetFile))
{
- using (FileStream strm = new FileStream(filePath, FileMode.Open, FileAccess.Read))
+ using (FileStream strm = new FileStream(userPresetFile, FileMode.Open, FileAccess.Read))
{
if (strm.Length != 0)
{
@@ -257,8 +258,7 @@ namespace Handbrake.Presets // Deal with Root
if (preset.Category == category && preset.TopCategory == category)
rootNode.Nodes.Add(preset.Name);
- else if (preset.Category != category && preset.TopCategory == category)
- // Deal with child nodes for that root
+ else if (preset.Category != category && preset.TopCategory == category) // Deal with child nodes for that root
{
if (childNode == null) // For the first child node
childNode = new TreeNode(preset.Category);
@@ -266,8 +266,7 @@ namespace Handbrake.Presets childNode.Nodes.Add(preset.Name);
addChildNode = true;
}
- else if (preset.Category != category && preset.TopCategory != category && preset.Level == 1)
- // Deal with changing root nodes
+ else if (preset.Category != category && preset.TopCategory != category && preset.Level == 1)// Deal with changing root nodes
{
// If we find there are child nodes, add them to the current root node set before adding the rootnode to the panel.
if (addChildNode)
@@ -301,7 +300,7 @@ namespace Handbrake.Presets /// </summary>
private void updatePresetsFile()
{
- string userPresets = Application.StartupPath + "\\presets.xml";
+ string userPresets = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\presets.xml";
try
{
using (FileStream strm = new FileStream(userPresets, FileMode.Create, FileAccess.Write))
@@ -323,10 +322,9 @@ namespace Handbrake.Presets /// </summary>
private void updateUserPresetsFile()
{
- string userPresets = Application.StartupPath + "\\user_presets.xml";
try
{
- using (FileStream strm = new FileStream(userPresets, FileMode.Create, FileAccess.Write))
+ using (FileStream strm = new FileStream(userPresetFile, FileMode.Create, FileAccess.Write))
{
ser.Serialize(strm, user_presets);
strm.Close();
diff --git a/win/C#/Presets/preset.cs b/win/C#/Presets/preset.cs index 4431c9ce1..2a54d44a9 100644 --- a/win/C#/Presets/preset.cs +++ b/win/C#/Presets/preset.cs @@ -14,6 +14,9 @@ namespace Handbrake.Presets /// </summary>
public string Category { get; set; }
+ /// <summary>
+ /// Get or Set the top level category for the preset.
+ /// </summary>
public string TopCategory { get; set; }
/// <summary>
diff --git a/win/C#/Program.cs b/win/C#/Program.cs index 885a36988..ecc9c0281 100644 --- a/win/C#/Program.cs +++ b/win/C#/Program.cs @@ -6,6 +6,8 @@ using System;
using System.Windows.Forms;
+using System.IO;
+using Handbrake.Presets;
namespace Handbrake
{
@@ -37,6 +39,14 @@ namespace Handbrake // Either Launch or Close the Application
if (launch)
{
+ string appDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake";
+ if (!Directory.Exists(appDir))
+ {
+ Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake");
+ PresetsHandler x = new PresetsHandler();
+ x.updateBuiltInPresets();
+ }
+
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new frmMain());
diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs index 2e3841fa7..c54d0be30 100644 --- a/win/C#/Properties/Settings.Designer.cs +++ b/win/C#/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.1433
+// Runtime Version:2.0.50727.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -242,12 +242,12 @@ namespace Handbrake.Properties { [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
- public string saveLog {
+ public string saveLogToSpecifiedPath {
get {
- return ((string)(this["saveLog"]));
+ return ((string)(this["saveLogToSpecifiedPath"]));
}
set {
- this["saveLog"] = value;
+ this["saveLogToSpecifiedPath"] = value;
}
}
diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings index 2964a6488..62894d2de 100644 --- a/win/C#/Properties/Settings.settings +++ b/win/C#/Properties/Settings.settings @@ -56,7 +56,7 @@ <Setting Name="autoNameFormat" Type="System.String" Scope="User">
<Value Profile="(Default)">{source}-{title}-{chapters}</Value>
</Setting>
- <Setting Name="saveLog" Type="System.String" Scope="User">
+ <Setting Name="saveLogToSpecifiedPath" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="saveLogPath" Type="System.String" Scope="User">
diff --git a/win/C#/app.config b/win/C#/app.config index 326695a57..4789bc858 100644 --- a/win/C#/app.config +++ b/win/C#/app.config @@ -61,7 +61,7 @@ <setting name="autoNameFormat" serializeAs="String">
<value>{source}-{title}-{chapters}</value>
</setting>
- <setting name="saveLog" serializeAs="String">
+ <setting name="saveLogToSpecifiedPath" serializeAs="String">
<value />
</setting>
<setting name="saveLogPath" serializeAs="String">
diff --git a/win/C#/frmAddPreset.Designer.cs b/win/C#/frmAddPreset.Designer.cs index be37ade4a..9ac8fe4cb 100644 --- a/win/C#/frmAddPreset.Designer.cs +++ b/win/C#/frmAddPreset.Designer.cs @@ -64,7 +64,7 @@ namespace Handbrake //
// btn_add
//
- this.btn_add.BackColor = System.Drawing.SystemColors.Control;
+ this.btn_add.BackColor = System.Drawing.Color.Transparent;
this.btn_add.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_add.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_add.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
@@ -78,7 +78,7 @@ namespace Handbrake //
// btn_cancel
//
- this.btn_cancel.BackColor = System.Drawing.SystemColors.Control;
+ this.btn_cancel.BackColor = System.Drawing.Color.Transparent;
this.btn_cancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_cancel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_cancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index c40651e12..dddf3fd3b 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -80,7 +80,7 @@ namespace Handbrake lbl_max.Text = "";
queueWindow = new frmQueue(encodeQueue); // Prepare the Queue
if (Properties.Settings.Default.QueryEditorTab != "Checked")
- tabs_panel.TabPages.RemoveAt(5); // Remove the query editor tab if the user does not want it enabled.
+ tabs_panel.TabPages.RemoveAt(6); // Remove the query editor tab if the user does not want it enabled.
// Load the user's default settings or Normal Preset
if (Properties.Settings.Default.defaultSettings == "Checked" && Properties.Settings.Default.defaultPreset != "")
@@ -641,6 +641,7 @@ namespace Handbrake }
private void btn_add2Queue_Click(object sender, EventArgs e)
{
+
if (text_source.Text == string.Empty || text_source.Text == "Click 'Source' to continue" || text_destination.Text == string.Empty)
MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
else
@@ -1612,7 +1613,10 @@ namespace Handbrake if (File.Exists(dvdInfoPath))
File.Delete(dvdInfoPath);
- string strCmdLine = String.Format(@"cmd /c """"{0}"" -i ""{1}"" -t0 -v >""{2}"" 2>&1""", handbrakeCLIPath, inputFile, dvdInfoPath);
+ String dvdnav = string.Empty;
+ if (Properties.Settings.Default.dvdnav == "Checked")
+ dvdnav = " --dvdnav";
+ string strCmdLine = String.Format(@"cmd /c """"{0}"" -i ""{1}"" -t0 {2} -v >""{3}"" 2>&1""", handbrakeCLIPath, inputFile, dvdnav, dvdInfoPath);
ProcessStartInfo hbParseDvd = new ProcessStartInfo("CMD.exe", strCmdLine) { WindowStyle = ProcessWindowStyle.Hidden };
@@ -1675,7 +1679,7 @@ namespace Handbrake // If no titles were found, Display an error message
if (drp_dvdtitle.Items.Count == 0)
- MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source.\nYour Source may be copy protected, badly mastered or a format which HandBrake does not support. \nPlease refer to the Documentation and FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
+ MessageBox.Show("No Title(s) found. \n\nYour Source may be copy protected, badly mastered or a format which HandBrake does not support. \nPlease refer to the Documentation and FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
// Enable the GUI components and enable any disabled components
enableGUI();
diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs index 321fe2f70..e4f0cb98f 100644 --- a/win/C#/frmOptions.Designer.cs +++ b/win/C#/frmOptions.Designer.cs @@ -60,12 +60,10 @@ namespace Handbrake this.tab_cli = new System.Windows.Forms.TabPage();
this.cb_logVerboseLvl = new System.Windows.Forms.ComboBox();
this.label3 = new System.Windows.Forms.Label();
- this.label15 = new System.Windows.Forms.Label();
this.check_saveLogWithVideo = new System.Windows.Forms.CheckBox();
this.btn_saveLog = new System.Windows.Forms.Button();
this.label14 = new System.Windows.Forms.Label();
this.text_logPath = new System.Windows.Forms.TextBox();
- this.check_keepLogs = new System.Windows.Forms.CheckBox();
this.label9 = new System.Windows.Forms.Label();
this.check_cli_minimized = new System.Windows.Forms.CheckBox();
this.label12 = new System.Windows.Forms.Label();
@@ -74,6 +72,8 @@ namespace Handbrake this.drp_processors = new System.Windows.Forms.ComboBox();
this.Label4 = new System.Windows.Forms.Label();
this.tab_advanced = new System.Windows.Forms.TabPage();
+ this.check_dvdnav = new System.Windows.Forms.CheckBox();
+ this.label32 = new System.Windows.Forms.Label();
this.label30 = new System.Windows.Forms.Label();
this.drop_x264step = new System.Windows.Forms.ComboBox();
this.label28 = new System.Windows.Forms.Label();
@@ -116,8 +116,7 @@ namespace Handbrake this.label26 = new System.Windows.Forms.Label();
this.label27 = new System.Windows.Forms.Label();
this.openFile_vlc = new System.Windows.Forms.OpenFileDialog();
- this.label32 = new System.Windows.Forms.Label();
- this.check_dvdnav = new System.Windows.Forms.CheckBox();
+ this.check_logsInSpecifiedLocation = new System.Windows.Forms.CheckBox();
this.tab_options.SuspendLayout();
this.tab_general.SuspendLayout();
this.tab_picture.SuspendLayout();
@@ -132,7 +131,7 @@ namespace Handbrake this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_close.Location = new System.Drawing.Point(430, 366);
+ this.btn_close.Location = new System.Drawing.Point(430, 370);
this.btn_close.Name = "btn_close";
this.btn_close.Size = new System.Drawing.Size(72, 22);
this.btn_close.TabIndex = 53;
@@ -169,7 +168,7 @@ namespace Handbrake this.tab_options.Location = new System.Drawing.Point(12, 55);
this.tab_options.Name = "tab_options";
this.tab_options.SelectedIndex = 0;
- this.tab_options.Size = new System.Drawing.Size(490, 305);
+ this.tab_options.Size = new System.Drawing.Size(490, 309);
this.tab_options.TabIndex = 58;
//
// tab_general
@@ -190,7 +189,7 @@ namespace Handbrake this.tab_general.Controls.Add(this.drp_completeOption);
this.tab_general.Location = new System.Drawing.Point(4, 22);
this.tab_general.Name = "tab_general";
- this.tab_general.Size = new System.Drawing.Size(482, 279);
+ this.tab_general.Size = new System.Drawing.Size(482, 283);
this.tab_general.TabIndex = 3;
this.tab_general.Text = "General";
this.tab_general.UseVisualStyleBackColor = true;
@@ -352,7 +351,7 @@ namespace Handbrake this.tab_picture.Controls.Add(this.label29);
this.tab_picture.Location = new System.Drawing.Point(4, 22);
this.tab_picture.Name = "tab_picture";
- this.tab_picture.Size = new System.Drawing.Size(482, 279);
+ this.tab_picture.Size = new System.Drawing.Size(482, 283);
this.tab_picture.TabIndex = 5;
this.tab_picture.Text = "Picture";
this.tab_picture.UseVisualStyleBackColor = true;
@@ -392,14 +391,13 @@ namespace Handbrake //
// tab_cli
//
+ this.tab_cli.Controls.Add(this.check_logsInSpecifiedLocation);
this.tab_cli.Controls.Add(this.cb_logVerboseLvl);
this.tab_cli.Controls.Add(this.label3);
- this.tab_cli.Controls.Add(this.label15);
this.tab_cli.Controls.Add(this.check_saveLogWithVideo);
this.tab_cli.Controls.Add(this.btn_saveLog);
this.tab_cli.Controls.Add(this.label14);
this.tab_cli.Controls.Add(this.text_logPath);
- this.tab_cli.Controls.Add(this.check_keepLogs);
this.tab_cli.Controls.Add(this.label9);
this.tab_cli.Controls.Add(this.check_cli_minimized);
this.tab_cli.Controls.Add(this.label12);
@@ -409,7 +407,7 @@ namespace Handbrake this.tab_cli.Controls.Add(this.Label4);
this.tab_cli.Location = new System.Drawing.Point(4, 22);
this.tab_cli.Name = "tab_cli";
- this.tab_cli.Size = new System.Drawing.Size(482, 279);
+ this.tab_cli.Size = new System.Drawing.Size(482, 283);
this.tab_cli.TabIndex = 2;
this.tab_cli.Text = "CLI";
this.tab_cli.UseVisualStyleBackColor = true;
@@ -441,21 +439,11 @@ namespace Handbrake this.label3.TabIndex = 85;
this.label3.Text = "Log Verbosity Level:";
//
- // label15
- //
- this.label15.AutoSize = true;
- this.label15.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label15.Location = new System.Drawing.Point(195, 214);
- this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(24, 13);
- this.label15.TabIndex = 84;
- this.label15.Text = "OR";
- //
// check_saveLogWithVideo
//
this.check_saveLogWithVideo.AutoSize = true;
this.check_saveLogWithVideo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_saveLogWithVideo.Location = new System.Drawing.Point(71, 194);
+ this.check_saveLogWithVideo.Location = new System.Drawing.Point(71, 178);
this.check_saveLogWithVideo.Name = "check_saveLogWithVideo";
this.check_saveLogWithVideo.Size = new System.Drawing.Size(349, 17);
this.check_saveLogWithVideo.TabIndex = 83;
@@ -469,7 +457,7 @@ namespace Handbrake this.btn_saveLog.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_saveLog.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_saveLog.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_saveLog.Location = new System.Drawing.Point(343, 235);
+ this.btn_saveLog.Location = new System.Drawing.Point(343, 225);
this.btn_saveLog.Name = "btn_saveLog";
this.btn_saveLog.Size = new System.Drawing.Size(68, 22);
this.btn_saveLog.TabIndex = 82;
@@ -481,7 +469,7 @@ namespace Handbrake //
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label14.Location = new System.Drawing.Point(68, 238);
+ this.label14.Location = new System.Drawing.Point(68, 228);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(61, 13);
this.label14.TabIndex = 81;
@@ -489,26 +477,13 @@ namespace Handbrake //
// text_logPath
//
- this.text_logPath.Location = new System.Drawing.Point(135, 235);
+ this.text_logPath.Location = new System.Drawing.Point(135, 225);
this.text_logPath.Name = "text_logPath";
this.text_logPath.Size = new System.Drawing.Size(202, 21);
this.text_logPath.TabIndex = 80;
this.ToolTip.SetToolTip(this.text_logPath, "The default location where auto named files are stored.");
this.text_logPath.TextChanged += new System.EventHandler(this.text_logPath_TextChanged);
//
- // check_keepLogs
- //
- this.check_keepLogs.AutoSize = true;
- this.check_keepLogs.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_keepLogs.Location = new System.Drawing.Point(71, 171);
- this.check_keepLogs.Name = "check_keepLogs";
- this.check_keepLogs.Size = new System.Drawing.Size(185, 17);
- this.check_keepLogs.TabIndex = 79;
- this.check_keepLogs.Text = "Keep individual encode logs";
- this.ToolTip.SetToolTip(this.check_keepLogs, "Save encode logs to a file after the encode has completed.");
- this.check_keepLogs.UseVisualStyleBackColor = true;
- this.check_keepLogs.CheckedChanged += new System.EventHandler(this.check_keepLogs_CheckedChanged);
- //
// label9
//
this.label9.AutoSize = true;
@@ -623,11 +598,34 @@ namespace Handbrake this.tab_advanced.Location = new System.Drawing.Point(4, 22);
this.tab_advanced.Name = "tab_advanced";
this.tab_advanced.Padding = new System.Windows.Forms.Padding(3);
- this.tab_advanced.Size = new System.Drawing.Size(482, 279);
+ this.tab_advanced.Size = new System.Drawing.Size(482, 283);
this.tab_advanced.TabIndex = 4;
this.tab_advanced.Text = "Advanced / Other";
this.tab_advanced.UseVisualStyleBackColor = true;
//
+ // check_dvdnav
+ //
+ this.check_dvdnav.AutoSize = true;
+ this.check_dvdnav.BackColor = System.Drawing.Color.Transparent;
+ this.check_dvdnav.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.check_dvdnav.Location = new System.Drawing.Point(76, 184);
+ this.check_dvdnav.Name = "check_dvdnav";
+ this.check_dvdnav.Size = new System.Drawing.Size(297, 17);
+ this.check_dvdnav.TabIndex = 90;
+ this.check_dvdnav.Text = "Use Libdvdnav (instead of libdvdread) for dvd\'s";
+ this.check_dvdnav.UseVisualStyleBackColor = false;
+ this.check_dvdnav.CheckedChanged += new System.EventHandler(this.check_dvdnav_CheckedChanged);
+ //
+ // label32
+ //
+ this.label32.AutoSize = true;
+ this.label32.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label32.Location = new System.Drawing.Point(38, 184);
+ this.label32.Name = "label32";
+ this.label32.Size = new System.Drawing.Size(32, 13);
+ this.label32.TabIndex = 89;
+ this.label32.Text = "CLI:";
+ //
// label30
//
this.label30.AutoSize = true;
@@ -1100,34 +1098,22 @@ namespace Handbrake this.openFile_vlc.DefaultExt = "exe";
this.openFile_vlc.Filter = "exe|*.exe";
//
- // label32
- //
- this.label32.AutoSize = true;
- this.label32.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label32.Location = new System.Drawing.Point(38, 184);
- this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(32, 13);
- this.label32.TabIndex = 89;
- this.label32.Text = "CLI:";
- //
- // check_dvdnav
+ // check_logsInSpecifiedLocation
//
- this.check_dvdnav.AutoSize = true;
- this.check_dvdnav.BackColor = System.Drawing.Color.Transparent;
- this.check_dvdnav.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_dvdnav.Location = new System.Drawing.Point(76, 184);
- this.check_dvdnav.Name = "check_dvdnav";
- this.check_dvdnav.Size = new System.Drawing.Size(185, 17);
- this.check_dvdnav.TabIndex = 90;
- this.check_dvdnav.Text = "Use DvdNav (Experimental)";
- this.ToolTip.SetToolTip(this.check_dvdnav, "Enables the built in update checker to check for the latest development snapshot " +
- "builds.\r\nWarning: These are considered unstable builds and are not supported!");
- this.check_dvdnav.UseVisualStyleBackColor = false;
- this.check_dvdnav.CheckedChanged += new System.EventHandler(this.check_dvdnav_CheckedChanged);
+ this.check_logsInSpecifiedLocation.AutoSize = true;
+ this.check_logsInSpecifiedLocation.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(71, 201);
+ this.check_logsInSpecifiedLocation.Name = "check_logsInSpecifiedLocation";
+ this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(306, 17);
+ this.check_logsInSpecifiedLocation.TabIndex = 87;
+ this.check_logsInSpecifiedLocation.Text = "Put individual encode logs in a specified location:";
+ this.ToolTip.SetToolTip(this.check_logsInSpecifiedLocation, "Place a copy of the encode log in the same folder as the encoded movie.");
+ this.check_logsInSpecifiedLocation.UseVisualStyleBackColor = true;
+ this.check_logsInSpecifiedLocation.CheckedChanged += new System.EventHandler(this.check_logsInSpecifiedLocation_CheckedChanged);
//
// frmOptions
//
- this.ClientSize = new System.Drawing.Size(514, 396);
+ this.ClientSize = new System.Drawing.Size(514, 402);
this.Controls.Add(this.label8);
this.Controls.Add(this.pictureBox2);
this.Controls.Add(this.tab_options);
@@ -1191,11 +1177,9 @@ namespace Handbrake private System.Windows.Forms.TextBox txt_autoNameFormat;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label9;
- internal System.Windows.Forms.Label label15;
internal System.Windows.Forms.Button btn_saveLog;
internal System.Windows.Forms.Label label14;
private System.Windows.Forms.TextBox text_logPath;
- internal System.Windows.Forms.CheckBox check_keepLogs;
internal System.Windows.Forms.CheckBox check_saveLogWithVideo;
internal System.Windows.Forms.Button btn_vlcPath;
private System.Windows.Forms.TextBox txt_vlcPath;
@@ -1239,5 +1223,6 @@ namespace Handbrake internal System.Windows.Forms.Label label3;
internal System.Windows.Forms.CheckBox check_dvdnav;
private System.Windows.Forms.Label label32;
+ internal System.Windows.Forms.CheckBox check_logsInSpecifiedLocation;
}
}
\ No newline at end of file diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs index 34ccef623..c33cc22c2 100644 --- a/win/C#/frmOptions.cs +++ b/win/C#/frmOptions.cs @@ -73,14 +73,15 @@ namespace Handbrake // Log Verbosity Level
cb_logVerboseLvl.SelectedIndex = Properties.Settings.Default.verboseLevel;
- // Save individual log files
- if (Properties.Settings.Default.saveLog == "Checked")
- check_keepLogs.CheckState = CheckState.Checked;
// Save logs in the same directory as encoded files
if (Properties.Settings.Default.saveLogWithVideo == "Checked")
check_saveLogWithVideo.CheckState = CheckState.Checked;
+ // Save Logs in a specified path
+ if (Properties.Settings.Default.saveLogToSpecifiedPath == "Checked")
+ check_logsInSpecifiedLocation.CheckState = CheckState.Checked;
+
// The saved log path
text_logPath.Text = Properties.Settings.Default.saveLogPath;
@@ -202,16 +203,13 @@ namespace Handbrake Properties.Settings.Default.verboseLevel = cb_logVerboseLvl.SelectedIndex;
}
- private void check_keepLogs_CheckedChanged(object sender, EventArgs e)
- {
- Properties.Settings.Default.saveLog = check_keepLogs.CheckState.ToString();
- }
-
private void check_saveLogWithVideo_CheckedChanged(object sender, EventArgs e)
{
Properties.Settings.Default.saveLogWithVideo = check_saveLogWithVideo.CheckState.ToString();
- if (check_saveLogWithVideo.Checked)
- text_logPath.Text = "";
+ }
+ private void check_logsInSpecifiedLocation_CheckedChanged(object sender, EventArgs e)
+ {
+ Properties.Settings.Default.saveLogToSpecifiedPath = check_logsInSpecifiedLocation.CheckState.ToString();
}
private void btn_saveLog_Click(object sender, EventArgs e)
@@ -225,8 +223,6 @@ namespace Handbrake private void text_logPath_TextChanged(object sender, EventArgs e)
{
Properties.Settings.Default.saveLogPath = text_logPath.Text;
- if (text_logPath.Text != String.Empty)
- check_saveLogWithVideo.Checked = false;
}
#endregion
@@ -269,6 +265,8 @@ namespace Handbrake this.Close();
}
+
+
}
}
\ No newline at end of file diff --git a/win/C#/frmPreview.Designer.cs b/win/C#/frmPreview.Designer.cs index bab1f41ae..bd3f7201b 100644 --- a/win/C#/frmPreview.Designer.cs +++ b/win/C#/frmPreview.Designer.cs @@ -37,11 +37,11 @@ this.cb_preview = new System.Windows.Forms.ToolStripComboBox();
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
this.cb_duration = new System.Windows.Forms.ToolStripComboBox();
+ this.btn_playQT = new System.Windows.Forms.ToolStripButton();
+ this.btn_playVLC = new System.Windows.Forms.ToolStripButton();
this.QTControl = new AxQTOControlLib.AxQTControl();
this.panel1 = new System.Windows.Forms.Panel();
this.lbl_status = new System.Windows.Forms.Label();
- this.btn_playQT = new System.Windows.Forms.ToolStripButton();
- this.btn_playVLC = new System.Windows.Forms.ToolStripButton();
this.toolBar.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.QTControl)).BeginInit();
this.panel1.SuspendLayout();
@@ -121,6 +121,26 @@ this.cb_duration.Name = "cb_duration";
this.cb_duration.Size = new System.Drawing.Size(75, 25);
//
+ // btn_playQT
+ //
+ this.btn_playQT.Image = global::Handbrake.Properties.Resources.Play_small;
+ this.btn_playQT.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.btn_playQT.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.btn_playQT.Name = "btn_playQT";
+ this.btn_playQT.Size = new System.Drawing.Size(89, 22);
+ this.btn_playQT.Text = "Play with QT";
+ this.btn_playQT.Click += new System.EventHandler(this.btn_playQT_Click);
+ //
+ // btn_playVLC
+ //
+ this.btn_playVLC.Image = global::Handbrake.Properties.Resources.Play_small;
+ this.btn_playVLC.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.btn_playVLC.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.btn_playVLC.Name = "btn_playVLC";
+ this.btn_playVLC.Size = new System.Drawing.Size(93, 22);
+ this.btn_playVLC.Text = "Play with VLC";
+ this.btn_playVLC.Click += new System.EventHandler(this.btn_playVLC_Click);
+ //
// QTControl
//
this.QTControl.Enabled = true;
@@ -155,26 +175,6 @@ this.lbl_status.Text = "{0}";
this.lbl_status.Visible = false;
//
- // btn_playQT
- //
- this.btn_playQT.Image = global::Handbrake.Properties.Resources.Play_small;
- this.btn_playQT.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.btn_playQT.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.btn_playQT.Name = "btn_playQT";
- this.btn_playQT.Size = new System.Drawing.Size(89, 22);
- this.btn_playQT.Text = "Play with QT";
- this.btn_playQT.Click += new System.EventHandler(this.btn_playQT_Click);
- //
- // btn_playVLC
- //
- this.btn_playVLC.Image = global::Handbrake.Properties.Resources.Play_small;
- this.btn_playVLC.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.btn_playVLC.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.btn_playVLC.Name = "btn_playVLC";
- this.btn_playVLC.Size = new System.Drawing.Size(93, 22);
- this.btn_playVLC.Text = "Play with VLC";
- this.btn_playVLC.Click += new System.EventHandler(this.btn_playVLC_Click);
- //
// frmPreview
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|