WinGui:

Fix for Ticket #107 - Destination Save File Dialog window now shows extension of currently file in the destination field if there is one.

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

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index b234b05e6b138bc040d0795e32e05bda964b2a58..e7345b539d6455f494a5c1ede35d5fb5f456f4fe 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -664,18 +664,31 @@ 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
-            DVD_Save.ShowDialog();\r
-            if (DVD_Save.FileName.StartsWith("\\"))\r
-                MessageBox.Show("Sorry, HandBrake does not support UNC file paths. \nTry mounting the share as a network drive in My Computer", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
-            else\r
-            {\r
-                setAudioByContainer(DVD_Save.FileName);\r
 \r
-                text_destination.Text = DVD_Save.FileName;\r
+            if (text_destination.Text.EndsWith(".mp4"))\r
+                DVD_Save.FilterIndex = 1;\r
+            else if (text_destination.Text.EndsWith(".m4v"))\r
+                DVD_Save.FilterIndex = 2;\r
+            else if (text_destination.Text.EndsWith(".avi"))\r
+                DVD_Save.FilterIndex = 3;\r
+            else if (text_destination.Text.EndsWith(".ogm"))\r
+                DVD_Save.FilterIndex = 4;\r
+            else if (text_destination.Text.EndsWith(".mkv"))\r
+                DVD_Save.FilterIndex = 5;\r
+\r
+            if (DVD_Save.ShowDialog() == DialogResult.OK)\r
+            {\r
+                if (DVD_Save.FileName.StartsWith("\\"))\r
+                    MessageBox.Show("Sorry, HandBrake does not support UNC file paths. \nTry mounting the share as a network drive in My Computer", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+                else\r
+                {\r
+                    setAudioByContainer(DVD_Save.FileName);\r
+                    text_destination.Text = DVD_Save.FileName;\r
 \r
-                // Quicktime requires .m4v file for chapter markers to work. If checked, change the extension to .m4v (mp4 and m4v are the same thing)\r
-                if (Check_ChapterMarkers.Checked)\r
-                    text_destination.Text = text_destination.Text.Replace(".mp4", ".m4v");\r
+                    // Quicktime requires .m4v file for chapter markers to work. If checked, change the extension to .m4v (mp4 and m4v are the same thing)\r
+                    if (Check_ChapterMarkers.Checked)\r
+                        text_destination.Text = text_destination.Text.Replace(".mp4", ".m4v");\r
+                }\r
             }\r
         }\r
         private void text_destination_TextChanged(object sender, EventArgs e)\r
@@ -1442,7 +1455,7 @@ namespace Handbrake
             {\r
                 if (treeView_presets.SelectedNode != null)\r
                     presetHandler.remove(treeView_presets.SelectedNode.Text);\r
-               \r
+\r
                 // Remember each nodes expanded status so we can reload it\r
                 List<Boolean> nodeStatus = saveTreeViewState();\r
 \r
@@ -1561,7 +1574,7 @@ namespace Handbrake
                 foreach (TreeNode node in treenode.Nodes)\r
                 {\r
                     if (node.Text.ToString().Equals("Normal"))\r
-                       treeView_presets.SelectedNode = treeView_presets.Nodes[treenode.Index].Nodes[0];\r
+                        treeView_presets.SelectedNode = treeView_presets.Nodes[treenode.Index].Nodes[0];\r
                 }\r
             }\r
         }\r