From 94cd2c0599ec6285e61a817e11fb323a3fcad22b Mon Sep 17 00:00:00 2001
From: qianlifeng <qianlf2008@163.com>
Date: Wed, 25 Dec 2013 00:21:54 +0800
Subject: [PATCH] UI staff

---
 PyWinAlfred/Main.cpp            |  1 +
 PyWinAlfred/PyWinAlfred.vcxproj |  1 +
 WinAlfred/App.config            |  2 +-
 WinAlfred/App.xaml              | 27 +++++++++++++++++
 WinAlfred/MainWindow.xaml       |  2 +-
 WinAlfred/MainWindow.xaml.cs    | 52 ++++++++++++++++++++-------------
 WinAlfred/WinAlfred.csproj      |  2 +-
 WinAlfred/packages.config       |  4 +--
 8 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/PyWinAlfred/Main.cpp b/PyWinAlfred/Main.cpp
index 7f3f8a00b1..4ff589a1ea 100644
--- a/PyWinAlfred/Main.cpp
+++ b/PyWinAlfred/Main.cpp
@@ -38,6 +38,7 @@ extern "C" __declspec(dllexport) char* ExecPython(char* directory, char* file, c
 		// Call a method of the class with two parameters
 		pValue = PyObject_CallMethod(pInstance,"query", "(s)",query);
         char * str_ret = PyString_AsString(pValue); 
+
 		// Finish the Python Interpreter
 		Py_Finalize();
 
diff --git a/PyWinAlfred/PyWinAlfred.vcxproj b/PyWinAlfred/PyWinAlfred.vcxproj
index 378502315a..22d14e8648 100644
--- a/PyWinAlfred/PyWinAlfred.vcxproj
+++ b/PyWinAlfred/PyWinAlfred.vcxproj
@@ -75,6 +75,7 @@
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>C:\Python27\include;$(IncludePath)</IncludePath>
     <LibraryPath>C:\Python27\libs;$(LibraryPath)</LibraryPath>
+    <OutDir>$(SolutionDir)WinAlfred\bin\Debug\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
diff --git a/WinAlfred/App.config b/WinAlfred/App.config
index e1eb5518f6..01c0f5391e 100644
--- a/WinAlfred/App.config
+++ b/WinAlfred/App.config
@@ -17,4 +17,4 @@
       <appender-ref ref="LogFileAppender"/>
     </root>
   </log4net>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/WinAlfred/App.xaml b/WinAlfred/App.xaml
index f2fe37b419..ba0967d5dc 100644
--- a/WinAlfred/App.xaml
+++ b/WinAlfred/App.xaml
@@ -4,6 +4,33 @@
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
+            <Style x:Key="defaultQueryBoxStyle" BasedOn="{x:Null}" TargetType="{x:Type TextBox}">
+                <Setter Property="BorderThickness" Value="0"/>
+                <Setter Property="FontSize" Value="22"/>
+                <Setter Property="FontWeight" Value="Medium"/>
+                <Setter Property="AllowDrop" Value="true"/>
+                <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="Margin" Value="10"/>
+                <Setter Property="Height" Value="36"/>
+                <Setter Property="VerticalContentAlignment" Value="Center"/>
+                <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
+                <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type TextBox}">
+                            <Border x:Name="border" Background="Transparent" BorderBrush="Transparent" CornerRadius="3" BorderThickness="0">
+                                <ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsFocused" Value="True">
+                                    <Setter Property="BorderBrush" TargetName="border" Value="Silver"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
             <Style x:Key="windowShow" TargetType="Window">
                 <Setter Property="Border.RenderTransform">
                     <Setter.Value>
diff --git a/WinAlfred/MainWindow.xaml b/WinAlfred/MainWindow.xaml
index 0dd71cf62d..3713cbc112 100644
--- a/WinAlfred/MainWindow.xaml
+++ b/WinAlfred/MainWindow.xaml
@@ -14,7 +14,7 @@
         Icon="Images\ico.png"
         >
     <DockPanel>
-        <TextBox DockPanel.Dock="Top" Margin="10" VerticalContentAlignment="Center" x:Name="tbQuery" PreviewKeyDown="TbQuery_OnPreviewKeyDown" TextChanged="TextBoxBase_OnTextChanged" Height="26.965" />
+        <TextBox Style="{DynamicResource defaultQueryBoxStyle}" DockPanel.Dock="Top" x:Name="tbQuery" PreviewKeyDown="TbQuery_OnPreviewKeyDown" TextChanged="TextBoxBase_OnTextChanged" />
         <winAlfred:ResultPanel x:Name="resultCtrl" Margin="10 0 10 0" />
     </DockPanel>
 </Window>
diff --git a/WinAlfred/MainWindow.xaml.cs b/WinAlfred/MainWindow.xaml.cs
index 265330a070..260ea04791 100644
--- a/WinAlfred/MainWindow.xaml.cs
+++ b/WinAlfred/MainWindow.xaml.cs
@@ -2,10 +2,12 @@
 using System.Collections.Generic;
 using System.IO.Ports;
 using System.Linq;
