WinGui:

- now using C#.Net 08
- Fixed bug with VFR setting framerate when enabled.
- Fixed potential framerate bug (passing framerate without -r to the CLI)

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

7 files changed, 102 insertions, 56 deletions

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index b4b2070bb..ec6ebeefb 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -498,6 +498,7 @@ namespace Handbrake.Functions
             string vidQSetting = "";

             string twoPassEncoding = "";

             string videoFramerate = mainWindow.drp_videoFramerate.Text;

+            string vid_frame_rate = "";

             string turboH264 = "";

             string largeFile = "";

             string denoise = "";

@@ -528,9 +529,12 @@ namespace Handbrake.Functions
                 twoPassEncoding = " -2 ";

 

             if (videoFramerate == "Automatic")

-                videoFramerate = "";

+                vid_frame_rate = "";

             else

-                videoFramerate = " -r " + videoFramerate;

+            {

+                if (!mainWindow.check_vfr.Checked)

+                    vid_frame_rate = " -r " + videoFramerate;

+            }

 

             if (mainWindow.check_turbo.Checked)

                 turboH264 = " -T ";

@@ -565,7 +569,7 @@ namespace Handbrake.Functions
                 optimizeMP4 = " -O ";

 

 

-            string queryVideoSettings = videoBitrate + videoFilesize + vidQSetting + twoPassEncoding + videoFramerate + turboH264 + ipodAtom + optimizeMP4 + largeFile + denoise;

+            string queryVideoSettings = videoBitrate + videoFilesize + vidQSetting + twoPassEncoding + vid_frame_rate + turboH264 + ipodAtom + optimizeMP4 + largeFile + denoise;

             #endregion

 

             // Audio Settings Tab

@@ -699,7 +703,7 @@ namespace Handbrake.Functions
                 {

                     string path = Path.Combine(Path.GetTempPath(), "chapters.csv");

 

-                    ChapterMarkers = " --markers=" + path;

+                    ChapterMarkers = " --markers=" + "\"" + path + "\"";

                 }

             }

 

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 1e545d05e..61db8ab09 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -1,8 +1,8 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

+    <ProductVersion>9.0.21022</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

     <ProjectGuid>{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}</ProjectGuid>

     <OutputType>WinExe</OutputType>

@@ -13,6 +13,27 @@
     <StartupObject>Handbrake.Program</StartupObject>

     <TargetZone>LocalIntranet</TargetZone>

     <GenerateManifests>false</GenerateManifests>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

+    <UpgradeBackupLocation>

+    </UpgradeBackupLocation>

+    <OldToolsVersion>2.0</OldToolsVersion>

+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>

+    <PublishUrl>publish\</PublishUrl>

+    <Install>true</Install>

+    <InstallFrom>Disk</InstallFrom>

+    <UpdateEnabled>false</UpdateEnabled>

+    <UpdateMode>Foreground</UpdateMode>

+    <UpdateInterval>7</UpdateInterval>

+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>

+    <UpdatePeriodically>false</UpdatePeriodically>

+    <UpdateRequired>false</UpdateRequired>

+    <MapFileExtensions>true</MapFileExtensions>

+    <ApplicationRevision>0</ApplicationRevision>

+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>

+    <IsWebBootstrapper>false</IsWebBootstrapper>

+    <UseApplicationTrust>false</UseApplicationTrust>

+    <BootstrapperEnabled>true</BootstrapperEnabled>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

@@ -61,6 +82,12 @@
     <PlatformTarget>x86</PlatformTarget>

   </PropertyGroup>

   <ItemGroup>

+    <Reference Include="PresentationCore">

+      <RequiredTargetFramework>3.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="PresentationFramework">

+      <RequiredTargetFramework>3.0</RequiredTargetFramework>

+    </Reference>

     <Reference Include="System" />

     <Reference Include="System.Data" />

     <Reference Include="System.Deployment" />

@@ -68,6 +95,15 @@
     <Reference Include="System.Messaging" />

     <Reference Include="System.Windows.Forms" />

     <Reference Include="System.Xml" />

+    <Reference Include="UIAutomationProvider">

+      <RequiredTargetFramework>3.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="WindowsBase">

+      <RequiredTargetFramework>3.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="WindowsFormsIntegration">

+      <RequiredTargetFramework>3.0</RequiredTargetFramework>

+    </Reference>

   </ItemGroup>

   <ItemGroup>

     <Compile Include="frmActivityWindow.cs">

@@ -253,6 +289,28 @@
       <Isolated>False</Isolated>

     </COMReference>

   </ItemGroup>

+  <ItemGroup>

+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">

