WinGui:

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

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index ba06ede..453b48a 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -16,6 +16,9 @@ namespace Handbrake
     using System.Windows.Forms;\r
     using Functions;\r
 \r
+    using HandBrake.Framework.Model;\r
+    using HandBrake.Framework.Services;\r
+    using HandBrake.Framework.Views;\r
     using HandBrake.ApplicationServices.Functions;\r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Parsing;\r
@@ -108,7 +111,13 @@ namespace Handbrake
             {\r
                 if (DateTime.Now.Subtract(Settings.Default.lastUpdateCheckDate).TotalDays > Properties.Settings.Default.daysBetweenUpdateCheck)\r
                 {\r
-                    Main.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDone), false);\r
+                    // Set when the last update was\r
+                    Settings.Default.lastUpdateCheckDate = DateTime.Now;\r
+                    Settings.Default.Save();\r
+                    string url = Settings.Default.hb_build.ToString().EndsWith("1")\r
+                                                  ? Settings.Default.appcast_unstable\r
+                                                  : Settings.Default.appcast;\r
+                    UpdateService.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDone), false, url, Settings.Default.hb_build, Settings.Default.skipversion, Settings.Default.hb_version);\r
                 }\r
             }\r
 \r
@@ -174,15 +183,13 @@ namespace Handbrake
                 return;\r
             }\r
 \r
-            UpdateCheckInformation info;\r
-\r
             try\r
             {\r
-                info = Main.EndCheckForUpdates(result);\r
+                UpdateCheckInformation info = UpdateService.EndCheckForUpdates(result);\r
 \r
                 if (info.NewVersionAvailable)\r
                 {\r
-                    frmUpdater updateWindow = new frmUpdater(info.BuildInformation);\r
+                    UpdateInfo updateWindow = new UpdateInfo(info.BuildInformation, Settings.Default.hb_version, Settings.Default.hb_build.ToString());\r
                     updateWindow.ShowDialog();\r
                 }\r
             }\r
@@ -532,7 +539,12 @@ namespace Handbrake
         private void mnu_UpdateCheck_Click(object sender, EventArgs e)\r
         {\r
             lbl_updateCheck.Visible = true;\r
-            Main.BeginCheckForUpdates(new AsyncCallback(this.UpdateCheckDoneMenu), false);\r
+            Settings.Default.lastUpdateCheckDate = DateTime.Now;\r
+            Settings.Default.Save();\r
+            string url = Settings.Default.hb_build.ToString().EndsWith("1")\r
+                                                  ? Settings.Default.appcast_unstable\r
+                                                  : Settings.Default.appcast;\r
+            UpdateService.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDoneMenu), false, url, Settings.Default.hb_build, Settings.Default.skipversion, Settings.Default.hb_version);\r
         }\r
 \r
         /// <summary>\r
@@ -1317,7 +1329,7 @@ namespace Handbrake
                 {\r
                     sourceTitle = title.Title;\r
                     SelectSource(ISO_Open.FileName, sourceTitle);\r
-                }          \r
+                }\r
             }\r
             else\r
                 UpdateSourceLabel();\r
@@ -1420,7 +1432,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, this.currentlySelectedPreset);\r
+                AudioSettings.SetTrackListFromPreset(selectedTitle, this.currentlySelectedPreset);\r
 \r
                 // Populate the Subtitles dropdown\r
                 Subtitles.SetSubtitleTrackAuto(selectedTitle.Subtitles.ToArray());\r
@@ -2038,7 +2050,7 @@ namespace Handbrake
                 BeginInvoke(new UpdateWindowHandler(UpdateScanStatusLabel));\r
                 return;\r
             }\r
-            lbl_encode.Text = SourceScan.ScanStatus;\r
+            labelSource.Text = SourceScan.ScanStatus;\r
         }\r
 \r
         /// <summary>\r
@@ -2119,7 +2131,6 @@ namespace Handbrake
             {\r
                 if (InvokeRequired)\r
                     BeginInvoke(new UpdateWindowHandler(EnableGUI));\r
-                lbl_encode.Text = "Scan Completed";\r
                 foreach (Control ctrl in Controls)\r
                     ctrl.Enabled = true;\r
                 btn_start.Enabled = true;\r
@@ -2144,8 +2155,9 @@ namespace Handbrake
                 if (!(ctrl is StatusStrip || ctrl is MenuStrip || ctrl is ToolStrip))\r
                     ctrl.Enabled = false;\r
 \r
-            lbl_encode.Visible = true;\r
-            lbl_encode.Text = "Scanning ...";\r
+            labelSource.Enabled = true;\r
+            labelStaticSource.Enabled = true;\r
+            SourceLayoutPanel.Enabled = true;\r
             btn_source.Enabled = false;\r
             btn_start.Enabled = false;\r
             btn_showQueue.Enabled = false;\r
@@ -2408,11 +2420,11 @@ namespace Handbrake
             try\r
             {\r
                 // Get the information about the new build, if any, and close the window\r
-                info = Main.EndCheckForUpdates(result);\r
+                info = UpdateService.EndCheckForUpdates(result);\r
 \r
                 if (info.NewVersionAvailable && info.BuildInformation != null)\r
                 {\r
-                    frmUpdater updateWindow = new frmUpdater(info.BuildInformation);\r
+                    UpdateInfo updateWindow = new UpdateInfo(info.BuildInformation, Settings.Default.hb_version, Settings.Default.hb_build.ToString());\r
                     updateWindow.ShowDialog();\r
                 }\r
                 else\r