Переделки UI. Обновил splashscreen

Author: Dezodemius

Library/Library.Client/Library.Client.csproj

@@ -14,6 +14,7 @@
         <WarningLevel>4</WarningLevel>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <LangVersion>8</LangVersion>
+        <ApplicationIcon>Library.ico</ApplicationIcon>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
         <PlatformTarget>AnyCPU</PlatformTarget>
@@ -82,12 +83,8 @@
         <Compile Include="View\HighlightsControl.xaml.cs">
           <DependentUpon>HighlightsControl.xaml</DependentUpon>
         </Compile>
-        <Compile Include="View\MainControl.xaml.cs">
-          <DependentUpon>MainControl.xaml</DependentUpon>
-          <SubType>Code</SubType>
-        </Compile>
-        <Compile Include="View\SearchControl.xaml.cs">
-          <DependentUpon>SearchControl.xaml</DependentUpon>
+        <Compile Include="View\MainWindow.xaml.cs">
+          <DependentUpon>MainWindow.xaml</DependentUpon>
         </Compile>
     </ItemGroup>
     <ItemGroup>
@@ -104,11 +101,7 @@
     </ItemGroup>
     <ItemGroup>
       <Page Include="View\HighlightsControl.xaml" />
-      <Page Include="View\MainControl.xaml">
-        <Generator>MSBuild:Compile</Generator>
-        <SubType>Designer</SubType>
-      </Page>
-      <Page Include="View\SearchControl.xaml" />
+      <Page Include="View\MainWindow.xaml" />
     </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\Library\Library.csproj">
@@ -131,7 +124,12 @@
       <SplashScreen Include="splashscreen.png">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </SplashScreen>
+    <Content Include="Library.ico">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
     </ItemGroup>
+
     <ItemGroup>
       <PackageReference Include="NLog" Version="4.7.2" />
     </ItemGroup>

Library/Library.Client/Library.ico

@@ -7,12 +7,12 @@
              Startup="App_OnStartup"
              Exit="App_OnExit"
              ShutdownMode="OnLastWindowClose">
+    <Application.MainWindow>
+        <view:MainWindow Visibility="Visible"/>
+    </Application.MainWindow>
     <Application.Resources>
         <DataTemplate DataType="{x:Type viewModel:SearchViewModel}">
-            <view:SearchControl/>
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type viewModel:MainWindowViewModel}">
-            <view:MainControl/>
+            <view:MainWindow/>
         </DataTemplate>
         <DataTemplate DataType="{x:Type viewModel:HighlightsViewModel}">
             <view:HighlightsControl/>

Library/Library.Client/View/App.xaml

@@ -37,14 +37,16 @@ public partial class App
     private void App_OnStartup(object sender, StartupEventArgs e)
     {
       ShowTransparentWindow();
+      var splash = new SplashScreen("splashscreen.png");
+      splash.Show(false);
       InitApplication();
 
       ElasticProvider.Instance.Initialize();
       ElasticSynchronizer.SynchronizeWithDisk();
 
-      ViewService.OpenViewModel(new MainWindowViewModel());
       transparentWindow.Close();
       transparentWindow = null;
+      splash.Close(TimeSpan.Zero);
     }
 
     private void App_OnExit(object sender, ExitEventArgs e)

Library/Library.Client/View/App.xaml.cs

@@ -1,15 +1,18 @@
-<UserControl x:Class="Library.Client.View.SearchControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             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:view="clr-namespace:Library.Client.View"
-             xmlns:viewModel="clr-namespace:Library.Client.ViewModel"
-             mc:Ignorable="d"  d:DataContext="{d:DesignInstance viewModel:SearchViewModel}">
-    <UserControl.Resources>
-        <view:IndexConverter x:Key="IndexConverter" />
-        <view:PagesConverter x:Key="PagesConverter" />
-    </UserControl.Resources>
+<Window x:Class="Library.Client.View.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        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:local="clr-namespace:Library.Client.View"
+        mc:Ignorable="d"
+        Title="Library"
+        Width="640" Height="480"
+        MinWidth="440" MinHeight="280"
+        WindowStartupLocation="CenterScreen">
+     <Window.Resources>
+        <local:IndexConverter x:Key="IndexConverter" />
+        <local:PagesConverter x:Key="PagesConverter" />
+    </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="40"/>
@@ -149,4 +152,4 @@
                        Height="50"/>
         </ScrollViewer>
     </Grid>
-</UserControl>
+</Window>

Library/Library.Client/View/MainControl.xaml

@@ -1,22 +1,21 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
+using Library.Client.ViewModel;
 
 namespace Library.Client.View
 {
-  /// <summary>
-  /// Логика взаимодействия для SearchControl.xaml.
-  /// </summary>
-  public partial class SearchControl : UserControl
+  public partial class MainWindow : Window
   {
-    public SearchControl()
+    public MainWindow()
     {
       InitializeComponent();
+      DataContext = new SearchViewModel();
     }
   }
-    
   /// <summary>
   /// Конвертер индексов.
   /// </summary>
@@ -57,4 +56,4 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
       throw new NotImplementedException();
     }
   }
-}
+}

Library/Library.Client/View/MainControl.xaml.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Elasticsearch.Net;
 using Library.Entity;
 using Library.Resources;
 using Nest;
@@ -322,13 +323,19 @@ public ISearchResponse<Page> Search(string searchPhrase)
       {
         _log.Debug($"Searching: {searchPhrase} in index: {PagesIndexName}");
         response = Client.Search<Page>(s => s.Index(Indices.Parse(PagesIndexName))
-            .StoredFields(sf => sf.Field(f => f.BookId).Field(f => f.Number).Field(f => f.Attachment.Content))
-            .Query(q => q.SimpleQueryString(sq => sq
+            .StoredFields(sf => sf.Field(f => f.BookId).Field(f => f.Number).Field(f => f.Attachment.Content).Field("_score"))
+            .Query(q => q
+                .SimpleQueryString(sq => sq
                   .Query(searchPhrase)
+                  .DefaultOperator(Operator.And)
                   .Fields(f => f.Field(p => p.Attachment.Content))
-                  .Analyzer("my_russian_morphology")))
+                  .Analyzer("my_russian_morphology")
+                  .Flags(SimpleQueryStringFlags.Near | 
+                         SimpleQueryStringFlags.Phrase |
+                         SimpleQueryStringFlags.Fuzzy)))
             .Sort(s => s
-                .Ascending(f => f.BookId))
+                .Ascending(f => f.BookId)
+                .Field(f => f.Field("_score")))
             .Size(10000)
             .Highlight(h => h
                 .Fields(f => f.Field(b => b.Attachment.Content))));