From: sr55 <sr55.hb@outlook.com>
Date: Fri, 22 Jun 2007 18:42:41 +0000 (+0000)
Subject: WinGUI:
X-Git-Tag: 0.9.0~210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5712c9dd99066bcc9d72892f548b5be280c17352;p=handbrake

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 047eaa1b1..4b2adfe9a 100644
--- a/win/Handbrake/Handbrake.vbproj
+++ b/win/Handbrake/Handbrake.vbproj
@@ -11,8 +11,7 @@
     <RootNamespace>Handbrake</RootNamespace>
     <AssemblyName>Handbrake</AssemblyName>
     <MyType>WindowsForms</MyType>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon>handbrakepineapple.ico</ApplicationIcon>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -199,6 +198,9 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="handbrakepineapple.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/win/Handbrake/My Project/Application.Designer.vb b/win/Handbrake/My Project/Application.Designer.vb
index 11afa33fa..b17a49fad 100644
--- 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()
             MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)
             Me.IsSingleInstance = true
-            Me.EnableVisualStyles = false
+            Me.EnableVisualStyles = true
             Me.SaveMySettingsOnExit = true
             Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses
         End Sub
diff --git a/win/Handbrake/My Project/Application.myapp b/win/Handbrake/My Project/Application.myapp
index 91f973068..4eed33b87 100644
--- a/win/Handbrake/My Project/Application.myapp	
+++ b/win/Handbrake/My Project/Application.myapp	
@@ -4,7 +4,7 @@
   <MainForm>frmMain</MainForm>
   <SingleInstance>true</SingleInstance>
   <ShutdownMode>0</ShutdownMode>
-  <EnableVisualStyles>false</EnableVisualStyles>
+  <EnableVisualStyles>true</EnableVisualStyles>
   <AuthenticationMode>0</AuthenticationMode>
   <SplashScreen>frmSplashScreen</SplashScreen>
   <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
diff --git a/win/Handbrake/frmDVDData.Designer.vb b/win/Handbrake/frmDVDData.Designer.vb
index 2adde006f..173e43e92 100644
--- a/win/Handbrake/frmDVDData.Designer.vb
+++ b/win/Handbrake/frmDVDData.Designer.vb
@@ -47,7 +47,7 @@ Partial Class frmDvdData
         '
         'btn_close
         '
-        Me.btn_close.BackColor = System.Drawing.SystemColors.ActiveBorder
+        Me.btn_close.BackColor = System.Drawing.SystemColors.Control
         Me.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black
         Me.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btn_close.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -60,7 +60,7 @@ Partial Class frmDvdData
         Me.btn_close.Text = "Close Window"
         Me.btn_close.UseVisualStyleBackColor = False
         '
-        'frmSelect
+        'frmDvdData
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
@@ -69,7 +69,7 @@ Partial Class frmDvdData
         Me.Controls.Add(Me.rtf_dvdInfo)
         Me.Controls.Add(Me.btn_close)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.Name = "frmSelect"
+        Me.Name = "frmDvdData"
         Me.Text = "Read DVD"
         Me.ResumeLayout(False)
         Me.PerformLayout()
diff --git a/win/Handbrake/frmMain.Designer.vb b/win/Handbrake/frmMain.Designer.vb
index 1b9ed441d..3f89dee64 100644
--- a/win/Handbrake/frmMain.Designer.vb
+++ b/win/Handbrake/frmMain.Designer.vb
@@ -254,10 +254,11 @@ Partial Class frmMain
         '
         'frmMainMenu
         '
+        Me.frmMainMenu.BackColor = System.Drawing.SystemColors.Control
         Me.frmMainMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FileToolStripMenuItem, Me.ToolsToolStripMenuItem, Me.PresetsToolStripMenuItem, Me.HelpToolStripMenuItem})
         Me.frmMainMenu.Location = New System.Drawing.Point(0, 0)
         Me.frmMainMenu.Name = "frmMainMenu"
