Merge pull request #1 from iboshkov/gh_pages

Gh pages
iboshkov · May 1, 2017 · d97f57c · d97f57c
2 parents 7a5b153 + 6972113
commit d97f57c
Show file tree

Hide file tree

Showing 121 changed files with 14,044 additions and 31 deletions.
diff --git a/OpenSubSearchWPF/App.xaml b/OpenSubSearchWPF/App.xaml
@@ -13,8 +13,9 @@
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
                 <!-- Accent and AppTheme setting -->
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Amber.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Crimson.xaml" />
                 <ResourceDictionary Source="/Resources/Icons.xaml" />
+                <ResourceDictionary Source="/Resources/logo.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <FontFamily x:Key="DefaultFont">Roboto Light</FontFamily>
 

diff --git a/OpenSubSearchWPF/MainWindow.xaml b/OpenSubSearchWPF/MainWindow.xaml
@@ -11,6 +11,8 @@
                       xmlns:local="clr-namespace:OpenSubSearchWPF"
                       xmlns:iconPacks1="http://metro.mahapps.com/winfx/xaml/iconpacks"
                       mc:Ignorable="d"
+                      ShowIconOnTitleBar="False"
+                      Icon="Resources/logo_raster_Ck3_icon.ico"
                       Title="Open Sub Search" Height="700" Width="450" HorizontalContentAlignment="Stretch"
                       VerticalContentAlignment="Stretch" Loaded="Window_Loaded" DragEnter="MetroWindow_DragEnter"
                       Drop="MetroWindow_Drop" DragOver="MetroWindow__ClearDragEffects"
@@ -33,23 +35,21 @@
             <Button Click="Author_Click">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Margin="4 0 5 0"
-                               VerticalAlignment="Center">Made with </TextBlock>
+                               VerticalAlignment="Center">
+                        Made with
+                    </TextBlock>
                     <Rectangle Width="20"
-                   Height="20"
-                   Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">
+                               Height="20"
+                               Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">
                         <Rectangle.OpacityMask>
                             <VisualBrush Stretch="Fill" Visual="{StaticResource appbar_heart}" />
                         </Rectangle.OpacityMask>
                     </Rectangle>
                     <TextBlock Margin="4 0 0 0"
-                   VerticalAlignment="Center"
-                   Text=" by iboshkov" />
+                               VerticalAlignment="Center"
+                               Text=" by iboshkov" />
                 </StackPanel>
             </Button>
-        </Controls:WindowCommands>
-    </Controls:MetroWindow.RightWindowCommands>
-    <Controls:MetroWindow.LeftWindowCommands>
-        <Controls:WindowCommands>
             <Button Click="AppGithub_Click">
                 <Rectangle Width="20"
                            Height="20"
@@ -60,6 +60,18 @@
                 </Rectangle>
             </Button>
         </Controls:WindowCommands>
+    </Controls:MetroWindow.RightWindowCommands>
+    <Controls:MetroWindow.LeftWindowCommands>
+        <Controls:WindowCommands>
+            <Rectangle
+                Margin="5, 0, 0, 0"
+                Width="20"
+                Height="20">
+                <Rectangle.Fill>
+                    <VisualBrush Stretch="Fill" Visual="{StaticResource open_sub_logo}" />
+                </Rectangle.Fill>
+            </Rectangle>
+        </Controls:WindowCommands>
     </Controls:MetroWindow.LeftWindowCommands>
     <Controls:MetroWindow.Flyouts>
         <Controls:FlyoutsControl>
@@ -93,24 +105,26 @@
                                    Text="{Binding selectedSubtitle.fileName, StringFormat=Filename: {0}}" />
 
                         <StackPanel Grid.Row="4" Orientation="Horizontal">
-                            <TextBlock Text="Source: "/>
+                            <TextBlock Text="Source: " />
                             <TextBlock>
