SAVECHANGES

CopyCenter/AuthorizationWindow.xaml

@@ -8,14 +8,16 @@
         Icon="200x200bb.jpg"
         Title="" Height="300" Width="450" WindowStartupLocation="CenterScreen" FontFamily="Century Gothic">
     <Grid>
-
+        <Grid.Background>
+            <ImageBrush ImageSource="i39C1W5IB.jpg"/>
+        </Grid.Background>
         <TextBlock Text="Логин" Margin="10,77,387,153"/>
         <TextBlock Text="Пароль" Margin="10,125,378,108"/>
         <TextBlock Text="АВТОРИЗАЦИЯ" Margin="179,10,164,229"/>
         <TextBox Name="login" Grid.Row="0" Margin="109,72,39,164"/>
         <PasswordBox Name="password" Margin="109,120,39,117"/>
-        <Button Grid.Column="0" Content="Вход" Click="AuthorizationClick" FontFamily="Century Gothic" Height="Auto" Margin="311,157,66,78" Width="Auto" Background="#FF138DE2" FontSize="14"/>
-        <Button Content="Зарегистрироваться" Click="Registration_Click" FontFamily="Century Gothic" Height="Auto" Margin="119,157,158,78" Width="Auto" Background="#FF138DE2" FontSize="14"/>
+        <Button Grid.Column="0" Content="Вход" Click="AuthorizationClick" FontFamily="Century Gothic" Height="Auto" Margin="311,157,66,78" Width="Auto" Background="#FF138DE2" FontSize="14" Foreground="White"/>
+        <Button Content="Зарегистрироваться" Click="Registration_Click" FontFamily="Century Gothic" Height="Auto" Margin="119,157,158,78" Width="Auto" Background="#FF138DE2" FontSize="14" Foreground="White"/>
         <StackPanel>
             <Image Margin="64,120,346,117" Source="key[1].png" Stretch="Fill"/>
             <Image Margin="64,-190,346,165" Source="1536306136_user[1].png" Stretch="Fill" Height="24" />

CopyCenter/CardsWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:CopyCenter"
         mc:Ignorable="d"
-        Title="Дисконтные карты" Height="450" Width="800">
+        Title="Дисконтные карты" Height="450" Width="800" WindowStartupLocation="CenterScreen">
     <Grid>
         <DataGrid Name="CardsList" AutoGenerateColumns="False">
             <DataGrid.Columns>
@@ -16,7 +16,7 @@
         </DataGrid>
         <Button Content="" HorizontalAlignment="Right" Margin="0,369,10,0" VerticalAlignment="Top" Width="45" Click="Exit_Click" Height="40">
             <Button.Background>
-                <ImageBrush ImageSource="exit_PNG29.png"/>
+                <ImageBrush ImageSource="edit_redo.png"/>
             </Button.Background>
         </Button>
         <Button Content="Добавить" HorizontalAlignment="Left" Margin="385,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Add"/>

CopyCenter/ClientsWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:CopyCenter"
         mc:Ignorable="d"
-        Title="Клиенты" Height="450" Width="800">
+        Title="Клиенты" Height="450" Width="800" WindowStartupLocation="CenterScreen">
     <Grid>
         <DataGrid Name="ClientsList" AutoGenerateColumns="False">
             <DataGrid.Columns>
@@ -15,12 +15,12 @@
         </DataGrid>
         <Button Content="" HorizontalAlignment="Right" Margin="0,369,10,0" VerticalAlignment="Top" Width="45" Click="Exit_Click" Height="40">
             <Button.Background>
-                <ImageBrush ImageSource="exit_PNG29.png"/>
+                <ImageBrush ImageSource="edit_redo.png"/>
             </Button.Background>
         </Button>
