WinGui:

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

diff --git a/win/C#/frmUpdater.cs b/win/C#/frmUpdater.cs
index 67f850d..816e00f 100644 (file)
--- a/win/C#/frmUpdater.cs
+++ b/win/C#/frmUpdater.cs
@@ -6,39 +6,39 @@
 \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.RssReader rssRead = new Functions.RssReader();\r
-        public frmUpdater()\r
+        readonly AppcastReader _appcast;\r
+        public frmUpdater(AppcastReader reader)\r
         {\r
             InitializeComponent();\r
-          \r
-            getRss();\r
-            setVersions();\r
+\r
+            _appcast = reader;\r
+            GetRss();\r
+            SetVersions();\r
         }\r
 \r
-        private void getRss()\r
-        { \r
-            wBrowser.DocumentText = "<font face=\"verdana\" size=\"1\">" + rssRead.versionInfo() + "</font>";\r
+        private void GetRss()\r
+        {\r
+            wBrowser.Url = _appcast.descriptionUrl;\r
         }\r
 \r
-        private void setVersions()\r
+        private void SetVersions()\r
         {\r
-            lbl_oldVersion.Text = "(you have: " + Properties.Settings.Default.hb_version + " / " + Properties.Settings.Default.hb_build  + ").";\r
-            lbl_newVersion.Text = rssRead.version() + " (" + rssRead.build() + ")";\r
+            string old = "(You have: " + Properties.Settings.Default.hb_version.Trim() + " / " + Properties.Settings.Default.hb_build.ToString().Trim() + ")";\r
+            string newBuild = _appcast.version.Trim() + " (" + _appcast.build + ")";\r
+            lbl_update_text.Text = "HandBrake " + newBuild + " is now available. " + old;\r
         }\r
 \r
         private void btn_installUpdate_Click(object sender, EventArgs e)\r
         {\r
-            frmDownload download = new frmDownload();\r
-            download.Show();\r
-            this.Close(); \r
+            frmDownload download = new frmDownload(_appcast.downloadFile);\r
+            download.ShowDialog();\r
+            this.Close();\r
         }\r
 \r
         private void btn_remindLater_Click(object sender, EventArgs e)\r
@@ -48,15 +48,9 @@ namespace Handbrake
 \r
         private void btn_skip_Click(object sender, EventArgs e)\r
         {\r
-            try\r
-            {\r
-                Properties.Settings.Default.skipversion = int.Parse(rssRead.build());\r
-                Properties.Settings.Default.Save();\r
-            }\r
-            catch (Exception exc)\r
-            {\r
-                MessageBox.Show(exc.ToString());\r
-            }\r
+            Properties.Settings.Default.skipversion = int.Parse(_appcast.build);\r
+            Properties.Settings.Default.Save();\r
+\r
             this.Close();\r
         }\r
 \r