WinGui:

- Updated some tooltips for the main items on frmMain
- Created a Debug window.
- Added comments relating to a cross-thread bug with frmDvdInfo
- A few other code small code tweaks

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

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index c9b1bac812cf7a15a4b21b7928b87a3ce97f946b..829bad5d0bbeb8b9a437dc77e075ec0a8d4552ff 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -47,6 +47,12 @@
     <Compile Include="frmAbout.Designer.cs">\r
       <DependentUpon>frmAbout.cs</DependentUpon>\r
     </Compile>\r
+    <Compile Include="frmDebug.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="frmDebug.Designer.cs">\r
+      <DependentUpon>frmDebug.cs</DependentUpon>\r
+    </Compile>\r
     <Compile Include="frmDvdInfo.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
@@ -78,6 +84,10 @@
       <SubType>Designer</SubType>\r
       <DependentUpon>frmAbout.cs</DependentUpon>\r
     </EmbeddedResource>\r
+    <EmbeddedResource Include="frmDebug.resx">\r
+      <SubType>Designer</SubType>\r
+      <DependentUpon>frmDebug.cs</DependentUpon>\r
+    </EmbeddedResource>\r
     <EmbeddedResource Include="frmDvdInfo.resx">\r
       <SubType>Designer</SubType>\r
       <DependentUpon>frmDvdInfo.cs</DependentUpon>\r

diff --git a/win/C#/frmDvdInfo.Designer.cs b/win/C#/frmDvdInfo.Designer.cs
index 7760fc83405fa9a563eb4e19c382255be119a07d..6a3e690ae6c4f097a32f7933399aa337c253a6fe 100644 (file)
--- a/win/C#/frmDvdInfo.Designer.cs
+++ b/win/C#/frmDvdInfo.Designer.cs
@@ -76,7 +76,7 @@ namespace Handbrake
             this.AcceptButton = this.btn_close;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(545, 486);\r
+            this.ClientSize = new System.Drawing.Size(547, 495);\r
             this.Controls.Add(this.Label2);\r
             this.Controls.Add(this.rtf_dvdInfo);\r
             this.Controls.Add(this.btn_close);\r
@@ -84,6 +84,7 @@ namespace Handbrake
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
             this.MaximumSize = new System.Drawing.Size(553, 520);\r
+            this.MinimizeBox = false;\r
             this.MinimumSize = new System.Drawing.Size(553, 520);\r
             this.Name = "frmDvdInfo";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index c3aad552948867529f23dfe653545fac454454cf..3f4e8a669f2ba14257451373405e14e66083b832 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -214,7 +214,8 @@ namespace Handbrake
             this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21);\r
             this.drop_chapterFinish.TabIndex = 41;\r
             this.drop_chapterFinish.Text = "Auto";\r
-            this.ToolTip.SetToolTip(this.drop_chapterFinish, "Encode chapters to this number");\r
+            this.ToolTip.SetToolTip(this.drop_chapterFinish, "Step 3 - Select the chapter range you would like to enocde. (default: All Chapter" +\r
+                    "s)");\r
             this.drop_chapterFinish.SelectedIndexChanged += new System.EventHandler(this.drop_chapterFinish_SelectedIndexChanged);\r
             // \r
             // drop_chapterStart\r
@@ -227,7 +228,8 @@ namespace Handbrake
             this.drop_chapterStart.Size = new System.Drawing.Size(69, 21);\r
             this.drop_chapterStart.TabIndex = 40;\r
             this.drop_chapterStart.Text = "Auto";\r
-            this.ToolTip.SetToolTip(this.drop_chapterStart, "Encode chatpers from this number.");\r
+            this.ToolTip.SetToolTip(this.drop_chapterStart, "Step 3 - Select the chapter range you would like to enocde. (default: All Chapter" +\r
+                    "s)");\r
             this.drop_chapterStart.SelectedIndexChanged += new System.EventHandler(this.drop_chapterStart_SelectedIndexChanged);\r
             // \r
             // drp_dvdtitle\r
@@ -242,7 +244,7 @@ namespace Handbrake
             this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);\r
             this.drp_dvdtitle.TabIndex = 39;\r
             this.drp_dvdtitle.Text = "Automatic";\r
