WinGui:

- Fix Cancel button on Title Specific scan.
- Improve Add to queue error messages.

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

3 files changed, 31 insertions, 23 deletions

diff --git a/win/C#/TitleSpecificScan.cs b/win/C#/TitleSpecificScan.cs
index a78ab61fa..57e8f0d0c 100644
--- a/win/C#/TitleSpecificScan.cs
+++ b/win/C#/TitleSpecificScan.cs
@@ -25,7 +25,7 @@ namespace Handbrake
         /// <param name="e">The EventArgs</param>

         private void BtnCancelClick(object sender, EventArgs e)

         {

-            this.Close();

+            this.DialogResult = DialogResult.Cancel;

         }

 

         /// <summary>

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 63b5a205b..abb397c54 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -60,7 +60,6 @@ namespace Handbrake
             this.ChaptersMenu = new System.Windows.Forms.ContextMenuStrip(this.components);

             this.mnu_resetChapters = new System.Windows.Forms.ToolStripMenuItem();

             this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem();

-            this.VideoTitleSpecificScan = new System.Windows.Forms.ToolStripMenuItem();

             this.btn_addPreset = new System.Windows.Forms.Button();

             this.btn_removePreset = new System.Windows.Forms.Button();

             this.drop_format = new System.Windows.Forms.ComboBox();

@@ -146,6 +145,8 @@ namespace Handbrake
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();

             this.btn_source = new System.Windows.Forms.ToolStripDropDownButton();

             this.btn_dvd_source = new System.Windows.Forms.ToolStripMenuItem();

+            this.btnTitleSpecific = new System.Windows.Forms.ToolStripMenuItem();

+            this.FileTitleSpecificScan = new System.Windows.Forms.ToolStripMenuItem();

             this.FolderTitleSpecificScan = new System.Windows.Forms.ToolStripMenuItem();

             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();

             this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();

@@ -442,8 +443,6 @@ namespace Handbrake
             // 

             // btn_file_source

             // 

-            this.btn_file_source.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {

-            this.VideoTitleSpecificScan});

             this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small;

             this.btn_file_source.Name = "btn_file_source";

             this.btn_file_source.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));

@@ -451,13 +450,6 @@ namespace Handbrake
             this.btn_file_source.Text = "Video File";

             this.btn_file_source.Click += new System.EventHandler(this.BtnFileScanClicked);

             // 

-            // VideoTitleSpecificScan

-            // 

-            this.VideoTitleSpecificScan.Name = "VideoTitleSpecificScan";

-            this.VideoTitleSpecificScan.Size = new System.Drawing.Size(169, 22);

-            this.VideoTitleSpecificScan.Text = "Title Specific Scan";

-            this.VideoTitleSpecificScan.Click += new System.EventHandler(this.VideoTitleSpecificScanClick);

-            // 

             // btn_addPreset

             // 

             this.btn_addPreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;

@@ -1334,6 +1326,7 @@ namespace Handbrake
             this.btn_source.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {

             this.btn_file_source,

             this.btn_dvd_source,

+            this.btnTitleSpecific,

             this.toolStripSeparator1});

             this.btn_source.Image = global::Handbrake.Properties.Resources.Movies;

             this.btn_source.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

@@ -1346,8 +1339,6 @@ namespace Handbrake
             // 

             // btn_dvd_source

             // 

-            this.btn_dvd_source.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {

-            this.FolderTitleSpecificScan});

             this.btn_dvd_source.Image = global::Handbrake.Properties.Resources.folder;

             this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_dvd_source.Name = "btn_dvd_source";

@@ -1357,11 +1348,29 @@ namespace Handbrake
             this.btn_dvd_source.Text = "Folder";

             this.btn_dvd_source.Click += new System.EventHandler(this.BtnFolderScanClicked);

             // 

+            // btnTitleSpecific

+            // 

+            this.btnTitleSpecific.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {

+            this.FileTitleSpecificScan,

+            this.FolderTitleSpecificScan});