+      <Visible>False</Visible>

+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>

+      <Install>false</Install>

+    </BootstrapperPackage>

+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">

+      <Visible>False</Visible>

+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>

+      <Install>false</Install>

+    </BootstrapperPackage>

+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">

+      <Visible>False</Visible>

+      <ProductName>.NET Framework 3.5</ProductName>

+      <Install>true</Install>

+    </BootstrapperPackage>

+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">

+      <Visible>False</Visible>

+      <ProductName>Windows Installer 3.1</ProductName>

+      <Install>true</Install>

+    </BootstrapperPackage>

+  </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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/C#/HandBrakeCS.sln b/win/C#/HandBrakeCS.sln
index eaa729e0f..be0c50c6a 100644
--- a/win/C#/HandBrakeCS.sln
+++ b/win/C#/HandBrakeCS.sln
@@ -1,6 +1,6 @@
 

-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual C# Express 2008

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeCS", "HandBrakeCS.csproj", "{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}"

 EndProject

 Global

diff --git a/win/C#/Program.cs b/win/C#/Program.cs
index a613eca65..5f3b9464a 100644
--- a/win/C#/Program.cs
+++ b/win/C#/Program.cs
@@ -32,7 +32,7 @@ namespace Handbrake
         {

             // Development Code Expiry.

             // Remember to comment out on public release!!!

-            if (DateTime.Now > DateTime.Parse("2008/02/27", new CultureInfo("en-US"))) { MessageBox.Show("Sorry, This development build of Handbrake has expired."); return; } 

+            if (DateTime.Now > DateTime.Parse("2008/02/25", new CultureInfo("en-US"))) { MessageBox.Show("Sorry, This development build of Handbrake has expired."); return; } 

 

             // Check the system meets the system requirements.

             Boolean launch = true;

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 607a238e5..8dd4dc476 100644
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace Handbrake.Properties {
     

     

     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]

+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]

     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {

         

         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index d657c4050..09faabe08 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -37,7 +37,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();

             System.Windows.Forms.Label Label38;

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));

-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();

             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();

             this.File_Save = new System.Windows.Forms.SaveFileDialog();

             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);

@@ -131,7 +131,7 @@ namespace Handbrake
             this.TabPage3 = new System.Windows.Forms.TabPage();

             this.label25 = new System.Windows.Forms.Label();

             this.lbl_vfr = new System.Windows.Forms.Label();

-            this.lbl_largeMp4Warning = new System.Windows.Forms.Label();

+            this.check_grayscale = new System.Windows.Forms.CheckBox();

             this.Label22 = new System.Windows.Forms.Label();

             this.check_2PassEncode = new System.Windows.Forms.CheckBox();

             this.Label2 = new System.Windows.Forms.Label();

@@ -140,7 +140,6 @@ namespace Handbrake
             this.Label46 = new System.Windows.Forms.Label();

             this.Label40 = new System.Windows.Forms.Label();

             this.check_iPodAtom = new System.Windows.Forms.CheckBox();

-            this.check_grayscale = new System.Windows.Forms.CheckBox();

             this.TabPage1 = new System.Windows.Forms.TabPage();

             this.text_bottom = new System.Windows.Forms.NumericUpDown();

             this.text_top = new System.Windows.Forms.NumericUpDown();

@@ -259,8 +258,7 @@ namespace Handbrake
             this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21);

             this.drop_chapterFinish.TabIndex = 10;

             this.drop_chapterFinish.Text = "Auto";

-            this.ToolTip.SetToolTip(this.drop_chapterFinish, "Step 3 - Select the chapter range you would like to enocde. (default: All Chapter" +

-                    "s)");

+            this.ToolTip.SetToolTip(this.drop_chapterFinish, "Select the chapter range you would like to enocde. (default: All Chapters)");

             this.drop_chapterFinish.SelectedIndexChanged += new System.EventHandler(this.drop_chapterFinish_SelectedIndexChanged);

             // 

             // drop_chapterStart

@@ -273,8 +271,7 @@ namespace Handbrake
             this.drop_chapterStart.Size = new System.Drawing.Size(69, 21);

             this.drop_chapterStart.TabIndex = 9;

             this.drop_chapterStart.Text = "Auto";

-            this.ToolTip.SetToolTip(this.drop_chapterStart, "Step 3 - Select the chapter range you would like to enocde. (default: All Chapter" +

-                    "s)");

+            this.ToolTip.SetToolTip(this.drop_chapterStart, "Select the chapter range you would like to enocde. (default: All Chapters)");

             this.drop_chapterStart.SelectedIndexChanged += new System.EventHandler(this.drop_chapterStart_SelectedIndexChanged);

             // 

             // drp_dvdtitle

