WinGui:

- Fixed Tools>Options would not remember settings on Windows Vista
- Fixed "Set current options as program defaults" not saving current settings on vista.

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

diff --git a/win/Handbrake.sln b/win/Handbrake.sln
index 91d1d30..055c019 100644 (file)
--- a/win/Handbrake.sln
+++ b/win/Handbrake.sln
@@ -1,18 +1,28 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 9.00\r
-# Visual Basic Express 2005\r
+# Visual Studio 2005\r
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Handbrake", "Handbrake\Handbrake.vbproj", "{90340A3E-52AC-4396-8199-7047229DCC75}"\r
+       ProjectSection(WebsiteProperties) = preProject\r
+               Debug.AspNetCompiler.Debug = "True"\r
+               Release.AspNetCompiler.Debug = "False"\r
+       EndProjectSection\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Any CPU = Debug|Any CPU\r
+               Debug|x86 = Debug|x86\r
                Release|Any CPU = Release|Any CPU\r
+               Release|x86 = Release|x86\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
                {90340A3E-52AC-4396-8199-7047229DCC75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {90340A3E-52AC-4396-8199-7047229DCC75}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {90340A3E-52AC-4396-8199-7047229DCC75}.Debug|x86.ActiveCfg = Debug|x86\r
+               {90340A3E-52AC-4396-8199-7047229DCC75}.Debug|x86.Build.0 = Debug|x86\r
                {90340A3E-52AC-4396-8199-7047229DCC75}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {90340A3E-52AC-4396-8199-7047229DCC75}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {90340A3E-52AC-4396-8199-7047229DCC75}.Release|x86.ActiveCfg = Release|x86\r
+               {90340A3E-52AC-4396-8199-7047229DCC75}.Release|x86.Build.0 = Release|x86\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/win/Handbrake.suo b/win/Handbrake.suo
index 1d2a796..260fc12 100644 (file)
Binary files a/win/Handbrake.suo and b/win/Handbrake.suo differ

diff --git a/win/Handbrake/Handbrake.vbproj b/win/Handbrake/Handbrake.vbproj
index 4b2adfe..9607cab 100644 (file)
--- a/win/Handbrake/Handbrake.vbproj
+++ b/win/Handbrake/Handbrake.vbproj
@@ -44,6 +44,25 @@
     <DocumentationFile>Handbrake.xml</DocumentationFile>\r
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DefineDebug>true</DefineDebug>\r
+    <DefineTrace>true</DefineTrace>\r
+    <OutputPath>bin\x86\Debug\</OutputPath>\r
+    <DocumentationFile>Handbrake.xml</DocumentationFile>\r
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x86</PlatformTarget>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">\r
+    <DefineTrace>true</DefineTrace>\r
+    <OutputPath>bin\x86\Release\</OutputPath>\r
+    <DocumentationFile>Handbrake.xml</DocumentationFile>\r
+    <Optimize>true</Optimize>\r
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x86</PlatformTarget>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="System" />\r
     <Reference Include="System.Data" />\r

diff --git a/win/Handbrake/frmMain.vb b/win/Handbrake/frmMain.vb
index ca2af6c..12ee4f7 100644 (file)
--- a/win/Handbrake/frmMain.vb
+++ b/win/Handbrake/frmMain.vb
@@ -10,7 +10,6 @@ Public Class frmMain
 \r
 \r
     Private Sub frmMain_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load\r
-\r
         '# Sets the Version in the bottom corner of the screen.\r
         Version.Text = System.String.Format(Version.Text, My.Application.Info.Version.Major, My.Application.Info.Version.Minor)\r
 \r
@@ -304,7 +303,7 @@ Public Class frmMain
         'H264 Tab\r
         My.Settings.CRF = CheckCRF.CheckState\r
         My.Settings.H264 = rtf_h264advanced.Text\r
-\r
+        My.Settings.Save()\r
     End Sub\r
 \r
     Private Sub mnu_viewDVDdata_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mnu_viewDVDdata.Click\r

diff --git a/win/Handbrake/frmOptions.vb b/win/Handbrake/frmOptions.vb
index 8441db7..23294e2 100644 (file)
--- a/win/Handbrake/frmOptions.vb
+++ b/win/Handbrake/frmOptions.vb
@@ -3,6 +3,7 @@ Imports System.IO
 Public Class frmOptions\r
 \r
     Private Sub btn_close_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btn_close.Click\r
+        My.Settings.Save()\r
         Me.Close()\r
     End Sub\r
 \r
@@ -72,7 +73,7 @@ Public Class frmOptions
         End If\r
     End Sub\r
 \r
-   \r
+\r
     Private Sub check_readDVDWindow_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles check_readDVDWindow.CheckedChanged\r
         If check_readDVDWindow.CheckState = 1 Then\r
             Try\r