WinGUI:

- Fixed style problems in Vista and XP when using the stock windows theme. Should look far more consistent now.

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

diff --git a/win/Handbrake/Handbrake.vbproj b/win/Handbrake/Handbrake.vbproj
index 047eaa1b168e1f9634f9e75aa7b801267697a47a..4b2adfe9a7512a7a05327a6e88dbd702f738f220 100644 (file)
--- a/win/Handbrake/Handbrake.vbproj
+++ b/win/Handbrake/Handbrake.vbproj
@@ -11,8 +11,7 @@
     <RootNamespace>Handbrake</RootNamespace>\r
     <AssemblyName>Handbrake</AssemblyName>\r
     <MyType>WindowsForms</MyType>\r
-    <ApplicationIcon>\r
-    </ApplicationIcon>\r
+    <ApplicationIcon>handbrakepineapple.ico</ApplicationIcon>\r
     <PublishUrl>publish\</PublishUrl>\r
     <Install>true</Install>\r
     <InstallFrom>Disk</InstallFrom>\r
@@ -199,6 +198,9 @@
       <Install>true</Install>\r
     </BootstrapperPackage>\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <Content Include="handbrakepineapple.ico" />\r
+  </ItemGroup>\r
   <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r

diff --git a/win/Handbrake/My Project/Application.Designer.vb b/win/Handbrake/My Project/Application.Designer.vb
index 11afa33fa19e258b6f831fd25ca650ed809bf3de..b17a49fad57e7ecb78dbbb3f7f3cd59cdfa856ff 100644 (file)
--- a/win/Handbrake/My Project/Application.Designer.vb
+++ b/win/Handbrake/My Project/Application.Designer.vb
@@ -25,7 +25,7 @@ Namespace My
         Public Sub New()\r
             MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)\r
             Me.IsSingleInstance = true\r
-            Me.EnableVisualStyles = false\r
+            Me.EnableVisualStyles = true\r
             Me.SaveMySettingsOnExit = true\r
             Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses\r
         End Sub\r

diff --git a/win/Handbrake/My Project/Application.myapp b/win/Handbrake/My Project/Application.myapp
index 91f973068d1985a487a534b5a9e8148bb36848d7..4eed33b87e90e912816cb4f50a33abeac9ea7fc6 100644 (file)
--- a/win/Handbrake/My Project/Application.myapp
+++ b/win/Handbrake/My Project/Application.myapp
@@ -4,7 +4,7 @@
   <MainForm>frmMain</MainForm>\r
   <SingleInstance>true</SingleInstance>\r
   <ShutdownMode>0</ShutdownMode>\r
-  <EnableVisualStyles>false</EnableVisualStyles>\r
+  <EnableVisualStyles>true</EnableVisualStyles>\r
   <AuthenticationMode>0</AuthenticationMode>\r
   <SplashScreen>frmSplashScreen</SplashScreen>\r
   <SaveMySettingsOnExit>true</SaveMySettingsOnExit>\r

diff --git a/win/Handbrake/frmDVDData.Designer.vb b/win/Handbrake/frmDVDData.Designer.vb
index 2adde006f9fefdc4991f64a57c22b17ff88cae2b..173e43e92ddc5259d7849f2bce0ad1e591dbf5ea 100644 (file)
--- a/win/Handbrake/frmDVDData.Designer.vb
+++ b/win/Handbrake/frmDVDData.Designer.vb
@@ -47,7 +47,7 @@ Partial Class frmDvdData
         '\r
         'btn_close\r
         '\r
-        Me.btn_close.BackColor = System.Drawing.SystemColors.ActiveBorder\r
+        Me.btn_close.BackColor = System.Drawing.SystemColors.Control\r
         Me.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black\r
         Me.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_close.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
@@ -60,7 +60,7 @@ Partial Class frmDvdData
         Me.btn_close.Text = "Close Window"\r
         Me.btn_close.UseVisualStyleBackColor = False\r
         '\r
-        'frmSelect\r
+        'frmDvdData\r
         '\r
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)\r
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font\r
@@ -69,7 +69,7 @@ Partial Class frmDvdData
         Me.Controls.Add(Me.rtf_dvdInfo)\r
         Me.Controls.Add(Me.btn_close)\r
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)\r
-        Me.Name = "frmSelect"\r
+        Me.Name = "frmDvdData"\r
         Me.Text = "Read DVD"\r
         Me.ResumeLayout(False)\r
         Me.PerformLayout()\r

