WinGui: Sizing tweak to mini view. Tidy up some code warnings. Update assembly info files.

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

14 files changed, 81 insertions, 35 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 08fdf54ab..5c9f7e23c 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -138,6 +138,7 @@
     <Compile Include="Interop\Json\Encode\SubtitleTrack.cs" />

     <Compile Include="Interop\Json\Encode\Video.cs" />

     <Compile Include="Interop\Factories\AnamorphicFactory.cs" />

+    <Compile Include="Properties\AssemblyInfo.cs" />

     <Compile Include="Services\Encode\Factories\EncodeFactory.cs" />

     <Compile Include="Interop\Json\Scan\SourceAudioTrack.cs" />

     <Compile Include="Interop\Json\Scan\SourceChapter.cs" />

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/EncodeProgressEventArgs.cs b/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/EncodeProgressEventArgs.cs
index 82003719f..d58798e81 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/EncodeProgressEventArgs.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/EncodeProgressEventArgs.cs
@@ -36,16 +36,16 @@ namespace HandBrake.ApplicationServices.Interop.EventArgs
         /// </summary>

         public TimeSpan EstimatedTimeLeft { get; set; }

 

-		/// <summary>

-		/// Gets or sets the pass ID.

-		/// </summary>

-		/// <remarks>

-		/// -1: Subtitle scan

-		///  0: Encode

-		///  1: Encode first pass

-		///  2: Encode second pass

-		/// </remarks>

-		public int PassId { get; set; }

+        /// <summary>

+        /// Gets or sets the pass ID.

+        /// </summary>

+        /// <remarks>

+        /// -1: Subtitle scan

+        ///  0: Encode

+        ///  1: Encode first pass

+        ///  2: Encode second pass

+        /// </remarks>

+        public int PassId { get; set; }

 

         /// <summary>

         /// Gets or sets the current encoding pass. (1-based)

diff --git a/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs b/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..94fdadad0
--- /dev/null
+++ b/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs
@@ -0,0 +1,47 @@
+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="AssemblyInfo.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Assembly Info

+// </summary>

+// <auto-generated/>

+// --------------------------------------------------------------------------------------------------------------------

+

+using System.Reflection;

+using System.Resources;

+using System.Runtime.CompilerServices;

+using System.Runtime.InteropServices;

+

+// General Information about an assembly is controlled through the following 

+// set of attributes. Change these attribute values to modify the information

+// associated with an assembly.

+[assembly: AssemblyTitle("HandBrake LibHB Wrapper")]

+[assembly: AssemblyDescription("HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.")]

+[assembly: AssemblyConfiguration("")]

+[assembly: AssemblyCompany("HandBrake Team")]

+[assembly: AssemblyProduct("HandBrake")]

+[assembly: AssemblyCopyright("Copyright © 2003-2015 HandBrake Team")]

+[assembly: AssemblyTrademark("")]

+[assembly: AssemblyCulture("")]

+

+// Setting ComVisible to false makes the types in this assembly not visible 

+// to COM components.  If you need to access a type in this assembly from 

+// COM, set the ComVisible attribute to true on that type.

+[assembly: ComVisible(false)]

+

+// The following GUID is for the ID of the typelib if this project is exposed to COM

+[assembly: Guid("5e4e3f97-5252-41f6-aae9-3846f62cbc66")]

+

+// Version information for an assembly consists of the following four values:

+//

+//      Major Version

+//      Minor Version 

+//      Build Number

+//      Revision

+//

+// You can specify all the values or you can default the Build and Revision Numbers 

+// by using the '*' as shown below:

+// [assembly: AssemblyVersion("1.0.*")]

+[assembly: AssemblyVersion("0.0.0.0")]

+[assembly: NeutralResourcesLanguage("")]

diff --git a/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.Nightly.tmpl b/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.Nightly.tmpl
index 1052671f7..3cf2c747e 100644
--- a/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.Nightly.tmpl
+++ b/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.Nightly.tmpl
@@ -1,7 +1,12 @@
-/*  AssemblyInfo.cs $

-    This file is part of the HandBrake source code.

-    Homepage: <http://handbrake.fr>.

-    It may be used under the terms of the GNU General Public License. */

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="AssemblyInfo.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Assembly Info

+// </summary>

+// <auto-generated/>

+// --------------------------------------------------------------------------------------------------------------------

 

 using System.Reflection;

 using System.Resources;

diff --git a/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl b/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl
index d913a2a96..f07078261 100644
--- a/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl
+++ b/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl
@@ -1,7 +1,12 @@
-/*  AssemblyInfo.cs $

-    This file is part of the HandBrake source code.

-    Homepage: <http://handbrake.fr>.

-    It may be used under the terms of the GNU General Public License. */

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="AssemblyInfo.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Assembly Info

+// </summary>

+// <auto-generated/>

