merge master

This commit is contained in:
bao-qian
2015-11-26 06:57:12 +00:00
15 changed files with 67 additions and 81 deletions

View File

@@ -16,9 +16,6 @@
Icon="Images\app.png"
AllowsTransparency="True"
>
<Window.Resources>
<ResourceDictionary Source="/PresentationFramework.Classic,Version=3.0.0.0,Culture=neutral,PublicKeyToken=31bf3856ad364e35,processorArchitecture=MSIL;component/themes/Classic.xaml"/>
</Window.Resources>
<Border Style="{DynamicResource WindowBorderStyle}" MouseDown="Border_OnMouseDown">
<StackPanel Orientation="Vertical">
<TextBox Style="{DynamicResource QueryBoxStyle}" PreviewDragOver="TbQuery_OnPreviewDragOver" AllowDrop="True"