Quellcode durchsuchen

Ну пусть так будет (DatePicker)

Danila Alekseev vor 1 Jahr
Ursprung
Commit
b6a24f3cb5
3 geänderte Dateien mit 15 neuen und 98 gelöschten Zeilen
  1. 9 96
      ROGOZ/Dictionary.xaml
  2. 2 2
      ROGOZ/Pages/AddEditPage.xaml
  3. 4 0
      ROGOZ/Pages/AddEditPage.xaml.cs

+ 9 - 96
ROGOZ/Dictionary.xaml

@@ -331,28 +331,6 @@
     
     <!--КомбоБоксы-->
 
-    <!--<Style x:Key="AddTaskCmb" TargetType="ComboBox">
-        <Setter Property="Background" Value="#edf4fa"/>
-        <Setter Property="Height" Value="45"/>
-        <Setter Property="FontSize" Value="25"/>
-        <Setter Property="FontFamily" Value="Comic Sans MS"/>
-        <Setter Property="AllowDrop" Value="True"/>
-        <Setter Property="BorderThickness" Value="3"/>
-        <Setter Property="Cursor" Value="IBeam"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        <Setter Property="Padding" Value="6 -1 6 -1"/>
-    </Style>
-
-    <Style x:Key="AddTaskCmbItem" TargetType="ComboBoxItem">
-        <Style.Resources>
-            <Style TargetType ="Border">
-                <Setter Property="CornerRadius" Value="5"/>
-            </Style>
-        </Style.Resources>
-    </Style>-->
-
-
     <Style x:Key="FocusVisual">
         <Setter Property="Control.Template">
             <Setter.Value>
@@ -649,78 +627,12 @@
     
     <!--Дата пикеры-->
 
-    <!--<Style x:Key="DPCalendarStyle" TargetType="{x:Type Calendar}">
+    <Style x:Key="DPCalendarStyle" TargetType="{x:Type Calendar}">
         <Setter Property="Foreground" Value="#222528"/>
-        <Setter Property="Background" Value="#52a8ff"/>
         <Setter Property="BorderBrush" Value="#0075eb"/>
-        <Setter Property="BorderThickness" Value="3"/>
+        <Setter Property="BorderThickness" Value="1"/>
     </Style>
 
-    <Style x:Key="AddEditDPStyle" TargetType="DatePicker">
-        <Setter Property="FontSize" Value="25"/>
-        <Setter Property="FontFamily" Value="Comic Sans MS"/>
-        <Setter Property="HorizontalAlignment" Value="Center"/>
-        <Setter Property="Cursor" Value="Hand"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type DatePicker}">
-                    <Grid>
-                        <Border x:Name="Border"
-                                Grid.ColumnSpan="2"
-                                Height="40"
-                                Width="250"
-                                BorderThickness="2"
-                                BorderBrush="#0075eb"
-                                CornerRadius="5"
-                                Background="#edf4fa">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="35"/>
-                                </Grid.ColumnDefinitions>
-                                <Button x:Name="Part_Button" Grid.Column="1" Background="Transparent" BorderThickness="0">
-                                    <Image Source="/Resources/Calendar.png"/>
-                                    
-                                </Button>
-                                --><!--<Popup  x:Name="Part_Popup"
-                                        AllowsTransparency="True"
-                                        Placement="Bottom"
-                                        PlacementTarget="{Binding ElementName=Part_ContentHost}"
-                                        StaysOpen="False"
-                                        HorizontalOffset="17"/>--><!--
-
-                            </Grid>
-
-                        </Border>
-                        <ScrollViewer Name="Part_ContentHost"
-                                          Focusable="False"
-                                          Grid.Column="0"
-                                          HorizontalScrollBarVisibility="Hidden"
-                                          VerticalScrollBarVisibility="Hidden"/>
-                        <Label x:Name="WaterMarkerLabel" 
-                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                   Visibility="Collapsed"
-                                   Content="{TemplateBinding Tag}"
-                                   Foreground="#222528"
-                                   Grid.Column="1"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="Text" Value=""/>
-                            </MultiTrigger.Conditions>
-                            <Setter Property="Visibility"
-                                    TargetName="WaterMarkerLabel"
-                                    Value="Visible"/>
-                        </MultiTrigger>
-
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>-->
-
     <Style x:Key="DatePickerStyle1" TargetType="{x:Type DatePicker}">
         <Setter Property="Foreground" Value="#FF333333"/>
         <Setter Property="IsTodayHighlighted" Value="True"/>
