WinGui: Remove the option to enable the static preview window. Window is now always...

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

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
index 6c4e26edeb822b957ad45a83db8cc708e047521b..1bc9445f39bf56ad1175b121e44e31a15b9f950a 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
@@ -829,13 +829,13 @@ namespace HandBrake.Interop
                 IntPtr titleSetPtr = HBFunctions.hb_get_title_set(this.hbHandle);\r
                 hb_title_set_s titleSet = InteropUtilities.ToStructureFromPtr<hb_title_set_s>(titleSetPtr);\r
                 this.originalTitles = titleSet.list_title.ToListFromHandBrakeList<hb_title_s>();\r
-
-                foreach (hb_title_s title in this.originalTitles)
-                {
-                    this.titles.Add(this.ConvertTitle(title));
-                }
-
-                if (this.originalTitles.Count > 0)
+\r
+                foreach (hb_title_s title in this.originalTitles)\r
+                {\r
+                    this.titles.Add(this.ConvertTitle(title));\r
+                }\r
+\r
+                if (this.originalTitles.Count > 0)\r
                 {\r
                     this.featureTitle = titleSet.feature;\r
                 }\r
@@ -1874,13 +1874,13 @@ namespace HandBrake.Interop
                 AspectRatio = title.aspect,\r
                 AngleCount = title.angle_count,\r
                 VideoCodecName = title.video_codec_name,\r
-                Framerate = ((double)title.rate) / title.rate_base,
-                FramerateNumerator = title.rate,
-                FramerateDenominator = title.rate_base,
-                Path = Encoding.UTF8.GetString(title.path).TrimEnd('\0')
-            };
-
-            switch (title.type)
+                Framerate = ((double)title.rate) / title.rate_base,\r
+                FramerateNumerator = title.rate,\r
+                FramerateDenominator = title.rate_base,\r
+                Path = Encoding.UTF8.GetString(title.path).TrimEnd('\0')\r
+            };\r
+\r
+            switch (title.type)\r
             {\r
                 case hb_title_type_anon.HB_STREAM_TYPE:\r
                     newTitle.InputType = InputType.Stream;\r

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 3eb9c9faa2c5c9c1214bd691969ce5bea27092bb..4fd168aee5c68635e80861a1d800427158178309 100644 (file)
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -74,7 +74,7 @@
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x86' ">\r
     <DebugSymbols>true</DebugSymbols>\r
-    <OutputPath>bin\x86\Debug31\</OutputPath>\r
+    <OutputPath>bin\x86\Debug\</OutputPath>\r
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
     <DebugType>full</DebugType>\r
     <PlatformTarget>x86</PlatformTarget>\r

diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs
index 77f45379ff9538ae32e27d4a39a740e5418b8def..80bebe4b3624f2789f047107f846884aca9b7a41 100644 (file)
--- a/win/CS/HandBrakeWPF/UserSettingConstants.cs
+++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs
@@ -256,11 +256,6 @@ namespace HandBrakeWPF
         /// </summary>\r
         public const string ClearCompletedFromQueue = "ClearCompletedFromQueue";\r
 \r
-        /// <summary>\r
-        /// The enable static preview.\r
-        /// </summary>\r
-        public const string EnableStaticPreview = "EnableStaticPreview";\r
-\r
         #endregion\r
     }\r
 }
\ No newline at end of file

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 85e74ed20e18dd6b99c36e8edfbecb5a54f8043d..bb303aef534560b01ff3cc0c0385ae3ae806ed10 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -280,11 +280,6 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>\r
         private bool showAdvancedTab;\r
 \r
-        /// <summary>\r
-        /// The enable static preview.\r
-        /// </summary>\r
-        private bool enableStaticPreview;\r
-\r
         /// <summary>\r
         /// The remove punctuation.\r
         /// </summary>\r
@@ -1134,22 +1129,6 @@ namespace HandBrakeWPF.ViewModels
             }\r
         }\r
 \r
