WinGui:

- Applies http://forum.handbrake.fr/viewtopic.php?f=4&t=8772
- Changes the File Save Dialog box to use the Format dropdown rather than the file extension. Some users seem to have an unusual workflow selecting a format before a file.

git-svn-id: svn://localhost/HandBrake/trunk@2065 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index d814262..df944ce 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -312,7 +312,7 @@ namespace Handbrake
             // \r
             // DVD_Save\r
             // \r
-            this.DVD_Save.Filter = "mp4|*.mp4|m4v|*.m4v|avi|*.avi|ogm|*.ogm|mkv|*.mkv";\r
+            this.DVD_Save.Filter = "mp4|*.mp4|m4v|*.m4v|mkv|*.mkv|avi|*.avi|ogm|*.ogm";\r
             this.DVD_Save.SupportMultiDottedExtensions = true;\r
             // \r
             // File_Save\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index ff9c69a..828ff1e 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -916,15 +916,15 @@ namespace Handbrake
             DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", "").Replace(".m4v", "").Replace(".mkv", "").Replace(".ogm", "").Replace(".avi", "");\r
 \r
             // Show the dialog and set the main form file path\r
-            if (text_destination.Text.EndsWith(".mp4"))\r
+            if (drop_format.SelectedIndex.Equals(0))\r
                 DVD_Save.FilterIndex = 1;\r
-            else if (text_destination.Text.EndsWith(".m4v"))\r
+            else if (drop_format.SelectedIndex.Equals(1))\r
                 DVD_Save.FilterIndex = 2;\r
-            else if (text_destination.Text.EndsWith(".avi"))\r
+            else if (drop_format.SelectedIndex.Equals(2))\r
                 DVD_Save.FilterIndex = 3;\r
-            else if (text_destination.Text.EndsWith(".ogm"))\r
+            else if (drop_format.SelectedIndex.Equals(3))\r
                 DVD_Save.FilterIndex = 4;\r
-            else if (text_destination.Text.EndsWith(".mkv"))\r
+            else if (drop_format.SelectedIndex.Equals(4))\r
                 DVD_Save.FilterIndex = 5;\r
 \r
             if (DVD_Save.ShowDialog() == DialogResult.OK)\r