merge 0.9.4 to jp

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

diff --git a/win/C#/frmUpdater.cs b/win/C#/frmUpdater.cs
index ef28040..7c5b71d 100644 (file)
--- a/win/C#/frmUpdater.cs
+++ b/win/C#/frmUpdater.cs
@@ -6,40 +6,38 @@
 \r
 using System;\r
 using System.Windows.Forms;\r
-using System.IO;\r
-using System.Xml;\r
-using System.Net;\r
+using Handbrake.Functions;\r
 \r
 namespace Handbrake\r
 {\r
     public partial class frmUpdater : Form\r
     {\r
-        Functions.AppcastReader appcast = new Functions.AppcastReader();\r
-        public frmUpdater()\r
+        AppcastReader appcast;\r
+        public frmUpdater(AppcastReader reader)\r
         {\r
             InitializeComponent();\r
 \r
-            appcast.getInfo(); // Initializes the appcast\r
+            appcast = reader;\r
             getRss();\r
             setVersions();\r
         }\r
 \r
         private void getRss()\r
         {\r
-            wBrowser.DocumentText = "<font face=\"verdana\" size=\"1\">" + appcast.versionInfo() + "</font>";\r
+            wBrowser.Url = appcast.descriptionUrl;\r
         }\r
 \r
         private void setVersions()\r
         {\r
             string old = "(\8c»\8dÝ\82Ì\83o\81[\83W\83\87\83\93\82Í " + Properties.Settings.Default.hb_version.Trim() + " / " + Properties.Settings.Default.hb_build.ToString().Trim() + "\82Å\82·)";\r
-            string newBuild = appcast.version().Trim() + " (" + appcast.build() + ")";\r
+            string newBuild = appcast.version.Trim() + " (" + appcast.build + ")";\r
             lbl_update_text.Text = "HandBrake " + newBuild + " \82ª\97\98\97p\89Â\94\\82Å\82·\81B " + old;\r
         }\r
 \r
         private void btn_installUpdate_Click(object sender, EventArgs e)\r
         {\r
-            frmDownload download = new frmDownload(appcast.downloadFile());\r
-            download.Show();\r
+            frmDownload download = new frmDownload(appcast.downloadFile);\r
+            download.ShowDialog();\r
             this.Close();\r
         }\r
 \r
@@ -50,7 +48,7 @@ namespace Handbrake
 \r
         private void btn_skip_Click(object sender, EventArgs e)\r
         {\r
-            Properties.Settings.Default.skipversion = int.Parse(appcast.build());\r
+            Properties.Settings.Default.skipversion = int.Parse(appcast.build);\r
             Properties.Settings.Default.Save();\r
 \r
             this.Close();\r