-        Me.frmMainMenu.Size = New System.Drawing.Size(714, 24)
+        Me.frmMainMenu.Size = New System.Drawing.Size(710, 24)
         Me.frmMainMenu.TabIndex = 0
         Me.frmMainMenu.Text = "MenuStrip1"
         '
@@ -340,6 +341,7 @@ Partial Class frmMain
         '
         'PresetsToolStripMenuItem
         '
+        Me.PresetsToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control
         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})
         Me.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem"
         Me.PresetsToolStripMenuItem.Size = New System.Drawing.Size(55, 20)
@@ -416,7 +418,7 @@ Partial Class frmMain
         '
         Me.mnu_faq.Name = "mnu_faq"
         Me.mnu_faq.Size = New System.Drawing.Size(157, 22)
-        Me.mnu_faq.Text = "Faq"
+        Me.mnu_faq.Text = "FAQ"
         '
         'WebsiteToolStripMenuItem
         '
@@ -450,7 +452,7 @@ Partial Class frmMain
         '
         'GroupBox4
         '
-        Me.GroupBox4.BackColor = System.Drawing.SystemColors.ControlLight
+        Me.GroupBox4.BackColor = System.Drawing.SystemColors.Control
         Me.GroupBox4.Controls.Add(Me.Label56)
         Me.GroupBox4.Controls.Add(Me.lbl_Aspect)
         Me.GroupBox4.Controls.Add(Me.Label91)
@@ -466,7 +468,7 @@ Partial Class frmMain
         Me.GroupBox4.Controls.Add(Me.Label12)
         Me.GroupBox4.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.GroupBox4.ForeColor = System.Drawing.Color.Black
-        Me.GroupBox4.Location = New System.Drawing.Point(15, 165)
+        Me.GroupBox4.Location = New System.Drawing.Point(15, 169)
         Me.GroupBox4.Name = "GroupBox4"
         Me.GroupBox4.Size = New System.Drawing.Size(683, 126)
         Me.GroupBox4.TabIndex = 406
@@ -615,7 +617,7 @@ Partial Class frmMain
         '
         'GroupBox1
         '
-        Me.GroupBox1.BackColor = System.Drawing.SystemColors.ControlLight
+        Me.GroupBox1.BackColor = System.Drawing.SystemColors.Control
         Me.GroupBox1.Controls.Add(Me.Label13)
         Me.GroupBox1.Controls.Add(Me.drop_chapterFinish)
         Me.GroupBox1.Controls.Add(Me.drop_chapterStart)
@@ -771,7 +773,7 @@ Partial Class frmMain
         '
         'btn_encode
         '
-        Me.btn_encode.BackColor = System.Drawing.SystemColors.ActiveBorder
+        Me.btn_encode.BackColor = System.Drawing.SystemColors.Control
         Me.btn_encode.FlatAppearance.BorderColor = System.Drawing.Color.Black
         Me.btn_encode.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btn_encode.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -786,7 +788,7 @@ Partial Class frmMain
         '
         'btn_queue
         '
-        Me.btn_queue.BackColor = System.Drawing.SystemColors.ActiveBorder
+        Me.btn_queue.BackColor = System.Drawing.SystemColors.Control
         Me.btn_queue.FlatAppearance.BorderColor = System.Drawing.Color.Black
         Me.btn_queue.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btn_queue.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -801,6 +803,7 @@ Partial Class frmMain
         '
         'h264Tab
         '
+        Me.h264Tab.BackColor = System.Drawing.SystemColors.Control
         Me.h264Tab.Controls.Add(Me.Label43)
         Me.h264Tab.Controls.Add(Me.label_h264)
         Me.h264Tab.Controls.Add(Me.Label95)
@@ -815,7 +818,6 @@ Partial Class frmMain
         Me.h264Tab.Size = New System.Drawing.Size(675, 257)
         Me.h264Tab.TabIndex = 5
         Me.h264Tab.Text = "H.264"