+using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Forms;
 using System.Windows.Input;
+using System.Windows.Threading;
 using WinAlfred.Helper;
 using WinAlfred.Plugin;
 using WinAlfred.PluginLoader;
@@ -26,11 +28,12 @@ namespace WinAlfred
             hook.KeyPressed += OnHotKey;
             hook.RegisterHotKey(XModifierKeys.Alt, Keys.Space);
             resultCtrl.resultItemChangedEvent += resultCtrl_resultItemChangedEvent;
+            ThreadPool.SetMaxThreads(10, 5);
         }
 
         private void InitialTray()
         {
-            notifyIcon = new NotifyIcon {Text = "WinAlfred", Icon = Properties.Resources.app, Visible = true};
+            notifyIcon = new NotifyIcon { Text = "WinAlfred", Icon = Properties.Resources.app, Visible = true };
             notifyIcon.Click += (o, e) => ShowWinAlfred();
             System.Windows.Forms.MenuItem open = new System.Windows.Forms.MenuItem("Open");
             open.Click += (o, e) => ShowWinAlfred();
@@ -47,7 +50,7 @@ namespace WinAlfred
         private void resultCtrl_resultItemChangedEvent()
         {
             Height = resultCtrl.pnlContainer.ActualHeight + tbQuery.Height + tbQuery.Margin.Top + tbQuery.Margin.Bottom;
-            resultCtrl.Margin = results.Count > 0 ? new Thickness{ Bottom = 10,Left = 10,Right = 10} : new Thickness { Bottom = 0,Left = 10,Right = 10 };
+            resultCtrl.Margin = results.Count > 0 ? new Thickness { Bottom = 10, Left = 10, Right = 10 } : new Thickness { Bottom = 0, Left = 10, Right = 10 };
         }
 
         private void OnHotKey(object sender, KeyPressedEventArgs e)
@@ -64,31 +67,38 @@ namespace WinAlfred
 
         private void TextBoxBase_OnTextChanged(object sender, TextChangedEventArgs e)
         {
-            results.Clear();
-            foreach (PluginPair pair in plugins)
+            string query = tbQuery.Text;
+            ThreadPool.QueueUserWorkItem(state =>
             {
-                var q = new Query(tbQuery.Text);
-                if (pair.Metadata.ActionKeyword == q.ActionName)
+                results.Clear();
+                foreach (PluginPair pair in plugins)
                 {
-                    try
+                    var q = new Query(query);
+                    if (pair.Metadata.ActionKeyword == q.ActionName)
                     {
-                        results.AddRange(pair.Plugin.Query(q));
-                        results.ForEach(o => o.PluginDirectory = pair.Metadata.PluginDirecotry);
-                    }
-                    catch (Exception queryException)
-                    {
-                        Log.Error(string.Format("Plugin {0} query failed: {1}", pair.Metadata.Name,
-                            queryException.Message));
-#if (DEBUG)
+                        try
                         {
-                            throw;
+                            results.AddRange(pair.Plugin.Query(q));
+                            results.ForEach(o => o.PluginDirectory = pair.Metadata.PluginDirecotry);
                         }
+                        catch (Exception queryException)
+                        {
+                            Log.Error(string.Format("Plugin {0} query failed: {1}", pair.Metadata.Name,
+                                queryException.Message));
+#if (DEBUG)
+                            {
+                                throw;
+                            }
 #endif
+                        }
                     }
                 }
-            }
-            resultCtrl.AddResults(results.OrderByDescending(o => o.Score).ToList());
-            resultCtrl.SelectFirst();
+                resultCtrl.Dispatcher.Invoke(new Action(() =>
+                {
+                    resultCtrl.AddResults(results.OrderByDescending(o => o.Score).ToList());
+                    resultCtrl.SelectFirst();
+                }));
+            });
         }
 
         private void HideWinAlfred()
@@ -99,9 +109,9 @@ namespace WinAlfred
         private void ShowWinAlfred()
         {
             tbQuery.SelectAll();
-            Focus();
-            tbQuery.Focus();
             Show();
+            Focus();
+            FocusManager.SetFocusedElement(this, tbQuery);
         }
 
         private void MainWindow_OnLoaded(object sender, RoutedEventArgs e)
diff --git a/WinAlfred/WinAlfred.csproj b/WinAlfred/WinAlfred.csproj
index 1397806efd..02dcadb309 100644
--- a/WinAlfred/WinAlfred.csproj
+++ b/WinAlfred/WinAlfred.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WinAlfred</RootNamespace>
     <AssemblyName>WinAlfred</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
diff --git a/WinAlfred/packages.config b/WinAlfred/packages.config
index 0db9c4556d..e25e951af7 100644
--- a/WinAlfred/packages.config
+++ b/WinAlfred/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.3" targetFramework="net35" />
-  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net35" />
+  <package id="log4net" version="2.0.3" targetFramework="net35" requireReinstallation="True" />
+  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net35" requireReinstallation="True" />
 </packages>
\ No newline at end of file