diff --git a/win/Handbrake/frmMain.Designer.vb b/win/Handbrake/frmMain.Designer.vb
index 1b9ed441d3a5ba802b0fc5fd80bfbeb250faec49..3f89dee64959941ad245985212ad6a6053c09739 100644 (file)
--- a/win/Handbrake/frmMain.Designer.vb
+++ b/win/Handbrake/frmMain.Designer.vb
@@ -254,10 +254,11 @@ Partial Class frmMain
         '\r
         'frmMainMenu\r
         '\r
+        Me.frmMainMenu.BackColor = System.Drawing.SystemColors.Control\r
         Me.frmMainMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FileToolStripMenuItem, Me.ToolsToolStripMenuItem, Me.PresetsToolStripMenuItem, Me.HelpToolStripMenuItem})\r
         Me.frmMainMenu.Location = New System.Drawing.Point(0, 0)\r
         Me.frmMainMenu.Name = "frmMainMenu"\r
-        Me.frmMainMenu.Size = New System.Drawing.Size(714, 24)\r
+        Me.frmMainMenu.Size = New System.Drawing.Size(710, 24)\r
         Me.frmMainMenu.TabIndex = 0\r
         Me.frmMainMenu.Text = "MenuStrip1"\r
         '\r
@@ -340,6 +341,7 @@ Partial Class frmMain
         '\r
         'PresetsToolStripMenuItem\r
         '\r
+        Me.PresetsToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control\r
         Me.PresetsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnu_preset_ipod133, Me.mnu_preset_ipod178, Me.mnu_preset_ipod235, Me.mnu_appleTv, Me.mnu_presetPS3, Me.ToolStripSeparator4, Me.mnu_ProgramDefaultOptions})\r
         Me.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem"\r
         Me.PresetsToolStripMenuItem.Size = New System.Drawing.Size(55, 20)\r
@@ -416,7 +418,7 @@ Partial Class frmMain
         '\r
         Me.mnu_faq.Name = "mnu_faq"\r
         Me.mnu_faq.Size = New System.Drawing.Size(157, 22)\r
-        Me.mnu_faq.Text = "Faq"\r
+        Me.mnu_faq.Text = "FAQ"\r
         '\r
         'WebsiteToolStripMenuItem\r
         '\r
@@ -450,7 +452,7 @@ Partial Class frmMain
         '\r
         'GroupBox4\r
         '\r
-        Me.GroupBox4.BackColor = System.Drawing.SystemColors.ControlLight\r
+        Me.GroupBox4.BackColor = System.Drawing.SystemColors.Control\r
         Me.GroupBox4.Controls.Add(Me.Label56)\r
         Me.GroupBox4.Controls.Add(Me.lbl_Aspect)\r
         Me.GroupBox4.Controls.Add(Me.Label91)\r
@@ -466,7 +468,7 @@ Partial Class frmMain
         Me.GroupBox4.Controls.Add(Me.Label12)\r
         Me.GroupBox4.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.GroupBox4.ForeColor = System.Drawing.Color.Black\r
-        Me.GroupBox4.Location = New System.Drawing.Point(15, 165)\r
+        Me.GroupBox4.Location = New System.Drawing.Point(15, 169)\r
         Me.GroupBox4.Name = "GroupBox4"\r
         Me.GroupBox4.Size = New System.Drawing.Size(683, 126)\r
         Me.GroupBox4.TabIndex = 406\r
@@ -615,7 +617,7 @@ Partial Class frmMain
         '\r
         'GroupBox1\r
         '\r
-        Me.GroupBox1.BackColor = System.Drawing.SystemColors.ControlLight\r
+        Me.GroupBox1.BackColor = System.Drawing.SystemColors.Control\r
         Me.GroupBox1.Controls.Add(Me.Label13)\r
         Me.GroupBox1.Controls.Add(Me.drop_chapterFinish)\r
         Me.GroupBox1.Controls.Add(Me.drop_chapterStart)\r
@@ -771,7 +773,7 @@ Partial Class frmMain
         '\r
         'btn_encode\r
         '\r
-        Me.btn_encode.BackColor = System.Drawing.SystemColors.ActiveBorder\r
+        Me.btn_encode.BackColor = System.Drawing.SystemColors.Control\r
         Me.btn_encode.FlatAppearance.BorderColor = System.Drawing.Color.Black\r
         Me.btn_encode.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_encode.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
@@ -786,7 +788,7 @@ Partial Class frmMain
         '\r
         'btn_queue\r
         '\r
-        Me.btn_queue.BackColor = System.Drawing.SystemColors.ActiveBorder\r
+        Me.btn_queue.BackColor = System.Drawing.SystemColors.Control\r
         Me.btn_queue.FlatAppearance.BorderColor = System.Drawing.Color.Black\r
         Me.btn_queue.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_queue.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
