WinGui:

- Activity logs for individual encodes can now be saved either:
  +  With the encoded file
  +  or to a a directory which is configured from options.

Log file format: "YYYY-MM-DD HH-MM-SS {Destination File Name}.txt"
Feature is disabled by default

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

1 files changed, 127 insertions, 53 deletions

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index a94b2c752..4e6d698e2 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -25,53 +25,95 @@ namespace Handbrake
             InitializeComponent();

             mainWindow = window;

 

+            // #############################

+            // General

+            // #############################

+

             // Enable Tooltips.

             if (Properties.Settings.Default.tooltipEnable == "Checked")

+            {

+                check_tooltip.CheckState = CheckState.Checked;

                 ToolTip.Active = true;

-            

+            }

+

             // Setup Widgets to match settings.

             if (Properties.Settings.Default.updateStatus == "Checked")

                 check_updateCheck.CheckState = CheckState.Checked;

 

-            // Unstable Snapshot checking should only be visible for stable builds.

-            if (Properties.Settings.Default.hb_build.ToString().EndsWith("1"))

-            {

-                lbl_appcastUnstable.Visible = false;

-                check_snapshot.Visible = false;

-            }

-            if (Properties.Settings.Default.checkSnapshot == "Checked")

-                check_snapshot.CheckState = CheckState.Checked;

-

+            // enable loading of default user settings.

             if (Properties.Settings.Default.defaultSettings == "Checked")

                 check_userDefaultSettings.CheckState = CheckState.Checked;

 

+            // On Encode Completeion Action

+            drp_completeOption.Text = Properties.Settings.Default.CompletionOption;

+            

+            // Enable auto naming feature.

+            if (Properties.Settings.Default.autoNaming == "Checked")

+                check_autoNaming.CheckState = CheckState.Checked;

+

+            // Store the auto name path

+            text_an_path.Text = Properties.Settings.Default.autoNamePath;

+            if (text_an_path.Text == string.Empty)

+                text_an_path.Text = "Click 'Browse' to set the default location";

+

+            // Store auto name format

+            txt_autoNameFormat.Text = Properties.Settings.Default.autoNameFormat;

+

+            // #############################

+            // Picture Tab

+            // #############################

+

+            // Store decomb value string

             txt_decomb.Text = Properties.Settings.Default.decomb;

 

+            // #############################

+            // CLI

+            // #############################

+

+            // Enable Start CLI minimized

+            if (Properties.Settings.Default.cli_minimized == "Checked")

+                check_cli_minimized.CheckState = CheckState.Checked;

+

+            // Number of processor cores

             drp_processors.Text = Properties.Settings.Default.Processors;

+

+            // Priority level for encodes

             drp_Priority.Text = Properties.Settings.Default.processPriority;

-            drp_completeOption.Text = Properties.Settings.Default.CompletionOption;

 

-            if (Properties.Settings.Default.tooltipEnable == "Checked")

-                check_tooltip.CheckState = CheckState.Checked;

+            // Save individual log files

+            if (Properties.Settings.Default.saveLog == "Checked")

+                check_keepLogs.CheckState = CheckState.Checked;

 

-            if (Properties.Settings.Default.autoNaming == "Checked")

-                check_autoNaming.CheckState = CheckState.Checked;

+            // Save logs in the same directory as encoded files

+            if (Properties.Settings.Default.saveLogWithVideo == "Checked")

+                check_saveLogWithVideo.CheckState = CheckState.Checked;

 

-            txt_autoNameFormat.Text = Properties.Settings.Default.autoNameFormat;

+            // The saved log path

+            text_logPath.Text = Properties.Settings.Default.saveLogPath;

 

-            if (Properties.Settings.Default.drive_detection == "Checked")

-                btn_drive_detect.CheckState = CheckState.Checked;

 

-            if (Properties.Settings.Default.cli_minimized == "Checked")

-               check_cli_minimized.CheckState = CheckState.Checked;

+            // #############################

+            // Advanced

+            // #############################

 

-            text_an_path.Text = Properties.Settings.Default.autoNamePath;

+            // Unstable Snapshot checking should only be visible for stable builds.

+            if (Properties.Settings.Default.hb_build.ToString().EndsWith("1"))

+            {

+                lbl_appcastUnstable.Visible = false;

+                check_snapshot.Visible = false;

+            }

+

+            // Enable snapshot updating

+            if (Properties.Settings.Default.checkSnapshot == "Checked")

+                check_snapshot.CheckState = CheckState.Checked;

+

+            // Enable GUI DVD Drive detection code

