diff --git a/Wox/ResultPanel.xaml b/Wox/ResultPanel.xaml
index 0ee4433781..641765bc77 100644
--- a/Wox/ResultPanel.xaml
+++ b/Wox/ResultPanel.xaml
@@ -3,11 +3,10 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:wox="clr-namespace:Wox"
- mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100"
- >
+ xmlns:converters="clr-namespace:Wox.Converters"
+ mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100">
-
+
@@ -42,7 +41,7 @@
-
+
diff --git a/Wox/ResultPanel.xaml.cs b/Wox/ResultPanel.xaml.cs
index 1516069303..e071a33310 100644
--- a/Wox/ResultPanel.xaml.cs
+++ b/Wox/ResultPanel.xaml.cs
@@ -1,16 +1,10 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics;
using System.Windows;
using System.Windows.Controls;
-using System.Windows.Forms;
using System.Windows.Input;
using System.Windows.Media;
-using System.Windows.Media.Animation;
-using Wox.Helper;
-using Wox.Infrastructure;
using Wox.Plugin;
-using MessageBox = System.Windows.MessageBox;
using UserControl = System.Windows.Controls.UserControl;
namespace Wox
diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml
index e228a6a689..e58ea5bc96 100644
--- a/Wox/SettingWindow.xaml
+++ b/Wox/SettingWindow.xaml
@@ -5,13 +5,14 @@
xmlns:UserSettings="clr-namespace:Wox.Infrastructure.Storage.UserSettings;assembly=Wox.Infrastructure" x:Class="Wox.SettingWindow"
xmlns:woxPlugin="clr-namespace:Wox.Plugin;assembly=Wox.Plugin"
xmlns:system="clr-namespace:Wox.Plugin.SystemPlugins;assembly=Wox.Plugin.SystemPlugins"
+ xmlns:converters="clr-namespace:Wox.Converters"
Icon="Images\app.png"
Title="Wox Setting"
ResizeMode="NoResize"
WindowStartupLocation="CenterScreen"
Height="600" Width="800">
-
+
@@ -71,7 +72,7 @@
-
+
@@ -98,7 +99,7 @@
-
+
@@ -122,7 +123,7 @@
-
+
@@ -215,7 +216,7 @@
DWM
-
+
diff --git a/Wox/SettingWindow.xaml.cs b/Wox/SettingWindow.xaml.cs
index 698ea8c9f9..4e8a2d2aad 100644
--- a/Wox/SettingWindow.xaml.cs
+++ b/Wox/SettingWindow.xaml.cs
@@ -9,6 +9,7 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using IWshRuntimeLibrary;
using Microsoft.VisualBasic.ApplicationServices;
+using Wox.Converters;
using Wox.Infrastructure;
using Wox.Infrastructure.Storage;
using Wox.Infrastructure.Storage.UserSettings;
@@ -462,7 +463,7 @@ namespace Wox
() =>
pluginIcon.Source =
(ImageSource)
- new Wox.ImagePathConverter().Convert(
+ new ImagePathConverter().Convert(
new object[] {pair.Metadata.IcoPath, pair.Metadata.PluginDirecotry}, null, null,
null));
}
@@ -479,7 +480,7 @@ namespace Wox
() =>
pluginIcon.Source =
(ImageSource)
- new Wox.ImagePathConverter().Convert(
+ new ImagePathConverter().Convert(
new object[] { sys.IcoPath, sys.PluginDirectory }, null, null,
null));
}
diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj
index dd4c4e29d2..e1663d5b11 100644
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@@ -109,6 +109,7 @@
+
@@ -120,7 +121,7 @@
-
+
CustomPluginHotkeySetting.xaml
@@ -133,7 +134,7 @@
HotkeyControl.xaml
-
+
Msg.xaml
@@ -149,8 +150,8 @@
SettingWindow.xaml
-
-
+
+
Designer
MSBuild:Compile