-        /// <summary>\r
-        /// Gets or sets a value indicating whether enable static preview.\r
-        /// </summary>\r
-        public bool EnableStaticPreview\r
-        {\r
-            get\r
-            {\r
-                return this.enableStaticPreview;\r
-            }\r
-            set\r
-            {\r
-                this.enableStaticPreview = value;\r
-                this.NotifyOfPropertyChange(() => this.EnableStaticPreview);\r
-            }\r
-        }\r
-\r
         #endregion\r
 \r
         #region Video\r
@@ -1591,9 +1570,7 @@ namespace HandBrakeWPF.ViewModels
             this.MinLength = this.userSettingService.GetUserSetting<int>(UserSettingConstants.MinScanDuration);\r
 \r
             // Use dvdnav\r
-            this.DisableLibdvdNav = userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav);\r
-\r
-            this.EnableStaticPreview = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableStaticPreview);            \r
+            this.DisableLibdvdNav = userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav);  \r
 \r
             int port;\r
             int.TryParse(userSettingService.GetUserSetting<string>(UserSettingConstants.ServerPort), out port);\r
@@ -1652,7 +1629,6 @@ namespace HandBrakeWPF.ViewModels
             userSettingService.SetUserSetting(UserSettingConstants.PreviewScanCount, this.SelectedPreviewCount);\r
             userSettingService.SetUserSetting(UserSettingConstants.X264Step, double.Parse(this.SelectedGranulairty, CultureInfo.InvariantCulture));\r
             userSettingService.SetUserSetting(UserSettingConstants.ShowAdvancedTab, this.ShowAdvancedTab);\r
-            userSettingService.SetUserSetting(UserSettingConstants.EnableStaticPreview, this.EnableStaticPreview);\r
 \r
             int value;\r
             if (int.TryParse(this.MinLength.ToString(CultureInfo.InvariantCulture), out value))\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index cc6421d28b4bc04f09efb1f457642bfd5a4a93d6..d1ca9e65a997ed320285c3f62e24b7727b6523c0 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -324,17 +324,6 @@ namespace HandBrakeWPF.ViewModels
             }\r
         }\r
 \r
-        /// <summary>\r
-        /// Gets a value indicating whether is picture preview enabled.\r
-        /// </summary>\r
-        public bool IsPicturePreviewEnabled\r
-        {\r
-            get\r
-            {\r
-                return this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.EnableStaticPreview);\r
-            }\r
-        }\r
-\r
         #endregion\r
 \r
         #region Task Properties\r

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index f891da8eeed18895e2b97582ff6f5f54c405b4a0..20bea31e60a40caa09f83113139b0926ef872d88 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -331,8 +331,7 @@
                         <TextBlock Text="Alpha Features" FontSize="14" Margin="0,0,0,10"/>\r
 \r
                         <StackPanel Orientation="Vertical"  Margin="20,0,0,0">\r
-                            <CheckBox Content="Enable Static Preview" Margin="0,5,0,0" IsChecked="{Binding EnableStaticPreview}" />\r
-                                    \r
+                                   \r
                             <CheckBox Content="Use LibHB for Encoding (uses hb.dll instead of HandBrakeCLI.exe)" Margin="0,5,0,0" IsChecked="{Binding EnableLibHb}" Visibility="Collapsed" />\r
                             <CheckBox Content="Enable Process Isolation (Run Encodes via an intermediate service)" Margin="20,10,0,0" IsChecked="{Binding EnableProcessIsolation}" Visibility="Collapsed" />\r
                             <StackPanel Orientation="Horizontal" Margin="0,10,0,0" Visibility="Collapsed">\r

diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index 65d6dc1afec1d09d664b90dddb06e8aacef10dc3..23f9885c7d5eaaefe5e6ba295d59e91fad676512 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -153,8 +153,7 @@
             </StackPanel>\r
 \r
             <!-- Preview Panel -->\r
-            <StackPanel Name="PreviewPanel" Margin="0,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="1"  Grid.Column="0"\r
-                        Visibility="{Binding IsPicturePreviewEnabled, Converter={StaticResource boolToVisConverter}}">\r
+            <StackPanel Name="PreviewPanel" Margin="0,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="1"  Grid.Column="0">\r
                 <Label Content="Output" FontWeight="Bold" />\r
 \r
                 <Grid Margin="5,0,0,0">\r