+            if (Properties.Settings.Default.drive_detection == "Checked")

+                btn_drive_detect.CheckState = CheckState.Checked;

 

-            if (text_an_path.Text == string.Empty)

-                text_an_path.Text = "Click 'Browse' to set the default location";              

         }

 

-        #region Options

+        #region General

         private void check_updateCheck_CheckedChanged(object sender, EventArgs e)

         {

             Properties.Settings.Default.updateStatus = check_updateCheck.CheckState.ToString();

@@ -82,22 +124,6 @@ namespace Handbrake
             Properties.Settings.Default.defaultSettings = check_userDefaultSettings.CheckState.ToString();

         }

 

-        private void drp_processors_SelectedIndexChanged(object sender, EventArgs e)

-        {

-            Properties.Settings.Default.Processors = drp_processors.Text;

-        }

-

-        private void drp_Priority_SelectedIndexChanged(object sender, EventArgs e)

-        {

-            Properties.Settings.Default.processPriority = drp_Priority.Text;

-        }

-

-        private void btn_close_Click(object sender, EventArgs e)

-        {

-            Properties.Settings.Default.Save(); // Small hack for Vista. Seems to work fine on XP without this

-            this.Close();

-        }

-

         private void check_tooltip_CheckedChanged(object sender, EventArgs e)

         {

             Properties.Settings.Default.tooltipEnable = check_tooltip.CheckState.ToString();

@@ -112,7 +138,6 @@ namespace Handbrake
                 mainWindow.ToolTip.Active = false;

             }

         }

-

         private void drp_completeOption_SelectedIndexChanged(object sender, EventArgs e)

         {

             Properties.Settings.Default.CompletionOption = drp_completeOption.Text;

@@ -134,16 +159,6 @@ namespace Handbrake
             text_an_path.Text = pathFinder.SelectedPath;

         }

 

-        private void txt_decomb_TextChanged(object sender, EventArgs e)

-        {

-            Properties.Settings.Default.decomb = txt_decomb.Text;

-        }

-

-        private void btn_drive_detect_CheckedChanged(object sender, EventArgs e)

-        {

-            Properties.Settings.Default.drive_detection = btn_drive_detect.CheckState.ToString();

-        }

-

         private void text_an_path_TextChanged(object sender, EventArgs e)

         {

             if (text_an_path.Text == string.Empty)

@@ -154,17 +169,76 @@ namespace Handbrake
             else

                 Properties.Settings.Default.autoNamePath = text_an_path.Text;

         }

+        #endregion

 

-        private void check_snapshot_CheckedChanged(object sender, EventArgs e)

+        #region Picture

+        private void txt_decomb_TextChanged(object sender, EventArgs e)

         {

-            Properties.Settings.Default.checkSnapshot = check_snapshot.CheckState.ToString();

+            Properties.Settings.Default.decomb = txt_decomb.Text;

         }

+        #endregion

 

+        #region CLI

         private void check_cli_minimized_CheckedChanged(object sender, EventArgs e)

         {

             Properties.Settings.Default.cli_minimized = check_cli_minimized.CheckState.ToString();

         }

+

+        private void drp_processors_SelectedIndexChanged(object sender, EventArgs e)

+        {

+            Properties.Settings.Default.Processors = drp_processors.Text;

+        }

+

+        private void drp_Priority_SelectedIndexChanged(object sender, EventArgs e)

+        {

+            Properties.Settings.Default.processPriority = drp_Priority.Text;

+        }

+

+        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 == true)

+                text_logPath.Text = "";

+        }

+

+        private void btn_saveLog_Click(object sender, EventArgs e)

+        {

+            pathFinder.SelectedPath = String.Empty;

+            pathFinder.ShowDialog();

+            if (pathFinder.SelectedPath != string.Empty)

+                text_logPath.Text = pathFinder.SelectedPath;

+        }

+

+        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

 

+        #region Advanced

+        private void btn_drive_detect_CheckedChanged(object sender, EventArgs e)

+        {

+            Properties.Settings.Default.drive_detection = btn_drive_detect.CheckState.ToString();

+        }

+

+        private void check_snapshot_CheckedChanged(object sender, EventArgs e)

+        {

+            Properties.Settings.Default.checkSnapshot = check_snapshot.CheckState.ToString();

+        }

+        #endregion

+

+        private void btn_close_Click(object sender, EventArgs e)

+        {

+            Properties.Settings.Default.Save(); // Small hack for Vista. Seems to work fine on XP without this

+            this.Close();

+        }

     }

 }
\ No newline at end of file