-            this.ToolTip.SetToolTip(this.drp_dvdtitle, "The title number you wish to encode.");\r
+            this.ToolTip.SetToolTip(this.drp_dvdtitle, "Step 2 - Select the title number you wish to encode.");\r
             this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged);\r
             this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click);\r
             // \r
@@ -277,7 +279,7 @@ namespace Handbrake
             this.text_destination.Name = "text_destination";\r
             this.text_destination.Size = new System.Drawing.Size(262, 21);\r
             this.text_destination.TabIndex = 4;\r
-            this.ToolTip.SetToolTip(this.text_destination, "Where you wish to save your output file.");\r
+            this.ToolTip.SetToolTip(this.text_destination, "Location where the enoceded file will be saved.");\r
             // \r
             // drp_subtitle\r
             // \r
@@ -616,6 +618,7 @@ namespace Handbrake
             this.btn_Browse.Size = new System.Drawing.Size(78, 22);\r
             this.btn_Browse.TabIndex = 2;\r
             this.btn_Browse.Text = "Browse";\r
+            this.ToolTip.SetToolTip(this.btn_Browse, "Step 1 - Select a Source. This can be either a DVD or ts/mpg/iso file");\r
             this.btn_Browse.UseVisualStyleBackColor = true;\r
             this.btn_Browse.Click += new System.EventHandler(this.btn_Browse_Click);\r
             // \r
@@ -717,6 +720,7 @@ namespace Handbrake
             this.text_height.Name = "text_height";\r
             this.text_height.Size = new System.Drawing.Size(64, 21);\r
             this.text_height.TabIndex = 8;\r
+            this.ToolTip.SetToolTip(this.text_height, "Video Resolution (Height)");\r
             this.text_height.TextChanged += new System.EventHandler(this.text_height_TextChanged);\r
             // \r
             // Label55\r
@@ -738,6 +742,7 @@ namespace Handbrake
             this.text_width.Name = "text_width";\r
             this.text_width.Size = new System.Drawing.Size(64, 21);\r
             this.text_width.TabIndex = 7;\r
+            this.ToolTip.SetToolTip(this.text_width, "Video Resolution (Width)");\r
             this.text_width.TextChanged += new System.EventHandler(this.text_width_TextChanged);\r
             // \r
             // btn_destBrowse\r
@@ -751,6 +756,7 @@ namespace Handbrake
             this.btn_destBrowse.Size = new System.Drawing.Size(83, 22);\r
             this.btn_destBrowse.TabIndex = 4;\r
             this.btn_destBrowse.Text = "Browse";\r
+            this.ToolTip.SetToolTip(this.btn_destBrowse, "Step 4 - Select a location to save your encoded file.");\r
             this.btn_destBrowse.UseVisualStyleBackColor = true;\r
             this.btn_destBrowse.Click += new System.EventHandler(this.btn_destBrowse_Click);\r
             // \r
@@ -781,6 +787,7 @@ namespace Handbrake
             this.drp_videoEncoder.Size = new System.Drawing.Size(156, 21);\r
             this.drp_videoEncoder.TabIndex = 5;\r
             this.drp_videoEncoder.Text = "H.264";\r
+            this.ToolTip.SetToolTip(this.drp_videoEncoder, "Step 5 - Select a video encoder");\r
             this.drp_videoEncoder.SelectedIndexChanged += new System.EventHandler(this.drp_videoEncoder_SelectedIndexChanged);\r
             // \r
             // Label47\r
@@ -809,6 +816,7 @@ namespace Handbrake
             this.drp_audioCodec.Size = new System.Drawing.Size(111, 21);\r
             this.drp_audioCodec.TabIndex = 6;\r
             this.drp_audioCodec.Text = "AAC";\r
+            this.ToolTip.SetToolTip(this.drp_audioCodec, "Step 6 - Select an audio encoder.");\r
             this.drp_audioCodec.SelectedIndexChanged += new System.EventHandler(this.drp_audioCodec_SelectedIndexChanged);\r
             // \r
             // Label12\r
@@ -1742,6 +1750,7 @@ namespace Handbrake
             this.MinimumSize = new System.Drawing.Size(683, 648);\r
             this.Name = "frmMain";\r
             this.Text = "Handbrake";\r
