diff options
-rw-r--r-- | win/C#/HandBrakeCS.csproj | 14 | ||||
-rw-r--r-- | win/C#/Properties/Settings.Designer.cs | 2 | ||||
-rw-r--r-- | win/C#/Properties/Settings.settings | 2 | ||||
-rw-r--r-- | win/C#/app.config | 2 | ||||
-rw-r--r-- | win/C#/frmUpdater.Designer.cs | 14 |
5 files changed, 19 insertions, 15 deletions
diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj index ce04fa177..b09ad060d 100644 --- a/win/C#/HandBrakeCS.csproj +++ b/win/C#/HandBrakeCS.csproj @@ -20,6 +20,7 @@ <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
+ <SignManifests>false</SignManifests>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -34,7 +35,6 @@ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
- <SignManifests>false</SignManifests>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -51,7 +51,7 @@ </DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
+ <DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -261,6 +261,11 @@ <None Include="Resources\General Preferences.png" />
</ItemGroup>
<ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
<Visible>False</Visible>
<ProductName>.NET Framework 2.0 %28x86%29</ProductName>
@@ -276,6 +281,11 @@ <ProductName>.NET Framework 3.5</ProductName>
<Install>true</Install>
</BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs index 63a2b07cd..f1ce04bcd 100644 --- a/win/C#/Properties/Settings.Designer.cs +++ b/win/C#/Properties/Settings.Designer.cs @@ -181,7 +181,7 @@ namespace Handbrake.Properties { [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("http://handbrake.fr/appcast_test.xml")]
+ [global::System.Configuration.DefaultSettingValueAttribute("http://handbrake.fr/appcast_unstable.xml")]
public string appcast_unstable {
get {
return ((string)(this["appcast_unstable"]));
diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings index a47faee27..60694165d 100644 --- 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>
</Setting>
<Setting Name="appcast_unstable" Type="System.String" Scope="User">
- <Value Profile="(Default)">http://handbrake.fr/appcast_test.xml</Value>
+ <Value Profile="(Default)">http://handbrake.fr/appcast_unstable.xml</Value>
</Setting>
<Setting Name="drive_detection" Type="System.String" Scope="User">
<Value Profile="(Default)">Checked</Value>
diff --git a/win/C#/app.config b/win/C#/app.config index 479fe2751..ce66d92db 100644 --- a/win/C#/app.config +++ b/win/C#/app.config @@ -47,7 +47,7 @@ <value>http://handbrake.fr/appcast.xml</value>
</setting>
<setting name="appcast_unstable" serializeAs="String">
- <value>http://handbrake.fr/appcast_test.xml</value>
+ <value>http://handbrake.fr/appcast_unstable.xml</value>
</setting>
<setting name="drive_detection" serializeAs="String">
<value>Checked</value>
diff --git a/win/C#/frmUpdater.Designer.cs b/win/C#/frmUpdater.Designer.cs index d51d50005..2522ea82b 100644 --- a/win/C#/frmUpdater.Designer.cs +++ b/win/C#/frmUpdater.Designer.cs @@ -77,9 +77,7 @@ namespace Handbrake //
// btn_skip
//
- this.btn_skip.BackColor = System.Drawing.SystemColors.ControlLight;
this.btn_skip.FlatAppearance.BorderColor = System.Drawing.Color.Black;
- this.btn_skip.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_skip.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_skip.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
this.btn_skip.Location = new System.Drawing.Point(94, 250);
@@ -87,14 +85,12 @@ namespace Handbrake this.btn_skip.Size = new System.Drawing.Size(133, 22);
this.btn_skip.TabIndex = 54;
this.btn_skip.Text = "Skip This Version";
- this.btn_skip.UseVisualStyleBackColor = true;
+ this.btn_skip.UseVisualStyleBackColor = false;
this.btn_skip.Click += new System.EventHandler(this.btn_skip_Click);
//
// btn_installUpdate
//
- this.btn_installUpdate.BackColor = System.Drawing.SystemColors.ControlLight;
this.btn_installUpdate.FlatAppearance.BorderColor = System.Drawing.Color.Black;
- this.btn_installUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_installUpdate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_installUpdate.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
this.btn_installUpdate.Location = new System.Drawing.Point(464, 250);
@@ -102,14 +98,12 @@ namespace Handbrake this.btn_installUpdate.Size = new System.Drawing.Size(133, 22);
this.btn_installUpdate.TabIndex = 55;
this.btn_installUpdate.Text = "Install Update";
- this.btn_installUpdate.UseVisualStyleBackColor = true;
+ this.btn_installUpdate.UseVisualStyleBackColor = false;
this.btn_installUpdate.Click += new System.EventHandler(this.btn_installUpdate_Click);
//
// btn_remindLater
//
- this.btn_remindLater.BackColor = System.Drawing.SystemColors.ControlLight;
this.btn_remindLater.FlatAppearance.BorderColor = System.Drawing.Color.Black;
- this.btn_remindLater.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_remindLater.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_remindLater.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
this.btn_remindLater.Location = new System.Drawing.Point(325, 250);
@@ -117,7 +111,7 @@ namespace Handbrake this.btn_remindLater.Size = new System.Drawing.Size(133, 22);
this.btn_remindLater.TabIndex = 56;
this.btn_remindLater.Text = "Remind me Later";
- this.btn_remindLater.UseVisualStyleBackColor = true;
+ this.btn_remindLater.UseVisualStyleBackColor = false;
this.btn_remindLater.Click += new System.EventHandler(this.btn_remindLater_Click);
//
// label3
@@ -154,7 +148,7 @@ namespace Handbrake //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(609, 288);
+ this.ClientSize = new System.Drawing.Size(609, 282);
this.Controls.Add(this.lbl_update_text);
this.Controls.Add(this.label3);
this.Controls.Add(this.btn_remindLater);
|