-        <Button Content="Добавить" HorizontalAlignment="Left" Margin="385,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Add"/>
-        <Button Content="Удалить" HorizontalAlignment="Left" Margin="503,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Delete"/>
-        <Button Content="Обновить" HorizontalAlignment="Left" Margin="622,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Update"/>
+        <Button Content="Добавить" HorizontalAlignment="Left" Margin="385,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Add" Foreground="White"/>
+        <Button Content="Удалить" HorizontalAlignment="Left" Margin="503,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Delete" Foreground="White"/>
+        <Button Content="Обновить" HorizontalAlignment="Left" Margin="622,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Update" Foreground="White"/>
         <TextBox Name="Name" HorizontalAlignment="Left" Height="40" Margin="385,324,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
         <TextBox Name="TypeClient" HorizontalAlignment="Left" Height="40" Margin="503,324,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
 

CopyCenter/CopyCenter.csproj

@@ -199,6 +199,7 @@
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="edit_redo.png" />
     <Resource Include="logging-out-2355227_1280.png" />
     <Resource Include="i39C1W5IB.jpg" />
     <Resource Include="exit_png_456938.png" />

CopyCenter/MenuWindow.xaml

@@ -15,7 +15,7 @@
 
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="38,0,42,21">
             <Button Content="Клиенты" Width="120" Height="30" Margin="25,0,30,35" Background="#FF138DE2" FontSize="14" FontFamily="Century Gothic" Foreground="White" Click="Clients"/>
-            <Button Content="Карты" Width="120" Height="30" Margin="5,0,30,35" Background="#FF138DE2" FontSize="14" FontFamily="Century Gothic" Foreground="White" Click="Cards"/>
+            <Button Content="Карты" Width="120" Height="30" Margin="5,0,30,35" Background="#FF138DE9" FontSize="14" FontFamily="Century Gothic" Foreground="White" Click="Cards"/>
             <Button Content="Заказы" Width="120" Height="30" Margin="5,0,30,35" Background="#FF138DE2" FontSize="14" FontFamily="Century Gothic" Foreground="White" Click="Orders"/>
             <Button Content="Услуги" Width="120" Height="30" Margin="5,0,30,35" Background="#FF138DE2" FontSize="14" FontFamily="Century Gothic" Foreground="White" Click="Service"/>
         </StackPanel>

CopyCenter/OrdersWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:CopyCenter"
         mc:Ignorable="d"
-        Title="Заказы" Height="450" Width="800">
+        Title="Заказы" Height="450" Width="800" WindowStartupLocation="CenterScreen">
     <Grid>
         <DataGrid Name="OrdersList" AutoGenerateColumns="False">
             <DataGrid.Columns>
@@ -22,12 +22,12 @@
         </DataGrid>
         <Button Content="" HorizontalAlignment="Right" Margin="1,369,10,0" VerticalAlignment="Top" Width="45" Click="Exit_Click" Height="40">
             <Button.Background>
-                <ImageBrush ImageSource="exit_PNG29.png"/>
+                <ImageBrush ImageSource="edit_redo.png"/>
             </Button.Background>
         </Button>
-        <Button Content="Добавить" HorizontalAlignment="Left" Margin="385,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Add"/>
-        <Button Content="Удалить" HorizontalAlignment="Left" Margin="503,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Delete"/>
-        <Button Content="Обновить" HorizontalAlignment="Left" Margin="622,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Update"/>
+        <Button Content="Добавить" HorizontalAlignment="Left" Margin="385,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Add" Foreground="White"/>
+        <Button Content="Удалить" HorizontalAlignment="Left" Margin="503,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Delete" Foreground="White"/>
+        <Button Content="Обновить" HorizontalAlignment="Left" Margin="622,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Update" Foreground="White"/>
         <TextBox Name="Number" HorizontalAlignment="Left" Height="40" Margin="267,269,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
         <TextBox Name="View" HorizontalAlignment="Left" Height="40" Margin="385,269,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
         <TextBox Name="Date" HorizontalAlignment="Left" Height="40" Margin="503,269,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>

CopyCenter/OrdersWindow.xaml.cs

@@ -73,7 +73,7 @@ namespace CopyCenter
             uRow.idUser = Convert.ToInt32(idUser.Text);
             uRow.idPayment = Convert.ToInt32(idPayment.Text);
             db.SaveChanges();
