Improved manual and hid scrollbars

Dzerillious · Mar 30, 2018 · a25f8ab · a25f8ab
1 parent 100eeea
commit a25f8ab
Show file tree

Hide file tree

Showing 72 changed files with 654 additions and 1,005 deletions.
diff --git a/BattleChess3.Api/App.xaml b/BattleChess3.Api/App.xaml
@@ -8,7 +8,7 @@
             <Setter Property="Background">
                 <Setter.Value>
                     <ImageBrush
-                        ImageSource="{Binding Path=ApplicationStyle.DefaultObject, UpdateSourceTrigger=PropertyChanged}" />
+                        ImageSource="{Binding Path=ApplicationStyle.DefaultObject}" />
                 </Setter.Value>
             </Setter>
             <Setter Property="Foreground" Value="Black" />
@@ -21,7 +21,7 @@
             <Setter Property="Background">
                 <Setter.Value>
                     <ImageBrush
-                        ImageSource="{Binding Path=ApplicationStyle.DefaultObject, UpdateSourceTrigger=PropertyChanged}" />
+                        ImageSource="{Binding Path=ApplicationStyle.DefaultObject}" />
                 </Setter.Value>
             </Setter>
             <Setter Property="FontWeight" Value="Heavy" />
@@ -38,7 +38,7 @@
             <Setter Property="Background">
                 <Setter.Value>
                     <ImageBrush
-                        ImageSource="{Binding Path=ApplicationStyle.DefaultButton, UpdateSourceTrigger=PropertyChanged}" />
+                        ImageSource="{Binding Path=ApplicationStyle.DefaultButton}" />
                 </Setter.Value>
             </Setter>
             <Setter Property="Template">
@@ -56,7 +56,7 @@
                     <Setter Property="Background">
                         <Setter.Value>
                             <ImageBrush
-                                ImageSource="{Binding Path=ApplicationStyle.DefaultButtonMouseOn, Source={x:Static game:Session.SelectedStyle}, UpdateSourceTrigger=PropertyChanged}" />
+                                ImageSource="{Binding Path=ApplicationStyle.DefaultButtonMouseOn, Source={x:Static game:Session.SelectedStyle}}" />
                         </Setter.Value>
                     </Setter>
                 </Trigger>
@@ -68,7 +68,7 @@
             <Setter Property="Background">
                 <Setter.Value>
                     <ImageBrush
-                        ImageSource="{Binding Path=ApplicationStyle.ChessTile, UpdateSourceTrigger=PropertyChanged}" />
+                        ImageSource="{Binding Path=ApplicationStyle.ChessTile}" />
                 </Setter.Value>
             </Setter>
             <Setter Property="Template">
@@ -85,7 +85,7 @@
                     <Setter Property="Background">
                         <Setter.Value>
                             <ImageBrush
-                                ImageSource="{Binding Path=ApplicationStyle.SelectedChessTile, Source={x:Static game:Session.SelectedStyle}, UpdateSourceTrigger=PropertyChanged}" />
+                                ImageSource="{Binding Path=ApplicationStyle.SelectedChessTile, Source={x:Static game:Session.SelectedStyle}}" />
                         </Setter.Value>
                     </Setter>
                 </Trigger>
@@ -101,7 +101,7 @@
             <Setter Property="Background">
                 <Setter.Value>
                     <ImageBrush
-                        ImageSource="{Binding Path=ApplicationStyle.TabItem, UpdateSourceTrigger=PropertyChanged}" />
+                        ImageSource="{Binding Path=ApplicationStyle.TabItem}" />
                 </Setter.Value>
             </Setter>
             <Setter Property="Template">
@@ -121,7 +121,7 @@
                     <Setter Property="Background">
                         <Setter.Value>
                             <ImageBrush
-                                ImageSource="{Binding Path=ApplicationStyle.TabItem, UpdateSourceTrigger=PropertyChanged}" />
+                                ImageSource="{Binding Path=ApplicationStyle.TabItem}" />
                         </Setter.Value>
                     </Setter>
                 </Trigger>
@@ -130,7 +130,7 @@
                     <Setter Property="Background">
                         <Setter.Value>
                             <ImageBrush
-                                ImageSource="{Binding Path=ApplicationStyle.TabItemMouseOn, UpdateSourceTrigger=PropertyChanged}" />
+                                ImageSource="{Binding Path=ApplicationStyle.TabItemMouseOn}" />
                         </Setter.Value>
                     </Setter>
                 </Trigger>
@@ -139,7 +139,7 @@
                     <Setter Property="Background">
                         <Setter.Value>
                             <ImageBrush
-                                ImageSource="{Binding Path=ApplicationStyle.TabItemMouseOn, UpdateSourceTrigger=PropertyChanged}" />
+                                ImageSource="{Binding Path=ApplicationStyle.TabItemMouseOn}" />
                         </Setter.Value>
                     </Setter>
                 </Trigger>
@@ -148,7 +148,7 @@
                     <Setter Property="Background">
                         <Setter.Value>
                             <ImageBrush
-                                ImageSource="{Binding Path=ApplicationStyle.TabItemDisabled, UpdateSourceTrigger=PropertyChanged}" />
+                                ImageSource="{Binding Path=ApplicationStyle.TabItemDisabled}" />
                         </Setter.Value>
                     </Setter>
                 </Trigger>

diff --git a/BattleChess3.Api/BattleChess3.Api.csproj b/BattleChess3.Api/BattleChess3.Api.csproj
@@ -149,18 +149,12 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <ProjectReference Include="..\BattleChess3.Model\BattleChess3.Model.csproj">
       <Project>{4663da29-aa05-4134-800d-1974be8db559}</Project>
       <Name>BattleChess3.Model</Name>
     </ProjectReference>
