diff options
| author | sr55 <[email protected]> | 2014-01-02 21:15:56 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2014-01-02 21:15:56 +0000 |
| commit | e6b6f7bd7c7da9c0f8fb100613b40140911398d1 (patch) | |
| tree | 4670294f44b947f7166bc860f5742b98186c0516 | |
| parent | c6e405a1d3f44745af4439129ae3cc48a6b6ffcb (diff) | |
WinGui: cleanup some warnings.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5952 b64f7644-9d1e-0410-96f1-a4d463321fa5
19 files changed, 54 insertions, 46 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs b/win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs index c86bc5ff6..fd10e22bd 100644 --- a/win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs +++ b/win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs @@ -269,7 +269,7 @@ namespace HandBrake.ApplicationServices.Factories preset.Name = kvp.Value;
break;
case "Type":
- //preset.Task.Type = kvp.Value; // TODO find out what this is
+ // preset.Task.Type = kvp.Value; // TODO find out what this is
break;
case "UsesMaxPictureSettings":
// TODO Not sure if this is used now!?
diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs index f20589f7d..b521d3b9d 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs @@ -33,6 +33,9 @@ namespace HandBrake.ApplicationServices.Model /// </summary>
private bool showAdvancedTab;
+ /// <summary>
+ /// The advanced encoder options.
+ /// </summary>
private string advancedEncoderOptions;
#endregion
diff --git a/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs b/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs index f97355ad5..57e4bfd71 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs @@ -34,7 +34,7 @@ namespace HandBrake.ApplicationServices.Services /// <summary>
/// Lock for the log file
/// </summary>
- private static readonly object logLock = new object();
+ private static readonly object LogLock = new object();
/// <summary>
/// The instance.
@@ -244,7 +244,7 @@ namespace HandBrake.ApplicationServices.Services {
if (this.loggingEnabled)
{
- lock (logLock)
+ lock (LogLock)
{
this.ProcessLogMessage(e.Message);
}
@@ -264,7 +264,7 @@ namespace HandBrake.ApplicationServices.Services {
if (this.loggingEnabled)
{
- lock (logLock)
+ lock (LogLock)
{
this.ProcessLogMessage(e.Message);
}
diff --git a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs index 7bc569ed7..8de36ca7f 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs @@ -409,7 +409,7 @@ namespace HandBrake.ApplicationServices.Services }
}
}
- catch(IOException)
+ catch (IOException)
{
// Give up
}
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/EnumHelper.cs b/win/CS/HandBrake.ApplicationServices/Utilities/EnumHelper.cs index 78e8335c8..cc7dfc43e 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/EnumHelper.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/EnumHelper.cs @@ -85,7 +85,7 @@ namespace HandBrake.ApplicationServices.Utilities return val;
}
- if (insensitiveCase && currDescription.ToLower() == description.ToLower() || currDisplay.ToLower() == description.ToLower())
+ if (insensitiveCase && (currDescription.ToLower() == description.ToLower() || currDisplay.ToLower() == description.ToLower()))
{
return val;
}
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Win32.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Win32.cs index 81d4846ec..8a870adfb 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/Win32.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/Win32.cs @@ -5,6 +5,7 @@ // <summary>
// Win32 API calls
// </summary>
+// <auto-generated>Disable Stylecop for this file </auto-generated>
// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.ApplicationServices.Utilities
diff --git a/win/CS/HandBrake10.sln.DotSettings b/win/CS/HandBrake10.sln.DotSettings index 4d549497f..0f6feff62 100644 --- a/win/CS/HandBrake10.sln.DotSettings +++ b/win/CS/HandBrake10.sln.DotSettings @@ -20,8 +20,10 @@ <s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">StyleCop</s:String> <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_ARGUMENT/@EntryValue">False</s:Boolean> <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_ARRAY_AND_OBJECT_INITIALIZER/@EntryValue">True</s:Boolean> + <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_AUTO_PROPERTY/@EntryValue">1</s:Int64> <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_FIELD/@EntryValue">1</s:Int64> <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE/@EntryValue">1</s:Int64> + <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_PROPERTY/@EntryValue">1</s:Int64> <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BETWEEN_USING_GROUPS/@EntryValue">1</s:Int64> <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_ATTRIBUTE_STYLE/@EntryValue">SEPARATE</s:String> <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FIXED_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String> @@ -55,6 +57,7 @@ <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT/@EntryValue">True</s:Boolean> <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_EXTENDS_LIST_STYLE/@EntryValue">CHOP_IF_LONG</s:String> <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_PARAMETERS_STYLE/@EntryValue">CHOP_IF_LONG</s:String> + <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/JavaScriptFormatOther/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean> <s:String x:Key="/Default/CodeStyle/CSharpMemberOrderPattern/CustomPattern/@EntryValue"><?xml version="1.0" encoding="utf-8"?>
 <!-- Last updated 15.05.2012 -->
 @@ -485,6 +488,8 @@ <s:Boolean x:Key="/Default/Environment/MemoryUsageIndicator/IsVisible/@EntryValue">True</s:Boolean> <s:Boolean x:Key="/Default/Environment/OpenDocument/OpenDocumentAfterModification/@EntryValue">True</s:Boolean> <s:Boolean x:Key="/Default/Environment/SearchAndNavigation/MergeOccurences/@EntryValue">True</s:Boolean> + <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean> + <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/Environment/UpdatesManger/IsDownloadUpdateDataAllowed/@EntryValue">False</s:Boolean> <s:String x:Key="/Default/Environment/UserInterface/ShortcutSchemeName/@EntryValue">VS</s:String> <s:String x:Key="/Default/Environment/UserInterface/ThemedIcon/PsiSymbolIcon/PsiSymbolIconThemeSelection/@EntryValue">SymbolsVs08</s:String> diff --git a/win/CS/HandBrakeWPF/Converters/FullPathToFileNameConverter.cs b/win/CS/HandBrakeWPF/Converters/FullPathToFileNameConverter.cs index fa659d232..7989d6b06 100644 --- a/win/CS/HandBrakeWPF/Converters/FullPathToFileNameConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/FullPathToFileNameConverter.cs @@ -40,7 +40,7 @@ namespace HandBrakeWPF.Converters public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
