From 13ab8fd6aa65f4a2df22d376a6371bb3dd01e5e6 Mon Sep 17 00:00:00 2001
From: Pat <patrycja.lazna@gmail.com>
Date: Wed, 30 Jan 2019 23:53:23 +0100
Subject: [PATCH] color theme changed to cyan, images displayed in circular
 shape, changed window sizes and arrangement  in windows

---
 Magazyn_Client/Magazyn/App.xaml               |  4 ++--
 .../Magazyn/Windows/AmountWindow.xaml         | 19 +++++++++++--------
 .../Magazyn/Windows/AmountWindow.xaml.cs      |  2 +-
 .../Magazyn/Windows/ErrorWindow.xaml          |  4 ++--
 .../Magazyn/Windows/InfoWindow.xaml           | 18 +++++++++++-------
 .../Magazyn/Windows/InfoWindow.xaml.cs        |  2 +-
 .../Magazyn/Windows/ValueWindow.xaml          |  6 +++---
 7 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/Magazyn_Client/Magazyn/App.xaml b/Magazyn_Client/Magazyn/App.xaml
index 4dfc82f..313a1db 100644
--- a/Magazyn_Client/Magazyn/App.xaml
+++ b/Magazyn_Client/Magazyn/App.xaml
@@ -8,8 +8,8 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Amber.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Amber.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Cyan.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Cyan.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
index 2059156..736004c 100644
--- a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
@@ -15,15 +15,18 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Magazyn.Windows"
         mc:Ignorable="d"
-        Title="" WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown">
+        Title="" WindowStartupLocation="CenterOwner" Height="250" Width="340" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown">
 
     <Grid>
-        <TextBlock x:Name="fruitName" HorizontalAlignment="Left" Margin="10,87,0,0" TextWrapping="Wrap" Text="fruitName" Width="76" Height="16" VerticalAlignment="Top" TextAlignment="Center"/>
-        <TextBlock x:Name="messageBox" HorizontalAlignment="Left" Margin="84,10,0,0" TextWrapping="Wrap" Text="messageBox" VerticalAlignment="Top" Width="121" Height="64"/>
-        <TextBox x:Name="amountToChange" Margin="0,71,9,0" TextWrapping="Wrap" Text="" RenderTransformOrigin="1.456,0.316" Height="32" VerticalAlignment="Top" HorizontalAlignment="Right" Width="64"/>
-        <Button x:Name="saveButton" Content="Zastosuj" Margin="0,0,9,10" VerticalAlignment="Bottom" Click="saveButton_Click" Width="90" HorizontalAlignment="Right"/>
-        <Button x:Name="cancelButton" Content="Anuluj" Margin="10,0,0,10" VerticalAlignment="Bottom" Click="cancelButton_Click" Width="90" HorizontalAlignment="Left" />
-        <Image x:Name="fruitImage" HorizontalAlignment="Left" Height="64" Margin="15,10,0,0" VerticalAlignment="Top" Width="64"/>
-
+        <TextBlock x:Name="fruitName" HorizontalAlignment="Left" Margin="60,125,0,0" TextWrapping="Wrap" Text="fruitName" Width="76" Height="16" VerticalAlignment="Top" TextAlignment="Center"/>
+        <TextBlock x:Name="messageBox" HorizontalAlignment="Left" Margin="24,74,0,0" TextWrapping="Wrap" Text="messageBox" VerticalAlignment="Top" Width="290" Height="39" TextAlignment="Center" FontWeight="Bold"/>
+        <TextBox x:Name="amountToChange" Margin="0,109,65,0" TextWrapping="Wrap" Text="" RenderTransformOrigin="1.456,0.316" Height="32" VerticalAlignment="Top" HorizontalAlignment="Right" Width="89" TextAlignment="Center"/>
+        <Button x:Name="saveButton" Content="Zastosuj" Margin="0,0,66,10" VerticalAlignment="Bottom" Click="saveButton_Click" Width="90" HorizontalAlignment="Right"/>
+        <Button x:Name="cancelButton" Content="Anuluj" Margin="60,0,0,10" VerticalAlignment="Bottom" Click="cancelButton_Click" Width="90" HorizontalAlignment="Left" />
+        <Ellipse  HorizontalAlignment="Left" Width="60" Height="60" Margin="134,10,0,155.333">
+            <Ellipse.Fill>
+                <ImageBrush x:Name="fruitImage"/>
+            </Ellipse.Fill>
+        </Ellipse>
     </Grid>
 </Window>