-    <ProjectReference Include="..\BattleChess3.Shared\BattleChess3.Shared.csproj">
-      <Project>{4f503f20-176f-4c63-9604-6ed9d0c46652}</Project>
-      <Name>BattleChess3.Shared</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="WMPLib\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/BattleChess3.Api/Controller/MainWindowController.cs b/BattleChess3.Api/Controller/MainWindowController.cs
@@ -1,6 +1,6 @@
 using BattleChess3.Api.Game;
 using BattleChess3.Api.ViewModel;
-using BattleChess3.Shared.Properties;
+using BattleChess3.Model.Properties;
 using System;
 using System.IO;
 using System.Linq;
@@ -76,9 +76,10 @@ private void OnQuitApplicationClick(object sender, RoutedEventArgs e)
         }
 
         private bool _played = false;
+
         private void OnSelectionChanged(object sender, RoutedEventArgs e)
         {
-            if(_played)
+            if (_played)
                 PlayButtonSound();
             _played = true;
         }

diff --git a/BattleChess3.Api/Controller/ManualController.cs b/BattleChess3.Api/Controller/ManualController.cs
@@ -1,10 +1,23 @@
-namespace BattleChess3.Api.Controller
+using BattleChess3.Model;
+using System.Windows;
+using System.Windows.Controls;
+using System.Linq;
+
+namespace BattleChess3.Api.Controller
 {
     public partial class ManualController
     {
         public ManualController()
         {
             InitializeComponent();
         }
+
+        private void OnManualSelectedClick(object sender, RoutedEventArgs e)
+        {
+            System.Media.SoundPlayer snd = new System.Media.SoundPlayer("Sounds/BoardSound.wav");
+            snd.Play();
+            var button = (Button)sender;
+            ManualContent.DataContext = TypesOfFigures.FigureGroups.FirstOrDefault(x => x.Name == button.Content);
+        }
     }
 }
diff --git a/BattleChess3.Api/Game/BoardTools.cs b/BattleChess3.Api/Game/BoardTools.cs
@@ -1,7 +1,6 @@
 using BattleChess3.Api.ViewModel;
 using BattleChess3.Model.Figures;
-using BattleChess3.Shared;
-using BattleChess3.Shared.Properties;
+using BattleChess3.Model.Properties;
 using System.Linq;
 
 namespace BattleChess3.Api.Game

diff --git a/BattleChess3.Api/Game/FigureTools.cs b/BattleChess3.Api/Game/FigureTools.cs
@@ -1,7 +1,6 @@
 using BattleChess3.Model;
 using BattleChess3.Model.Figures;
-using BattleChess3.Shared;
-using BattleChess3.Shared.Properties;
+using BattleChess3.Model.Properties;
 
 namespace BattleChess3.Api.Game
 {
@@ -17,7 +16,7 @@ private static void CreateFigure(string tile, Position position, string playerNa
             player?.CreateFigure(newBaseFigure);
             SetFigureAtPosition(position, newBaseFigure);
         }
-        
+
         /// <summary>
         /// Tries to play the position if it is your turn
         /// </summary>

diff --git a/BattleChess3.Api/Game/Highlight.cs b/BattleChess3.Api/Game/Highlight.cs
@@ -1,5 +1,4 @@
 using BattleChess3.Model.Figures;
-using BattleChess3.Shared;
 using System.IO;
 
 namespace BattleChess3.Api.Game

diff --git a/BattleChess3.Api/Game/Session.cs b/BattleChess3.Api/Game/Session.cs
@@ -1,8 +1,5 @@
 using BattleChess3.Api.ViewModel;
-using BattleChess3.Model;
-using BattleChess3.Model.Figures;
-using BattleChess3.Shared;
-using BattleChess3.Shared.Properties;
+using BattleChess3.Model.Properties;
 
 namespace BattleChess3.Api.Game
 {

diff --git a/BattleChess3.Api/ViewModel/MapsHolder.cs b/BattleChess3.Api/ViewModel/MapsHolder.cs
@@ -2,14 +2,14 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
-using System.Linq;
 using System.Runtime.CompilerServices;
 
 namespace BattleChess3.Api.ViewModel
 {
     public class MapsHolder : INotifyPropertyChanged
     {
         private List<Map> _maps = new List<Map>();
+
         public List<Map> Maps
         {
             get => _maps;

diff --git a/BattleChess3.Api/ViewModel/SelectedFigure.cs b/BattleChess3.Api/ViewModel/SelectedFigure.cs
@@ -1,7 +1,6 @@
 using BattleChess3.Api.Annotations;
 using BattleChess3.Api.Game;
 using BattleChess3.Model.Figures;
-using BattleChess3.Shared;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 

diff --git a/BattleChess3.Api/Views/MainWindow.xaml b/BattleChess3.Api/Views/MainWindow.xaml
@@ -7,7 +7,7 @@
         xmlns:controllers="clr-namespace:BattleChess3.Api.Controller"
         mc:Ignorable="d"
         DataContext="{Binding Source={x:Static game:Session.SelectedStyle}, UpdateSourceTrigger=PropertyChanged}"
-        Title="MainWindow" Height="480" Width="800" MinHeight="480" MinWidth="640">
+        Title="MainWindow" Height="620" Width="860" MinHeight="480" MinWidth="640">
     <Window.Background>
         <ImageBrush
             ImageSource="{Binding Path=ApplicationStyle.ApplicationBackground, UpdateSourceTrigger=PropertyChanged}" />