+            this.btnTitleSpecific.Name = "btnTitleSpecific";

+            this.btnTitleSpecific.Size = new System.Drawing.Size(182, 22);

+            this.btnTitleSpecific.Text = "Title Specific Scan";

+            // 

+            // FileTitleSpecificScan

+            // 

+            this.FileTitleSpecificScan.Image = global::Handbrake.Properties.Resources.Movies_Small;

+            this.FileTitleSpecificScan.Name = "FileTitleSpecificScan";

+            this.FileTitleSpecificScan.Size = new System.Drawing.Size(125, 22);

+            this.FileTitleSpecificScan.Text = "Video File";

+            this.FileTitleSpecificScan.Click += new System.EventHandler(this.VideoTitleSpecificScanClick);

+            // 

             // FolderTitleSpecificScan

             // 

+            this.FolderTitleSpecificScan.Image = global::Handbrake.Properties.Resources.folder;

             this.FolderTitleSpecificScan.Name = "FolderTitleSpecificScan";

-            this.FolderTitleSpecificScan.Size = new System.Drawing.Size(169, 22);

-            this.FolderTitleSpecificScan.Text = "Title Specific Scan";

+            this.FolderTitleSpecificScan.Size = new System.Drawing.Size(125, 22);

+            this.FolderTitleSpecificScan.Text = "Folder";

             this.FolderTitleSpecificScan.Click += new System.EventHandler(this.FolderTitleSpecificScanClick);

             // 

             // toolStripSeparator1

@@ -1901,7 +1910,8 @@ namespace Handbrake
         private ToolStripMenuItem mnu_exportMacPreset;

         private ToolStripProgressBar ProgressBarStatus;

         internal CheckBox checkMaximumFramerate;

-        private ToolStripMenuItem VideoTitleSpecificScan;

+        private ToolStripMenuItem btnTitleSpecific;

+        private ToolStripMenuItem FileTitleSpecificScan;

         private ToolStripMenuItem FolderTitleSpecificScan;

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 91a7c3415..2489c8e3a 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1109,7 +1109,7 @@ namespace Handbrake
             // Make sure the destination path exists.

             if (!Directory.Exists(Path.GetDirectoryName(jobDestination)))

             {

-                MessageBox.Show("Destination Path does not exist.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

+                MessageBox.Show(string.Format("Destination Path does not exist.\nPath: {0}\n\nThis item was not added to the Queue.", Path.GetDirectoryName(jobDestination)), "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

                 return;

             }

 

@@ -1118,7 +1118,7 @@ namespace Handbrake
             {

                 DialogResult result =

                     MessageBox.Show(

-                        "There is already a queue item for this destination path. \n\n If you continue, the encode will be overwritten. Do you wish to continue?",

+                        string.Format("There is already a queue item for this destination path.\nDestination Path: {0} \n\nIf you continue, the encode will be overwritten. Do you wish to continue?", jobDestination),

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

                 if (result == DialogResult.Yes)

                     encodeQueue.Add(query, this.GetTitle(), jobSourcePath, jobDestination, (rtf_query.Text != string.Empty));

@@ -1314,9 +1314,8 @@ namespace Handbrake
                 if (title.ShowDialog() == DialogResult.OK)

                 {

                     sourceTitle = title.Title;

-                }

-

-                SelectSource(ISO_Open.FileName, sourceTitle);

+                    SelectSource(ISO_Open.FileName, sourceTitle);

+                }          

             }

             else

                 UpdateSourceLabel();

@@ -1334,9 +1333,8 @@ namespace Handbrake
                 if (title.ShowDialog() == DialogResult.OK)

                 {

                     sourceTitle = title.Title;

+                    SelectSource(DVD_Open.SelectedPath, sourceTitle);

                 }

-

-                SelectSource(DVD_Open.SelectedPath, sourceTitle);

             }

             else

                 UpdateSourceLabel();