From 3fbea7ec0d53bc1785adc63ddb1d9d53b20c58ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konrad=20Pierzy=C5=84ski?= Date: Tue, 22 Jan 2019 21:02:49 +0100 Subject: [PATCH] Error window, error when quantityMax is touched, pagination, small bugfixs --- Magazyn_Client/Magazyn/Magazyn.csproj | 14 +++ Magazyn_Client/Magazyn/MainWindow.xaml | 8 +- Magazyn_Client/Magazyn/MainWindow.xaml.cs | 91 +++++++++++++++---- Magazyn_Client/Magazyn/Views/FruitView.xaml | 12 +-- .../Magazyn/Views/FruitView.xaml.cs | 13 +-- .../Magazyn/Windows/AmountWindow.xaml | 2 +- .../Magazyn/Windows/AmountWindow.xaml.cs | 65 ++++++------- .../Magazyn/Windows/ErrorWindow.xaml | 23 +++++ .../Magazyn/Windows/ErrorWindow.xaml.cs | 33 +++++++ .../Magazyn/Windows/ValueWindow.xaml | 25 +++++ .../Magazyn/Windows/ValueWindow.xaml.cs | 33 +++++++ 11 files changed, 242 insertions(+), 77 deletions(-) create mode 100644 Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml create mode 100644 Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml.cs create mode 100644 Magazyn_Client/Magazyn/Windows/ValueWindow.xaml create mode 100644 Magazyn_Client/Magazyn/Windows/ValueWindow.xaml.cs diff --git a/Magazyn_Client/Magazyn/Magazyn.csproj b/Magazyn_Client/Magazyn/Magazyn.csproj index f088802..5c4a801 100644 --- a/Magazyn_Client/Magazyn/Magazyn.csproj +++ b/Magazyn_Client/Magazyn/Magazyn.csproj @@ -73,6 +73,12 @@ AmountWindow.xaml + + ErrorWindow.xaml + + + ValueWindow.xaml + MSBuild:Compile Designer @@ -93,6 +99,14 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + diff --git a/Magazyn_Client/Magazyn/MainWindow.xaml b/Magazyn_Client/Magazyn/MainWindow.xaml index e7d530a..aa7ac06 100644 --- a/Magazyn_Client/Magazyn/MainWindow.xaml +++ b/Magazyn_Client/Magazyn/MainWindow.xaml @@ -15,12 +15,14 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:Magazyn" mc:Ignorable="d" - Title="Magazyn Owoców" Height="400" MaxWidth="590" MinWidth="590" Width="590"> + Title="Magazyn Owoców" Height="500" MaxWidth="590" MinWidth="590" Width="590" SizeChanged="Window_SizeChanged"> - + -