+            this.Load += new System.EventHandler(this.frmMain_Load);\r
             this.frmMainMenu.ResumeLayout(false);\r
             this.frmMainMenu.PerformLayout();\r
             this.GroupBox1.ResumeLayout(false);\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 0983635ded48e7cda61e73ebc89b2fff0e519a21..96f90a6604791fd4256f96c904e09f4467c1caf4 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -20,8 +20,7 @@ namespace Handbrake
         // --------------------------------------------------------------\r
         // Some windows that require only 1 instance.\r
         // --------------------------------------------------------------\r
-        private frmDvdInfo dvdInfoWindow = new frmDvdInfo();\r
-        private frmQueue queueWindow = new frmQueue();\r
+        private frmQueue queueWindow = new frmQueue();  \r
         \r
         // -------------------------------------------------------------- \r
         // Stuff that needs doing on startup.\r
@@ -30,6 +29,7 @@ namespace Handbrake
         // --------------------------------------------------------------\r
         public frmMain()\r
         {\r
+            \r
             InitializeComponent();\r
 \r
             // Set the Version number lable to the corect version.\r
@@ -333,9 +333,17 @@ namespace Handbrake
             showQueue();\r
         }\r
 \r
+        private frmDvdInfo dvdInfoWindow = new frmDvdInfo();\r
         private void mnu_viewDVDdata_Click(object sender, EventArgs e)\r
         {\r
             dvdInfoWindow.Show();\r
+\r
+            // BUG *******************************************************\r
+            // Cross-thread operation not valid: Control 'rtf_dvdInfo' accessed from a thread other than the thread it was created on.\r
+            // This happens when the DVD is scanned and this item is then selected.\r
+            // If this item is selected so a blank copy of the window appears, then a DVD is scanned, there is no cross-thread issue.\r
+            // ***********************************************************\r
+\r
         }\r
 \r
         private void mnu_options_Click(object sender, EventArgs e)\r
@@ -1356,6 +1364,11 @@ namespace Handbrake
             return querySource+ queryDestination+ queryPictureSettings+ queryVideoSettings+ h264Settings+ queryAudioSettings+ queryAdvancedSettings+ verbose;\r
         }\r
 \r
+        private void frmMain_Load(object sender, EventArgs e)\r
+        {\r
+\r
+        }\r
+\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index c0513d469e3694298fb586ff970c3346e1806c37..67daeb96768d56bc3934c365e0bf9be0c59cefd2 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -257,6 +257,7 @@ namespace Handbrake
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
+            this.MinimizeBox = false;\r
             this.Name = "frmOptions";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
             this.Text = "Options";\r

diff --git a/win/C#/frmSplashScreen.Designer.cs b/win/C#/frmSplashScreen.Designer.cs
index 75c53b5356e53bd0de8da7cb42c628a0bfe184bb..9201edd8740718dc366826ddc8b637586a489d09 100644 (file)
--- a/win/C#/frmSplashScreen.Designer.cs
+++ b/win/C#/frmSplashScreen.Designer.cs
@@ -32,8 +32,8 @@ namespace Handbrake
             this.productName = new System.Windows.Forms.Label();\r
             this.cliVersion = new System.Windows.Forms.Label();\r
             this.guiVerison = new System.Windows.Forms.Label();\r
-            this.label2 = new System.Windows.Forms.Label();\r
-            this.label3 = new System.Windows.Forms.Label();\r
+            this.lbl_cli = new System.Windows.Forms.Label();\r
+            this.lbl_gui = new System.Windows.Forms.Label();\r
             this.label1 = new System.Windows.Forms.Label();\r
             this.label4 = new System.Windows.Forms.Label();\r
             this.SuspendLayout();\r
@@ -68,25 +68,25 @@ namespace Handbrake
             this.guiVerison.TabIndex = 2;\r
             this.guiVerison.Text = "Version:";\r
             // \r
-            // label2\r
+            // lbl_cli\r
             // \r