-            OrdersList.ItemsSource = db.Services.ToList();
+            OrdersList.ItemsSource = db.Orders.ToList();
         }
     }
 }

CopyCenter/RegistrationWindow.xaml

@@ -8,7 +8,9 @@ xmlns:local="clr-namespace:CopyCenter"
         Icon="200x200bb.jpg"
     Title="" Height="550" Width="500" WindowStartupLocation="CenterScreen" FontFamily="Century Gothic">
     <Grid>
-
+        <Grid.Background>
+            <ImageBrush ImageSource="i39C1W5IB.jpg"/>
+        </Grid.Background>
         <TextBlock Text="Логин" Margin="15,87,393,398"/>
         <TextBlock Text="Пароль" Margin="15,138,393,348"/>
         <TextBlock Text="Фамилия" Margin="15,236,393,250"/>
@@ -21,8 +23,8 @@ xmlns:local="clr-namespace:CopyCenter"
         <TextBox x:Name="firstname" Margin="120,236,79,250"/>
         <TextBox x:Name="middlename" Margin="120,284,79,202"/>
         <TextBox x:Name="contactnumber" Margin="120,332,79,154"/>
-        <Button Grid.Column="0" Content="Зарегистрироваться" Click="Registration_Click" FontFamily="Comic Sans MS" Background="#FF138DE2" Margin="64,467,238,10" Width="Auto" Height="Auto"/>
-        <Button Content="Отмена" Click="Cancel" FontFamily="Comic Sans MS" Background="#FF138DE2" Margin="344,467,34,10" Height="Auto" Width="Auto"/>
+        <Button Grid.Column="0" Content="Зарегистрироваться" Click="Registration_Click" FontFamily="Comic Sans MS" Background="#FF138DE2" Margin="64,467,238,10" Width="Auto" Height="Auto" Foreground="White"/>
+        <Button Content="Отмена" Click="Cancel" FontFamily="Comic Sans MS" Background="#FF138DE2" Margin="344,467,34,10" Height="Auto" Width="Auto" Foreground="White"/>
         <Image Margin="294,10,154,469" Source="reg[1].png" Stretch="Fill"/>
         <TextBlock Text="РЕГИСТРАЦИЯ" Margin="202,10,198,486"/>
     </Grid>

CopyCenter/ServicesWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:CopyCenter"
         mc:Ignorable="d"
-        Title="Услуги" Height="450" Width="800">
+        Title="Услуги" Height="450" Width="800" WindowStartupLocation="CenterScreen" Loaded="Window_Loaded">
     <Grid>
         <DataGrid Name="ServicesList" AutoGenerateColumns="False">
             <DataGrid.Columns>
@@ -17,12 +17,12 @@
         </DataGrid>
         <Button Content="" HorizontalAlignment="Right" Margin="0,369,10,0" VerticalAlignment="Top" Width="45" Click="Exit_Click" Height="40">
             <Button.Background>
-                <ImageBrush ImageSource="exit_PNG29.png"/>
+                <ImageBrush ImageSource="edit_redo.png"/>
             </Button.Background>
         </Button>
-        <Button Content="Добавить" HorizontalAlignment="Left" Margin="385,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Button_Click"/>
-        <Button Content="Удалить" HorizontalAlignment="Left" Margin="503,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Delete"/>
-        <Button Content="Обновить" HorizontalAlignment="Left" Margin="622,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Update"/>
+        <Button Content="Добавить" HorizontalAlignment="Left" Margin="385,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Button_Click" Foreground="White"/>
+        <Button Content="Удалить" HorizontalAlignment="Left" Margin="503,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Delete" Foreground="White"/>
+        <Button Content="Обновить" HorizontalAlignment="Left" Margin="622,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Update" Foreground="White"/>
         <TextBox Name="Name" HorizontalAlignment="Left" Height="40" Margin="385,324,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
         <TextBox Name="Price" HorizontalAlignment="Left" Height="40" Margin="503,324,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
         <TextBox Name="Description" HorizontalAlignment="Left" Height="40" Margin="622,325,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>

