WinGui:

- Made the "{source}" option for the default path auto name option a bit clearer. Added automatic warning if used in a path, updated tooltips and renamed to source_path to avoid confusion with the option below on the "format:" option.

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

4 files changed, 23 insertions, 7 deletions

diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs
index 11e6be932..78da9ca3c 100644
--- a/win/C#/Functions/Main.cs
+++ b/win/C#/Functions/Main.cs
@@ -238,7 +238,7 @@ namespace Handbrake.Functions
                 if (!mainWindow.text_destination.Text.Contains(Path.DirectorySeparatorChar.ToString()))

                 {

                     // If there is an auto name path, use it...

-                    if (Properties.Settings.Default.autoNamePath.Trim() == "{source}" && !string.IsNullOrEmpty(mainWindow.sourcePath))

+                    if (Properties.Settings.Default.autoNamePath.Trim() == "{source_path}" && !string.IsNullOrEmpty(mainWindow.sourcePath))

                     {

                         autoNamePath = Path.Combine(Path.GetDirectoryName(mainWindow.sourcePath), destinationFilename);

                         if (autoNamePath == mainWindow.sourcePath)

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index a614159a5..ec76c1f6b 100644
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -232,10 +232,12 @@ namespace Handbrake
             this.label34.Location = new System.Drawing.Point(179, 233);

             this.label34.Margin = new System.Windows.Forms.Padding(3);

             this.label34.Name = "label34";

-            this.label34.Size = new System.Drawing.Size(139, 13);

+            this.label34.Size = new System.Drawing.Size(167, 13);

             this.label34.TabIndex = 102;

-            this.label34.Text = "Available Options: {source}";

-            this.ToolTip.SetToolTip(this.label34, "{source} = Use the same directory as the source is in.");

+            this.label34.Text = "Available Options: {source_path}";

+            this.ToolTip.SetToolTip(this.label34, "{source_path} = Use the same directory as the source is in.\r\nNote: you can not us" +

+                    "e {source_path} within a path.  It has to be the only text in the path above to " +

+                    "work.");

             // 

             // check_TitleCase

             // 

@@ -447,8 +449,7 @@ namespace Handbrake
             this.text_an_path.Name = "text_an_path";

             this.text_an_path.Size = new System.Drawing.Size(253, 21);

             this.text_an_path.TabIndex = 76;

-            this.ToolTip.SetToolTip(this.text_an_path, "This is the default location where your encoded files will be stored if \"Automati" +

-                    "cally name output files\" is enabled.");

+            this.ToolTip.SetToolTip(this.text_an_path, resources.GetString("text_an_path.ToolTip"));

             this.text_an_path.TextChanged += new System.EventHandler(this.text_an_path_TextChanged);

             // 

             // tab_picture

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index c6519e11a..11034f9a3 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -272,12 +272,17 @@ namespace Handbrake
             else

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

 

-            if (text_an_path.Text == "{source}" && !optionsWindowLoading)

+            if (text_an_path.Text.ToLower() == "{source_path}" && !optionsWindowLoading)

             {

                 MessageBox.Show(

                     "Be careful with this feature. Make sure you can write to the same folder as the source! \n\n If you are encoding from a DVD, do not use this feature as HandBrake will not be able to write to the DVD!",

                     "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

             }

+

+            if (text_an_path.Text.ToLower().Contains("{source_path}") && text_an_path.Text.ToLower() != "{source_path}")

+            {

+                MessageBox.Show("Note you can not use the {source_path} within a path. {source_path} is the full source file path.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

+            }

         }

 

         private void check_m4v_CheckedChanged(object sender, EventArgs e)

diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx
index 8a1811c83..b02083a15 100644
--- a/win/C#/frmOptions.resx
+++ b/win/C#/frmOptions.resx
@@ -120,6 +120,12 @@
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>132, 18</value>

   </metadata>

+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

+    <value>132, 18</value>

+  </metadata>

+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

+    <value>132, 18</value>

+  </metadata>

   <data name="check_m4v.ToolTip" xml:space="preserve">

     <value>Use .m4v instead of .mp4 for MP4 files

 

@@ -127,6 +133,10 @@ Chapter Markers, AC3 Audio and SRT Subtitles will require the m4v extension if y
 When this option is disabled, Chapter Markers, AC3 audio and SRT subtitiles will still automatically change the file extension to m4v.

 </value>

   </data>

+  <data name="text_an_path.ToolTip" xml:space="preserve">

+    <value>This is the default location where your encoded files will be stored if "Automatically name output files" is enabled.

+You can enter {source_path} instead of a path to use the same path as the source file.</value>

+  </data>

   <data name="check_showCliForInGUIEncode.ToolTip" xml:space="preserve">

     <value>Shows the CLI window when encoding.

 You may wish to enable this as you'll be able to cleanly exit the CLI using ctrl-c