@@ -739,7 +651,7 @@
                                 Width="250"
                                 BorderThickness="3"
                                 BorderBrush="#0075eb"
-                                CornerRadius="5"
+                                CornerRadius="4"
                                 Background="Transparent">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -816,9 +728,9 @@
                                                 <RowDefinition Height="19*"/>
                                                 <RowDefinition Height="19*"/>
                                             </Grid.RowDefinitions>
-                                            <Border x:Name="Highlight" BorderBrush="#FF45D6FA" BorderThickness="1" CornerRadius="0,0,1,1" Grid.ColumnSpan="4" Margin="-1" Opacity="0" Grid.RowSpan="4" Grid.Row="0"/>
-                                            <Border x:Name="Background" Background="#FF1F3B53" BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius=".5" Grid.ColumnSpan="4" Margin="0,-1,0,0" Opacity="1" Grid.RowSpan="3" Grid.Row="1"/>
-                                            <Border x:Name="BackgroundGradient" BorderBrush="#BF000000" BorderThickness="1" CornerRadius=".5" Grid.ColumnSpan="4" Margin="0,-1,0,0" Opacity="1" Grid.RowSpan="3" Grid.Row="1">
+                                            <Border x:Name="Highlight" BorderBrush="#FF45D6FA" BorderThickness="1" CornerRadius="5" Grid.ColumnSpan="4" Margin="-1" Opacity="0" Grid.RowSpan="4" Grid.Row="0"/>
+                                            <Border x:Name="Background" Background="#FF1F3B53" BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="5" Grid.ColumnSpan="4" Margin="0,-1,0,0" Opacity="1" Grid.RowSpan="3" Grid.Row="1"/>
+                                            <Border x:Name="BackgroundGradient" BorderBrush="#BF000000" BorderThickness="1" CornerRadius="5" Grid.ColumnSpan="4" Margin="0,-1,0,0" Opacity="1" Grid.RowSpan="3" Grid.Row="1">
                                                 <Border.Background>
                                                     <LinearGradientBrush EndPoint=".7,1" StartPoint=".7,0">
                                                         <GradientStop Color="#FFFFFFFF" Offset="0"/>
@@ -844,7 +756,7 @@
                                             </Rectangle>
                                             <Path Grid.Column="0" Grid.ColumnSpan="4" Data="M11.426758,8.4305077 L11.749023,8.4305077 L11.749023,16.331387 L10.674805,16.331387 L10.674805,10.299648 L9.0742188,11.298672 L9.0742188,10.294277 C9.4788408,10.090176 9.9094238,9.8090878 10.365967,9.4510155 C10.82251,9.0929432 11.176106,8.7527733 11.426758,8.4305077 z M14.65086,8.4305077 L18.566387,8.4305077 L18.566387,9.3435936 L15.671368,9.3435936 L15.671368,11.255703 C15.936341,11.058764 16.27293,10.960293 16.681133,10.960293 C17.411602,10.960293 17.969301,11.178717 18.354229,11.615566 C18.739157,12.052416 18.931622,12.673672 18.931622,13.479336 C18.931622,15.452317 18.052553,16.438808 16.294415,16.438808 C15.560365,16.438808 14.951641,16.234707 14.468243,15.826504 L14.881817,14.929531 C15.368796,15.326992 15.837872,15.525723 16.289043,15.525723 C17.298809,15.525723 17.803692,14.895514 17.803692,13.635098 C17.803692,12.460618 17.305971,11.873379 16.310528,11.873379 C15.83071,11.873379 15.399232,12.079271 15.016094,12.491055 L14.65086,12.238613 z" Fill="#FF2F2F2F" HorizontalAlignment="Center" Margin="4,3,4,3" RenderTransformOrigin="0.5,0.5" Grid.RowSpan="3" Grid.Row="1" Stretch="Fill" VerticalAlignment="Center"/>
                                             <Ellipse Grid.ColumnSpan="4" Fill="#FFFFFFFF" HorizontalAlignment="Center" Height="3" StrokeThickness="0" VerticalAlignment="Center" Width="3"/>