+// --------------------------------------------------------------------------------------------------------------------

 

 using System.Reflection;

 using System.Resources;

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioRateTypeConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioRateTypeConverter.cs
index 1aaba88a2..720414b73 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioRateTypeConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioRateTypeConverter.cs
@@ -54,7 +54,6 @@ namespace HandBrakeWPF.Converters.Audio
                 return rateTypes;

             }

 

-

             if (targetType == typeof(AudioEncoderRateType) || value.GetType() == typeof(AudioEncoderRateType))

             {

                 return EnumHelper<AudioEncoderRateType>.GetDisplay((AudioEncoderRateType)value);

diff --git a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
index 4c5599d62..a28bf9685 100644
--- a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
@@ -133,7 +133,6 @@ namespace HandBrakeWPF.Converters
             {

                 return EnumHelper<OutputFormat>.GetDisplay((OutputFormat)value);

             }

-

  

             return null;

         }

diff --git a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs
index 10daac53d..1699a30b5 100644
--- a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs
+++ b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs
@@ -61,5 +61,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 

 // by using the '*' as shown below:

 // [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("0.0.0.6809")]

+[assembly: AssemblyVersion("0.0.0.0")]

 [assembly: NeutralResourcesLanguage("")]
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index bdb4d1a82..7b50cb750 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -316,7 +316,6 @@ namespace HandBrakeWPF.Services.Presets.Factories
                 }

             }

 

-

             /* Subtitle Settings */ 

             preset.SubtitleTrackBehaviours = new SubtitleBehaviours();

 

@@ -437,7 +436,6 @@ namespace HandBrakeWPF.Services.Presets.Factories
                 preset.AudioList.Add(track);

             }

             

-

             // Subtitles

             preset.SubtitleAddCC = export.SubtitleTrackBehaviours.AddClosedCaptions;

             preset.SubtitleAddForeignAudioSearch = export.SubtitleTrackBehaviours.AddForeignAudioScanTrack;

@@ -522,7 +520,6 @@ namespace HandBrakeWPF.Services.Presets.Factories
             return preset;

         }

 

-

         /// <summary>

         /// Get the OutputFormat Enum for a given string

         /// </summary>

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs
index 4f30c0aa3..bfc21e347 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs
@@ -55,7 +55,6 @@ namespace HandBrakeWPF.Services.Presets.Interfaces
         /// </param>

         void Import(string filename);

 

-

         /// <summary>

         /// The export.

         /// </summary>

diff --git a/win/CS/HandBrakeWPF/Startup/AppBootstrapper.cs b/win/CS/HandBrakeWPF/Startup/AppBootstrapper.cs
index 2be728b58..53225c235 100644
--- a/win/CS/HandBrakeWPF/Startup/AppBootstrapper.cs
+++ b/win/CS/HandBrakeWPF/Startup/AppBootstrapper.cs
@@ -84,7 +84,6 @@ namespace HandBrakeWPF.Startup
             this.container.Singleton<IMiniViewModel, MiniViewModel>();

             this.container.Singleton<IStaticPreviewViewModel, StaticPreviewViewModel>();

 

-

             // Tab Components

             this.container.Singleton<IAudioViewModel, AudioViewModel>();

             this.container.Singleton<IX264ViewModel, X264ViewModel>();

@@ -111,8 +110,8 @@ namespace HandBrakeWPF.Startup
         /// The e.

         /// </param>

         protected override void OnStartup(object sender, System.Windows.StartupEventArgs e)

-        {
-            DisplayRootViewFor<IShellViewModel>();
+        {

+            DisplayRootViewFor<IShellViewModel>();

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 2082dbb9e..41dc93291 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -298,9 +298,6 @@ namespace HandBrakeWPF.ViewModels
         /// <param name="userSettingService">

         /// The user Setting Service.

         /// </param>

-        /// <param name="shellViewModel">

-        /// The shell View Model.

-        /// </param>

         /// <param name="updateService">

         /// The update Service.

         /// </param>

@@ -555,7 +552,6 @@ namespace HandBrakeWPF.ViewModels
             }

         }

 

-

         #endregion

 

         #region Output Files

diff --git a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
index f516b156c..848472899 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
@@ -70,7 +70,6 @@ namespace HandBrakeWPF.ViewModels
             this.IsMainPanelEnabled = true;

             this.MainViewModel = mainViewModel;

             this.OptionsViewModel = optionsViewModel;

-            //this.OverlayPanelViewModel = overlayPanel;

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/Views/MiniView.xaml b/win/CS/HandBrakeWPF/Views/MiniView.xaml
index 4069d3ffa..a4abe239c 100644
--- a/win/CS/HandBrakeWPF/Views/MiniView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MiniView.xaml
@@ -6,9 +6,9 @@
         SnapsToDevicePixels="True"

         UseLayoutRounding="True"

         Width="300"

-        Height="165"

+        Height="175"

         MinWidth="300"

-        MinHeight="165"

+        MinHeight="175"

         TextOptions.TextFormattingMode="Display" ShowActivated="True" ShowInTaskbar="True"

         WindowStyle="ToolWindow"

         x:Name="miniView"