string path = value as string;
- if (!string.IsNullOrEmpty(path) && ! path.EndsWith("\\"))
+ if (!string.IsNullOrEmpty(path) && !path.EndsWith("\\"))
{
return Path.GetFileName(path);
}
diff --git a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs index 77106e397..aff1d2e5d 100644 --- a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs +++ b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs @@ -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="ListBoxHelper.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/Properties/AssemblyInfo.cs.Nightly.tmpl b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.Nightly.tmpl index 0a30129c7..6a5f3b8bc 100644 --- a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.Nightly.tmpl +++ b/win/CS/HandBrakeWPF/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="ListBoxHelper.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/Properties/AssemblyInfo.cs.tmpl b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.tmpl index d42127e97..b3b43f99c 100644 --- a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.tmpl +++ b/win/CS/HandBrakeWPF/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="ListBoxHelper.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/Services/NotificationService.cs b/win/CS/HandBrakeWPF/Services/NotificationService.cs index 306a2f5d2..e451460d8 100644 --- a/win/CS/HandBrakeWPF/Services/NotificationService.cs +++ b/win/CS/HandBrakeWPF/Services/NotificationService.cs @@ -55,7 +55,7 @@ namespace HandBrakeWPF.Services {
if (userSettingService.GetUserSetting<bool>(UserSettingConstants.GrowlQueue))
{
- // GrowlCommunicator.Notify("Queue Completed", "Put down that cocktail...\nyour Handbrake queue is done.");
+ // GrowlCommunicator.Notify("Queue Completed", "Put down that cocktail...\nyour Handbrake queue is done.");
}
}
diff --git a/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs b/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs index 387a950ec..379fcec91 100644 --- a/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs +++ b/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs @@ -122,7 +122,7 @@ namespace HandBrakeWPF.Startup /// The Service Requested
/// </returns>
protected override object GetInstance(Type service, string key)
- {
+ {
return string.IsNullOrWhiteSpace(key) ? this.windsorContainer.Resolve(service) : this.windsorContainer.Resolve(key, new { });
}
diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs index 5ef1d70dc..129f031b5 100644 --- a/win/CS/HandBrakeWPF/UserSettingConstants.cs +++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs @@ -144,7 +144,7 @@ namespace HandBrakeWPF /// <summary>
/// Vlc Path
/// </summary>
- public const string VLC_Path = "VLC_Path";
+ public const string VLCPath = "VLC_Path";
/// <summary>
/// The enable process isolation.
diff --git a/win/CS/HandBrakeWPF/Utilities/DelayedActionProcessor.cs b/win/CS/HandBrakeWPF/Utilities/DelayedActionProcessor.cs index 14d70c691..4da6f598f 100644 --- a/win/CS/HandBrakeWPF/Utilities/DelayedActionProcessor.cs +++ b/win/CS/HandBrakeWPF/Utilities/DelayedActionProcessor.cs @@ -44,7 +44,6 @@ namespace HandBrakeWPF.Utilities timer.Close();
}
-
timer = new Timer(timems) { AutoReset = true };
timer.Elapsed += this.timer_Elapsed;
task = taskReset;
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index ca3280a2c..0499e7157 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -1545,20 +1545,12 @@ namespace HandBrakeWPF.ViewModels {
if (!presetService.CanUpdatePreset(preset.Name))
{
- MessageBox.Show(
- Resources.Main_PresetErrorBuiltInName,
- Resources.Error,
- MessageBoxButton.OK,
- MessageBoxImage.Error);
+ MessageBox.Show(Resources.Main_PresetErrorBuiltInName, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
return;
}
MessageBoxResult result =
- MessageBox.Show(
- Resources.Main_PresetOverwriteWarning,
- Resources.Overwrite,
- MessageBoxButton.YesNo,
- MessageBoxImage.Warning);
+ MessageBox.Show(Resources.Main_PresetOverwriteWarning, Resources.Overwrite, MessageBoxButton.YesNo, MessageBoxImage.Warning);
if (result == MessageBoxResult.Yes)
{
presetService.Update(preset);
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs index 7e717c20e..b6b301d2b 100644 --- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs @@ -1849,7 +1849,7 @@ namespace HandBrakeWPF.ViewModels // #############################
// VLC Path
- this.VLCPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path) ?? string.Empty;
+ this.VLCPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath) ?? string.Empty;
// #############################
// Audio and Subtitles Tab
@@ -2019,7 +2019,7 @@ namespace HandBrakeWPF.ViewModels this.userSettingService.SetUserSetting(UserSettingConstants.RemovePunctuation, this.RemovePunctuation);
/* Previews */
- this.userSettingService.SetUserSetting(UserSettingConstants.VLC_Path, this.VLCPath);
+ this.userSettingService.SetUserSetting(UserSettingConstants.VLCPath, this.VLCPath);
/* Audio and Subtitles */
this.userSettingService.SetUserSetting(UserSettingConstants.NativeLanguage, this.SelectedPreferredLangauge);
diff --git a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs index b398a1b5c..932978e85 100644 --- a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs @@ -17,7 +17,6 @@ namespace HandBrakeWPF.ViewModels using System.Threading;
using System.Windows;
- using HandBrake.ApplicationServices;
using HandBrake.ApplicationServices.Model;
using HandBrake.ApplicationServices.Model.Encoding;
using HandBrake.ApplicationServices.Services.Interfaces;
@@ -327,7 +326,7 @@ namespace HandBrakeWPF.ViewModels }
else
{
- if (!File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path)))
+ if (!File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath)))
{
// Attempt to find VLC if it doesn't exist in the default set location.
string vlcPath;
@@ -344,7 +343,7 @@ namespace HandBrakeWPF.ViewModels if (File.Exists(vlcPath))
{
- UserSettingService.SetUserSetting(UserSettingConstants.VLC_Path, vlcPath);
+ UserSettingService.SetUserSetting(UserSettingConstants.VLCPath, vlcPath);
}
else
{
@@ -353,9 +352,9 @@ namespace HandBrakeWPF.ViewModels }
}
- if (File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path)))
+ if (File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath)))
{
- ProcessStartInfo vlc = new ProcessStartInfo(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path), args);
+ ProcessStartInfo vlc = new ProcessStartInfo(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath), args);
Process.Start(vlc);
}
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs index c4a26e033..d836f6d49 100644 --- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs @@ -189,12 +189,6 @@ namespace HandBrakeWPF.ViewModels this.PreviewImage = image;
}
- protected override void OnActivate()
- {
- Console.Write("test");
- base.OnActivate();
- }
-
/// <summary>
/// The update preview frame.
/// </summary>
|