WinGui:

- Got rid of the DVD info window. DVD information can now be read from the activity window.
- Removed some unused code calls to frmDvdInfo.
- Changed frmActivityWindow design, removed all buttons, text window now expands as the window size grows. Basically, the window is identical to the MacGUI window now.

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

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index da343ea949afa11e7c8375b03b0c92372195591b..49f2ae677d0fba0d252663f0059bfa0cae59191a 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -128,12 +128,6 @@
     <Compile Include="frmDownload.Designer.cs">\r
       <DependentUpon>frmDownload.cs</DependentUpon>\r
     </Compile>\r
-    <Compile Include="frmDvdInfo.cs">\r
-      <SubType>Form</SubType>\r
-    </Compile>\r
-    <Compile Include="frmDvdInfo.Designer.cs">\r
-      <DependentUpon>frmDvdInfo.cs</DependentUpon>\r
-    </Compile>\r
     <Compile Include="frmMain.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
@@ -187,10 +181,6 @@
       <SubType>Designer</SubType>\r
       <DependentUpon>frmDownload.cs</DependentUpon>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="frmDvdInfo.resx">\r
-      <SubType>Designer</SubType>\r
-      <DependentUpon>frmDvdInfo.cs</DependentUpon>\r
-    </EmbeddedResource>\r
     <EmbeddedResource Include="frmMain.resx">\r
       <SubType>Designer</SubType>\r
       <DependentUpon>frmMain.cs</DependentUpon>\r

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index e5f9dd949276815b1ab42b048f881d267bfcdd2b..41899aafe210bb4b80dd30f81192ce194bc4bd02 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -121,7 +121,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("2008041701")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("2008043001")]\r
         public int hb_build {\r
             get {\r
                 return ((int)(this["hb_build"]));\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index ab759a13b984c6bde5b8a634459bcf4d2f2406ef..e36176bfb9240e9b22ad1e1d3e317f06712f56ae 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -27,7 +27,7 @@
       <Value Profile="(Default)">Checked</Value>\r
     </Setting>\r
     <Setting Name="hb_build" Type="System.Int32" Scope="User">\r
-      <Value Profile="(Default)">2008041701</Value>\r
+      <Value Profile="(Default)">2008043001</Value>\r
     </Setting>\r
     <Setting Name="skipversion" Type="System.Int32" Scope="User">\r
       <Value Profile="(Default)">0</Value>\r

diff --git a/win/C#/app.config b/win/C#/app.config
index 61a016d11a1e0755a7fabba665f17bf78fa3744e..1b9181203bbb0c99edb091e7ae03cd3450bc6fc6 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -32,7 +32,7 @@
                 <value>Checked</value>\r
             </setting>\r
             <setting name="hb_build" serializeAs="String">\r
-                <value>2008041701</value>\r
+                <value>2008043001</value>\r
             </setting>\r
             <setting name="skipversion" serializeAs="String">\r
                 <value>0</value>\r

diff --git a/win/C#/frmActivityWindow.Designer.cs b/win/C#/frmActivityWindow.Designer.cs
index ac1e6f1acb94760e594a079fe4ded37cec923dc4..1ef113d368d43ac5178f9a59785d6be04b5685b8 100644 (file)
--- a/win/C#/frmActivityWindow.Designer.cs
+++ b/win/C#/frmActivityWindow.Designer.cs
@@ -37,81 +37,43 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmActivityWindow));\r
             this.rtf_actLog = new System.Windows.Forms.RichTextBox();\r
-            this.btn_close = new System.Windows.Forms.Button();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
-            this.btn_copy = new System.Windows.Forms.Button();\r
-            this.btn_refresh = new System.Windows.Forms.Button();\r
+            this.panel1 = new System.Windows.Forms.Panel();\r
+            this.panel1.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // rtf_actLog\r
             // \r
             this.rtf_actLog.Cursor = System.Windows.Forms.Cursors.IBeam;\r
             this.rtf_actLog.DetectUrls = false;\r
-            this.rtf_actLog.Location = new System.Drawing.Point(12, 12);\r
+            this.rtf_actLog.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.rtf_actLog.Location = new System.Drawing.Point(0, 0);\r
             this.rtf_actLog.Name = "rtf_actLog";\r
             this.rtf_actLog.ReadOnly = true;\r
-            this.rtf_actLog.Size = new System.Drawing.Size(515, 433);\r
+            this.rtf_actLog.Size = new System.Drawing.Size(390, 390);\r
             this.rtf_actLog.TabIndex = 29;\r
             this.rtf_actLog.Text = "";\r
             // \r