@@ -801,6 +803,7 @@ Partial Class frmMain
         '\r
         'h264Tab\r
         '\r
+        Me.h264Tab.BackColor = System.Drawing.SystemColors.Control\r
         Me.h264Tab.Controls.Add(Me.Label43)\r
         Me.h264Tab.Controls.Add(Me.label_h264)\r
         Me.h264Tab.Controls.Add(Me.Label95)\r
@@ -815,7 +818,6 @@ Partial Class frmMain
         Me.h264Tab.Size = New System.Drawing.Size(675, 257)\r
         Me.h264Tab.TabIndex = 5\r
         Me.h264Tab.Text = "H.264"\r
-        Me.h264Tab.UseVisualStyleBackColor = True\r
         '\r
         'Label43\r
         '\r
@@ -899,6 +901,7 @@ Partial Class frmMain
         '\r
         'TabPage4\r
         '\r
+        Me.TabPage4.BackColor = System.Drawing.SystemColors.Control\r
         Me.TabPage4.Controls.Add(Me.drp_processors)\r
         Me.TabPage4.Controls.Add(Me.Label6)\r
         Me.TabPage4.Controls.Add(Me.Label11)\r
@@ -908,7 +911,6 @@ Partial Class frmMain
         Me.TabPage4.Size = New System.Drawing.Size(675, 257)\r
         Me.TabPage4.TabIndex = 4\r
         Me.TabPage4.Text = "Advanced Settings"\r
-        Me.TabPage4.UseVisualStyleBackColor = True\r
         '\r
         'drp_processors\r
         '\r
@@ -944,6 +946,7 @@ Partial Class frmMain
         '\r
         'TabPage2\r
         '\r
+        Me.TabPage2.BackColor = System.Drawing.SystemColors.Control\r
         Me.TabPage2.Controls.Add(Me.Label29)\r
         Me.TabPage2.Controls.Add(Me.drp_audioMixDown)\r
         Me.TabPage2.Controls.Add(Me.drp_audioChannels)\r
@@ -962,7 +965,6 @@ Partial Class frmMain
         Me.TabPage2.Size = New System.Drawing.Size(675, 257)\r
         Me.TabPage2.TabIndex = 3\r
         Me.TabPage2.Text = "Audio Settings"\r
-        Me.TabPage2.UseVisualStyleBackColor = True\r
         '\r
         'Label29\r
         '\r
@@ -1090,6 +1092,7 @@ Partial Class frmMain
         '\r
         'TabPage3\r
         '\r
+        Me.TabPage3.BackColor = System.Drawing.SystemColors.Control\r
         Me.TabPage3.Controls.Add(Me.Label36)\r
         Me.TabPage3.Controls.Add(Me.Check_ChapterMarkers)\r
         Me.TabPage3.Controls.Add(Me.Label28)\r
@@ -1118,7 +1121,6 @@ Partial Class frmMain
         Me.TabPage3.Size = New System.Drawing.Size(675, 257)\r
         Me.TabPage3.TabIndex = 2\r
         Me.TabPage3.Text = "Video Settings"\r
-        Me.TabPage3.UseVisualStyleBackColor = True\r
         '\r
         'Label36\r
         '\r
@@ -1283,7 +1285,7 @@ Partial Class frmMain
         Me.slider_videoQuality.Location = New System.Drawing.Point(129, 90)\r
         Me.slider_videoQuality.Maximum = 100\r
         Me.slider_videoQuality.Name = "slider_videoQuality"\r
-        Me.slider_videoQuality.Size = New System.Drawing.Size(167, 42)\r
+        Me.slider_videoQuality.Size = New System.Drawing.Size(167, 45)\r
         Me.slider_videoQuality.TabIndex = 6\r
         Me.slider_videoQuality.TickFrequency = 17\r
         '\r
@@ -1337,6 +1339,7 @@ Partial Class frmMain
         '\r
         'TabPage1\r
         '\r
+        Me.TabPage1.BackColor = System.Drawing.SystemColors.Control\r
         Me.TabPage1.Controls.Add(Me.drp_subtitle)\r
         Me.TabPage1.Controls.Add(Me.Label19)\r
         Me.TabPage1.Controls.Add(Me.lbl_RecomendedCrop)\r
@@ -1360,7 +1363,6 @@ Partial Class frmMain
         Me.TabPage1.Size = New System.Drawing.Size(675, 257)\r
         Me.TabPage1.TabIndex = 0\r
         Me.TabPage1.Text = "Picture Settings"\r
-        Me.TabPage1.UseVisualStyleBackColor = True\r
         '\r
         'drp_subtitle\r
         '\r
