X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmUpdater.cs;h=f2e7c02d6bbc5c8ed4e56c735656ff61658c3a39;hb=d571d3e6a3bb4bbeda35cac674f697a253a11e94;hp=82fe2f3b6f53093f372568d0072cd21b0e82408a;hpb=e3e275c8c360abf1010859647ccee00bad9d3069;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmUpdater.cs b/win/C#/frmUpdater.cs
index 82fe2f3b..f2e7c02d 100644
--- a/win/C#/frmUpdater.cs
+++ b/win/C#/frmUpdater.cs
@@ -1,38 +1,46 @@
-using System;
-using System.Windows.Forms;
-using System.IO;
-using System.Xml;
-using System.Net;
+/*  frmUpdater.cs $
+ 	
+ 	   This file is part of the HandBrake source code.
+ 	   Homepage: <http://handbrake.fr>.
+ 	   It may be used under the terms of the GNU General Public License. */
 
 namespace Handbrake
 {
+    using System;
+    using System.Windows.Forms;
+    using Functions;
+
     public partial class frmUpdater : Form
     {
-        Functions.RssReader rssRead = new Functions.RssReader();
-        public frmUpdater()
+        private readonly AppcastReader Appcast;
+
+        public frmUpdater(AppcastReader reader)
         {
             InitializeComponent();
-          
-            getRss();
-            setVersions();
+
+            Appcast = reader;
+            GetRss();
+            SetVersions();
         }
 
-        private void getRss()
-        { 
-            wBrowser.DocumentText = "<font face=\"verdana\" size=\"1\">" + rssRead.versionInfo() + "</font>";
+        private void GetRss()
+        {
+            wBrowser.Url = Appcast.DescriptionUrl;
         }
 
-        private void setVersions()
+        private void SetVersions()
         {
-            lbl_oldVersion.Text = "(you have: " + Properties.Settings.Default.CliVersion + " / " + Properties.Settings.Default.build  + ").";
-            lbl_newVersion.Text = rssRead.version() + " (" + rssRead.build() + ")";
+            string old = "(You have: " + Properties.Settings.Default.hb_version.Trim() + " / " +
+                         Properties.Settings.Default.hb_build.ToString().Trim() + ")";
+            string newBuild = Appcast.Version.Trim() + " (" + Appcast.Build + ")";
+            lbl_update_text.Text = "HandBrake " + newBuild + " is now available. " + old;
         }
 
         private void btn_installUpdate_Click(object sender, EventArgs e)
         {
-            frmDownload download = new frmDownload();
-            download.Show();
-            this.Close(); 
+            frmDownload download = new frmDownload(Appcast.DownloadFile);
+            download.ShowDialog();
+            this.Close();
         }
 
         private void btn_remindLater_Click(object sender, EventArgs e)
@@ -42,17 +50,10 @@ namespace Handbrake
 
         private void btn_skip_Click(object sender, EventArgs e)
         {
-            try
-            {
-                Properties.Settings.Default.skipversion = int.Parse(rssRead.build());
-                Properties.Settings.Default.Save();
-            }
-            catch (Exception exc)
-            {
-                MessageBox.Show(exc.ToString());
-            }
+            Properties.Settings.Default.skipversion = int.Parse(Appcast.Build);
+            Properties.Settings.Default.Save();
+
             this.Close();
         }
-
     }
 }
\ No newline at end of file