WinGui:

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

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 83135c6..d95d085 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -12,11 +12,11 @@ namespace Handbrake
     using System.Drawing;\r
     using System.Globalization;\r
     using System.IO;\r
-    using System.Reflection;\r
     using System.Threading;\r
     using System.Windows.Forms;\r
     using Functions;\r
 \r
+    using HandBrake.ApplicationServices.Functions;\r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Parsing;\r
     using HandBrake.ApplicationServices.Services;\r
@@ -26,6 +26,11 @@ namespace Handbrake
     using Presets;\r
     using Properties;\r
 \r
+    using Main = Handbrake.Functions.Main;\r
+\r
+    /// <summary>\r
+    /// The Main Window\r
+    /// </summary>\r
     public partial class frmMain : Form\r
     {\r
         // Objects which may be used by one or more other objects *************\r
@@ -94,8 +99,7 @@ namespace Handbrake
 \r
             if (Settings.Default.hb_version.Contains("svn"))\r
             {\r
-                Version v = Assembly.GetExecutingAssembly().GetName().Version;\r
-                this.Text += " " + v.ToString(4);\r
+                this.Text += " " + Settings.Default.hb_version;\r
             }\r
 \r
             // Check for new versions, if update checking is enabled\r
@@ -910,7 +914,7 @@ namespace Handbrake
             MessageBox.Show("This feature has not been implimented yet.", "Not Implimented", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             return;\r
 \r
-            SaveFileDialog savefiledialog = new SaveFileDialog();\r
+            /*SaveFileDialog savefiledialog = new SaveFileDialog();\r
             savefiledialog.Filter = "plist|*.plist";\r
 \r
             if (treeView_presets.SelectedNode != null)\r
@@ -921,7 +925,7 @@ namespace Handbrake
                     Preset preset = presetHandler.GetPreset(treeView_presets.SelectedNode.Text);\r
                     PlistPresetHandler.Export(savefiledialog.FileName, preset);\r
                 }\r
-            }\r
+            }*/\r
         }\r
 \r
         #endregion\r
@@ -1126,7 +1130,6 @@ namespace Handbrake
             lbl_encode.Text = encodeQueue.Count + " encode(s) pending in the queue";\r
 \r
             queueWindow.Show();\r
-\r
         }\r
 \r
         /// <summary>\r
@@ -1288,7 +1291,6 @@ namespace Handbrake
                 int id;\r
                 if (int.TryParse(driveId, out id))\r
                 {\r
-\r
                     this.dvdDrivePath = drives[id].RootDirectory;\r
                     this.dvdDriveLabel = drives[id].VolumeLabel;\r
 \r
@@ -1761,7 +1763,7 @@ namespace Handbrake
             }\r
         }\r
 \r
-        private double _cachedCqStep = Properties.Settings.Default.x264cqstep;\r
+        private double cachedCqStep = Properties.Settings.Default.x264cqstep;\r
 \r
         /// <summary>\r
         /// Update the CQ slider for x264 for a new CQ step. This is set from option\r
@@ -1769,7 +1771,7 @@ namespace Handbrake
         public void setQualityFromSlider()\r
         {\r
             // Work out the current RF value.\r
-            double cqStep = _cachedCqStep;\r
+            double cqStep = this.cachedCqStep;\r
             double rfValue = 51.0 - slider_videoQuality.Value * cqStep;\r
 \r
             // Change the maximum value for the slider\r
@@ -1788,7 +1790,7 @@ namespace Handbrake
             }\r
 \r
             // Cache the CQ step for the next calculation\r
-            _cachedCqStep = Properties.Settings.Default.x264cqstep;\r
+            this.cachedCqStep = Properties.Settings.Default.x264cqstep;\r
         }\r
 \r
         private void slider_videoQuality_Scroll(object sender, EventArgs e)\r