-                                            <Border x:Name="DisabledVisual" BorderBrush="#B2FFFFFF" BorderThickness="1" CornerRadius="0,0,.5,.5" Grid.ColumnSpan="4" Opacity="0" Grid.RowSpan="4" Grid.Row="0"/>
+                                            <Border x:Name="DisabledVisual" BorderBrush="#B2FFFFFF" BorderThickness="1" CornerRadius="5" Grid.ColumnSpan="4" Opacity="0" Grid.RowSpan="4" Grid.Row="0"/>
                                         </Grid>
                                     </Grid>
                                 </ControlTemplate>
@@ -853,8 +765,9 @@
                                 <ColumnDefinition Width="*"/>
                                 <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
-                            <Button x:Name="PART_Button" Grid.Column="1" Focusable="False" HorizontalAlignment="Left" VerticalAlignment="Top" BorderThickness="0" Background="Transparent">
+                            <Button x:Name="PART_Button" Grid.Column="1" Focusable="False" HorizontalAlignment="Left" VerticalAlignment="Top" BorderThickness="0" Background="#F0F6FA">
                                 <Image Source="/Resources/Calendar.png" />
+                                
                             </Button>
                             <DatePickerTextBox x:Name="PART_TextBox" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="Stretch" Grid.Row="0" VerticalContentAlignment="Stretch"/>
                             <Grid x:Name="PART_DisabledVisual" Grid.Column="0" Grid.ColumnSpan="2" IsHitTestVisible="False" Opacity="0" Grid.Row="0">

+ 2 - 2
ROGOZ/Pages/AddEditPage.xaml

@@ -46,11 +46,11 @@
             <StackPanel Orientation="Horizontal">
                 <StackPanel Orientation="Vertical" Width="275">
                     <TextBlock Text="Срок исполнения:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="30,10,0,5"/>
-                    <DatePicker Style="{DynamicResource DatePickerStyle1}" Name="DPDeadLine" Tag="Выбор даты" SelectedDate="{Binding Deadline}" Margin="25,0,0,0"/>
+                    <DatePicker Style="{DynamicResource DatePickerStyle1}"  CalendarStyle="{DynamicResource DPCalendarStyle}" Name="DPDeadLine" Tag="Выбор даты" SelectedDate="{Binding Deadline}"   Margin="25,0,0,0"/>
                 </StackPanel>
                 <StackPanel Orientation="Vertical" Width="275">
                     <TextBlock Text="Дата выполнения:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="25,10,0,5"/>
-                    <DatePicker Name="DPCreateDateTime" Tag="Выбор даты" SelectedDate="{Binding CreateDateTime}" Margin="15,0,10,0"/>
+                    <DatePicker Name="DPCreateDateTime" Style="{DynamicResource DatePickerStyle1}" CalendarStyle="{DynamicResource DPCalendarStyle}" Tag="Выбор даты" SelectedDate="{Binding CreateDateTime}" Margin="15,0,10,0"/>
                 </StackPanel>
                 <StackPanel Orientation="Vertical" Width="270">
                     <TextBlock Text="Время выполнения:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="240" Margin="10,10,0,5"/>

+ 4 - 0
ROGOZ/Pages/AddEditPage.xaml.cs

@@ -26,6 +26,8 @@ namespace ROGOZ.Pages
         public AddEditPage()
         {
             InitializeComponent();
+            //DPCreateDateTime.SelectedDate = DateTime.Today;
+            //DPDeadLine.SelectedDate = DateTime.Today;
             DataContext = _currentTask;
             CmbStatus.ItemsSource = Status.FillStatus();
             CmbExecutor.ItemsSource = user1Entities.GetContext().Executor.ToList();
@@ -35,6 +37,8 @@ namespace ROGOZ.Pages
         public AddEditPage(Task selectedTask)
         {
             InitializeComponent();
+            DPCreateDateTime.SelectedDate = DateTime.Today;
+            DPDeadLine.SelectedDate = DateTime.Today;
             _currentTask = selectedTask;
             CmbStatus.ItemsSource = Status.FillStatus();
             CmbExecutor.ItemsSource = user1Entities.GetContext().Executor.ToList();