WinGui:

- Fixed View DVD Information window not loading the dvdinfo.dat file every time the window is launched.
- Fixed a small file path issue with frmReadDVD

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@865 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 50df43d0671a5ca76cb248e0d0160518196f9b50..c85849e3f3883020214bfd18630d7833e045d1e7 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -528,7 +528,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("0.9.1")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("0.9.0")]\r
         public string CliVersion {\r
             get {\r
                 return ((string)(this["CliVersion"]));\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index f0356a9bf5df49b7b263dbfb1cf33b515b145294..4c573b0ecac9595f90be3ad411fce637fa8dc9c5 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -129,7 +129,7 @@
       <Value Profile="(Default)" />\r
     </Setting>\r
     <Setting Name="CliVersion" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)">0.9.1</Value>\r
+      <Value Profile="(Default)">0.9.0</Value>\r
     </Setting>\r
   </Settings>\r
 </SettingsFile>
\ No newline at end of file

diff --git a/win/C#/app.config b/win/C#/app.config
index de5b445009e0c69fa722e63a977f7edda71c0ee6..cbddc2c98779fce4356c0c081cf0fe5b69b467b5 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -131,7 +131,7 @@
                 <value />\r
             </setting>\r
             <setting name="CliVersion" serializeAs="String">\r
-                <value>0.9.1</value>\r
+                <value>0.9.0</value>\r
             </setting>\r
         </Handbrake.Properties.Settings>\r
     </userSettings>\r

diff --git a/win/C#/frmDvdInfo.Designer.cs b/win/C#/frmDvdInfo.Designer.cs
index 3db856d1d20552b73944f2be60d92134eae5d86f..6777d16667a8ec74666df49cc93ad20129535c38 100644 (file)
--- a/win/C#/frmDvdInfo.Designer.cs
+++ b/win/C#/frmDvdInfo.Designer.cs
@@ -91,6 +91,7 @@ namespace Handbrake
             this.Name = "frmDvdInfo";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
             this.Text = "Read DVD";\r
+            this.Load += new System.EventHandler(this.frmDvdInfo_Load);\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r

diff --git a/win/C#/frmDvdInfo.cs b/win/C#/frmDvdInfo.cs
index 3b2cfd87db94b65f72aa253a754401b3e48286cd..b4160200c38ae6ea668f4b339e656a72256bd72b 100644 (file)
--- a/win/C#/frmDvdInfo.cs
+++ b/win/C#/frmDvdInfo.cs
@@ -19,7 +19,32 @@ namespace Handbrake
         {\r
             InitializeComponent();\r
             this.rtf_dvdInfo.Text = string.Empty;\r
+            \r
+        }\r
+\r
+        /*public void HandleParsedData(object Sender, string Data)\r
+        {\r
+            if (this.InvokeRequired)\r
+            {\r
+                this.BeginInvoke(new Parsing.DataReadEventHandler(HandleParsedData), new object[] { Sender, Data });\r
+                return;\r
+            }\r
+            this.rtf_dvdInfo.AppendText(Data + System.Environment.NewLine);\r
+        }*/\r
 \r
+        private void btn_close_Click(object sender, EventArgs e)\r
+        {\r
+            this.Hide();\r
+        }\r
+\r
+        private void frmDvdInfo_Load(object sender, EventArgs e)\r
+        {\r
+            this.rtf_dvdInfo.Text = string.Empty;\r
+            readFile();\r
+        }\r
+\r
+        private void readFile()\r
+        {\r
             try\r
             {\r
                 string appPath = Application.StartupPath.ToString();\r
@@ -36,24 +61,9 @@ namespace Handbrake
                 sr.Close();\r
             }\r
             catch (Exception)\r
-            { \r
-               // Don't do anything\r
-            }\r
-        }\r
-\r
-        /*public void HandleParsedData(object Sender, string Data)\r
-        {\r
-            if (this.InvokeRequired)\r
             {\r
-                this.BeginInvoke(new Parsing.DataReadEventHandler(HandleParsedData), new object[] { Sender, Data });\r
-                return;\r
+                // Don't do anything\r
             }\r
-            this.rtf_dvdInfo.AppendText(Data + System.Environment.NewLine);\r
-        }*/\r
-\r
-        private void btn_close_Click(object sender, EventArgs e)\r
-        {\r
-            this.Hide();\r
         }\r
 \r
         /*protected override void OnClosing(CancelEventArgs e)\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 72c87904fece77b41dbbb16bfa0c4a84bf2097eb..30360a66d04d1483a0572ce71063095a2bae4010 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -30,7 +30,7 @@ namespace Handbrake
         // - Load users default settings. (if required)\r
         // - Do an update check (if required)\r
         // --------------------------------------------------------------\r
-        private frmDvdInfo dvdInfoWindow = new frmDvdInfo();\r
+        //private frmDvdInfo dvdInfoWindow = new frmDvdInfo();\r
         \r
         public frmMain()\r
         {\r
@@ -41,8 +41,8 @@ namespace Handbrake
             InitializeComponent();\r
 \r
             // This is a quick Hack fix for the cross-thread problem with frmDvdIndo ************************\r
-            dvdInfoWindow.Show();\r
-            dvdInfoWindow.Hide();\r
+            //dvdInfoWindow.Show();\r
+            //dvdInfoWindow.Hide();\r
             // **********************************************************************************************\r
 \r
 \r
@@ -383,8 +383,8 @@ namespace Handbrake
         {\r
             try\r
             {\r
+                frmDvdInfo dvdInfoWindow = new frmDvdInfo();\r
                 dvdInfoWindow.Show();\r
-                \r
             }\r
             catch (Exception)\r
             {\r
@@ -911,8 +911,8 @@ namespace Handbrake
         private void btn_Browse_Click(object sender, EventArgs e)\r
         {\r
             String filename =""; \r
-                   text_source.Text = ""; \r
-                                \r
+                   text_source.Text = "";\r
+            frmDvdInfo dvdInfoWindow = new frmDvdInfo();                \r
                    if (RadioDVD.Checked) \r
                    { \r
                        DVD_Open.ShowDialog(); \r
@@ -1229,7 +1229,7 @@ namespace Handbrake
                     }\r
                 }\r
             }\r
-            catch (Exception exc)\r
+            catch (Exception)\r
             {\r
                 // No need to throw an error here.\r
                 // Note on non english systems, this will throw an error because of double.Parse(lbl_Aspect.Text); not working.\r

diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index ad5551188c6050a87570ec977e7f1e5c5ac11a70..caef654cd627619c84ea56eced4bed037ff991b9 100644 (file)
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -85,9 +85,8 @@ namespace Handbrake
              */\r
             try\r
             {\r
-                string appPath = Application.StartupPath.ToString();\r
-                appPath = appPath + "\\";\r
-                string strCmdLine = "cmd /c " + '"' + '"' + appPath + "\\hbcli.exe" + '"' +  " -i" + '"' + inputFile + '"' + " -t0 >" + '"'+ appPath + "\\dvdinfo.dat" + '"' + " 2>&1" + '"';\r
+                string appPath = Application.StartupPath.ToString()+ "\\";\r
+                string strCmdLine = "cmd /c " + '"' + '"' + appPath + "hbcli.exe" + '"' +  " -i " + '"' + inputFile + '"' + " -t0 >" + '"'+ appPath + "dvdinfo.dat" + '"' + " 2>&1" + '"';\r
                 Process hbproc = Process.Start("CMD.exe", strCmdLine);\r
                 hbproc.WaitForExit();\r
                 hbproc.Dispose();\r
@@ -96,7 +95,6 @@ namespace Handbrake
           \r
                 StreamReader sr = new StreamReader(appPath + "dvdinfo.dat");\r
                 thisDvd = Parsing.DVD.Parse(sr);\r
-\r
                 sr.Close();\r
 \r
                 Console.ReadLine();\r