X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmUpdater.cs;h=789a620fc5f0becd25c3c63f6b64996b65eb7e53;hb=bdeda20369fa84dc46814378c9a4af6a21ec3212;hp=9180f6dc369a2d81782d6adc08bfc6e427b06b79;hpb=65c22f1b679be4c6a631ea68b501ca465d7ac5c8;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmUpdater.cs b/win/C#/frmUpdater.cs
index 9180f6dc..789a620f 100644
--- a/win/C#/frmUpdater.cs
+++ b/win/C#/frmUpdater.cs
@@ -1,44 +1,44 @@
 /*  frmUpdater.cs $
  	
  	   This file is part of the HandBrake source code.
- 	   Homepage: <http://handbrake.m0k.org/>.
+ 	   Homepage: <http://handbrake.fr>.
  	   It may be used under the terms of the GNU General Public License. */
 
 using System;
 using System.Windows.Forms;
-using System.IO;
-using System.Xml;
-using System.Net;
+using Handbrake.Functions;
 
 namespace Handbrake
 {
     public partial class frmUpdater : Form
     {
-        Functions.RssReader rssRead = new Functions.RssReader();
-        public frmUpdater()
+        AppcastReader appcast;
+        public frmUpdater(AppcastReader reader)
         {
             InitializeComponent();
-          
+
+            appcast = reader;
             getRss();
             setVersions();
         }
 
         private void getRss()
-        { 
-            wBrowser.DocumentText = "<font face=\"verdana\" size=\"1\">" + rssRead.versionInfo() + "</font>";
+        {
+            wBrowser.Url = appcast.descriptionUrl;
         }
 
         private void setVersions()
         {
-            lbl_oldVersion.Text = "(you have: " + Properties.Settings.Default.hb_version + " / " + Properties.Settings.Default.hb_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)
@@ -48,15 +48,9 @@ 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();
         }