CopyCenter/ServicesWindow.xaml.cs

@@ -58,7 +58,8 @@ namespace CopyCenter
         }
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            
+            db = new gr672_liiEntities();
+            ServicesList.ItemsSource = db.Services.ToList();
         }
 
         private void Delete(object sender, RoutedEventArgs e)

CopyCenter/Style.xaml

@@ -2,61 +2,62 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:CopyCenter">
 
-    <Style TargetType="{x:Type Button}" >
+    <Style TargetType="{x:Type Button}">
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="1"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
-                    <Grid>
-                        <Rectangle x:Name="GelBackground" Opacity="1" RadiusX="9" RadiusY="9"
-                               Fill="{TemplateBinding Background}" StrokeThickness="0.35">
-                            <Rectangle.Stroke>
-                                <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-                                    <GradientStop Color="#FF14A8E0" Offset="0" />
-                                    <GradientStop Color="#FF14A8E0" Offset="1" />
-                                </LinearGradientBrush>
-                            </Rectangle.Stroke>
-                        </Rectangle>
-                        <Rectangle x:Name="GelShine" Margin="2,2,2,0" VerticalAlignment="Top" RadiusX="8" RadiusY="8"
-                               Opacity="1" Stroke="Transparent" Height="5px">
-                            <Rectangle.Fill>
-                                <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-                                    <GradientStop Color="#FF14A8E0" Offset="0"/>
-                                    <GradientStop Color="Transparent" Offset="1"/>
-                                </LinearGradientBrush>
-                            </Rectangle.Fill>
-                        </Rectangle>
-                        <ContentPresenter VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    <Grid x:Name="grid">
+                        <Border x:Name="border" CornerRadius="8" BorderThickness="2">
+                            <Border.Background>
+                                <RadialGradientBrush GradientOrigin="0.496,1.052">
+                                    <RadialGradientBrush.RelativeTransform>
+                                        <TransformGroup>
+                                            <ScaleTransform CenterX="0.5" CenterY="0.5" 
+                                                        ScaleX="1.5" ScaleY="1.5"/>
+                                            <TranslateTransform X="0.02" Y="0.3"/>
+                                        </TransformGroup>
+                                    </RadialGradientBrush.RelativeTransform>
+                                    <GradientStop Offset="0.3" Color="#FF138DE2"/>
+                                </RadialGradientBrush>
+                            </Border.Background>
+                            <ContentPresenter HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"
+                                          TextElement.FontWeight="Bold">
+                            </ContentPresenter>
+                        </Border>
+
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="DarkBlue">
-
-                            </Setter>
-                        </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Fill" TargetName="GelBackground">
+                            <Setter Property="Background" TargetName="border">
                                 <Setter.Value>
-                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                        <GradientStop Color="Blue" Offset="0"/>
-                                        <GradientStop Color="Blue" Offset="1"/>
-                                    </LinearGradientBrush>
+                                    <RadialGradientBrush GradientOrigin="0.496,1.052">
+                                        <RadialGradientBrush.RelativeTransform>
+                                            <TransformGroup>
+                                                <ScaleTransform CenterX="0.5" CenterY="0.5" ScaleX="1.5" ScaleY="1.5"/>
+                                                <TranslateTransform X="0.02" Y="0.3"/>
+                                            </TransformGroup>
+                                        </RadialGradientBrush.RelativeTransform>
+                                        <GradientStop Color="#00000000" Offset="1"/>
+                                        <GradientStop Color="#00000000" Offset="0.3"/>
+                                    </RadialGradientBrush>
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" TargetName="border" Value="#87CEFA"/>
+                        </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Fill" TargetName="GelBackground" Value="Blue">
-
-                            </Setter>
+                            <Setter Property="Opacity" TargetName="grid" Value="0.25"/>
                         </Trigger>
+
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="Background" Value="#002060"/>
-        <Setter Property="Foreground" Value="White"/>
-        <Setter Property="Width" Value="55"/>
-        <Setter Property="Height" Value="30"/>
-
     </Style>
 
 </ResourceDictionary>