Menu #7

InteractiveKiosk/AboutThePark.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:InteractiveKiosk"
         mc:Ignorable="d"
-        Title="О парке" Height="450" Width="600" WindowStartupLocation="CenterScreen">
+        Title="О парке" Height="450" Width="600" WindowStartupLocation="CenterScreen" Icon="Logo.png">
     <Grid>
         <TabControl HorizontalAlignment="Left" Height="397" Margin="10,10,0,0" VerticalAlignment="Top" Width="564">
             <TabItem Header="Описание">

InteractiveKiosk/App.config

@@ -23,12 +23,4 @@
       <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>
-  <userSettings>
-    <InteractiveKiosk.MySettings>
-      <setting name="password" serializeAs="String">
-        <value>Properties.Settings.Default.Password = password.Text;
-</value>
-      </setting>
-    </InteractiveKiosk.MySettings>
-  </userSettings>
 </configuration>

InteractiveKiosk/AuthorizationWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:InteractiveKiosk"
         mc:Ignorable="d"
-        Title="Окно авторизации" Height="400" Width="600" WindowStartupLocation="CenterScreen">
+        Title="Окно авторизации" Height="400" Width="600" WindowStartupLocation="CenterScreen" Icon="Logo.png">
     <Grid>
         <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"/>

InteractiveKiosk/AuthorizationWindow.xaml.cs

@@ -43,9 +43,6 @@ namespace InteractiveKiosk
             {
                 username.Foreground = Brushes.Black;
             }
-
-            PasswordBox password = sender as PasswordBox;
-            if (password == null) return;
         }
 
         private void password_TextChanged(object sender, RoutedEventArgs e)
@@ -106,6 +103,5 @@ namespace InteractiveKiosk
                 MessageBox.Show("Введено неверное значение логина/пароля");
             }
         }
-
     }
 }

InteractiveKiosk/InteractiveKiosk.csproj

@@ -185,6 +185,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="Logo.png" />
     <Resource Include="porfiry_krylov_1900-10-2.jpg" />
     <Resource Include="fofqug0yyom.jpg" />
     <Resource Include="vdy1jcjdndq.jpg" />

InteractiveKiosk/MainWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:InteractiveKiosk"
         mc:Ignorable="d"
-        Title="Главная страница" Height="950" Width="700" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" Loaded="WindowLoaded">
+        Title="Главная страница" Height="950" Width="700" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" Loaded="WindowLoaded" Icon="Logo.png">
     <Grid>
         <Button Content="ВОЙТИ" HorizontalAlignment="Left" Margin="625,10,0,0" VerticalAlignment="Top" Width="45" Height="19" Background="#00000000" FontFamily="Century Gothic" BorderBrush="#00000000" Click="Authorization"/>
         <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" Click="Map">
@@ -13,11 +13,11 @@
         <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" 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="538,633,0,0" VerticalAlignment="Top" Width="99" Height="225" FontSize="11" FontFamily="Century Gothic" Background="#00000000"/>
         <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" Click="More"/>
+        <Button Content="ПОДРОБНЕЕ" HorizontalAlignment="Left" Margin="253,195,0,0" VerticalAlignment="Top" Width="180" Height="40" FontFamily="Century Gothic" Background="#00000000" Click="More"/>
         <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"/>
+        <Image Source="Logo.png" Margin="232,10,232,714"></Image>
     </Grid>
 </Window>

InteractiveKiosk/Map.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:InteractiveKiosk"
         mc:Ignorable="d"
-        Title="Карта парка" Height="600" Width="685" WindowStartupLocation="CenterScreen">
+        Title="Карта парка" Height="600" Width="685" WindowStartupLocation="CenterScreen" Icon="Logo.png">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition/>