@@ -289,7 +286,7 @@ namespace Handbrake
             this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);

             this.drp_dvdtitle.TabIndex = 7;

             this.drp_dvdtitle.Text = "Automatic";

-            this.ToolTip.SetToolTip(this.drp_dvdtitle, "Step 2 - Select the title number you wish to encode.");

+            this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.");

             this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged);

             this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click);

             // 

@@ -302,7 +299,7 @@ namespace Handbrake
             this.RadioISO.Size = new System.Drawing.Size(44, 17);

             this.RadioISO.TabIndex = 4;

             this.RadioISO.Text = "File";

-            this.ToolTip.SetToolTip(this.RadioISO, "ISO, TS, MPG");

+            this.ToolTip.SetToolTip(this.RadioISO, "For selecting: ISO, TS, MPG");

             this.RadioISO.UseVisualStyleBackColor = true;

             // 

             // text_source

@@ -354,7 +351,7 @@ namespace Handbrake
             this.btn_destBrowse.Size = new System.Drawing.Size(83, 22);

             this.btn_destBrowse.TabIndex = 2;

             this.btn_destBrowse.Text = "Browse";

-            this.ToolTip.SetToolTip(this.btn_destBrowse, "Step 4 - Select a location to save your encoded file.");

+            this.ToolTip.SetToolTip(this.btn_destBrowse, " Select a location to save your encoded file.");

             this.btn_destBrowse.UseVisualStyleBackColor = false;

             this.btn_destBrowse.Click += new System.EventHandler(this.btn_destBrowse_Click);

             // 

@@ -372,7 +369,7 @@ namespace Handbrake
             this.drp_videoEncoder.Name = "drp_videoEncoder";

             this.drp_videoEncoder.Size = new System.Drawing.Size(156, 21);

             this.drp_videoEncoder.TabIndex = 1;

-            this.ToolTip.SetToolTip(this.drp_videoEncoder, "Step 5 - Select a video encoder");

+            this.ToolTip.SetToolTip(this.drp_videoEncoder, "Select a video encoder");

             this.drp_videoEncoder.SelectedIndexChanged += new System.EventHandler(this.drp_videoEncoder_SelectedIndexChanged);

             // 

             // drp_audioCodec

@@ -390,7 +387,7 @@ namespace Handbrake
             this.drp_audioCodec.Name = "drp_audioCodec";

             this.drp_audioCodec.Size = new System.Drawing.Size(111, 21);

             this.drp_audioCodec.TabIndex = 3;

-            this.ToolTip.SetToolTip(this.drp_audioCodec, "Step 6 - Select an audio encoder.");

+            this.ToolTip.SetToolTip(this.drp_audioCodec, "Select an audio encoder.");

             this.drp_audioCodec.SelectedIndexChanged += new System.EventHandler(this.drp_audioCodec_SelectedIndexChanged);

             // 

             // drp_audioBitrate

@@ -441,10 +438,11 @@ namespace Handbrake
             this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.check_largeFile.Location = new System.Drawing.Point(16, 80);

             this.check_largeFile.Name = "check_largeFile";

-            this.check_largeFile.Size = new System.Drawing.Size(170, 17);

+            this.check_largeFile.Size = new System.Drawing.Size(82, 17);

             this.check_largeFile.TabIndex = 4;

-            this.check_largeFile.Text = "Larger MP4 Files (> 4GB)";

-            this.ToolTip.SetToolTip(this.check_largeFile, "Allows creation of MP4 files greater than 4GB.");

+            this.check_largeFile.Text = "64Bit MP4";

+            this.ToolTip.SetToolTip(this.check_largeFile, "Allows creation of MP4 files greater than 4GB.\r\nWarning: Breaks iPod, Apple TV an" +

+                    "d PS3 compatibility.");

             this.check_largeFile.UseVisualStyleBackColor = false;

             this.check_largeFile.CheckedChanged += new System.EventHandler(this.check_largeFile_CheckedChanged);

             // 

@@ -905,6 +903,7 @@ namespace Handbrake
             this.RadioDVD.TabIndex = 3;

             this.RadioDVD.TabStop = true;

             this.RadioDVD.Text = "Folder";

+            this.ToolTip.SetToolTip(this.RadioDVD, "For Selecting a \"Video_TS\" folder on your hard drive or DVD");

             this.RadioDVD.UseVisualStyleBackColor = true;

             // 

             // Label17