-        Me.h264Tab.UseVisualStyleBackColor = True
         '
         'Label43
         '
@@ -899,6 +901,7 @@ Partial Class frmMain
         '
         'TabPage4
         '
+        Me.TabPage4.BackColor = System.Drawing.SystemColors.Control
         Me.TabPage4.Controls.Add(Me.drp_processors)
         Me.TabPage4.Controls.Add(Me.Label6)
         Me.TabPage4.Controls.Add(Me.Label11)
@@ -908,7 +911,6 @@ Partial Class frmMain
         Me.TabPage4.Size = New System.Drawing.Size(675, 257)
         Me.TabPage4.TabIndex = 4
         Me.TabPage4.Text = "Advanced Settings"
-        Me.TabPage4.UseVisualStyleBackColor = True
         '
         'drp_processors
         '
@@ -944,6 +946,7 @@ Partial Class frmMain
         '
         'TabPage2
         '
+        Me.TabPage2.BackColor = System.Drawing.SystemColors.Control
         Me.TabPage2.Controls.Add(Me.Label29)
         Me.TabPage2.Controls.Add(Me.drp_audioMixDown)
         Me.TabPage2.Controls.Add(Me.drp_audioChannels)
@@ -962,7 +965,6 @@ Partial Class frmMain
         Me.TabPage2.Size = New System.Drawing.Size(675, 257)
         Me.TabPage2.TabIndex = 3
         Me.TabPage2.Text = "Audio Settings"
-        Me.TabPage2.UseVisualStyleBackColor = True
         '
         'Label29
         '
@@ -1090,6 +1092,7 @@ Partial Class frmMain
         '
         'TabPage3
         '
+        Me.TabPage3.BackColor = System.Drawing.SystemColors.Control
         Me.TabPage3.Controls.Add(Me.Label36)
         Me.TabPage3.Controls.Add(Me.Check_ChapterMarkers)
         Me.TabPage3.Controls.Add(Me.Label28)
@@ -1118,7 +1121,6 @@ Partial Class frmMain
         Me.TabPage3.Size = New System.Drawing.Size(675, 257)
         Me.TabPage3.TabIndex = 2
         Me.TabPage3.Text = "Video Settings"
-        Me.TabPage3.UseVisualStyleBackColor = True
         '
         'Label36
         '
@@ -1283,7 +1285,7 @@ Partial Class frmMain
         Me.slider_videoQuality.Location = New System.Drawing.Point(129, 90)
         Me.slider_videoQuality.Maximum = 100
         Me.slider_videoQuality.Name = "slider_videoQuality"
-        Me.slider_videoQuality.Size = New System.Drawing.Size(167, 42)
+        Me.slider_videoQuality.Size = New System.Drawing.Size(167, 45)
         Me.slider_videoQuality.TabIndex = 6
         Me.slider_videoQuality.TickFrequency = 17
         '
@@ -1337,6 +1339,7 @@ Partial Class frmMain
         '
         'TabPage1
         '
+        Me.TabPage1.BackColor = System.Drawing.SystemColors.Control
         Me.TabPage1.Controls.Add(Me.drp_subtitle)
         Me.TabPage1.Controls.Add(Me.Label19)
         Me.TabPage1.Controls.Add(Me.lbl_RecomendedCrop)
@@ -1360,7 +1363,6 @@ Partial Class frmMain
         Me.TabPage1.Size = New System.Drawing.Size(675, 257)
         Me.TabPage1.TabIndex = 0
         Me.TabPage1.Text = "Picture Settings"
-        Me.TabPage1.UseVisualStyleBackColor = True
         '
         'drp_subtitle
         '
@@ -1553,6 +1555,7 @@ Partial Class frmMain
         '
         'TabPage6
         '