-            this.label2.AutoSize = true;\r
-            this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label2.Location = new System.Drawing.Point(331, 197);\r
-            this.label2.Name = "label2";\r
-            this.label2.Size = new System.Drawing.Size(88, 13);\r
-            this.label2.TabIndex = 4;\r
-            this.label2.Text = "{CLI Version}";\r
+            this.lbl_cli.AutoSize = true;\r
+            this.lbl_cli.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_cli.Location = new System.Drawing.Point(331, 197);\r
+            this.lbl_cli.Name = "lbl_cli";\r
+            this.lbl_cli.Size = new System.Drawing.Size(88, 13);\r
+            this.lbl_cli.TabIndex = 4;\r
+            this.lbl_cli.Text = "{CLI Version}";\r
             // \r
-            // label3\r
+            // lbl_gui\r
             // \r
-            this.label3.AutoSize = true;\r
-            this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label3.Location = new System.Drawing.Point(331, 170);\r
-            this.label3.Name = "label3";\r
-            this.label3.Size = new System.Drawing.Size(90, 13);\r
-            this.label3.TabIndex = 5;\r
-            this.label3.Text = "{GUI Version}";\r
+            this.lbl_gui.AutoSize = true;\r
+            this.lbl_gui.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_gui.Location = new System.Drawing.Point(331, 170);\r
+            this.lbl_gui.Name = "lbl_gui";\r
+            this.lbl_gui.Size = new System.Drawing.Size(90, 13);\r
+            this.lbl_gui.TabIndex = 5;\r
+            this.lbl_gui.Text = "{GUI Version}";\r
             // \r
             // label1\r
             // \r
@@ -119,8 +119,8 @@ namespace Handbrake
             this.ControlBox = false;\r
             this.Controls.Add(this.label4);\r
             this.Controls.Add(this.label1);\r
-            this.Controls.Add(this.label3);\r
-            this.Controls.Add(this.label2);\r
+            this.Controls.Add(this.lbl_gui);\r
+            this.Controls.Add(this.lbl_cli);\r
             this.Controls.Add(this.guiVerison);\r
             this.Controls.Add(this.cliVersion);\r
             this.Controls.Add(this.productName);\r
@@ -139,8 +139,8 @@ namespace Handbrake
         private System.Windows.Forms.Label productName;\r
         private System.Windows.Forms.Label cliVersion;\r
         private System.Windows.Forms.Label guiVerison;\r
-        private System.Windows.Forms.Label label2;\r
-        private System.Windows.Forms.Label label3;\r
+        private System.Windows.Forms.Label lbl_cli;\r
+        private System.Windows.Forms.Label lbl_gui;\r
         private System.Windows.Forms.Label label1;\r
         private System.Windows.Forms.Label label4;\r
     }\r

diff --git a/win/C#/frmSplashScreen.cs b/win/C#/frmSplashScreen.cs
index 65ca835b20a9541f60a407a75728136f78875ad4..d45d0ca269b616201135b5e542c0baaf99005c14 100644 (file)
--- a/win/C#/frmSplashScreen.cs
+++ b/win/C#/frmSplashScreen.cs
@@ -14,8 +14,8 @@ namespace Handbrake
         public frmSplashScreen()\r
         {\r
             InitializeComponent();\r
+            lbl_cli.Text = Properties.Settings.Default.CliVersion;\r
+            lbl_gui.Text = Properties.Settings.Default.GuiVersion;\r
         }\r
-\r
-           \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmUpdate.Designer.cs b/win/C#/frmUpdate.Designer.cs
index 3dc89ff5b547421aa0709527134acd9bf5e61aed..33efdb7af2c29ce93cf9ef71feeb0c5f6434f052 100644 (file)
--- a/win/C#/frmUpdate.Designer.cs
+++ b/win/C#/frmUpdate.Designer.cs
@@ -206,7 +206,7 @@ namespace Handbrake
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(498, 132);\r
+            this.ClientSize = new System.Drawing.Size(498, 139);\r
             this.Controls.Add(this.cliVersion);\r
             this.Controls.Add(this.lbl_cliVersion);\r
             this.Controls.Add(this.Label6);\r
@@ -225,6 +225,7 @@ namespace Handbrake
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
             this.MaximumSize = new System.Drawing.Size(504, 164);\r
+            this.MinimizeBox = false;\r
             this.MinimumSize = new System.Drawing.Size(504, 164);\r
             this.Name = "frmUpdate";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r