1 5 年之前
父节点
当前提交
9d7b2f02f0
共有 2 个文件被更改,包括 14 次插入27 次删除
  1. 3 0
      InteractiveKiosk/AuthorizationWindow.xaml.cs
  2. 11 27
      InteractiveKiosk/MainWindow.xaml

+ 3 - 0
InteractiveKiosk/AuthorizationWindow.xaml.cs

@@ -43,6 +43,9 @@ namespace InteractiveKiosk
             {
                 username.Foreground = Brushes.Black;
             }
+
+            PasswordBox password = sender as PasswordBox;
+            if (password == null) return;
         }
 
         private void password_TextChanged(object sender, RoutedEventArgs e)

+ 11 - 27
InteractiveKiosk/MainWindow.xaml

@@ -5,33 +5,17 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:InteractiveKiosk"
         mc:Ignorable="d"
-        Title="MainWindow" Height="700" Width="1250" WindowStartupLocation="CenterScreen">
+        Title="MainWindow" Height="950" Width="700" WindowStartupLocation="CenterScreen">
     <Grid>
-        <TabControl TabStripPlacement="Left">
-            <TabItem Header="Аттракционы" Margin="-1,0,-2,-30">
-                <Label Content="Аттракционы">
-                </Label>
-            </TabItem>
-            <TabItem Header="Мероприятия" Margin="-1,30,-2,-60">
-                <Label Content="Мероприятия"/>
-            </TabItem>
-            <TabItem Header="Мероприятия" Margin="-1,60,-2,-90">
-                <Label Content="Мероприятия"/>
-            </TabItem>
-            <TabItem Header="Мероприятия" Margin="-1,90,-2,-120">
-                <Label Content="Мероприятия"/>
-            </TabItem>
-            <TabItem Header="Карта" Margin="610,490,-624,-504">
-                <Label Content="" Width="1146" Margin="0,0,0,57">
-                    <Label.Background>
-                        <ImageBrush ImageSource="карта_для_администрации.jpg"/>
-                    </Label.Background>
-                </Label>
-            </TabItem>
-            <TabItem Header="Список" Margin="467,469,-481,-483">
-                <Label Content="Список"/>
-            </TabItem>
-        </TabControl>
-        <Button Content="Войти" HorizontalAlignment="Left" Margin="1072,10,0,0" VerticalAlignment="Top" Width="160" Click="OpenWindow" Height="65"/>
+        <Button Content="Войти" HorizontalAlignment="Left" Margin="559,5,0,0" VerticalAlignment="Top" Width="78" Click="OpenWindow" Height="20"/>
+        <Button Content="КАРТА ПАРКА" HorizontalAlignment="Left" Margin="46,633,0,0" VerticalAlignment="Top" Width="240" Height="225" Foreground="Black" FontSize="22" FontFamily="Showcard Gothic" FontWeight="Bold" Background="#00000000">
+        </Button>
+        <Button Content="ДОСТОПРИМЕЧАТЕЛЬНОСТИ" HorizontalAlignment="Left" Margin="291,633,0,0" VerticalAlignment="Top" Width="242" Height="110" FontSize="11" BorderBrush="Black" FontFamily="Century Gothic" Background="#00000000">
+        </Button>
+        <Button Content="КАФЕ И РЕСТОРАНЫ" HorizontalAlignment="Left" Margin="291,748,0,0" VerticalAlignment="Top" Width="242" Height="110" FontSize="11" Background="#00000000" BorderBrush="Black" FontFamily="Century Gothic"/>
+        <Button Content="АТТРАКЦИОНЫ" HorizontalAlignment="Left" Margin="538,633,0,0" VerticalAlignment="Top" Width="99" Height="225" FontSize="11" BorderBrush="Black" FontFamily="Century Gothic" Background="#00000000">
+        </Button>
+        <Button Content="АФИША ПАРКА" HorizontalAlignment="Left" Margin="390,284,0,0" VerticalAlignment="Top" Width="194" Height="41"/>
+        <Button Content="ПОДРОБНЕЕ" HorizontalAlignment="Left" Margin="220,202,0,0" VerticalAlignment="Top" Width="181" Height="40"/>
     </Grid>
 </Window>