diff options
Diffstat (limited to 'win/CS')
12 files changed, 23 insertions, 20 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj index 8d86c4e57..d3d229d67 100644 --- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj +++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj @@ -97,7 +97,6 @@ <Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
- <Compile Include="Collections\SerializableDictionary.cs" />
<Compile Include="Converters\EnumToDescConverter.cs" />
<Compile Include="EventArgs\QueueCompletedEventArgs.cs" />
<Compile Include="EventArgs\SettingChangedEventArgs.cs" />
@@ -125,11 +124,9 @@ <Compile Include="Utilities\Converters.cs" />
<Compile Include="Utilities\EnumHelper.cs" />
<Compile Include="Utilities\InteropModelCreator.cs" />
- <Compile Include="Utilities\PList.cs" />
<Compile Include="Utilities\SystemInfo.cs" />
<Compile Include="Utilities\VersionHelper.cs" />
<Compile Include="Utilities\Win32.cs" />
- <Compile Include="Utilities\Win7.cs" />
<Compile Include="Model\DriveInformation.cs" />
<Compile Include="Model\Encoding\AllowedPassthru.cs" />
<Compile Include="Model\Encoding\AudioTrack.cs" />
@@ -162,7 +159,6 @@ <Compile Include="Services\LibEncode.cs" />
<Compile Include="Services\LibScan.cs" />
<Compile Include="Services\QueueProcessor.cs" />
- <Compile Include="Utilities\AppcastReader.cs" />
<Compile Include="Utilities\CharCodesUtilities.cs" />
<Compile Include="Utilities\GeneralUtilities.cs" />
<Compile Include="Utilities\LanguageUtilities.cs" />
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs b/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs index f7e0ae0ed..df1211528 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs @@ -11,10 +11,8 @@ namespace HandBrake.ApplicationServices.Utilities {
using System;
using System.Collections.Generic;
- using System.Globalization;
using System.Management;
using System.Text.RegularExpressions;
- using System.Windows.Documents;
using System.Windows.Forms;
using HandBrake.Interop.HbLib;
diff --git a/win/CS/HandBrake.ApplicationServices/Collections/SerializableDictionary.cs b/win/CS/HandBrakeWPF/Collections/SerializableDictionary.cs index 15ac8a7c0..92ec90d1f 100644 --- a/win/CS/HandBrake.ApplicationServices/Collections/SerializableDictionary.cs +++ b/win/CS/HandBrakeWPF/Collections/SerializableDictionary.cs @@ -7,7 +7,7 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.ApplicationServices.Collections
+namespace HandBrakeWPF.Collections
{
using System.Collections.Generic;
using System.Collections.Specialized;
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj index 3ca004790..1e588f984 100644 --- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj +++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj @@ -132,6 +132,7 @@ <Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
+ <Reference Include="System.Xml.Linq" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
</ItemGroup>
@@ -142,6 +143,7 @@ </ApplicationDefinition>
<Compile Include="AppArguments.cs" />
<Compile Include="AttachedProperties\MenuItemExtensions.cs" />
+ <Compile Include="Collections\SerializableDictionary.cs" />
<Compile Include="Commands\CancelScanCommand.cs" />
<Compile Include="Commands\Interfaces\IAdvancedEncoderOptionsCommand.cs" />
<Compile Include="Commands\OpenOptionsScreenCommand.cs" />
@@ -163,10 +165,13 @@ <Compile Include="Services\Interfaces\IUserSettingService.cs" />
<Compile Include="Services\Presets\PresetService.cs" />
<Compile Include="Services\UserSettingService.cs" />
+ <Compile Include="Utilities\AppcastReader.cs" />
<Compile Include="Utilities\DelayedActionProcessor.cs" />
<Compile Include="Utilities\DPIAwareness.cs" />
<Compile Include="Utilities\HandBrakeApp.cs" />
<Compile Include="Services\Presets\Factories\PlistFactory.cs" />
+ <Compile Include="Utilities\PList.cs" />
+ <Compile Include="Utilities\Win7.cs" />
<Compile Include="ViewModels\CountdownAlertViewModel.cs" />
<Compile Include="ViewModels\Interfaces\ICountdownAlertViewModel.cs" />
<Compile Include="Controls\SourceSelection.xaml.cs">
diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs index b06df1728..7edf71836 100644 --- a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs +++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs @@ -26,6 +26,7 @@ namespace HandBrakeWPF.Services.Presets.Factories using HandBrakeWPF.Services.Presets;
using HandBrakeWPF.Services.Presets.Model;
+ using HandBrakeWPF.Utilities;
/// <summary>
/// A Factory to translate a Plist object into a Preset.
diff --git a/win/CS/HandBrakeWPF/Services/UpdateService.cs b/win/CS/HandBrakeWPF/Services/UpdateService.cs index 67220c0e3..2064e8e5c 100644 --- a/win/CS/HandBrakeWPF/Services/UpdateService.cs +++ b/win/CS/HandBrakeWPF/Services/UpdateService.cs @@ -20,6 +20,8 @@ namespace HandBrakeWPF.Services using HandBrakeWPF.Model;
using HandBrakeWPF.Services.Interfaces;
+ using AppcastReader = HandBrakeWPF.Utilities.AppcastReader;
+
/// <summary>
/// The Update Service
/// </summary>
diff --git a/win/CS/HandBrakeWPF/Services/UserSettingService.cs b/win/CS/HandBrakeWPF/Services/UserSettingService.cs index d10ec84df..6b7d87f1b 100644 --- a/win/CS/HandBrakeWPF/Services/UserSettingService.cs +++ b/win/CS/HandBrakeWPF/Services/UserSettingService.cs @@ -16,7 +16,6 @@ namespace HandBrakeWPF.Services using System.Reflection;
using System.Xml.Serialization;
- using HandBrake.ApplicationServices.Collections;
using HandBrake.ApplicationServices.EventArgs;
using HandBrake.ApplicationServices.Exceptions;
@@ -35,12 +34,12 @@ namespace HandBrakeWPF.Services /// <summary>
/// The XML Serializer
/// </summary>
- readonly XmlSerializer serializer = new XmlSerializer(typeof(SerializableDictionary<string, object>));
+ readonly XmlSerializer serializer = new XmlSerializer(typeof(Collections.SerializableDictionary<string, object>));
/// <summary>
/// The User Settings
/// </summary>
- private SerializableDictionary<string, object> userSettings;
+ private Collections.SerializableDictionary<string, object> userSettings;
/// <summary>
/// Initializes a new instance of the <see cref="UserSettingService"/> class.
@@ -162,17 +161,17 @@ namespace HandBrakeWPF.Services {
using (StreamReader reader = new StreamReader(this.settingsFile))
{
- SerializableDictionary<string, object> data = (SerializableDictionary<string, object>)this.serializer.Deserialize(reader);
+ Collections.SerializableDictionary<string, object> data = (Collections.SerializableDictionary<string, object>)this.serializer.Deserialize(reader);
this.userSettings = data;
}
}
else
{
- this.userSettings = new SerializableDictionary<string, object>();
+ this.userSettings = new Collections.SerializableDictionary<string, object>();
}
// Add any missing / new settings
- SerializableDictionary<string, object> defaults = this.GetDefaults();
+ Collections.SerializableDictionary<string, object> defaults = this.GetDefaults();
foreach (var item in defaults.Where(item => !this.userSettings.Keys.Contains(item.Key)))
{
this.userSettings.Add(item.Key, item.Value);
@@ -205,7 +204,7 @@ namespace HandBrakeWPF.Services /// <returns>
/// The get defaults.
/// </returns>
- private SerializableDictionary<string, object> GetDefaults()
+ private Collections.SerializableDictionary<string, object> GetDefaults()
{
try
{
@@ -213,15 +212,15 @@ namespace HandBrakeWPF.Services Stream stream = assembly.GetManifestResourceStream("HandBrakeWPF.defaultsettings.xml");
if (stream != null)
{
- return (SerializableDictionary<string, object>)this.serializer.Deserialize(stream);
+ return (Collections.SerializableDictionary<string, object>)this.serializer.Deserialize(stream);
}
}
catch (Exception)
{
- return new SerializableDictionary<string, object>();
+ return new Collections.SerializableDictionary<string, object>();
}
- return new SerializableDictionary<string, object>();
+ return new Collections.SerializableDictionary<string, object>();
}
}
}
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/AppcastReader.cs b/win/CS/HandBrakeWPF/Utilities/AppcastReader.cs index 0a3fac109..49d7f4714 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/AppcastReader.cs +++ b/win/CS/HandBrakeWPF/Utilities/AppcastReader.cs @@ -7,7 +7,7 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.ApplicationServices.Utilities
+namespace HandBrakeWPF.Utilities
{
using System;
using System.IO;
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PList.cs b/win/CS/HandBrakeWPF/Utilities/PList.cs index 78320f1fe..1e3c30e20 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/PList.cs +++ b/win/CS/HandBrakeWPF/Utilities/PList.cs @@ -7,7 +7,7 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.ApplicationServices.Utilities
+namespace HandBrakeWPF.Utilities
{
using System;
using System.Collections.Generic;
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Win7.cs b/win/CS/HandBrakeWPF/Utilities/Win7.cs index 10ae1f296..0f6cb5680 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/Win7.cs +++ b/win/CS/HandBrakeWPF/Utilities/Win7.cs @@ -7,7 +7,7 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.ApplicationServices.Utilities
+namespace HandBrakeWPF.Utilities
{
using System.Windows.Shell;
diff --git a/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs index 1eddfd83e..3d4781276 100644 --- a/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs @@ -35,6 +35,7 @@ namespace HandBrakeWPF.ViewModels using HandBrakeWPF.Services.Interfaces;
using HandBrakeWPF.Services.Presets.Interfaces;
using HandBrakeWPF.Services.Presets.Model;
+ using HandBrakeWPF.Utilities;
using HandBrakeWPF.ViewModels.Interfaces;
using HandBrakeWPF.Views;
diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs b/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs index 35e1e0333..bb757662c 100644 --- a/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs @@ -23,6 +23,7 @@ namespace HandBrakeWPF.Views using HandBrakeWPF.Commands;
using HandBrakeWPF.Services.Interfaces;
+ using HandBrakeWPF.Utilities;
using HandBrakeWPF.ViewModels.Interfaces;
using Application = System.Windows.Application;
|