Browse Source

список авто и доп кнопки

Kuzmenco 1 year ago
parent
commit
30234d5c18
4 changed files with 56 additions and 2 deletions
  1. 7 0
      Prokatavto03.csproj
  2. 2 2
      Window1.xaml
  3. 20 0
      Window3.xaml
  4. 27 0
      Window3.xaml.cs

+ 7 - 0
Prokatavto03.csproj

@@ -61,6 +61,9 @@
     <Compile Include="Window2.xaml.cs">
       <DependentUpon>Window2.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Window3.xaml.cs">
+      <DependentUpon>Window3.xaml</DependentUpon>
+    </Compile>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -81,6 +84,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Window3.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">

+ 2 - 2
Window1.xaml

@@ -8,14 +8,14 @@
         Title="Window1" Height="370.393" Width="302.457" Background="#FF78909C">
     <Grid>
         <TextBox HorizontalAlignment="Left" Height="22" Margin="77,84,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="143" TextChanged="TextBox_TextChanged"/>
-        <Button Content="Вход" HorizontalAlignment="Left" Margin="46,213,0,0" VerticalAlignment="Top" Width="90" RenderTransformOrigin="-0.927,-1.391" Height="22"/>
+        <Button Content="Вход" HorizontalAlignment="Left" Margin="101,216,0,0" VerticalAlignment="Top" Width="90" RenderTransformOrigin="-0.927,-1.391" Height="22"/>
         <TextBox HorizontalAlignment="Left" Height="21" Margin="77,131,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="143"/>
         <TextBlock HorizontalAlignment="Left" Margin="77,61,0,0" TextWrapping="Wrap" Text="Логин" VerticalAlignment="Top" Width="59" Height="15"/>
         <TextBlock HorizontalAlignment="Left" Margin="77,111,0,0" TextWrapping="Wrap" Text="Пароль" VerticalAlignment="Top" Width="59" Height="15"/>
-        <Button Content="" HorizontalAlignment="Left" Margin="160,213,0,0" VerticalAlignment="Top" Width="90" Height="22"/>
         <TextBlock HorizontalAlignment="Left" Margin="77,152,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="96" Height="18" RenderTransformOrigin="0.5,0.5"><Run Text="Пароль"/><Run Text=" повтор"/></TextBlock>
         <TextBox HorizontalAlignment="Left" Height="23" Margin="77,175,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="143"/>
         <TextBlock HorizontalAlignment="Left" Margin="97,39,0,0" TextWrapping="Wrap" Text="Регистрация" VerticalAlignment="Top" Height="38" Width="123" FontSize="20"/>
+        <Image Margin="113,0,103,308" Source="pack://siteoforigin:,,,/logo.png" Stretch="Fill"/>
 
     </Grid>
 </Window>

+ 20 - 0
Window3.xaml

@@ -0,0 +1,20 @@
+<Window x:Class="Prokatavto03.Window3"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Prokatavto03"
+        mc:Ignorable="d"
+        Title="Window3" Height="450" Width="800" Background="#FF78909C">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="199*"/>
+        </Grid.ColumnDefinitions>
+        <DataGrid HorizontalAlignment="Left" Height="292" Margin="23,41,0,0" VerticalAlignment="Top" Width="748"/>
+        <TextBlock HorizontalAlignment="Left" Margin="225,0,0,0" TextWrapping="Wrap" Text="Список автомобилей " VerticalAlignment="Top" FontSize="36" FontFamily="Times New Roman"/>
+        <Button Content="Добавить " HorizontalAlignment="Left" Margin="23,359,0,0" VerticalAlignment="Top" Width="90" Height="38" FontSize="16" FontFamily="Times New Roman"/>
+        <Button Content="Редактирование" HorizontalAlignment="Left" Margin="132,359,0,0" VerticalAlignment="Top" Width="135" Height="38" FontSize="16" FontFamily="Times New Roman"/>
+        <Button Content="Удаление" HorizontalAlignment="Left" Margin="284,359,0,0" VerticalAlignment="Top" Width="90" Height="38" FontSize="16" FontFamily="Times New Roman"/>
+
+    </Grid>
+</Window>

+ 27 - 0
Window3.xaml.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Prokatavto03
+{
+    /// <summary>
+    /// Логика взаимодействия для Window3.xaml
+    /// </summary>
+    public partial class Window3 : Window
+    {
+        public Window3()
+        {
+            InitializeComponent();
+        }
+    }
+}