@@ -1553,6 +1555,7 @@ Partial Class frmMain
         '\r
         'TabPage6\r
         '\r
+        Me.TabPage6.BackColor = System.Drawing.SystemColors.Control\r
         Me.TabPage6.Controls.Add(Me.Label7)\r
         Me.TabPage6.Controls.Add(Me.Label39)\r
         Me.TabPage6.Controls.Add(Me.btn_ClearQuery)\r
@@ -1564,7 +1567,6 @@ Partial Class frmMain
         Me.TabPage6.Size = New System.Drawing.Size(675, 257)\r
         Me.TabPage6.TabIndex = 6\r
         Me.TabPage6.Text = "Query Editor"\r
-        Me.TabPage6.UseVisualStyleBackColor = True\r
         '\r
         'Label7\r
         '\r
@@ -2325,7 +2327,7 @@ Partial Class frmMain
         '\r
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)\r
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font\r
-        Me.ClientSize = New System.Drawing.Size(714, 631)\r
+        Me.ClientSize = New System.Drawing.Size(710, 633)\r
         Me.Controls.Add(Me.lbl_update)\r
         Me.Controls.Add(Me.btn_queue)\r
         Me.Controls.Add(Me.btn_encode)\r

diff --git a/win/Handbrake/frmQueue.Designer.vb b/win/Handbrake/frmQueue.Designer.vb
index 58ac7ff6dc2765b0d935b2515f9ab1ff5980f380..28a25c3c63033cf4b5abae14ff3aa749453104eb 100644 (file)
--- a/win/Handbrake/frmQueue.Designer.vb
+++ b/win/Handbrake/frmQueue.Designer.vb
@@ -29,7 +29,7 @@ Partial Class frmQueue
         '\r
         'btn_Close\r
         '\r
-        Me.btn_Close.BackColor = System.Drawing.SystemColors.ActiveBorder\r
+        Me.btn_Close.BackColor = System.Drawing.SystemColors.Control\r
         Me.btn_Close.FlatAppearance.BorderColor = System.Drawing.Color.Black\r
         Me.btn_Close.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_Close.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
@@ -53,7 +53,7 @@ Partial Class frmQueue
         '\r
         'btn_q_encoder\r
         '\r
-        Me.btn_q_encoder.BackColor = System.Drawing.SystemColors.ActiveBorder\r
+        Me.btn_q_encoder.BackColor = System.Drawing.SystemColors.Control\r
         Me.btn_q_encoder.FlatAppearance.BorderColor = System.Drawing.Color.Black\r
         Me.btn_q_encoder.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_q_encoder.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
@@ -77,7 +77,7 @@ Partial Class frmQueue
         '\r
         'btn_delete\r
         '\r
-        Me.btn_delete.BackColor = System.Drawing.SystemColors.ActiveBorder\r
+        Me.btn_delete.BackColor = System.Drawing.SystemColors.Control\r
         Me.btn_delete.FlatAppearance.BorderColor = System.Drawing.Color.Black\r
         Me.btn_delete.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_delete.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r

diff --git a/win/Handbrake/frmReadDVD.Designer.vb b/win/Handbrake/frmReadDVD.Designer.vb
index 0fae574b59610beb07203ea3b608ddabaaaf54bc..8faa4ae6415bac68527580dbe85eb6a923534bf1 100644 (file)
--- a/win/Handbrake/frmReadDVD.Designer.vb
+++ b/win/Handbrake/frmReadDVD.Designer.vb
@@ -58,7 +58,7 @@ Partial Class frmReadDVD
         '\r
         'btn_ok\r
         '\r
-        Me.btn_ok.BackColor = System.Drawing.SystemColors.ActiveBorder\r
+        Me.btn_ok.BackColor = System.Drawing.SystemColors.Control\r
         Me.btn_ok.FlatAppearance.BorderColor = System.Drawing.Color.Black\r
         Me.btn_ok.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_ok.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
@@ -71,7 +71,7 @@ Partial Class frmReadDVD
         Me.btn_ok.Text = "Ok"\r
         Me.btn_ok.UseVisualStyleBackColor = False\r
         '\r
-        'frmStatus\r
+        'frmReadDVD\r
         '\r
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)\r
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font\r
@@ -84,7 +84,7 @@ Partial Class frmReadDVD
         Me.Controls.Add(Me.Label1)\r
         Me.Cursor = System.Windows.Forms.Cursors.Default\r
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)\r
-        Me.Name = "frmStatus"\r
+        Me.Name = "frmReadDVD"\r
         Me.Padding = New System.Windows.Forms.Padding(1)\r
         Me.ShowIcon = False\r
         Me.ShowInTaskbar = False\r