diff options
| author | sr55 <[email protected]> | 2015-08-23 12:38:12 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2015-08-23 12:38:12 +0000 |
| commit | f04245c5a03398eba8302b5c122d0f9c1bf07a22 (patch) | |
| tree | bbf69a32055d34cca71950ac09022451708aa44b /win/CS/HandBrakeWPF | |
| parent | 70f9d02e090184b86f81fb7765b020e3004ae5bd (diff) | |
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
Diffstat (limited to 'win/CS/HandBrakeWPF')
9 files changed, 5 insertions, 17 deletions
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"
|