Imagara 3 gadi atpakaļ
vecāks
revīzija
d153db3b0f

+ 1 - 1
PartsWarehouse/EDM.edmx.diagram

@@ -4,7 +4,7 @@
   <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
-      <Diagram DiagramId="a983730c88db49b8acf871fd319e858a" Name="Diagram1" ZoomLevel="73">
+      <Diagram DiagramId="a983730c88db49b8acf871fd319e858a" Name="Diagram1" ZoomLevel="104">
         <EntityTypeShape EntityType="PartsWarehouseDataBaseModel.Car" Width="1.5" PointX="0.75" PointY="3.5" />
         <EntityTypeShape EntityType="PartsWarehouseDataBaseModel.Parts" Width="1.5" PointX="2.75" PointY="5.125" />
         <EntityTypeShape EntityType="PartsWarehouseDataBaseModel.sysdiagrams" Width="1.5" PointX="5.75" PointY="1.25" />

+ 2 - 1
PartsWarehouse/MainWindow.xaml

@@ -84,7 +84,8 @@
                 </Button>
                 <Button Height="30"
                         Margin="5"
-                        Content="Профиль">
+                        Content="Профиль"
+                        Click="ProfileButton">
 
                 </Button>
             </StackPanel>

+ 5 - 0
PartsWarehouse/MainWindow.xaml.cs

@@ -46,5 +46,10 @@ namespace PartsWarehouse
         {
             Application.Current.Shutdown();
         }
+
+        private void ProfileButton(object sender, RoutedEventArgs e)
+        {
+            MainFrame.Content = new ProfilePage();
+        }
     }
 }

+ 1 - 2
PartsWarehouse/PartsPage.xaml

@@ -6,8 +6,7 @@
       xmlns:local="clr-namespace:PartsWarehouse"
       mc:Ignorable="d" 
       d:DesignHeight="421"
-      d:DesignWidth="634"
-      Title="ChatPage">
+      d:DesignWidth="634">
 
     <Grid Background="#32353B">
         <Grid.RowDefinitions>

+ 4 - 6
PartsWarehouse/ProfilePage.xaml

@@ -42,10 +42,9 @@
                                      Background="{x:Null}"/>
                         </StackPanel>
                         <Button Width="80"
-                            Content="Изменить"
-                            Margin="0,18,0,0"
-                            HorizontalAlignment="Right"
-                                Click="EmailButton_Click">
+                                Content="Изменить"
+                                Margin="0,18,0,0"
+                                HorizontalAlignment="Right">
                         </Button>
                     </StackPanel>
 
@@ -70,8 +69,7 @@
                         <Button Width="80"
                             Content="Изменить"
                             Margin="0,18,0,0"
-                            HorizontalAlignment="Right"
-                                Click="DateButton_Click">
+                            HorizontalAlignment="Right">
                         </Button>
                     </StackPanel>
 

+ 13 - 16
PartsWarehouse/СatalogPage.xaml

@@ -5,16 +5,16 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:PartsWarehouse"
       mc:Ignorable="d" 
-      d:DesignHeight="450" d:DesignWidth="800"
-      Title="СatalogPage">
+      d:DesignHeight="421"
+      d:DesignWidth="634">
 
-    <Grid>
+    <Grid Background="#32353B">
         <Grid.RowDefinitions>
             <RowDefinition/>
             <RowDefinition Height="4*"/>
         </Grid.RowDefinitions>
 
-        <Border CornerRadius="15" Background="red" Margin="5">
+        <Border CornerRadius="15" Background="#2F3136" Margin="5">
             <Grid Grid.Row="0">
                 <Grid.RowDefinitions>
                     <RowDefinition/>
@@ -22,7 +22,8 @@
                 </Grid.RowDefinitions>
 
                 <StackPanel Orientation="Horizontal"
-                        Grid.Row="0">
+                            Grid.Row="0"
+                            HorizontalAlignment="Center">
                     <ComboBox Name="CarCompanyCombo"
                               Margin="5"
                               Width="120"
@@ -47,16 +48,11 @@
                       Width="120">
 
                     </ComboBox>
-
-                    <ComboBox Name="PartManufacturerCombo"
-                      Margin="5"
-                      Width="120">
-
-                    </ComboBox>
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal"
-                            Grid.Row="1">
+                            Grid.Row="1"
+                            HorizontalAlignment="Center">
                     <ComboBox Name="NameCombo"
                               Margin="5"
                               Width="120"
@@ -76,11 +72,12 @@
 
                     </ComboBox>
 
-                    <ComboBox Name="PartNumCombo"
-                      Margin="5"
-                      Width="120">
+                    <Button Name="FindPartButton"
+                            Margin="5"
+                            Width="120"
+                            Content="Поиск">
 
-                    </ComboBox>
+                    </Button>
 
                 </StackPanel>