Danila Alekseev 1 год назад
Родитель
Сommit
a8649baa59
3 измененных файлов с 14 добавлено и 11 удалено
  1. 1 1
      ROGOZ/App.config
  2. 11 8
      ROGOZ/Dictionary.xaml
  3. 2 2
      ROGOZ/Pages/Authorization.xaml.cs

+ 1 - 1
ROGOZ/App.config

@@ -8,7 +8,7 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
   <connectionStrings>
-    <add name="user1Entities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=SRV-WSR\IS4;initial catalog=user1;user id=user1;password = ScladniyParol;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <add name="user1Entities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=VPMT.RU\IS4;initial catalog=user1;user id=user1;password = ScladniyParol;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">

+ 11 - 8
ROGOZ/Dictionary.xaml

@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
+    <!--КНОПКА АВТОРИЗАЦИИ-->
     <Style x:Key="AuthoButtons" TargetType="Button">
         <Setter Property="FontSize" Value="30"/>
         <Setter Property="FontFamily" Value="Comic Sans MS"/>
@@ -38,6 +39,7 @@
     </Style>
 
 
+    <!--ТЕКСТ БОКС АВТОРИЗАЦИИ-->
     <Style x:Key="TextBoxStyle" TargetType="TextBox">
         <Setter Property="Width" Value="300"/>
         <Setter Property="Height" Value="55"/>
@@ -94,6 +96,7 @@
         </Style.Resources>
     </Style>
 
+    <!--ПАРОЛЬ БОКС АВТОРИЗАЦИИ-->
     <Style x:Key="PasswordBoxStyle" TargetType="PasswordBox">
         <Setter Property="Width" Value="300"/>
         <Setter Property="Height" Value="55"/>
@@ -135,14 +138,15 @@
         </Setter>
     </Style>
 
+    <!--НАДПИСЬ АВТОРИЗАЦИЯ-->
     <Style x:Key="LabelStyle" TargetType="Label">
         <Setter Property="FontFamily" Value="Comic Sans MS"/>
         <Setter Property="FontSize" Value="40"/>
         <Setter Property="FontWeight" Value="UltraBold"/>
         <Setter Property="Foreground" Value="#1f8fff"/>
-
     </Style>
 
+    <!--ВРЕМЕННАЯ ШТУКА ДЛЯ ТЕКСБЛОКОВ ДОБАВЛЕНИЕ ЗАДАЧИ-->
     <Style x:Key="BlockHeader" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="Comic Sans MS"/>
         <Setter Property="FontSize" Value="50"/>
@@ -152,6 +156,7 @@
         <Setter Property="HorizontalAlignment" Value="Center"/>
     </Style>
 
+    <!--КНОПКА ЗАКРЫТИЯ-->
     <Style x:Key="PanelButtonX" TargetType="Button">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Width" Value="30"/>
@@ -185,6 +190,7 @@
         </Style.Triggers>
     </Style>
 
+    <!--КНОПКА СВОРАЧИВАНИЯ-->
     <Style x:Key="PanelButtonMin" TargetType="Button">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Width" Value="30"/>
@@ -219,16 +225,16 @@
     </Style>
 
 
+    <!--СТИЛЬ КАРТИНОК НА ПАНЕЛЬКЕ--> 
     <Style x:Key="ImageStyle" TargetType="Image">
         <Setter Property="HorizontalAlignment" Value="Left"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="Stretch" Value="Uniform"/>
         <Setter Property="Width" Value="50"/>
         <Setter Property="Height" Value="50"/>
-        <!--<Setter Property="Margin" Value="22,0,0,0"/>-->
-
     </Style>
 
+    <!--СТИЛЬ ТЕКСТА НА ПАНЕЛЬКЕ-->
     <Style x:Key="Text_Style" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="Comic Sans Ms"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
@@ -238,6 +244,8 @@
         <Setter Property="Margin" Value="60,0,0,0"/>
     </Style>
 
+    
+    <!--КНОПКИ НА ПАНЕЛЬКЕ-->
     <Style x:Key="NaviButtons" TargetType="Button">
         <Setter Property="Height" Value="70"/>
         <Setter Property="Width" Value="280"/>
@@ -255,11 +263,6 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <!--<Style.Resources>
-            <Style TargetType ="Border">
-                <Setter Property="CornerRadius" Value="15"/>
-            </Style>
-        </Style.Resources>-->
 
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">

+ 2 - 2
ROGOZ/Pages/Authorization.xaml.cs

@@ -29,7 +29,7 @@ namespace ROGOZ.Pages
         {
             if (TBoxLogin.Text != "" && PBoxPassword.Password != "") 
             {
-                MessageBox.Show("Заходи", "хихихи", MessageBoxButton.OK, MessageBoxImage.Asterisk);
+                //MessageBox.Show("Заходи", "хихихи", MessageBoxButton.OK, MessageBoxImage.Asterisk);
                 
                 MainWindow mainWindow = new MainWindow();
                 mainWindow.Show();
@@ -38,7 +38,7 @@ namespace ROGOZ.Pages
 
             else
             {
-                MessageBox.Show("Ну ты введи чонить для приличия", "Капец", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show("ДА.", "Капец", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }