From fc2d7b41d8231bf449c9c30059c37caa507c3e4e Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Tue, 26 Apr 2016 01:20:10 +0100
Subject: [PATCH] Move ImageLoader to Wox.Infrastructure, part 2

---
 Wox.Infrastructure/Image/ImageCache.cs       | 4 +---
 Wox.Infrastructure/Image/ImageLoader.cs      | 5 ++---
 Wox.Infrastructure/Wox.Infrastructure.csproj | 6 ++++++
 Wox/App.xaml.cs                              | 5 +++--
 Wox/Wox.csproj                               | 2 --
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Wox.Infrastructure/Image/ImageCache.cs b/Wox.Infrastructure/Image/ImageCache.cs
index 8c6ab12fa8..1bf5fc795b 100644
--- a/Wox.Infrastructure/Image/ImageCache.cs
+++ b/Wox.Infrastructure/Image/ImageCache.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Linq;
-using Wox.Infrastructure.Storage;
 
-namespace Wox.ImageLoader
+namespace Wox.Infrastructure.Image
 {
     [Serializable]
     public class ImageCache
diff --git a/Wox.Infrastructure/Image/ImageLoader.cs b/Wox.Infrastructure/Image/ImageLoader.cs
index 00b564b69e..1ecd4e9f25 100644
--- a/Wox.Infrastructure/Image/ImageLoader.cs
+++ b/Wox.Infrastructure/Image/ImageLoader.cs
@@ -3,16 +3,15 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Linq;
-using Wox.Infrastructure;
 using Wox.Infrastructure.Storage;
 
-namespace Wox.ImageLoader
+namespace Wox.Infrastructure.Image
 {
     public class ImageLoader
     {
diff --git a/Wox.Infrastructure/Wox.Infrastructure.csproj b/Wox.Infrastructure/Wox.Infrastructure.csproj
index 918eda340a..44ee979b07 100644
--- a/Wox.Infrastructure/Wox.Infrastructure.csproj
+++ b/Wox.Infrastructure/Wox.Infrastructure.csproj
@@ -52,8 +52,12 @@
       <HintPath>..\packages\Pinyin4DotNet.2016.4.23.4\lib\net452\Pinyin4Net.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
@@ -70,6 +74,8 @@
     <Compile Include="Exception\WoxPluginException.cs" />
     <Compile Include="Hotkey\InterceptKeys.cs" />
     <Compile Include="Hotkey\KeyEvent.cs" />
+    <Compile Include="Image\ImageCache.cs" />
+    <Compile Include="Image\ImageLoader.cs" />
     <Compile Include="Logger\Log.cs" />
     <Compile Include="Storage\PluginSettingsStorage.cs" />
     <Compile Include="SyntaxSuger.cs" />
diff --git a/Wox/App.xaml.cs b/Wox/App.xaml.cs
index ac43e4bb4b..01edd7141a 100644
--- a/Wox/App.xaml.cs
+++ b/Wox/App.xaml.cs
@@ -11,6 +11,7 @@ using Wox.CommandArgs;
 using Wox.Core.Plugin;
 using Wox.Helper;
 using Wox.Infrastructure;
+using Wox.Infrastructure.Image;
 using Wox.ViewModel;
 using Stopwatch = Wox.Infrastructure.Stopwatch;
 
@@ -20,7 +21,7 @@ namespace Wox
     {
         private const string Unique = "Wox_Unique_Application_Mutex";
         public static MainWindow Window { get; private set; }
-        public static ImageLoader.ImageLoader ImageLoader;
+        public static ImageLoader ImageLoader;
         public static PublicAPIInstance API { get; private set; }
 
         [STAThread]
@@ -43,7 +44,7 @@ namespace Wox
                 WoxDirectroy.Executable = Directory.GetParent(Assembly.GetExecutingAssembly().Location).ToString();
                 RegisterUnhandledException();
 
-                ImageLoader = new ImageLoader.ImageLoader();
+                ImageLoader = new ImageLoader();
                 Task.Factory.StartNew(ImageLoader.PreloadImages);
                 PluginManager.Initialize();
 
diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj
index be5dbc83cb..4c1098898e 100644
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@@ -126,7 +126,6 @@
     <Compile Include="Converters\ImagePathConverter.cs" />
     <Compile Include="Helper\VisibilityExtensions.cs" />
     <Compile Include="Helper\SingletonWindowOpener.cs" />
-    <Compile Include="ImageLoader\ImageCache.cs" />
     <Compile Include="NotifyIconManager.cs" />
     <Compile Include="PublicAPIInstance.cs" />
     <Compile Include="ResultListBox.xaml.cs">
@@ -156,7 +155,6 @@
     <Compile Include="CommandArgs\QueryCommandArg.cs" />
     <Compile Include="Helper\DataWebRequestFactory.cs" />
     <Compile Include="Helper\ErrorReporting.cs" />
-    <Compile Include="ImageLoader\ImageLoader.cs" />
     <Compile Include="Helper\SingleInstance.cs" />
     <Compile Include="Helper\SyntaxSugars.cs" />
     <Compile Include="Helper\WallpaperPathRetrieval.cs" />