WinGui:

- Fix a bug in the AutoName where is used the folder name instead of source name when multiple files are scanned.

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

3 files changed, 9 insertions, 12 deletions

diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs
index 385671355..c26d59502 100644
--- a/win/C#/Functions/Main.cs
+++ b/win/C#/Functions/Main.cs
@@ -10,10 +10,8 @@ namespace Handbrake.Functions
     using System.Diagnostics;

     using System.IO;

     using System.Linq;

-    using System.Net;

     using System.Text;

     using System.Text.RegularExpressions;

-    using System.Threading;

     using System.Windows.Forms;

     using System.Xml.Serialization;

 

@@ -23,7 +21,6 @@ namespace Handbrake.Functions
     using HandBrake.ApplicationServices.Parsing;

     using HandBrake.ApplicationServices.Services.Interfaces;

     using Model;

-    using HandBrake.ApplicationServices.Services;

 

     /// <summary>

     /// Useful functions which various screens can use.

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index b54fda06d..165da56d4 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -77,6 +77,11 @@ namespace Handbrake
                     return this.dvdDriveLabel;

                 }

 

+                if (selectedTitle != null && !string.IsNullOrEmpty(selectedTitle.SourceName))

+                {

+                    return Path.GetFileName(selectedTitle.SourceName);

+                }

+

                 if (Path.GetFileNameWithoutExtension(this.sourcePath) != "VIDEO_TS")

                     return Path.GetFileNameWithoutExtension(this.sourcePath);

 

@@ -1435,7 +1440,7 @@ namespace Handbrake
             // Update the source label if we have multiple streams

             if (selectedTitle != null)

                 if (!string.IsNullOrEmpty(selectedTitle.SourceName))

-                    labelSource.Text = labelSource.Text = Path.GetFileName(selectedTitle.SourceName);

+                    labelSource.Text = Path.GetFileName(selectedTitle.SourceName);

 

             // Run the AutoName & ChapterNaming functions

             if (Properties.Settings.Default.autoNaming)

@@ -2196,11 +2201,6 @@ namespace Handbrake
         private void UpdateSourceLabel()

         {

             labelSource.Text = string.IsNullOrEmpty(sourcePath) ? "Select \"Source\" to continue." : this.SourceName;

-

-            if (selectedTitle != null)

-                if (!string.IsNullOrEmpty(selectedTitle.SourceName))

-                    // If it's one of multiple source files, make sure we don't use the folder name

-                    labelSource.Text = Path.GetFileName(selectedTitle.SourceName);

         }

 

         /// <summary>

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index f4f2e0b4e..51a7cc904 100644
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -667,7 +667,7 @@ namespace Handbrake
             this.check_preventSleep.AutoSize = true;

             this.check_preventSleep.Location = new System.Drawing.Point(73, 45);

             this.check_preventSleep.Name = "check_preventSleep";

-            this.check_preventSleep.Size = new System.Drawing.Size(266, 17);

+            this.check_preventSleep.Size = new System.Drawing.Size(260, 17);

             this.check_preventSleep.TabIndex = 91;

             this.check_preventSleep.Text = "Prevent the system from sleeping when encoding.";

             this.ToolTip.SetToolTip(this.check_preventSleep, "Prevent system from sleeping during encoding.");

@@ -680,7 +680,7 @@ namespace Handbrake
             this.check_clearOldLogs.AutoSize = true;

             this.check_clearOldLogs.Location = new System.Drawing.Point(73, 234);

             this.check_clearOldLogs.Name = "check_clearOldLogs";

-            this.check_clearOldLogs.Size = new System.Drawing.Size(166, 17);

+            this.check_clearOldLogs.Size = new System.Drawing.Size(162, 17);

             this.check_clearOldLogs.TabIndex = 90;

             this.check_clearOldLogs.Text = "Clear logs older than 30 days";

             this.ToolTip.SetToolTip(this.check_clearOldLogs, "Clear logs which are older than 30 days.\r\nThis only applies to HandBrakes Applica" +

@@ -775,7 +775,7 @@ namespace Handbrake
             this.check_logsInSpecifiedLocation.AutoSize = true;

             this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(73, 139);

             this.check_logsInSpecifiedLocation.Name = "check_logsInSpecifiedLocation";

-            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(306, 17);

+            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(305, 17);

             this.check_logsInSpecifiedLocation.TabIndex = 87;

             this.check_logsInSpecifiedLocation.Text = "Put a copy of 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.");