-                                    <Hyperlink RequestNavigate="Hyperlink_OnRequestNavigate" NavigateUri="{Binding selectedSubtitle.pageLink}">
-                                        <Hyperlink.Style>
-                                            <Style TargetType="Hyperlink"
-                                                   BasedOn="{StaticResource {x:Type Hyperlink}}">
-                                                <Setter Property="Foreground" Value="White"/>
-                                                <Style.Triggers>
-                                                    <Trigger Property="IsMouseOver" Value="True">
-                                                        <Setter Property="Foreground" Value="{StaticResource AccentColorBrush}" />
-                                                    </Trigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </Hyperlink.Style>
-
-                                        <TextBlock TextWrapping="WrapWithOverflow"
-                                                   Text="{Binding selectedSubtitle.sourceName}" />
-                                    </Hyperlink>
+                                <Hyperlink RequestNavigate="Hyperlink_OnRequestNavigate"
+                                           NavigateUri="{Binding selectedSubtitle.pageLink}">
+                                    <Hyperlink.Style>
+                                        <Style TargetType="Hyperlink"
+                                               BasedOn="{StaticResource {x:Type Hyperlink}}">
+                                            <Setter Property="Foreground" Value="White" />
+                                            <Style.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter Property="Foreground"
+                                                            Value="{StaticResource AccentColorBrush}" />
+                                                </Trigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </Hyperlink.Style>
+
+                                    <TextBlock TextWrapping="WrapWithOverflow"
+                                               Text="{Binding selectedSubtitle.sourceName}" />
+                                </Hyperlink>
                             </TextBlock>
                         </StackPanel>
 

diff --git a/OpenSubSearchWPF/MainWindow.xaml.cs b/OpenSubSearchWPF/MainWindow.xaml.cs
@@ -76,8 +76,14 @@ private async void searchTimer_Tick(object sender, EventArgs e)
             searchTimer.Stop();
             var query = vm.query;
             if (query.Trim().Length == 0)