@@ -1256,7 +1255,6 @@ namespace Handbrake
             this.TabPage3.BackColor = System.Drawing.SystemColors.ControlLight;

             this.TabPage3.Controls.Add(this.label25);

             this.TabPage3.Controls.Add(this.lbl_vfr);

-            this.TabPage3.Controls.Add(this.lbl_largeMp4Warning);

             this.TabPage3.Controls.Add(this.check_largeFile);

             this.TabPage3.Controls.Add(this.check_grayscale);

             this.TabPage3.Controls.Add(this.check_turbo);

@@ -1302,16 +1300,17 @@ namespace Handbrake
             this.lbl_vfr.Text = "(VFR On)";

             this.lbl_vfr.Visible = false;

             // 

-            // lbl_largeMp4Warning

+            // check_grayscale

             // 

-            this.lbl_largeMp4Warning.AutoSize = true;

-            this.lbl_largeMp4Warning.BackColor = System.Drawing.Color.Transparent;

-            this.lbl_largeMp4Warning.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lbl_largeMp4Warning.Location = new System.Drawing.Point(35, 100);

-            this.lbl_largeMp4Warning.Name = "lbl_largeMp4Warning";

-            this.lbl_largeMp4Warning.Size = new System.Drawing.Size(241, 12);

-            this.lbl_largeMp4Warning.TabIndex = 5;

-            this.lbl_largeMp4Warning.Text = "Warning: Breaks iPod, @TV, PS3 compatibility.";

+            this.check_grayscale.AutoSize = true;

+            this.check_grayscale.BackColor = System.Drawing.Color.Transparent;

+            this.check_grayscale.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.check_grayscale.Location = new System.Drawing.Point(16, 103);

+            this.check_grayscale.Name = "check_grayscale";

+            this.check_grayscale.Size = new System.Drawing.Size(138, 17);

+            this.check_grayscale.TabIndex = 1;

+            this.check_grayscale.Text = "Grayscale Encoding";

+            this.check_grayscale.UseVisualStyleBackColor = false;

             // 

             // Label22

             // 

@@ -1405,18 +1404,6 @@ namespace Handbrake
             this.check_iPodAtom.UseVisualStyleBackColor = false;

             this.check_iPodAtom.CheckedChanged += new System.EventHandler(this.check_iPodAtom_CheckedChanged);

             // 

-            // check_grayscale

-            // 

-            this.check_grayscale.AutoSize = true;

-            this.check_grayscale.BackColor = System.Drawing.Color.Transparent;

-            this.check_grayscale.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_grayscale.Location = new System.Drawing.Point(16, 117);

-            this.check_grayscale.Name = "check_grayscale";

-            this.check_grayscale.Size = new System.Drawing.Size(138, 17);

-            this.check_grayscale.TabIndex = 1;

-            this.check_grayscale.Text = "Grayscale Encoding";

-            this.check_grayscale.UseVisualStyleBackColor = false;

-            // 

             // TabPage1

             // 

             this.TabPage1.BackColor = System.Drawing.SystemColors.ControlLight;

@@ -1866,9 +1853,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle3.Format = "N0";

-            dataGridViewCellStyle3.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle3;

+            dataGridViewCellStyle2.Format = "N0";

+            dataGridViewCellStyle2.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle2;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

             this.number.Name = "number";

@@ -2285,7 +2272,6 @@ namespace Handbrake
         internal System.Windows.Forms.Label Label18;

         internal System.Windows.Forms.ComboBox drp_audioSampleRate;

         internal System.Windows.Forms.TabPage TabPage3;

-        internal System.Windows.Forms.Label lbl_largeMp4Warning;

         internal System.Windows.Forms.CheckBox check_largeFile;

         internal System.Windows.Forms.CheckBox check_turbo;

         internal System.Windows.Forms.Label Label22;

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index bd7601917..0d9e6f4c1 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -733,16 +733,14 @@ namespace Handbrake
 

         private void check_largeFile_CheckedChanged(object sender, EventArgs e)

         {

-            if (!text_destination.Text.Contains(".mp4"))

+            if ((!text_destination.Text.Contains(".mp4")) && (!text_destination.Text.Contains(".m4v")))

             {

-                lbl_largeMp4Warning.Text = "Warning: Only mp4 files are supported";

-                lbl_largeMp4Warning.ForeColor = Color.Red;

+                check_largeFile.BackColor = Color.LightCoral;

                 check_largeFile.CheckState = CheckState.Unchecked;

             }

             else

             {

-                lbl_largeMp4Warning.Text = "Warning: Breaks iPod, @TV, PS3 compatibility.";

-                lbl_largeMp4Warning.ForeColor = Color.Black;

+                check_largeFile.BackColor = Color.Transparent;

             }

         }