WinGui:

- Move the "Scanning x of x" text to the Source Label. Similar to the Lin/Mac gui's.

git-svn-id: svn://localhost/HandBrake/trunk@3546 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 8a806e5..ba0e3a6 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -25,7 +25,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
-    <PlatformTarget>x86</PlatformTarget>\r
+    <PlatformTarget>AnyCPU</PlatformTarget>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
     <DebugType>pdbonly</DebugType>\r

diff --git a/win/C#/HandBrake.Framework/HandBrake.Framework.csproj b/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
index 2cc2cf3..9ef6a51 100644 (file)
--- a/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
+++ b/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
@@ -25,7 +25,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
-    <PlatformTarget>x86</PlatformTarget>\r
+    <PlatformTarget>AnyCPU</PlatformTarget>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
     <DebugType>pdbonly</DebugType>\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index abb397c..f4dee16 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -39,7 +39,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.ContextMenuStrip notifyIconMenu;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
@@ -176,7 +176,7 @@ namespace Handbrake
             this.labelPreset = new System.Windows.Forms.Label();\r
             this.labelSource = new System.Windows.Forms.Label();\r
             this.labelStaticSource = new System.Windows.Forms.Label();\r
-            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();\r
+            this.SourceLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();\r
             this.openPreset = new System.Windows.Forms.OpenFileDialog();\r
             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
@@ -204,7 +204,7 @@ namespace Handbrake
             this.tableLayoutPanel2.SuspendLayout();\r
             this.tableLayoutPanel3.SuspendLayout();\r
             this.tableLayoutPanel1.SuspendLayout();\r
-            this.flowLayoutPanel1.SuspendLayout();\r
+            this.SourceLayoutPanel.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // notifyIconMenu\r
@@ -407,9 +407,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle2.Format = "N0";\r
+            dataGridViewCellStyle2.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle2;\r
             this.number.Frozen = true;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
@@ -1685,17 +1685,17 @@ namespace Handbrake
             this.labelStaticSource.TabIndex = 51;\r
             this.labelStaticSource.Text = "Source:";\r
             // \r
-            // flowLayoutPanel1\r
+            // SourceLayoutPanel\r
             // \r
-            this.flowLayoutPanel1.AutoSize = true;\r
-            this.flowLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
-            this.flowLayoutPanel1.Controls.Add(this.labelStaticSource);\r
-            this.flowLayoutPanel1.Controls.Add(this.labelSource);\r
-            this.flowLayoutPanel1.Location = new System.Drawing.Point(9, 70);\r
-            this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);\r
-            this.flowLayoutPanel1.Name = "flowLayoutPanel1";\r
-            this.flowLayoutPanel1.Size = new System.Drawing.Size(195, 13);\r
-            this.flowLayoutPanel1.TabIndex = 55;\r
+            this.SourceLayoutPanel.AutoSize = true;\r
+            this.SourceLayoutPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
+            this.SourceLayoutPanel.Controls.Add(this.labelStaticSource);\r
+            this.SourceLayoutPanel.Controls.Add(this.labelSource);\r
+            this.SourceLayoutPanel.Location = new System.Drawing.Point(9, 70);\r
+            this.SourceLayoutPanel.Margin = new System.Windows.Forms.Padding(0);\r
+            this.SourceLayoutPanel.Name = "SourceLayoutPanel";\r
+            this.SourceLayoutPanel.Size = new System.Drawing.Size(195, 13);\r
+            this.SourceLayoutPanel.TabIndex = 55;\r
             // \r
             // openPreset\r
             // \r
@@ -1715,7 +1715,7 @@ namespace Handbrake
             this.ClientSize = new System.Drawing.Size(1002, 583);\r
             this.Controls.Add(this.tableLayoutPanel3);\r
             this.Controls.Add(this.toolStrip1);\r
-            this.Controls.Add(this.flowLayoutPanel1);\r
+            this.Controls.Add(this.SourceLayoutPanel);\r
             this.Controls.Add(this.frmMainMenu);\r
             this.Controls.Add(this.tableLayoutPanel2);\r
             this.Controls.Add(this.labelPreset);\r
@@ -1765,8 +1765,8 @@ namespace Handbrake
             this.tableLayoutPanel3.PerformLayout();\r
             this.tableLayoutPanel1.ResumeLayout(false);\r
             this.tableLayoutPanel1.PerformLayout();\r
-            this.flowLayoutPanel1.ResumeLayout(false);\r
-            this.flowLayoutPanel1.PerformLayout();\r
+            this.SourceLayoutPanel.ResumeLayout(false);\r
+            this.SourceLayoutPanel.PerformLayout();\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -1894,7 +1894,7 @@ namespace Handbrake
         internal ComboBox drp_dvdtitle;\r
         internal Label Label10;\r
         private Label labelStaticSource;\r
-        private FlowLayoutPanel flowLayoutPanel1;\r
+        private FlowLayoutPanel SourceLayoutPanel;\r
         private ToolStripMenuItem mnu_importMacPreset;\r
         private OpenFileDialog openPreset;\r
         private Button btn_importChapters;\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 2c72afa..453b48a 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -2050,7 +2050,7 @@ namespace Handbrake
                 BeginInvoke(new UpdateWindowHandler(UpdateScanStatusLabel));\r
                 return;\r
             }\r
-            lbl_encode.Text = SourceScan.ScanStatus;\r
+            labelSource.Text = SourceScan.ScanStatus;\r
         }\r
 \r
         /// <summary>\r
@@ -2131,7 +2131,6 @@ namespace Handbrake
             {\r
                 if (InvokeRequired)\r
                     BeginInvoke(new UpdateWindowHandler(EnableGUI));\r
-                lbl_encode.Text = "Scan Completed";\r
                 foreach (Control ctrl in Controls)\r
                     ctrl.Enabled = true;\r
                 btn_start.Enabled = true;\r
@@ -2156,8 +2155,9 @@ namespace Handbrake
                 if (!(ctrl is StatusStrip || ctrl is MenuStrip || ctrl is ToolStrip))\r
                     ctrl.Enabled = false;\r
 \r
-            lbl_encode.Visible = true;\r
-            lbl_encode.Text = "Scanning ...";\r
+            labelSource.Enabled = true;\r
+            labelStaticSource.Enabled = true;\r
+            SourceLayoutPanel.Enabled = true;\r
             btn_source.Enabled = false;\r
             btn_start.Enabled = false;\r
             btn_showQueue.Enabled = false;\r