WinGui:

# New
- Setup LibDVDNav option for scanning.

# Directory and logging changes
- The GUI now stores preset data in the systems user Application Data directory. This means that multi-user systems don't share the same single set of user presets.
- A History of logs are automatically stored in the systems application data directory.
- Changed the log preferences to make them a bit easier to understand.

# Bugs / Typos
- Fixed small bug in the version info regex parser.
- Fixed typo on x264 tab
- Fixed minor GUI issue on the Add Preset window (button transparency)
- Fixed disable Query Editor tab option (Thanks tlindgren)



git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2383 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 50 insertions, 65 deletions

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