+        Me.TabPage6.BackColor = System.Drawing.SystemColors.Control
         Me.TabPage6.Controls.Add(Me.Label7)
         Me.TabPage6.Controls.Add(Me.Label39)
         Me.TabPage6.Controls.Add(Me.btn_ClearQuery)
@@ -1564,7 +1567,6 @@ Partial Class frmMain
         Me.TabPage6.Size = New System.Drawing.Size(675, 257)
         Me.TabPage6.TabIndex = 6
         Me.TabPage6.Text = "Query Editor"
-        Me.TabPage6.UseVisualStyleBackColor = True
         '
         'Label7
         '
@@ -2325,7 +2327,7 @@ Partial Class frmMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(714, 631)
+        Me.ClientSize = New System.Drawing.Size(710, 633)
         Me.Controls.Add(Me.lbl_update)
         Me.Controls.Add(Me.btn_queue)
         Me.Controls.Add(Me.btn_encode)
diff --git a/win/Handbrake/frmQueue.Designer.vb b/win/Handbrake/frmQueue.Designer.vb
index 58ac7ff6d..28a25c3c6 100644
--- a/win/Handbrake/frmQueue.Designer.vb
+++ b/win/Handbrake/frmQueue.Designer.vb
@@ -29,7 +29,7 @@ Partial Class frmQueue
         '
         'btn_Close
         '
-        Me.btn_Close.BackColor = System.Drawing.SystemColors.ActiveBorder
+        Me.btn_Close.BackColor = System.Drawing.SystemColors.Control
         Me.btn_Close.FlatAppearance.BorderColor = System.Drawing.Color.Black
         Me.btn_Close.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btn_Close.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -53,7 +53,7 @@ Partial Class frmQueue
         '
         'btn_q_encoder
         '
-        Me.btn_q_encoder.BackColor = System.Drawing.SystemColors.ActiveBorder
+        Me.btn_q_encoder.BackColor = System.Drawing.SystemColors.Control
         Me.btn_q_encoder.FlatAppearance.BorderColor = System.Drawing.Color.Black
         Me.btn_q_encoder.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btn_q_encoder.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -77,7 +77,7 @@ Partial Class frmQueue
         '
         'btn_delete
         '
-        Me.btn_delete.BackColor = System.Drawing.SystemColors.ActiveBorder
+        Me.btn_delete.BackColor = System.Drawing.SystemColors.Control
         Me.btn_delete.FlatAppearance.BorderColor = System.Drawing.Color.Black
         Me.btn_delete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btn_delete.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
diff --git a/win/Handbrake/frmReadDVD.Designer.vb b/win/Handbrake/frmReadDVD.Designer.vb
index 0fae574b5..8faa4ae64 100644
--- a/win/Handbrake/frmReadDVD.Designer.vb
+++ b/win/Handbrake/frmReadDVD.Designer.vb
@@ -58,7 +58,7 @@ Partial Class frmReadDVD
         '
         'btn_ok
         '
-        Me.btn_ok.BackColor = System.Drawing.SystemColors.ActiveBorder
+        Me.btn_ok.BackColor = System.Drawing.SystemColors.Control
         Me.btn_ok.FlatAppearance.BorderColor = System.Drawing.Color.Black
         Me.btn_ok.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btn_ok.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -71,7 +71,7 @@ Partial Class frmReadDVD
         Me.btn_ok.Text = "Ok"
         Me.btn_ok.UseVisualStyleBackColor = False
         '
-        'frmStatus
+        'frmReadDVD
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
@@ -84,7 +84,7 @@ Partial Class frmReadDVD
         Me.Controls.Add(Me.Label1)
         Me.Cursor = System.Windows.Forms.Cursors.Default
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.Name = "frmStatus"
+        Me.Name = "frmReadDVD"
         Me.Padding = New System.Windows.Forms.Padding(1)
         Me.ShowIcon = False
         Me.ShowInTaskbar = False