WinGui:

- Couple of debug changes slipped in that were not supposed to. Fixed.
- Sorted incorrect styling on frmUpdater buttons.

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

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index ce04fa1..b09ad06 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -20,6 +20,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>\r
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
     <IsWebBootstrapper>false</IsWebBootstrapper>\r
+    <SignManifests>false</SignManifests>\r
     <PublishUrl>publish\</PublishUrl>\r
     <Install>true</Install>\r
     <InstallFrom>Disk</InstallFrom>\r
@@ -34,7 +35,6 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
     <UseApplicationTrust>false</UseApplicationTrust>\r
     <BootstrapperEnabled>true</BootstrapperEnabled>\r
-    <SignManifests>false</SignManifests>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
@@ -51,7 +51,7 @@
     </DocumentationFile>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
+    <DebugType>full</DebugType>\r
     <Optimize>true</Optimize>\r
     <OutputPath>bin\Release\</OutputPath>\r
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
@@ -261,6 +261,11 @@
     <None Include="Resources\General Preferences.png" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework Client Profile</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">\r
       <Visible>False</Visible>\r
       <ProductName>.NET Framework 2.0 %28x86%29</ProductName>\r
@@ -276,6 +281,11 @@
       <ProductName>.NET Framework 3.5</ProductName>\r
       <Install>true</Install>\r
     </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
     <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">\r
       <Visible>False</Visible>\r
       <ProductName>Windows Installer 3.1</ProductName>\r

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 63a2b07..f1ce04b 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -181,7 +181,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("http://handbrake.fr/appcast_test.xml")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("http://handbrake.fr/appcast_unstable.xml")]\r
         public string appcast_unstable {\r
             get {\r
                 return ((string)(this["appcast_unstable"]));\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index a47faee..6069416 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -42,7 +42,7 @@
       <Value Profile="(Default)">http://handbrake.fr/appcast.xml</Value>\r
     </Setting>\r
     <Setting Name="appcast_unstable" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)">http://handbrake.fr/appcast_test.xml</Value>\r
+      <Value Profile="(Default)">http://handbrake.fr/appcast_unstable.xml</Value>\r
     </Setting>\r
     <Setting Name="drive_detection" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">Checked</Value>\r

diff --git a/win/C#/app.config b/win/C#/app.config
index 479fe27..ce66d92 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -47,7 +47,7 @@
                 <value>http://handbrake.fr/appcast.xml</value>\r
             </setting>\r
             <setting name="appcast_unstable" serializeAs="String">\r
-                <value>http://handbrake.fr/appcast_test.xml</value>\r
+                <value>http://handbrake.fr/appcast_unstable.xml</value>\r
             </setting>\r
             <setting name="drive_detection" serializeAs="String">\r
                 <value>Checked</value>\r

diff --git a/win/C#/frmUpdater.Designer.cs b/win/C#/frmUpdater.Designer.cs
index d51d500..2522ea8 100644 (file)
--- a/win/C#/frmUpdater.Designer.cs
+++ b/win/C#/frmUpdater.Designer.cs
@@ -77,9 +77,7 @@ namespace Handbrake
             // \r
             // btn_skip\r
             // \r
-            this.btn_skip.BackColor = System.Drawing.SystemColors.ControlLight;\r
             this.btn_skip.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_skip.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_skip.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_skip.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
             this.btn_skip.Location = new System.Drawing.Point(94, 250);\r
@@ -87,14 +85,12 @@ namespace Handbrake
             this.btn_skip.Size = new System.Drawing.Size(133, 22);\r
             this.btn_skip.TabIndex = 54;\r
             this.btn_skip.Text = "Skip This Version";\r
-            this.btn_skip.UseVisualStyleBackColor = true;\r
+            this.btn_skip.UseVisualStyleBackColor = false;\r
             this.btn_skip.Click += new System.EventHandler(this.btn_skip_Click);\r
             // \r
             // btn_installUpdate\r
             // \r
-            this.btn_installUpdate.BackColor = System.Drawing.SystemColors.ControlLight;\r
             this.btn_installUpdate.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_installUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_installUpdate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_installUpdate.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
             this.btn_installUpdate.Location = new System.Drawing.Point(464, 250);\r
@@ -102,14 +98,12 @@ namespace Handbrake
             this.btn_installUpdate.Size = new System.Drawing.Size(133, 22);\r
             this.btn_installUpdate.TabIndex = 55;\r
             this.btn_installUpdate.Text = "Install Update";\r
-            this.btn_installUpdate.UseVisualStyleBackColor = true;\r
+            this.btn_installUpdate.UseVisualStyleBackColor = false;\r
             this.btn_installUpdate.Click += new System.EventHandler(this.btn_installUpdate_Click);\r
             // \r
             // btn_remindLater\r
             // \r
-            this.btn_remindLater.BackColor = System.Drawing.SystemColors.ControlLight;\r
             this.btn_remindLater.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_remindLater.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_remindLater.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_remindLater.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
             this.btn_remindLater.Location = new System.Drawing.Point(325, 250);\r
@@ -117,7 +111,7 @@ namespace Handbrake
             this.btn_remindLater.Size = new System.Drawing.Size(133, 22);\r
             this.btn_remindLater.TabIndex = 56;\r
             this.btn_remindLater.Text = "Remind me Later";\r
-            this.btn_remindLater.UseVisualStyleBackColor = true;\r
+            this.btn_remindLater.UseVisualStyleBackColor = false;\r
             this.btn_remindLater.Click += new System.EventHandler(this.btn_remindLater_Click);\r
             // \r
             // label3\r
@@ -154,7 +148,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(609, 288);\r
+            this.ClientSize = new System.Drawing.Size(609, 282);\r
             this.Controls.Add(this.lbl_update_text);\r
             this.Controls.Add(this.label3);\r
             this.Controls.Add(this.btn_remindLater);\r