From f16b345bfc2fa547cb6990c16abcda381aaf2e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konrad=20Pierzy=C5=84ski?=
 <s442333@instalka-Standard-PC-i440FX-PIIX-1996>
Date: Wed, 23 Jan 2019 11:07:24 +0100
Subject: [PATCH] =?UTF-8?q?Added=20+=20z=C5=82=20and=20names=20for=20colum?=
 =?UTF-8?q?ns?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Magazyn_Client/Magazyn.sln                     | 4 ++--
 Magazyn_Client/Magazyn/MainWindow.xaml         | 9 ++++++++-
 Magazyn_Client/Magazyn/Views/FruitView.xaml.cs | 4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Magazyn_Client/Magazyn.sln b/Magazyn_Client/Magazyn.sln
index 741d861..a13e6c2 100644
--- a/Magazyn_Client/Magazyn.sln
+++ b/Magazyn_Client/Magazyn.sln
@@ -11,8 +11,8 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C50EC6F3-86E6-405C-991F-1B4157C04B34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C50EC6F3-86E6-405C-991F-1B4157C04B34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C50EC6F3-86E6-405C-991F-1B4157C04B34}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{C50EC6F3-86E6-405C-991F-1B4157C04B34}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{C50EC6F3-86E6-405C-991F-1B4157C04B34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C50EC6F3-86E6-405C-991F-1B4157C04B34}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
diff --git a/Magazyn_Client/Magazyn/MainWindow.xaml b/Magazyn_Client/Magazyn/MainWindow.xaml
index 9849de2..97485f3 100644
--- a/Magazyn_Client/Magazyn/MainWindow.xaml
+++ b/Magazyn_Client/Magazyn/MainWindow.xaml
@@ -17,10 +17,17 @@
         mc:Ignorable="d"
         Title="Magazyn Owoców" Height="500" MaxWidth="590" MinWidth="590" Width="590" SizeChanged="Window_SizeChanged">
 	<Grid>
-		<ListBox x:Name="fruitList" Margin="10,35,10,89"/>
+		<ListBox x:Name="fruitList" Margin="10,51,10,89"/>
 
 		<Button Name="sum" Content="Wartość magazynu" Margin="0,0,10,10" VerticalAlignment="Bottom" Height="35" Click="Value_Click" HorizontalAlignment="Right" Width="163"/>
 		<Label Content="Lista owoców:" FontWeight="Bold" HorizontalAlignment="Left" Margin="10,4,0,0" VerticalAlignment="Top" Width="100"/>
+		<Label Content="Nazwa owocu:" FontWeight="Bold" HorizontalAlignment="Left" Margin="91,25,0,0" VerticalAlignment="Top" Width="100"/>
+
+		<Label Content="Ilość:" FontWeight="Bold" HorizontalAlignment="Left" Margin="283,25,0,0" VerticalAlignment="Top" Width="46"/>
+
+		<Label Content="Cena 1szt:" FontWeight="Bold" HorizontalAlignment="Left" Margin="360,25,0,0" VerticalAlignment="Top" Width="73"/>
+		<Label Content="Wartość:" FontWeight="Bold" HorizontalAlignment="Left" Margin="438,25,0,0" VerticalAlignment="Top" Width="65"/>
+
 		<Button x:Name="prevButton" Content="Poprzednia" HorizontalAlignment="Left" Margin="10,0,0,52" VerticalAlignment="Bottom" Width="105" Click="prevButton_Click"/>
 		<Button x:Name="nextButton"  Content="Następna" HorizontalAlignment="Right" Margin="0,0,10,52" VerticalAlignment="Bottom" Width="105" Click="nextButton_Click"/>
 		<ComboBox SelectionChanged="themeCombo_SelectionChanged" x:Name="themeCombo" HorizontalAlignment="Left" Margin="10,0,0,10" VerticalAlignment="Bottom" Width="162"/>
diff --git a/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs b/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
index c5759c2..653e228 100644
--- a/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
+++ b/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
@@ -37,8 +37,8 @@ namespace Magazyn.Views
 
             fruitName.Text = fruit.Name;
             fruitAmount.Text = fruit.Quantity.ToString();
-            fruitPrice.Text = fruit.Price.ToString();
-            allPrice.Text = (fruit.Quantity * fruit.Price).ToString();
+            fruitPrice.Text = fruit.Price.ToString() + "zł";
+            allPrice.Text = (fruit.Quantity * fruit.Price).ToString() + "zł";
 
             try
 			{