diff --git a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
index 5c6774d..48b1ef7 100644
--- a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
@@ -50,7 +50,7 @@ namespace Magazyn.Windows
 
             try
             {
-                fruitImage.Source = fruit.ImageSource;
+                fruitImage.ImageSource = fruit.ImageSource;
             }
             catch (Exception ex)
             {
diff --git a/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml b/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml
index 4a7c743..77c1561 100644
--- a/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml
@@ -15,9 +15,9 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Magazyn.Windows"
         mc:Ignorable="d"
-        Title="Błąd" WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown">
+        Title="Błąd" WindowStartupLocation="CenterOwner" Height="250" Width="340" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown">
 	<Grid>
 		<Button x:Name="okButton" Content="Ok" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="75" Click="okButton_Click"/>
-		<TextBlock x:Name="messageBlock" FontSize="16" Margin="10,10,10,0" TextWrapping="Wrap" Text="messageBlock" VerticalAlignment="Top"/>
+		<TextBlock x:Name="messageBlock" FontSize="16" Margin="10,70,10,0" TextWrapping="Wrap" Text="messageBlock" VerticalAlignment="Top" TextAlignment="Center" RenderTransformOrigin="0.502,0.878"/>
 	</Grid>
 </Window>
diff --git a/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml b/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml
index ce465fd..623438c 100644
--- a/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml
@@ -15,14 +15,18 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Magazyn.Windows"
         mc:Ignorable="d"
-        Title="Informacje o: " WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown">
+        Title="Informacje o: " WindowStartupLocation="CenterOwner" Height="250" Width="340" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown">
     <Grid>
-        <TextBlock x:Name="fruitName" Margin="79,10,9,0" TextWrapping="Wrap" Text="fruitName" Height="16" VerticalAlignment="Top"/>
-        <TextBlock x:Name="fruitPrice" Margin="79,31,10,0" TextWrapping="Wrap" Text="fruitPrice" Height="16" VerticalAlignment="Top"/>
-        <TextBlock x:Name="fruitQuantity" Margin="79,52,10,0" TextWrapping="Wrap" Text="fruitQuantity" Height="16" VerticalAlignment="Top"/>
-        <TextBlock x:Name="fruitQuantityMax" Margin="79,73,10,0" TextWrapping="Wrap" Text="fruitQuantityMax" Height="16" VerticalAlignment="Top"/>
-        <TextBlock x:Name="fruitValue" Margin="79,94,10,0" TextWrapping="Wrap" Text="fruitValue" Height="16" VerticalAlignment="Top"/>
+        <TextBlock x:Name="fruitName" Margin="37,70,48.333,0" TextWrapping="Wrap" Text="fruitName" Height="16" VerticalAlignment="Top" FontWeight="Bold"/>
+        <TextBlock x:Name="fruitPrice" Margin="37,91,49.333,0" TextWrapping="Wrap" Text="fruitPrice" Height="16" VerticalAlignment="Top" FontWeight="Bold"/>
+        <TextBlock x:Name="fruitQuantity" Margin="37,112,49.333,0" TextWrapping="Wrap" Text="fruitQuantity" Height="16" VerticalAlignment="Top" FontWeight="Bold"/>
+        <TextBlock x:Name="fruitQuantityMax" Margin="37,133,49.333,0" TextWrapping="Wrap" Text="fruitQuantityMax" Height="16" VerticalAlignment="Top" FontWeight="Bold"/>
+        <TextBlock x:Name="fruitValue" Margin="37,154,50.333,0" TextWrapping="Wrap" Text="fruitValue" Height="16" VerticalAlignment="Top" FontWeight="Bold"/>
         <Button x:Name="okButton" Content="Ok" Margin="0,0,9,10" VerticalAlignment="Bottom" Click="okButton_Click" Width="75" HorizontalAlignment="Right"/>
-        <Image x:Name="fruitImage" HorizontalAlignment="Left" Height="64" Margin="10,10,0,0" VerticalAlignment="Top" Width="64"/>
+        <Ellipse  HorizontalAlignment="Left" Width="60" Height="60" Margin="134,10,0,155.333">
+            <Ellipse.Fill>
+                <ImageBrush x:Name="fruitImage"/>
+            </Ellipse.Fill>
+        </Ellipse>
     </Grid>
 </Window>
diff --git a/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml.cs b/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml.cs
index 0234a90..72db372 100644
--- a/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml.cs
@@ -37,7 +37,7 @@ namespace Magazyn.Windows
 
             try
             {
-                fruitImage.Source = fruit.ImageSource;
+                fruitImage.ImageSource = fruit.ImageSource;
             }
             catch (Exception ex)
             {
diff --git a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
index 26be3a2..ca7b20b 100644
--- a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
@@ -15,11 +15,11 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Magazyn.Windows"
         mc:Ignorable="d"
-        Title="Wartość magazynu" WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown">
+        Title="Wartość magazynu" WindowStartupLocation="CenterOwner" Height="250" Width="340" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown">
     <Grid>
         <Button x:Name="okButton" Content="Ok" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="75" Click="okButton_Click"/>
-        <TextBlock Margin="10,28,10,0" TextWrapping="Wrap" Text="Wartość magazynu to:" VerticalAlignment="Top" TextAlignment="Center" RenderTransformOrigin="0.495,1.734" />
-        <TextBlock x:Name="valueBlock" Margin="67,49,69,0" TextWrapping="Wrap" Text="NaN zł" VerticalAlignment="Top" TextAlignment="Center" RenderTransformOrigin="2.405,0.629"/>
+        <TextBlock Margin="10,70,10,0" TextWrapping="Wrap" Text="Wartość magazynu to:" VerticalAlignment="Top" TextAlignment="Center" RenderTransformOrigin="0.495,1.734" />
+        <TextBlock x:Name="valueBlock" Margin="69,108,66.667,0" TextWrapping="Wrap" Text="NaN zł" VerticalAlignment="Top" TextAlignment="Center" RenderTransformOrigin="2.405,0.629" FontWeight="Bold"/>
 
     </Grid>
 </Window>