1 5 anos atrás
pai
commit
73d00acebf

+ 9 - 9
InteractiveKiosk/AuthorizationWindow.xaml

@@ -5,15 +5,15 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:InteractiveKiosk"
         mc:Ignorable="d"
-        Title="Окно авторизации" Height="451" Width="800" WindowStartupLocation="CenterScreen">
+        Title="Окно авторизации" Height="400" Width="600" WindowStartupLocation="CenterScreen">
     <Grid>
-        <TextBox Name="username" GotFocus="Username_GotFocus" LostFocus="Username_LostFocus" HorizontalAlignment="Left" Height="23" Margin="276,178,0,0" TextWrapping="Wrap" Text="Логин" VerticalAlignment="Top" Width="120" TextChanged="username_TextChanged"/>
-        <TextBlock HorizontalAlignment="Left" Margin="126,179,0,0" TextWrapping="Wrap" Text="Имя пользователя:" VerticalAlignment="Top" Height="23" Width="106"/>
-        <PasswordBox Name="password2" HorizontalAlignment="Left" Margin="570,178,0,0" VerticalAlignment="Top" Width="120" Height="23"/>
-        <TextBox Name="password" GotFocus="Password_GotFocus" LostFocus="Password_LostFocus" HorizontalAlignment="Left" Height="23" Margin="276,216,0,0" TextWrapping="Wrap" Text="Пароль" VerticalAlignment="Top" Width="120" TextChanged="password_TextChanged"/>
-        <TextBlock HorizontalAlignment="Left" Margin="126,217,0,0" TextWrapping="Wrap" Text="Пароль:" VerticalAlignment="Top" Height="23" Width="106"/>
-        <Button Content="Вход" Click = "LoginButton" HorizontalAlignment="Left" Margin="228,271,0,0" VerticalAlignment="Top" Width="75" />
-        <CheckBox Content="Показать пароль" HorizontalAlignment="Left" Margin="390,252,0,0" VerticalAlignment="Top"/>
-        <ListBox Name="listbox" HorizontalAlignment="Left" Height="100" Margin="29,47,0,0" VerticalAlignment="Top" Width="100"/>
+        <TextBox Name="username" GotFocus="Username_GotFocus" LostFocus="Username_LostFocus" HorizontalAlignment="Left" Height="23" Margin="256,27,0,0" TextWrapping="Wrap" Text="Логин" VerticalAlignment="Top" Width="120" TextChanged="username_TextChanged"/>
+        <TextBlock HorizontalAlignment="Left" Margin="122,27,0,0" TextWrapping="Wrap" Text="Имя пользователя:" VerticalAlignment="Top" Height="23" Width="106"/>
+        <PasswordBox Name="password2" HorizontalAlignment="Left" Margin="394,54,0,0" VerticalAlignment="Top" Width="120" Height="23"/>
+        <TextBox Name="password" GotFocus="Password_GotFocus" LostFocus="Password_LostFocus" HorizontalAlignment="Left" Height="23" Margin="256,75,0,0" TextWrapping="Wrap" Text="Пароль" VerticalAlignment="Top" Width="120" TextChanged="password_TextChanged"/>
+        <TextBlock HorizontalAlignment="Left" Margin="122,75,0,0" TextWrapping="Wrap" Text="Пароль:" VerticalAlignment="Top" Height="23" Width="106"/>
+        <Button Content="Вход" Click = "LoginButton" HorizontalAlignment="Left" Margin="122,122,0,0" VerticalAlignment="Top" Width="75" />
+        <CheckBox Content="Показать пароль" HorizontalAlignment="Left" Margin="256,122,0,0" VerticalAlignment="Top"/>
+        <ListBox Name="listbox" HorizontalAlignment="Left" Height="100" Margin="10,10,0,0" VerticalAlignment="Top" Width="100"/>
     </Grid>
 </Window>

+ 9 - 7
InteractiveKiosk/MainWindow.xaml

@@ -5,17 +5,19 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:InteractiveKiosk"
         mc:Ignorable="d"
-        Title="MainWindow" Height="950" Width="700" WindowStartupLocation="CenterScreen">
+        Title="Главная страница" Height="950" Width="700" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" Loaded="WindowLoaded">
     <Grid>
-        <Button Content="Войти" HorizontalAlignment="Left" Margin="559,5,0,0" VerticalAlignment="Top" Width="78" Click="OpenWindow" Height="20"/>
+        <Button Content="ВОЙТИ" HorizontalAlignment="Left" Margin="625,10,0,0" VerticalAlignment="Top" Width="45" Click="OpenWindow" Height="19" Background="#00000000" FontFamily="Century Gothic" BorderBrush="#00000000"/>
         <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 Content="ДОСТОПРИМЕЧАТЕЛЬНОСТИ" HorizontalAlignment="Left" Margin="291,633,0,0" VerticalAlignment="Top" Width="242" Height="110" FontSize="11" 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 Content="КАФЕ И РЕСТОРАНЫ" HorizontalAlignment="Left" Margin="291,748,0,0" VerticalAlignment="Top" Width="242" Height="110" FontSize="11" Background="#00000000" FontFamily="Century Gothic"/>
+        <Button Content="АТТРАКЦИОНЫ" HorizontalAlignment="Left" Margin="538,633,0,0" VerticalAlignment="Top" Width="99" Height="225" FontSize="11" 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"/>
+        <Button Content="АФИША ПАРКА" HorizontalAlignment="Left" Margin="476,342,0,0" VerticalAlignment="Top" Width="194" Height="42" FontFamily="Century Gothic" Background="#00000000"/>
+        <Button Content="ПОДРОБНЕЕ" HorizontalAlignment="Left" Margin="264,260,0,0" VerticalAlignment="Top" Width="180" Height="40" FontFamily="Century Gothic" Background="#00000000"/>
+        <Label Name="date" HorizontalAlignment="Left" Margin="132,360,0,0" VerticalAlignment="Top" Height="24" Width="98" FontFamily="Century Gothic" FontSize="11"/>
+        <Label Name="time" HorizontalAlignment="Left" Margin="46,342,0,0" VerticalAlignment="Top" Height="42" Width="86" FontSize="30" FontFamily="Century Gothic"/>
     </Grid>
 </Window>

+ 7 - 0
InteractiveKiosk/MainWindow.xaml.cs

@@ -42,5 +42,12 @@ namespace InteractiveKiosk
             this.Effect = null;
 
         }
+
+        private void WindowLoaded(object sender, RoutedEventArgs e)
+        {
+            date.Content = DateTime.Now.ToString("dddd");
+            time.Content = DateTime.Now.ToString("HH:mm");
+
+        }
     }
 }