OSDN Git Service

WinGui:
authorsr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 13 Nov 2007 17:44:33 +0000 (17:44 +0000)
committersr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 13 Nov 2007 17:44:33 +0000 (17:44 +0000)
- User default settings now uses the new Preset Parser function. This cuts down on a significant amount of code.
- Added system resolution to the resolution checker message box. For future debugging.

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

win/C#/Functions/QueryParser.cs
win/C#/HandBrakeCS.csproj
win/C#/Program.cs
win/C#/Properties/Settings.Designer.cs
win/C#/Properties/Settings.settings
win/C#/app.config
win/C#/frmMain.cs

index a4bd1c1..681602e 100644 (file)
@@ -774,6 +774,10 @@ namespace Handbrake.Functions
                 #endregion\r
 \r
                 //\r
+                //H264 tab and other \r
+                //\r
+                #region h264 and other\r
+                //\r
                 //H264 Tab\r
                 //\r
                 if (x264.Success != false)\r
@@ -785,6 +789,7 @@ namespace Handbrake.Functions
                 //Progam Options\r
                 //\r
                 thisQuery.q_verbose = verbose.Success;\r
+                #endregion\r
             }\r
             catch (Exception exc)\r
             {\r
index 1b55daa..a9c549b 100644 (file)
     <None Include="Resources\Delete.png" />\r
     <None Include="Resources\Burn.png" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <COMReference Include="AxMSComctlLib">\r
+      <Guid>{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}</Guid>\r
+      <VersionMajor>2</VersionMajor>\r
+      <VersionMinor>0</VersionMinor>\r
+      <Lcid>0</Lcid>\r
+      <WrapperTool>aximp</WrapperTool>\r
+      <Isolated>False</Isolated>\r
+    </COMReference>\r
+    <COMReference Include="MSComctlLib">\r
+      <Guid>{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}</Guid>\r
+      <VersionMajor>2</VersionMajor>\r
+      <VersionMinor>0</VersionMinor>\r
+      <Lcid>0</Lcid>\r
+      <WrapperTool>primary</WrapperTool>\r
+      <Isolated>False</Isolated>\r
+    </COMReference>\r
+    <COMReference Include="stdole">\r
+      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>\r
+      <VersionMajor>2</VersionMajor>\r
+      <VersionMinor>0</VersionMinor>\r
+      <Lcid>0</Lcid>\r
+      <WrapperTool>primary</WrapperTool>\r
+      <Isolated>False</Isolated>\r
+    </COMReference>\r
+  </ItemGroup>\r
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
index aec5ce1..b5af0d7 100644 (file)
@@ -35,7 +35,7 @@ namespace Handbrake
                 System.Windows.Forms.Screen scr = System.Windows.Forms.Screen.PrimaryScreen;\r
                 if ((scr.Bounds.Width < 1024) || (scr.Bounds.Height < 720))\r
                 {\r
-                    MessageBox.Show("Your system does not meet the minimum requirements for HandBrake. \n Screen resolution is too Low. Must be 1024x768 or greater", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                    MessageBox.Show("Your system does not meet the minimum requirements for HandBrake. \n" + "Your screen is running at: " + scr.Bounds.Width.ToString() + "x" + scr.Bounds.Height.ToString() + " \nScreen resolution is too Low. Must be 1024x720 or greater", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
                     launch = false;\r
                 }\r
 \r
index 7238dc8..ddc8dcf 100644 (file)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
 //     This code was generated by a tool.\r
-//     Runtime Version:2.0.50727.832\r
+//     Runtime Version:2.0.50727.1378\r
 //\r
 //     Changes to this file may cause incorrect behavior and will be lost if\r
 //     the code is regenerated.\r
@@ -109,413 +109,6 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string DVDSource {\r
-            get {\r
-                return ((string)(this["DVDSource"]));\r
-            }\r
-            set {\r
-                this["DVDSource"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string DVDTitle {\r
-            get {\r
-                return ((string)(this["DVDTitle"]));\r
-            }\r
-            set {\r
-                this["DVDTitle"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string ChapterStart {\r
-            get {\r
-                return ((string)(this["ChapterStart"]));\r
-            }\r
-            set {\r
-                this["ChapterStart"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string ChapterFinish {\r
-            get {\r
-                return ((string)(this["ChapterFinish"]));\r
-            }\r
-            set {\r
-                this["ChapterFinish"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string VideoDest {\r
-            get {\r
-                return ((string)(this["VideoDest"]));\r
-            }\r
-            set {\r
-                this["VideoDest"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string VideoEncoder {\r
-            get {\r
-                return ((string)(this["VideoEncoder"]));\r
-            }\r
-            set {\r
-                this["VideoEncoder"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string AudioEncoder {\r
-            get {\r
-                return ((string)(this["AudioEncoder"]));\r
-            }\r
-            set {\r
-                this["AudioEncoder"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string Width {\r
-            get {\r
-                return ((string)(this["Width"]));\r
-            }\r
-            set {\r
-                this["Width"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string Height {\r
-            get {\r
-                return ((string)(this["Height"]));\r
-            }\r
-            set {\r
-                this["Height"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string CroppingOption {\r
-            get {\r
-                return ((string)(this["CroppingOption"]));\r
-            }\r
-            set {\r
-                this["CroppingOption"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string CropTop {\r
-            get {\r
-                return ((string)(this["CropTop"]));\r
-            }\r
-            set {\r
-                this["CropTop"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string CropBottom {\r
-            get {\r
-                return ((string)(this["CropBottom"]));\r
-            }\r
-            set {\r
-                this["CropBottom"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string CropLeft {\r
-            get {\r
-                return ((string)(this["CropLeft"]));\r
-            }\r
-            set {\r
-                this["CropLeft"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string CropRight {\r
-            get {\r
-                return ((string)(this["CropRight"]));\r
-            }\r
-            set {\r
-                this["CropRight"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string Subtitles {\r
-            get {\r
-                return ((string)(this["Subtitles"]));\r
-            }\r
-            set {\r
-                this["Subtitles"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string VideoBitrate {\r
-            get {\r
-                return ((string)(this["VideoBitrate"]));\r
-            }\r
-            set {\r
-                this["VideoBitrate"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string VideoFilesize {\r
-            get {\r
-                return ((string)(this["VideoFilesize"]));\r
-            }\r
-            set {\r
-                this["VideoFilesize"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string TwoPass {\r
-            get {\r
-                return ((string)(this["TwoPass"]));\r
-            }\r
-            set {\r
-                this["TwoPass"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string DeInterlace {\r
-            get {\r
-                return ((string)(this["DeInterlace"]));\r
-            }\r
-            set {\r
-                this["DeInterlace"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string Grayscale {\r
-            get {\r
-                return ((string)(this["Grayscale"]));\r
-            }\r
-            set {\r
-                this["Grayscale"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string Framerate {\r
-            get {\r
-                return ((string)(this["Framerate"]));\r
-            }\r
-            set {\r
-                this["Framerate"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string PixelRatio {\r
-            get {\r
-                return ((string)(this["PixelRatio"]));\r
-            }\r
-            set {\r
-                this["PixelRatio"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string turboFirstPass {\r
-            get {\r
-                return ((string)(this["turboFirstPass"]));\r
-            }\r
-            set {\r
-                this["turboFirstPass"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string largeFile {\r
-            get {\r
-                return ((string)(this["largeFile"]));\r
-            }\r
-            set {\r
-                this["largeFile"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string AudioBitrate {\r
-            get {\r
-                return ((string)(this["AudioBitrate"]));\r
-            }\r
-            set {\r
-                this["AudioBitrate"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string AudioSampleRate {\r
-            get {\r
-                return ((string)(this["AudioSampleRate"]));\r
-            }\r
-            set {\r
-                this["AudioSampleRate"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string AudioChannels {\r
-            get {\r
-                return ((string)(this["AudioChannels"]));\r
-            }\r
-            set {\r
-                this["AudioChannels"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string CRF {\r
-            get {\r
-                return ((string)(this["CRF"]));\r
-            }\r
-            set {\r
-                this["CRF"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string H264 {\r
-            get {\r
-                return ((string)(this["H264"]));\r
-            }\r
-            set {\r
-                this["H264"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        public int VideoQuality {\r
-            get {\r
-                return ((int)(this["VideoQuality"]));\r
-            }\r
-            set {\r
-                this["VideoQuality"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string FullDVDInfo {\r
-            get {\r
-                return ((string)(this["FullDVDInfo"]));\r
-            }\r
-            set {\r
-                this["FullDVDInfo"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string denoise {\r
-            get {\r
-                return ((string)(this["denoise"]));\r
-            }\r
-            set {\r
-                this["denoise"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string detelecine {\r
-            get {\r
-                return ((string)(this["detelecine"]));\r
-            }\r
-            set {\r
-                this["detelecine"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string deblock {\r
-            get {\r
-                return ((string)(this["deblock"]));\r
-            }\r
-            set {\r
-                this["deblock"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
         [global::System.Configuration.DefaultSettingValueAttribute("0.9.2")]\r
         public string CliVersion {\r
             get {\r
@@ -577,17 +170,6 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        public global::System.Collections.Specialized.StringCollection BuiltInPresets {\r
-            get {\r
-                return ((global::System.Collections.Specialized.StringCollection)(this["BuiltInPresets"]));\r
-            }\r
-            set {\r
-                this["BuiltInPresets"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
         [global::System.Configuration.DefaultSettingValueAttribute("")]\r
         public string hidePresets {\r
             get {\r
@@ -601,24 +183,12 @@ namespace Handbrake.Properties {
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
         [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string selectedPreset {\r
-            get {\r
-                return ((string)(this["selectedPreset"]));\r
-            }\r
-            set {\r
-                this["selectedPreset"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string chapterMarker {\r
+        public string defaultUserSettings {\r
             get {\r
-                return ((string)(this["chapterMarker"]));\r
+                return ((string)(this["defaultUserSettings"]));\r
             }\r
             set {\r
-                this["chapterMarker"] = value;\r
+                this["defaultUserSettings"] = value;\r
             }\r
         }\r
     }\r
index 5063e11..468b350 100644 (file)
     <Setting Name="verbose" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">Checked</Value>\r
     </Setting>\r
-    <Setting Name="DVDSource" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="DVDTitle" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="ChapterStart" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="ChapterFinish" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="VideoDest" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="VideoEncoder" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="AudioEncoder" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="Width" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="Height" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="CroppingOption" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="CropTop" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="CropBottom" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="CropLeft" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="CropRight" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="Subtitles" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="VideoBitrate" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="VideoFilesize" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="TwoPass" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="DeInterlace" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="Grayscale" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="Framerate" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="PixelRatio" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="turboFirstPass" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="largeFile" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="AudioBitrate" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="AudioSampleRate" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="AudioChannels" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="CRF" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="H264" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="VideoQuality" Type="System.Int32" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="FullDVDInfo" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="denoise" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="detelecine" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="deblock" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
     <Setting Name="CliVersion" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">0.9.2</Value>\r
     </Setting>\r
     <Setting Name="CompletionOption" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">Do Nothing</Value>\r
     </Setting>\r
-    <Setting Name="BuiltInPresets" Type="System.Collections.Specialized.StringCollection" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
     <Setting Name="hidePresets" Type="System.String" Scope="User">\r
       <Value Profile="(Default)" />\r
     </Setting>\r
-    <Setting Name="selectedPreset" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
-    </Setting>\r
-    <Setting Name="chapterMarker" Type="System.String" Scope="User">\r
+    <Setting Name="defaultUserSettings" Type="System.String" Scope="User">\r
       <Value Profile="(Default)" />\r
     </Setting>\r
   </Settings>\r
index bfb9526..a19ca4b 100644 (file)
             <setting name="verbose" serializeAs="String">\r
                 <value>Checked</value>\r
             </setting>\r
-            <setting name="DVDSource" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="DVDTitle" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="ChapterStart" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="ChapterFinish" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="VideoDest" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="VideoEncoder" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="AudioEncoder" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="Width" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="Height" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="CroppingOption" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="CropTop" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="CropBottom" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="CropLeft" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="CropRight" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="Subtitles" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="VideoBitrate" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="VideoFilesize" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="TwoPass" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="DeInterlace" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="Grayscale" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="Framerate" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="PixelRatio" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="turboFirstPass" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="largeFile" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="AudioBitrate" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="AudioSampleRate" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="AudioChannels" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="CRF" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="H264" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="FullDVDInfo" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="denoise" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="detelecine" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="deblock" serializeAs="String">\r
-                <value />\r
-            </setting>\r
             <setting name="CliVersion" serializeAs="String">\r
                 <value>0.9.2</value>\r
             </setting>\r
             <setting name="hidePresets" serializeAs="String">\r
                 <value />\r
             </setting>\r
-            <setting name="selectedPreset" serializeAs="String">\r
-                <value />\r
-            </setting>\r
-            <setting name="chapterMarker" serializeAs="String">\r
+            <setting name="defaultUserSettings" serializeAs="String">\r
                 <value />\r
             </setting>\r
         </Handbrake.Properties.Settings>\r
index bf00e22..12d7a5d 100644 (file)
@@ -141,99 +141,22 @@ namespace Handbrake
 \r
         private void loadUserDefaults()\r
         {\r
+            string userDefaults = Properties.Settings.Default.defaultUserSettings;\r
             try\r
             {\r
-                // Load the users default settings or if the user has not got this option enabled, load the normal preset.\r
-                if (Properties.Settings.Default.defaultSettings == "Checked")\r
-                {\r
-                    // Source\r
-                    text_source.Text = Properties.Settings.Default.DVDSource;\r
-                    drp_dvdtitle.Text = Properties.Settings.Default.DVDTitle;\r
-                    drop_chapterStart.Text = Properties.Settings.Default.ChapterStart;\r
-                    drop_chapterFinish.Text = Properties.Settings.Default.ChapterFinish;\r
-\r
-                    // Destination\r
-                    text_destination.Text = Properties.Settings.Default.VideoDest;\r
-                    drp_videoEncoder.Text = Properties.Settings.Default.VideoEncoder;\r
-                    drp_audioCodec.Text = Properties.Settings.Default.AudioEncoder;\r
-                    text_width.Text = Properties.Settings.Default.Width;\r
-                    text_height.Text = Properties.Settings.Default.Height;\r
-\r
-                    // Picture Settings Tab\r
-                    drp_crop.Text = Properties.Settings.Default.CroppingOption;\r
-                    text_top.Text = Properties.Settings.Default.CropTop;\r
-                    text_bottom.Text = Properties.Settings.Default.CropBottom;\r
-                    text_left.Text = Properties.Settings.Default.CropLeft;\r
-                    text_right.Text = Properties.Settings.Default.CropRight;\r
-                    drp_subtitle.Text = Properties.Settings.Default.Subtitles;\r
-\r
-                    // Video Settings Tab\r
-                    text_bitrate.Text = Properties.Settings.Default.VideoBitrate;\r
-                    text_filesize.Text = Properties.Settings.Default.VideoFilesize;\r
-                    slider_videoQuality.Value = Properties.Settings.Default.VideoQuality;\r
-\r
-                    if (Properties.Settings.Default.TwoPass == "Checked")\r
-                    {\r
-                        check_2PassEncode.CheckState = CheckState.Checked;\r
-                    }\r
-\r
-                    drp_deInterlace_option.Text = Properties.Settings.Default.DeInterlace;\r
-                    drp_deNoise.Text = Properties.Settings.Default.denoise;\r
-\r
-                    if (Properties.Settings.Default.detelecine == "Checked")\r
-                    {\r
-                        check_detelecine.CheckState = CheckState.Checked;\r
-                    }\r
-\r
-                    if (Properties.Settings.Default.detelecine == "Checked")\r
-                    {\r
-                        check_deblock.CheckState = CheckState.Checked;\r
-                    }\r
-\r
-\r
-                    if (Properties.Settings.Default.Grayscale == "Checked")\r
-                    {\r
-                        check_grayscale.CheckState = CheckState.Checked;\r
-                    }\r
-\r
-                    drp_videoFramerate.Text = Properties.Settings.Default.Framerate;\r
-\r
-                    if (Properties.Settings.Default.PixelRatio == "Checked")\r
-                    {\r
-                        CheckPixelRatio.CheckState = CheckState.Checked;\r
-                    }\r
-                    if (Properties.Settings.Default.turboFirstPass == "Checked")\r
-                    {\r
-                        check_turbo.CheckState = CheckState.Checked;\r
-                    }\r
-                    if (Properties.Settings.Default.largeFile == "Checked")\r
-                    {\r
-                        check_largeFile.CheckState = CheckState.Checked;\r
-                    }\r
-\r
-                    if (Properties.Settings.Default.chapterMarker == "Checked")\r
-                    {\r
-                        Check_ChapterMarkers.CheckState = CheckState.Checked;\r
-                    }\r
-\r
-                    // Audio Settings Tab\r
-                    drp_audioBitrate.Text = Properties.Settings.Default.AudioBitrate;\r
-                    drp_audioSampleRate.Text = Properties.Settings.Default.AudioSampleRate;\r
-                    drp_audioChannels.Text = Properties.Settings.Default.AudioChannels;\r
+                    // Some things that need to be done to reset some gui components:\r
+                    CheckPixelRatio.CheckState = CheckState.Unchecked;\r
 \r
-                    // H264 Tab\r
-                    if (Properties.Settings.Default.CRF == "Checked")\r
-                    {\r
-                        CheckCRF.CheckState = CheckState.Checked;\r
-                    }\r
-                    rtf_h264advanced.Text = Properties.Settings.Default.H264;\r
+                    // Send the query from the file to the Query Parser class\r
+                    Functions.QueryParser presetQuery = Functions.QueryParser.Parse(userDefaults);\r
 \r
-                    groupBox_output.Text = "Output Settings (Preset: " + Properties.Settings.Default.selectedPreset + ")";\r
-                }\r
+                    // Now load the preset\r
+                    presetLoader(presetQuery, "User Defaults ");\r
             }\r
-            catch (Exception)\r
+            catch (Exception exc)\r
             {\r
-                // No real need to alert the user. Try/Catch only in just incase there is a problem reading the settings xml file.\r
+                    MessageBox.Show("Unable to load profile.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
+                    MessageBox.Show(exc.ToString());\r
             }\r
         }\r
 \r
@@ -255,7 +178,7 @@ namespace Handbrake
 \r
                     Boolean update = ((verdata > vergui) || (verd1 > cliversion));\r
 \r
-                    lbl_update.Visible = update;\r
+                    //lbl_update.Visible = update;\r
 \r
                     return update;\r
                 }\r
@@ -663,48 +586,8 @@ namespace Handbrake
 \r
         private void btn_setDefault_Click(object sender, EventArgs e)\r
         {\r
-            //Source\r
-            Properties.Settings.Default.DVDSource = text_source.Text;\r
-            Properties.Settings.Default.DVDTitle = drp_dvdtitle.Text;\r
-            Properties.Settings.Default.ChapterStart = drop_chapterStart.Text;\r
-            Properties.Settings.Default.ChapterFinish = drop_chapterFinish.Text;\r
-            //Destination\r
-            Properties.Settings.Default.VideoDest = text_destination.Text;\r
-            Properties.Settings.Default.VideoEncoder = drp_videoEncoder.Text;\r
-            Properties.Settings.Default.AudioEncoder = drp_audioCodec.Text;\r
-            Properties.Settings.Default.Width = text_width.Text;\r
-            Properties.Settings.Default.Height = text_height.Text;\r
-            //Picture Settings Tab\r
-            Properties.Settings.Default.CroppingOption = drp_crop.Text;\r
-            Properties.Settings.Default.CropTop = text_top.Text;\r
-            Properties.Settings.Default.CropBottom = text_bottom.Text;\r
-            Properties.Settings.Default.CropLeft = text_left.Text;\r
-            Properties.Settings.Default.CropRight = text_right.Text;\r
-            Properties.Settings.Default.Subtitles = drp_subtitle.Text;\r
-            //Video Settings Tab\r
-            Properties.Settings.Default.VideoBitrate = text_bitrate.Text;\r
-            Properties.Settings.Default.VideoFilesize = text_filesize.Text;\r
-            Properties.Settings.Default.VideoQuality = slider_videoQuality.Value;\r
-            Properties.Settings.Default.TwoPass = check_2PassEncode.CheckState.ToString();\r
-            Properties.Settings.Default.DeInterlace = drp_deInterlace_option.Text;\r
-            Properties.Settings.Default.Grayscale = check_grayscale.CheckState.ToString();\r
-            Properties.Settings.Default.Framerate = drp_videoFramerate.Text;\r
-            Properties.Settings.Default.PixelRatio = CheckPixelRatio.CheckState.ToString();\r
-            Properties.Settings.Default.turboFirstPass = check_turbo.CheckState.ToString();\r
-            Properties.Settings.Default.largeFile = check_largeFile.CheckState.ToString();\r
-            Properties.Settings.Default.detelecine = check_detelecine.CheckState.ToString();\r
-            Properties.Settings.Default.denoise = drp_deNoise.Text;\r
-            Properties.Settings.Default.deblock = check_deblock.CheckState.ToString();\r
-            Properties.Settings.Default.chapterMarker = Check_ChapterMarkers.CheckState.ToString();\r
-            //Audio Settings Tab\r
-            Properties.Settings.Default.AudioBitrate = drp_audioBitrate.Text;\r
-            Properties.Settings.Default.AudioSampleRate = drp_audioSampleRate.Text;\r
-            Properties.Settings.Default.AudioChannels = drp_audioChannels.Text;\r
-            //H264 Tab\r
-            Properties.Settings.Default.CRF = CheckCRF.CheckState.ToString();\r
-            Properties.Settings.Default.H264 = rtf_h264advanced.Text;\r
-            //Preset\r
-            Properties.Settings.Default.selectedPreset = groupBox_output.Text.Replace("Output Settings (Preset: ", "").Replace("\"", "").Replace(")", "");\r
+            String query = GenerateTheQuery();\r
+            Properties.Settings.Default.defaultUserSettings = query;\r
             // Save the new default Settings\r
             Properties.Settings.Default.Save();\r
             MessageBox.Show("New default settings saved.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
@@ -1909,7 +1792,6 @@ namespace Handbrake
         }\r
 \r
         #endregion\r
-\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file