MacGUI: rename PictureController.mm too

[handbrake-jp/handbrake-jp-git.git] / win / C# / frmMain.cs

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 224c077..6624915 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -69,12 +69,12 @@ namespace Handbrake
                 DateTime lastCheck = Properties.Settings.Default.lastUpdateCheckDate;\r
                 TimeSpan elapsed = now.Subtract(lastCheck);\r
                 if (elapsed.TotalDays > Properties.Settings.Default.daysBetweenUpdateCheck)\r
-                {\r
+               {\r
                     lblStatus.Text = "Checking for updates ...";\r
                     Application.DoEvents();\r
 \r
                     Main.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDone), false);\r
-                }\r
+               }\r
             }\r
 \r
             // Setup the GUI components\r
@@ -186,7 +186,7 @@ namespace Handbrake
         private void events()\r
         {\r
             // Handle Widget changes when preset is selected.\r
-            registerPresetEventHandler();\r
+            RegisterPresetEventHandler();\r
 \r
             // Handle Window Resize\r
             if (Properties.Settings.Default.MainWindowMinimize)\r
@@ -203,7 +203,7 @@ namespace Handbrake
         }\r
 \r
         // Change the preset label to custom when a user changes a setting. Don't want to give the impression that users can change settings and still be using a preset\r
-        public void registerPresetEventHandler()\r
+        private void RegisterPresetEventHandler()\r
         {\r
             // Output Settings\r
             drop_format.SelectedIndexChanged += new EventHandler(changePresetLabel);\r
@@ -231,7 +231,7 @@ namespace Handbrake
             // Advanced Tab\r
             x264Panel.rtf_x264Query.TextChanged += new EventHandler(changePresetLabel);\r
         }\r
-        public void unRegisterPresetEventHandler()\r
+        private void UnRegisterPresetEventHandler()\r
         {\r
             // Output Settings \r
             drop_format.SelectedIndexChanged -= new EventHandler(changePresetLabel);\r
@@ -883,7 +883,7 @@ namespace Handbrake
         }\r
         private void drp_dvdtitle_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            unRegisterPresetEventHandler();\r
+            UnRegisterPresetEventHandler();\r
 \r
             PictureSettings.lbl_Aspect.Text = "Select a Title"; // Reset some values on the form\r
             drop_chapterStart.Items.Clear();\r
@@ -926,7 +926,7 @@ namespace Handbrake
                     drop_chapterFinish.Text = drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString();\r
 \r
                 // Populate the Audio Channels Dropdown\r
-                AudioSettings.setTrackList(selectedTitle);\r
+                AudioSettings.SetTrackList(selectedTitle);\r
 \r
                 // Populate the Subtitles dropdown\r
                 Subtitles.drp_subtitleTracks.Items.Clear();\r
@@ -939,7 +939,7 @@ namespace Handbrake
             // Run the autoName & chapterNaming functions\r
             if (Properties.Settings.Default.autoNaming)\r
             {\r
-                string autoPath = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, sourcePath, text_destination.Text, drop_format.SelectedIndex);\r
+                string autoPath = Main.autoName(this);\r
                 if (autoPath != null)\r
                     text_destination.Text = autoPath;\r
                 else\r
@@ -963,7 +963,7 @@ namespace Handbrake
             data_chpt.Columns[0].Width = 166;\r
             data_chpt.Columns[0].Width = 165;\r
 \r
-            registerPresetEventHandler();\r
+            RegisterPresetEventHandler();\r
         }\r
         private void chapersChanged(object sender, EventArgs e)\r
         {\r
@@ -1014,7 +1014,7 @@ namespace Handbrake
 \r
             // Run the Autonaming function\r
             if (Properties.Settings.Default.autoNaming)\r
-                text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, sourcePath, text_destination.Text, drop_format.SelectedIndex);\r
+                text_destination.Text = Main.autoName(this);\r
 \r
             // Disable chapter markers if only 1 chapter is selected.\r
             if (chapterStart == chapterEnd)\r
@@ -1062,13 +1062,13 @@ namespace Handbrake
                         case 1:\r
                             if (!Path.GetExtension(DVD_Save.FileName).Equals(".mp4", StringComparison.InvariantCultureIgnoreCase))\r
                                 if (Properties.Settings.Default.useM4v)\r
-                                    DVD_Save.FileName += ".m4v";\r
+                                    DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".m4v").Replace(".mkv",".m4v");\r
                                 else\r
-                                    DVD_Save.FileName += ".mp4";\r
+                                    DVD_Save.FileName = DVD_Save.FileName.Replace(".m4v", ".mp4").Replace(".mkv", ".mp4");\r
                             break;\r
                         case 2:\r
                             if (!Path.GetExtension(DVD_Save.FileName).Equals(".mkv", StringComparison.InvariantCultureIgnoreCase))\r
-                                DVD_Save.FileName += ".mkv";\r
+                                DVD_Save.FileName = DVD_Save.FileName .Replace(".mp4", ".mkv").Replace(".m4v",".mkv");\r
                             break;\r
                         default:\r
                             //do nothing  \r
@@ -1097,7 +1097,7 @@ namespace Handbrake
             switch (drop_format.SelectedIndex)\r
             {\r
                 case 0:\r
-                    if (Properties.Settings.Default.useM4v)\r
+                    if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() || Subtitles.RequiresM4V())\r
                         setExtension(".m4v");\r
                     else\r
                         setExtension(".mp4");\r
@@ -1107,7 +1107,7 @@ namespace Handbrake
                     break;\r
             }\r
 \r
-            AudioSettings.setAudioByContainer(drop_format.Text);\r
+            AudioSettings.SetContainer(drop_format.Text);\r
             Subtitles.setContainer(drop_format.SelectedIndex);\r
 \r
             if ((drop_format.Text.Contains("MP4")) || (drop_format.Text.Contains("M4V")))\r