Merge language and theme into resource folder

Wox.Core/Plugin/PluginManager.cs

@@ -4,8 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
-using Wox.Core.i18n;
-using Wox.Core.UI;
+using Wox.Core.Resource;
 using Wox.Core.UserSettings;
 using Wox.Infrastructure;
 using Wox.Infrastructure.Exception;

Wox.Core/Resource/AvailableLanguages.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Wox.Core.i18n
+namespace Wox.Core.Resource
 {
     internal static class AvailableLanguages
     {

Wox.Core/Resource/FontHelper.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Media;
 
-namespace Wox.Core.Theme
+namespace Wox.Core.Resource
 {
     public static class FontHelper
     {

Wox.Core/Resource/Internationalization.cs

@@ -3,13 +3,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows;
-using Wox.Core.UI;
 using Wox.Core.UserSettings;
 using Wox.Infrastructure.Exception;
 using Wox.Infrastructure.Logger;
 using Wox.Plugin;
 
-namespace Wox.Core.i18n
+namespace Wox.Core.Resource
 {
     public class Internationalization : Resource
     {

Wox.Core/Resource/InternationalizationManager.cs

@@ -1,4 +1,4 @@
-namespace Wox.Core.i18n
+namespace Wox.Core.Resource
 {
     public static class InternationalizationManager
     {

Wox.Core/Resource/Language.cs

@@ -1,4 +1,4 @@
-namespace Wox.Core.i18n
+namespace Wox.Core.Resource
 {
     public class Language
     {

Wox.Core/Resource/Resource.cs

@@ -2,7 +2,7 @@
 using System.Windows;
 using Wox.Infrastructure;
 
-namespace Wox.Core.UI
+namespace Wox.Core.Resource
 {
     public abstract class Resource
     {

Wox.Core/Resource/ResourceMerger.cs

@@ -2,11 +2,10 @@
 using System.IO;
 using System.Linq;
 using System.Windows;
-using Wox.Core.i18n;
 using Wox.Core.Plugin;
 using Wox.Plugin;
 
-namespace Wox.Core.UI
+namespace Wox.Core.Resource
 {
     public static class ResourceMerger
     {
@@ -25,7 +24,7 @@ namespace Wox.Core.UI
             }
         }
 
-        public static void UpdateResource<T>(T t) where T : Resource
+        public static void UpdateResource<T>(T t) where T : Core.Resource.Resource
         {
             RemoveResource(t.DirectoryName);
             Application.Current.Resources.MergedDictionaries.Add(t.GetResourceDictionary());

Wox.Core/Resource/Theme.cs

@@ -2,17 +2,15 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Interop;
 using System.Windows.Media;
-using Wox.Core.UI;
 using Wox.Core.UserSettings;
 using Wox.Infrastructure.Logger;
 
-namespace Wox.Core.Theme
+namespace Wox.Core.Resource
 {
     public class Theme : Resource
     {

Wox.Core/Resource/ThemeManager.cs

@@ -1,4 +1,4 @@
-namespace Wox.Core.Theme
+namespace Wox.Core.Resource
 {
     public class ThemeManager
     {

Wox.Core/Updater/UpdaterManager.cs

@@ -8,7 +8,7 @@ using NAppUpdate.Framework.Common;
 using NAppUpdate.Framework.Sources;
 using NAppUpdate.Framework.Tasks;
 using Newtonsoft.Json;
-using Wox.Core.i18n;
+using Wox.Core.Resource;
 using Wox.Core.UserSettings;
 using Wox.Infrastructure.Http;
 using Wox.Infrastructure.Logger;

Wox.Core/Wox.Core.csproj

@@ -65,11 +65,11 @@
     <Compile Include="Updater\UpdaterManager.cs" />
     <Compile Include="Updater\WoxUpdateSource.cs" />
     <Compile Include="UserSettings\HttpProxy.cs" />
-    <Compile Include="i18n\AvailableLanguages.cs" />
-    <Compile Include="i18n\Internationalization.cs" />
-    <Compile Include="i18n\InternationalizationManager.cs" />
-    <Compile Include="i18n\Language.cs" />
-    <Compile Include="Theme\ThemeManager.cs" />
+    <Compile Include="Resource\AvailableLanguages.cs" />
+    <Compile Include="Resource\Internationalization.cs" />
+    <Compile Include="Resource\InternationalizationManager.cs" />
+    <Compile Include="Resource\Language.cs" />
+    <Compile Include="Resource\ThemeManager.cs" />
     <Compile Include="Resource\Resource.cs" />
     <Compile Include="Resource\ResourceMerger.cs" />
     <Compile Include="Plugin\PluginInstaller.cs" />
@@ -82,8 +82,8 @@
     <Compile Include="Plugin\PluginManager.cs" />
     <Compile Include="Plugin\PythonPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Theme\FontHelper.cs" />
-    <Compile Include="Theme\Theme.cs" />
+    <Compile Include="Resource\FontHelper.cs" />
+    <Compile Include="Resource\Theme.cs" />
     <Compile Include="UserSettings\CustomizedPluginConfig.cs" />
     <Compile Include="UserSettings\PluginHotkey.cs" />
     <Compile Include="UserSettings\UserSettingStorage.cs" />

Wox.CrashReporter/ReportWindow.xaml.cs

@@ -3,7 +3,7 @@ using System.Threading;
 using System.Windows;
 using System.Windows.Documents;
 using Exceptionless;
-using Wox.Core.i18n;
+using Wox.Core.Resource;
 using Wox.Core.Updater;
 
 namespace Wox.CrashReporter

Wox/ActionKeywords.xaml.cs

@@ -1,6 +1,6 @@
 using System.Windows;
-using Wox.Core.i18n;
 using Wox.Core.Plugin;
+using Wox.Core.Resource;
 using Wox.Core.UserSettings;
 using Wox.Infrastructure.Exception;
 using Wox.Plugin;

Wox/CustomQueryHotkeySetting.xaml.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
-using Wox.Core.i18n;
+using Wox.Core.Resource;
 using Wox.Core.UserSettings;
 
 namespace Wox

Wox/HotkeyControl.xaml.cs

@@ -5,7 +5,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using NHotkey.Wpf;
-using Wox.Core.i18n;
+using Wox.Core.Resource;
 using Wox.Infrastructure.Hotkey;
 using Wox.Plugin;
 

Wox/MainWindow.xaml.cs

@@ -15,9 +15,8 @@ using System.Windows.Input;
 using System.Windows.Media.Animation;
 using NHotkey;
 using NHotkey.Wpf;
-using Wox.Core.i18n;
 using Wox.Core.Plugin;
-using Wox.Core.Theme;
+using Wox.Core.Resource;
 using Wox.Core.Updater;
 using Wox.Core.UserSettings;
 using Wox.Helper;

Wox/SettingWindow.xaml.cs

@@ -11,9 +11,8 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Microsoft.Win32;
-using Wox.Core.i18n;
 using Wox.Core.Plugin;
-using Wox.Core.Theme;
+using Wox.Core.Resource;
 using Wox.Core.Updater;
 using Wox.Core.UserSettings;
 using Wox.Helper;

Wox/WoxUpdate.xaml.cs

@@ -1,6 +1,6 @@
 using System.Windows;
 using MarkdownSharp;
-using Wox.Core.i18n;
+using Wox.Core.Resource;
 using Wox.Core.Updater;
 
 namespace Wox