+            {
+                vm.subtitles = new List<Subtitle>();
+                vm.lastSearchType = SearchType.ST_NONE;
+                vm.isWorking = false;
                 return;
 
+            }
+
             vm.isWorking = true;
             if (debug)
             {

diff --git a/OpenSubSearchWPF/OpenSubSearchWPF.csproj b/OpenSubSearchWPF/OpenSubSearchWPF.csproj
@@ -13,6 +13,25 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <SupportUrl>https://github.com/iboshkov/open-sub-search</SupportUrl>
+    <ErrorReportUrl>https://github.com/iboshkov/open-sub-search</ErrorReportUrl>
+    <ProductName>Open Sub Search</ProductName>
+    <PublisherName>Ilija Boshkov</PublisherName>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,6 +52,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>logo_raster_Ck3_icon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
       <HintPath>..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath>
@@ -86,6 +108,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Resources\logo.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\Annotations.cs" />
@@ -128,5 +154,29 @@
   <ItemGroup>
     <Resource Include="Resources\Entypo-license.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\logo_raster.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icon.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\logo_raster_Ck3_icon.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="logo_raster_Ck3_icon.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/OpenSubSearchWPF/Properties/AssemblyInfo.cs b/OpenSubSearchWPF/Properties/AssemblyInfo.cs
@@ -7,12 +7,12 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenSubSearchWPF")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("Open Sub Search")]
+[assembly: AssemblyDescription("https://github.com/iboshkov/open-sub-search")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSubSearchWPF")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyProduct("Open Sub Search")]
+[assembly: AssemblyCopyright("Copyright ©  2017 Ilija Boshkov")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/OpenSubSearchWPF/Resources/Icon.ico b/OpenSubSearchWPF/Resources/Icon.ico
diff --git a/OpenSubSearchWPF/Resources/logo.xaml b/OpenSubSearchWPF/Resources/logo.xaml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--This file is NOT compatible with Silverlight-->
+<ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+  <Canvas x:Key="open_sub_logo" Name="Layer_1" Width="80" Height="80" Canvas.Left="0" Canvas.Top="0">
+    <Canvas.RenderTransform>
+      <TranslateTransform X="0" Y="0"/>
+    </Canvas.RenderTransform>
+    <Canvas.Resources/>
+    <!--Unknown tag: metadata-->
+    <!--Unknown tag: sodipodi:namedview-->
+    <Canvas Name="g4">
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path2" Fill="#FFFFFFFF">
+        <Path.Data>
+          <PathGeometry Figures="M40 0c22.091 0 40 17.909 40 40S62.091 80 40 80S0 62.091 0 40S17.909 0 40 0z" FillRule="NonZero"/>
+        </Path.Data>
+      </Path>
+    </Canvas>
+    <Canvas Name="g3748">
+      <Canvas.RenderTransform>
+        <MatrixTransform Matrix="0.08303269 0 0 0.08303269 19.723057 18.451086"/>
+      </Canvas.RenderTransform>
+      <Canvas Name="g3691" Opacity="1">
+        <Canvas.RenderTransform>
+          <TranslateTransform X="-17.251823" Y="4.3129557"/>
+        </Canvas.RenderTransform>
+        <Canvas Name="g3689" Opacity="1">
+          <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3687" Fill="#FFB92545">
+            <Path.Data>
+              <PathGeometry Figures="m 531.215 103.887 c -2.447 -3.06 -5.916 -4.998 -10.402 -5.814 L 271.116 47.889 c -2.448 -0.408 -4.896 -0.408 -7.343 0 L 14.076 98.073 C 9.588 98.889 6.12 100.827 3.672 103.887 1.224 106.947 0 110.721 0 115.209 v 147.492 9.183 147.492 c 0 4.484 1.224 8.26 3.672 11.318 2.448 3.063 5.916 4.998 10.404 5.814 l 249.696 50.184 c 2.448 0.816 4.896 0.816 7.343 0 l 249.697 -50.184 c 4.486 -0.816 7.955 -2.754 10.402 -5.814 2.447 -3.059 3.674 -6.834 3.674 -11.32 V 271.882 262.7 115.209 c 10e-4 -4.488 -1.226 -8.262 -3.673 -11.322 z M 232.56 332.47 c -17.136 37.941 -43.86 56.916 -80.172 56.916 -15.096 0 -28.764 -2.959 -41.004 -8.875 C 99.144 374.595 88.638 366.333 79.866 355.726 71.094 345.117 64.26 332.367 59.364 317.476 54.468 302.583 52.02 285.958 52.02 267.597 c 0 -18.36 2.448 -35.087 7.344 -50.184 4.896 -15.097 11.73 -27.948 20.502 -38.556 8.772 -10.608 19.278 -18.87 31.518 -24.786 12.24 -5.916 25.908 -8.874 41.004 -8.874 35.904 0 62.424 17.952 79.56 53.856 1.632 2.856 1.836 6.324 0.612 10.404 -1.632 3.672 -4.08 6.12 -7.344 7.344 l -28.764 12.852 c -3.264 1.632 -6.63 1.734 -10.098 0.306 -3.468 -1.428 -6.018 -3.774 -7.65 -7.038 -2.04 -4.488 -5.202 -8.976 -9.486 -13.464 -4.284 -4.488 -9.894 -6.732 -16.83 -6.732 -11.016 0 -20.094 5.916 -27.234 17.748 -7.14 11.832 -10.71 27.54 -10.71 47.124 0 19.176 3.57 34.68 10.71 46.512 7.14 11.832 16.218 17.748 27.234 17.748 8.16 0 14.28 -2.854 18.36 -8.564 4.08 -5.715 6.732 -10.201 7.956 -13.467 1.224 -3.672 3.672 -6.119 7.344 -7.344 3.264 -2.041 6.732 -2.041 10.404 0 l 29.376 12.24 c 3.264 2.039 5.508 4.488 6.732 7.344 1.224 3.671 1.224 7.138 0 10.404 z m 249.085 0 c -17.137 37.941 -43.861 56.916 -80.172 56.916 -15.1 0 -28.768 -2.959 -41.004 -8.875 -12.242 -5.916 -22.748 -14.178 -31.521 -24.785 -8.77 -10.609 -15.604 -23.359 -20.502 -38.25 -4.895 -14.893 -7.344 -31.518 -7.344 -49.879 0 -18.36 2.449 -35.087 7.344 -50.184 4.898 -15.096 11.732 -27.948 20.502 -38.556 8.773 -10.608 19.279 -18.87 31.521 -24.786 12.236 -5.916 25.904 -8.874 41.004 -8.874 36.311 0 63.035 17.952 80.172 53.856 1.223 3.264 1.223 6.732 0 10.404 -1.631 3.672 -3.877 6.12 -6.732 7.344 l -29.377 12.852 c -3.264 1.632 -6.525 1.734 -9.791 0.306 -3.264 -1.428 -5.713 -3.774 -7.344 -7.038 -2.041 -4.488 -5.303 -8.976 -9.793 -13.464 -4.488 -4.488 -10.199 -6.732 -17.135 -6.732 -11.02 0 -19.992 5.916 -26.932 17.748 -6.934 11.832 -10.4 27.54 -10.4 47.124 0 19.176 3.467 34.68 10.4 46.512 6.939 11.832 15.912 17.748 26.932 17.748 8.158 0 14.277 -2.854 18.357 -8.566 4.08 -5.712 6.732 -10.199 7.955 -13.465 1.227 -3.264 3.672 -5.713 7.346 -7.344 3.674 -2.041 7.141 -2.041 10.402 0 l 29.377 12.24 c 3.672 2.447 6.119 4.895 7.346 7.344 1.224 4.08 1.019 7.546 -0.611 10.404 z" FillRule="NonZero"/>
+            </Path.Data>
+          </Path>
+        </Canvas>
+      </Canvas>
+      <Canvas Name="g3693"/>
+      <Canvas Name="g3695"/>
+      <Canvas Name="g3697"/>
+      <Canvas Name="g3699"/>
+      <Canvas Name="g3701"/>
+      <Canvas Name="g3703"/>
+      <Canvas Name="g3705"/>
+      <Canvas Name="g3707"/>
+      <Canvas Name="g3709"/>
+      <Canvas Name="g3711"/>
+      <Canvas Name="g3713"/>
+      <Canvas Name="g3715"/>
+      <Canvas Name="g3717"/>
+      <Canvas Name="g3719"/>
+      <Canvas Name="g3721"/>
+    </Canvas>
+  </Canvas>
+</ResourceDictionary>
diff --git a/OpenSubSearchWPF/Resources/logo_raster.png b/OpenSubSearchWPF/Resources/logo_raster.png
diff --git a/OpenSubSearchWPF/Resources/logo_raster_Ck3_icon.ico b/OpenSubSearchWPF/Resources/logo_raster_Ck3_icon.ico
diff --git a/OpenSubSearchWPF/logo_raster_Ck3_icon.ico b/OpenSubSearchWPF/logo_raster_Ck3_icon.ico
diff --git a/docs/.gitlab-ci.yml b/docs/.gitlab-ci.yml
@@ -0,0 +1,25 @@
+# This file is a template, and might need editing before it works on your project.
+# Full project: https://gitlab.com/pages/jekyll
+image: ruby:2.3
+
+test:
+  stage: test
+  script:
+  - gem install jekyll
+  - jekyll build -d test
+  artifacts:
+    paths:
+    - test
+  except:
+  - master
+
+pages:
+  stage: deploy
+  script:
+  - gem install jekyll
+  - jekyll build -d public
+  artifacts:
+    paths:
+    - public
+  only:
+  - master
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
diff --git a/docs/Gemfile b/docs/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+gemspec
+gem 'wdm', '~> 0.1.0' if Gem.win_platform?
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
@@ -0,0 +1,58 @@
+PATH
+  remote: .
+  specs:
+    stellar_jekyll_theme (0.1.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
+    colorator (1.1.0)
+    ffi (1.9.18-x64-mingw32)
+    forwardable-extended (2.6.0)
+    jekyll (3.4.3)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 3.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (~> 1.7)
+      safe_yaml (~> 1.0)
+    jekyll-sass-converter (1.5.0)
+      sass (~> 3.4)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    kramdown (1.13.2)
+    liquid (3.0.6)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    mercenary (0.3.6)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
+    public_suffix (2.0.5)
+    rake (10.4.2)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
+      ffi (>= 0.5.0)
+    rouge (1.11.1)
+    safe_yaml (1.0.4)
+    sass (3.4.23)
+    wdm (0.1.1)
+
+PLATFORMS
+  x64-mingw32
+
+DEPENDENCIES
+  bundler (~> 1.12)
+  jekyll (~> 3.3)
+  rake (~> 10.0)
+  stellar_jekyll_theme!
+  wdm (~> 0.1.0)
+
+BUNDLED WITH
+   1.14.6