Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Sir3eBpA committed Mar 1, 2022
2 parents 8ac1964 + b5dfe61 commit 9094541
Show file tree
Hide file tree
Showing 57 changed files with 3,137 additions and 350 deletions.
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ publish/
*.pubxml

# NuGet Packages Directory
packages/*
*/packages/*
## TODO: If the tool you use requires repositories.config
## uncomment the next line
#!packages/repositories.config
Expand Down Expand Up @@ -160,6 +160,7 @@ ClientBin/
*.pfx
*.publishsettings
node_modules/
*.idea

# RIA/Silverlight projects
Generated_Code/
Expand Down Expand Up @@ -189,4 +190,5 @@ git_stats/*
*.ncrunchproject
StyleCop.Cache
bin
obj
obj
.vs/
14 changes: 0 additions & 14 deletions App.config

This file was deleted.

16 changes: 0 additions & 16 deletions App.xaml

This file was deleted.

17 changes: 0 additions & 17 deletions App.xaml.cs

This file was deleted.

20 changes: 0 additions & 20 deletions Controls/SearchTab.xaml

This file was deleted.

182 changes: 0 additions & 182 deletions FFS.csproj

This file was deleted.

12 changes: 9 additions & 3 deletions FFS.sln
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30717.126
# Visual Studio Version 17
VisualStudioVersion = 17.1.32210.238
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFS", "FFS.csproj", "{EE02E683-3E9D-4877-A6D4-FF200598134A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFS", ".\FFS\FFS.csproj", "{EE02E683-3E9D-4877-A6D4-FF200598134A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFSTests", ".\FFSTests\FFSTests.csproj", "{3F3EFAD2-75D8-4324-A0B6-2FB7DC8F9D6E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -15,6 +17,10 @@ Global
{EE02E683-3E9D-4877-A6D4-FF200598134A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EE02E683-3E9D-4877-A6D4-FF200598134A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EE02E683-3E9D-4877-A6D4-FF200598134A}.Release|Any CPU.Build.0 = Release|Any CPU
{3F3EFAD2-75D8-4324-A0B6-2FB7DC8F9D6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3F3EFAD2-75D8-4324-A0B6-2FB7DC8F9D6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3F3EFAD2-75D8-4324-A0B6-2FB7DC8F9D6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3F3EFAD2-75D8-4324-A0B6-2FB7DC8F9D6E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 2 additions & 0 deletions FFS.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=FFS_002EAnnotations/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
34 changes: 34 additions & 0 deletions FFS/App.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
51 changes: 51 additions & 0 deletions FFS/App.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<Application x:Class="FFS.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:FFS"
xmlns:converter="clr-namespace:FFS.Converters"
xmlns:adonisUi="clr-namespace:AdonisUI;assembly=AdonisUI"
xmlns:system="clr-namespace:System;assembly=System.Runtime"
xmlns:extensions="clr-namespace:AdonisUI.Extensions;assembly=AdonisUI">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/AdonisUI;component/ColorSchemes/Dark.xaml"/>
<ResourceDictionary Source="pack://application:,,,/AdonisUI.ClassicTheme;component/Resources.xaml"/>
</ResourceDictionary.MergedDictionaries>

<Thickness x:Key="{x:Static adonisUi:Dimensions.BorderThickness}">2</Thickness>

<!-- Converters -->
<converter:InverseBoolConverter x:Key="InverseBoolConverter"/>
<converter:ExtensionToIconConverter x:Key="ExtensionToIconConverter"/>
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>

<!--Default styles-->
<Style x:Key="{x:Type ListView}" TargetType="ListView" BasedOn="{StaticResource {x:Type ListView}}">
<Setter Property="Background" Value="{DynamicResource {x:Static adonisUi:Brushes.Layer1BackgroundBrush}}"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static adonisUi:Brushes.Layer1InteractionForegroundBrush}}"/>
</Style>

<!--Custom disk toggle button style-->
<Style x:Key="DiskToggleButton" TargetType="ToggleButton" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Style.Triggers>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" Value="DarkOliveGreen"/>
<Setter Property="BorderBrush" Value="DarkOliveGreen"/>
</Trigger>

<Trigger Property="IsChecked" Value="True">
<Setter Property="Background" Value="DarkGreen"/>
<Setter Property="BorderBrush" Value="DarkOliveGreen"/>
</Trigger>

<Trigger Property="IsFocused" Value="True">
<Setter Property="BorderBrush" Value="DarkOliveGreen"/>
<Setter Property="extensions:CursorSpotlightExtension.BorderBrush" Value="DarkOliveGreen"/>
</Trigger>
</Style.Triggers>
</Style>

</ResourceDictionary>
</Application.Resources>
</Application>
Loading

0 comments on commit 9094541

Please sign in to comment.