Browse Source

Приколы с кнопками

Timur Iksanov and Ilfat Gabdulbarov 1 year ago
parent
commit
79fbc3691f
4 changed files with 25 additions and 20 deletions
  1. 1 1
      ROGOZ/App.config
  2. 23 1
      ROGOZ/Dictionary.xaml
  3. 0 17
      ROGOZ/MainWindow.xaml
  4. 1 1
      ROGOZ/MainWindow.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;data source=VPMT.RU\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=SRV-WSR\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">

+ 23 - 1
ROGOZ/Dictionary.xaml

@@ -213,7 +213,7 @@
         </Style.Resources>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="Gray"/>
+                <Setter Property="Background" Value="#9DB1CC"/>
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -244,6 +244,28 @@
         <Setter Property="BorderBrush" Value="Transparent"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border Background="{TemplateBinding Background}">
+                        <Grid>
+                            <ContentPresenter VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="{TemplateBinding ContentStringFormat}"/>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <!--<Style.Resources>
+            <Style TargetType ="Border">
+                <Setter Property="CornerRadius" Value="15"/>
+            </Style>
+        </Style.Resources>-->
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="#79A0C1"/>
+            </Trigger>
+        </Style.Triggers>
     </Style>    
         
 

+ 0 - 17
ROGOZ/MainWindow.xaml

@@ -13,23 +13,6 @@
         ResizeMode="NoResize"
         MouseDown="Window_MouseDown">
     <Grid>
-        <!--<Grid.RowDefinitions>
-            <RowDefinition Height="75"/>
-            <RowDefinition Height="69*"/>
-            <RowDefinition Height="30"/>
-        </Grid.RowDefinitions>
-        <Grid Grid.Row="0" Grid.ColumnSpan="3" Background="#b3deff"/>
-        <Grid Grid.Row="2" Grid.ColumnSpan="3" Background="#b3deff"/>
-        <Image Source="Resources/logo.png" HorizontalAlignment="Left" Margin="15,0"/>
-        <TextBlock Text="HEADER" Grid.Column="1" Style="{StaticResource BlockHeader}"/>
-        <Frame Name="MainFrame" NavigationUIVisibility="Hidden" Grid.Row="1" Grid.ColumnSpan="3"/>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition/>
-            <ColumnDefinition/>
-            <ColumnDefinition/>
-        </Grid.ColumnDefinitions>-->
-
-
         
         <Border Background="#e6f4ff" CornerRadius="20"/>
         <Grid>

+ 1 - 1
ROGOZ/MainWindow.xaml.cs

@@ -24,7 +24,7 @@ namespace ROGOZ
         public MainWindow()
         {
             InitializeComponent();
-            //MainFrame.Navigate(new Pages.TaskList());
+            MainFrame.Navigate(new Pages.TaskList());
         }
 
         private void Window_MouseDown(object sender, MouseButtonEventArgs e)