-            // btn_close\r
-            // \r
-            this.btn_close.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_close.Location = new System.Drawing.Point(399, 451);\r
-            this.btn_close.Name = "btn_close";\r
-            this.btn_close.Size = new System.Drawing.Size(128, 22);\r
-            this.btn_close.TabIndex = 28;\r
-            this.btn_close.TabStop = false;\r
-            this.btn_close.Text = "Close Window";\r
-            this.btn_close.UseVisualStyleBackColor = true;\r
-            this.btn_close.Click += new System.EventHandler(this.btn_close_Click);\r
-            // \r
             // ToolTip\r
             // \r
             this.ToolTip.Active = false;\r
             // \r
-            // btn_copy\r
-            // \r
-            this.btn_copy.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.btn_copy.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_copy.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_copy.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_copy.Location = new System.Drawing.Point(12, 451);\r
-            this.btn_copy.Name = "btn_copy";\r
-            this.btn_copy.Size = new System.Drawing.Size(134, 23);\r
-            this.btn_copy.TabIndex = 93;\r
-            this.btn_copy.Text = "Copy to Clipboard";\r
-            this.btn_copy.UseVisualStyleBackColor = true;\r
-            this.btn_copy.Click += new System.EventHandler(this.btn_copy_Click);\r
-            // \r
-            // btn_refresh\r
+            // panel1\r
             // \r
-            this.btn_refresh.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.btn_refresh.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_refresh.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_refresh.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_refresh.Location = new System.Drawing.Point(152, 451);\r
-            this.btn_refresh.Name = "btn_refresh";\r
-            this.btn_refresh.Size = new System.Drawing.Size(69, 23);\r
-            this.btn_refresh.TabIndex = 94;\r
-            this.btn_refresh.Text = "Refresh";\r
-            this.btn_refresh.UseVisualStyleBackColor = true;\r
-            this.btn_refresh.Click += new System.EventHandler(this.btn_refresh_Click);\r
+            this.panel1.Controls.Add(this.rtf_actLog);\r
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.panel1.Location = new System.Drawing.Point(0, 0);\r
+            this.panel1.Name = "panel1";\r
+            this.panel1.Size = new System.Drawing.Size(390, 390);\r
+            this.panel1.TabIndex = 95;\r
             // \r
             // frmActivityWindow\r
             // \r
-            this.AcceptButton = this.btn_close;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.ClientSize = new System.Drawing.Size(539, 486);\r
-            this.Controls.Add(this.btn_refresh);\r
-            this.Controls.Add(this.btn_copy);\r
-            this.Controls.Add(this.rtf_actLog);\r
-            this.Controls.Add(this.btn_close);\r
+            this.ClientSize = new System.Drawing.Size(390, 390);\r
+            this.Controls.Add(this.panel1);\r
             this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
@@ -120,6 +82,7 @@ namespace Handbrake
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
             this.Text = "Activity Window";\r
             this.Load += new System.EventHandler(this.frmActivityWindow_Load);\r
+            this.panel1.ResumeLayout(false);\r
             this.ResumeLayout(false);\r
 \r
         }\r
@@ -127,9 +90,7 @@ namespace Handbrake
         #endregion\r
 \r
         internal System.Windows.Forms.RichTextBox rtf_actLog;\r
-        internal System.Windows.Forms.Button btn_close;\r
         internal System.Windows.Forms.ToolTip ToolTip;\r
-        internal System.Windows.Forms.Button btn_copy;\r
-        internal System.Windows.Forms.Button btn_refresh;\r
+        private System.Windows.Forms.Panel panel1;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index 4864df680a7f6e76f0fe1a087c117a72df327acb..ebee0ea4258226208385c6bc28469886873b7885 100644 (file)
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -24,19 +24,15 @@ namespace Handbrake
         /// </summary>\r
         /// \r
         Thread monitorFile;\r
-        public frmActivityWindow()\r
+        String read_file;\r
+        public frmActivityWindow(string file)\r
         {\r
             InitializeComponent();\r
             this.rtf_actLog.Text = string.Empty;\r
             monitorFile = new Thread(autoUpdate);\r
+            read_file = file;\r
 \r
         }\r
-        \r
-        private void btn_close_Click(object sender, EventArgs e)\r
-        {\r
-            monitorFile.Abort();\r
-            this.Hide();\r
-        }\r
 \r
         private void frmActivityWindow_Load(object sender, EventArgs e)\r
         {\r
@@ -78,7 +74,7 @@ namespace Handbrake
             {\r
                 // hb_encode_log.dat is the primary log file. Since .NET can't read this file whilst the CLI is outputing to it,\r
                 // we'll need to make a copy of it.\r
-                string logFile = Path.Combine(Path.GetTempPath(), "hb_encode_log.dat");\r
+                string logFile = Path.Combine(Path.GetTempPath(), read_file);\r
                 string logFile2 = Path.Combine(Path.GetTempPath(), "hb_encode_log_AppReadable.dat");\r
 \r
                 // Make sure the application readable log file does not already exist. FileCopy fill fail if it does.\r
@@ -105,19 +101,5 @@ namespace Handbrake
 \r
             return log;\r
         }\r
-\r
-        private void btn_copy_Click(object sender, EventArgs e)\r
-        {\r
-            if (rtf_actLog.Text != "")\r
-                Clipboard.SetText(rtf_actLog.Text, TextDataFormat.Rtf);\r
-        }\r
-\r
-        private void btn_refresh_Click(object sender, EventArgs e)\r
-        {\r
-            rtf_actLog.Clear();\r
-            rtf_actLog.Text = readFile();\r
-        }\r
-\r
-\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 052f1b71936386675ccce056c4a2281cde424f79..b9aad1efe76208ded982ee2417cea3a0940e351f 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -343,7 +343,7 @@ namespace Handbrake
         }\r
         private void mnu_viewDVDdata_Click(object sender, EventArgs e)\r
         {\r
-            frmDvdInfo dvdInfoWindow = new frmDvdInfo();\r
+            frmActivityWindow dvdInfoWindow = new frmActivityWindow("dvdinfo.dat");\r
             dvdInfoWindow.Show();\r
         }\r
         private void mnu_options_Click(object sender, EventArgs e)\r
@@ -456,7 +456,7 @@ namespace Handbrake
         }\r
         private void btn_ActivityWindow_Click(object sender, EventArgs e)\r
         {\r
-            Form ActivityWindow = new frmActivityWindow();\r
+            frmActivityWindow ActivityWindow = new frmActivityWindow("hb_encode_log.dat");\r
             ActivityWindow.ShowDialog();\r
         }\r
 \r
@@ -465,7 +465,6 @@ namespace Handbrake
         {\r
             String filename = "";\r
             text_source.Text = "";\r
-            frmDvdInfo dvdInfoWindow = new frmDvdInfo();\r
 \r
             if (check_fileMode.Checked)\r
             {\r
@@ -484,7 +483,7 @@ namespace Handbrake
             {\r
                 if (filename != "")\r
                 {\r
-                    Form frmRD = new frmReadDVD(filename, this, dvdInfoWindow);\r
+                    Form frmRD = new frmReadDVD(filename, this);\r
                     text_source.Text = filename;\r
                     frmRD.ShowDialog();\r
                 }\r

diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index 4c62658f65729c1bb4bf341eb310151624b39851..d825d1c562412b8cd6d778cc9228795a4218d58b 100644 (file)
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -23,16 +23,14 @@ namespace Handbrake
     {\r
         private string inputFile;\r
         private frmMain mainWindow;\r
-        private frmDvdInfo dvdInfo;\r
         private Parsing.DVD thisDvd;\r
         private delegate void UpdateUIHandler();\r
 \r
-        public frmReadDVD(string inputFile, frmMain parent, frmDvdInfo dvdInfoWindow)\r
+        public frmReadDVD(string inputFile, frmMain parent)\r
         {\r
             InitializeComponent();\r
             this.inputFile = inputFile;\r
             this.mainWindow = parent;\r
-            this.dvdInfo = dvdInfoWindow;\r
             startScan();\r
 \r
         }\r
@@ -100,11 +98,9 @@ namespace Handbrake
                             }\r
                         }\r
                     }\r
-            \r
                 }\r
 \r
-\r
-                    mainWindow.drp_dvdtitle.SelectedItem = title2Select;\r
+                mainWindow.drp_dvdtitle.SelectedItem = title2Select;\r
 \r
                 this.Close();\r
             }\r
@@ -136,7 +132,7 @@ namespace Handbrake
                 {\r
                     hbproc.WaitForExit();\r
                     // TODO: Verify exit code if the CLI supports it properly\r
-                } \r
+                }\r
 \r
                 if (!File.Exists(dvdInfoPath))\r
                 {\r
@@ -146,6 +142,8 @@ namespace Handbrake
                 using (StreamReader sr = new StreamReader(dvdInfoPath))\r
                 {\r
                     thisDvd = Parsing.DVD.Parse(sr);\r
+                    sr.Close();\r
+                    sr.Dispose();\r
                 }\r
 \r
                 updateUIElements();\r