Стиль addeditpage 50%

ROGOZ/Dictionary.xaml

@@ -308,12 +308,10 @@
     <!--Добавление задачи-->
 
     <Style x:Key="AddTaskTB" TargetType="TextBox">
-        <Setter Property="Width" Value="700"/>
-        <Setter Property="Height" Value="55"/>
         <Setter Property="Background" Value="#e6f4ff"/>
+        <Setter Property="Height" Value="45"/>
         <Setter Property="FontSize" Value="25"/>
         <Setter Property="FontFamily" Value="Comic Sans MS"/>
-        <Setter Property="Padding" Value="10"/>
         <Setter Property="AllowDrop" Value="True"/>
         <Setter Property="BorderThickness" Value="3"/>
         <Setter Property="Cursor" Value="IBeam"/>
@@ -321,44 +319,10 @@
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        <Setter Property="Padding" Value="6 4"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="TextBox">
-                    <Border Background="{TemplateBinding Background}" 
-                            BorderBrush="{TemplateBinding BorderBrush}" 
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            SnapsToDevicePixels="True">
-                        <Grid Margin="{TemplateBinding Margin}">
-                            <ScrollViewer x:Name="PART_ContentHost"
-                                          Focusable="False"
-                                          HorizontalScrollBarVisibility="Hidden"
-                                          VerticalScrollBarVisibility="Hidden"/>
-                            <Label x:Name="WaterMarkerLabel" 
-                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                   Visibility="Collapsed"
-                                   Margin="5,0"
-                                   Content="{TemplateBinding Tag}"
-                                   Foreground="Gray"/>
-                        </Grid>
-                    </Border>
-                    <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>
+        <Setter Property="Padding" Value="6 -1 6 -1"/>
         <Style.Resources>
             <Style TargetType ="Border">
-                <Setter Property="CornerRadius" Value="15"/>
+                <Setter Property="CornerRadius" Value="10"/>
             </Style>
         </Style.Resources>
         

ROGOZ/Pages/AddEditPage.xaml

@@ -5,34 +5,34 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:ROGOZ.Pages"
       mc:Ignorable="d" 
-      d:Height="620" d:Width="750"
+      d:Height="630" d:Width="820"
       Title="AddEditPage">
 
     <Grid>
         <StackPanel Orientation="Vertical" Height="550" VerticalAlignment="Top">
             <StackPanel Orientation="Vertical">
-                <TextBlock Text="Название задачи:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="210" Margin="50,10,0,5"/>
-                <TextBox x:Name="TaskNameTB" Height="35" Width="700" FontSize="30" FontFamily="Comic Sans Ms" Text="{Binding Title}"/>
+                <TextBlock Text="Название задачи:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="210" Margin="50,0,0,5"/>
+                <TextBox x:Name="TaskNameTB" Width="770" Text="{Binding Title}" Style="{DynamicResource AddTaskTB}"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-                <StackPanel Orientation="Vertical" Width="375">
+                <StackPanel Orientation="Vertical" Width="410">
                     <TextBlock Text="Описание задачи:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="50,10,0,5"/>
-                    <TextBox x:Name="TaskDescriptionTB" Text="{Binding Description}" Height="205" Width="340" TextWrapping="Wrap" HorizontalAlignment="Left" Margin="25,0,0,0" FontSize="25" FontFamily="Comic Sans Ms"/>
+                    <TextBox x:Name="TaskDescriptionTB" Text="{Binding Description}" Height="215" Width="370" TextWrapping="Wrap" HorizontalAlignment="Left" Margin="25,0,0,0" Style="{DynamicResource AddTaskTB}" VerticalContentAlignment="Top"/>
                 </StackPanel>
-                <StackPanel Width="375" Orientation="Vertical">
+                <StackPanel Width="410" Orientation="Vertical">
                     <StackPanel Orientation="Vertical">
                         <TextBlock Text="Cтатус задачи:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="40,10,0,5"/>
-                        <ComboBox x:Name="CmbStatus" Text="{Binding Status}" DisplayMemberPath="Name" Height="35" Width="340" HorizontalAlignment="Left" Margin="10,0,0,0"/>
+                        <ComboBox x:Name="CmbStatus" Text="{Binding Status}" DisplayMemberPath="Name" Height="35" Width="370" HorizontalAlignment="Left" Margin="10,0,0,0"/>
                     </StackPanel>
 
                     <StackPanel Orientation="Vertical">
                         <TextBlock Text="Характер задачи:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="40,10,0,5"/>
-                        <ComboBox x:Name="CmbTaskType" Text="{Binding WorkType}" DisplayMemberPath="Name" Height="35" Width="340" HorizontalAlignment="Left" Margin="10,0,0,0"/>
+                        <ComboBox x:Name="CmbTaskType" Text="{Binding WorkType}" DisplayMemberPath="Name" Height="35" Width="370" HorizontalAlignment="Left" Margin="10,0,0,0"/>
                     </StackPanel>
 
                     <StackPanel Orientation="Vertical">
                         <TextBlock Text="Сложность задачи:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="40,10,0,5"/>
-                        <TextBox x:Name="DifficultyTB" Text="{Binding Difficulty}" Height="35" Width="340" HorizontalAlignment="Left" Margin="10,0,0,0"/>
+                        <TextBox x:Name="DifficultyTB" Text="{Binding Difficulty}" Width="370" Style="{DynamicResource AddTaskTB}" HorizontalAlignment="Left" Margin="10,0,0,0"/>
                     </StackPanel>
                 </StackPanel>
 
@@ -40,7 +40,7 @@
 
             <StackPanel Orientation="Vertical">
                 <TextBlock Text="Исполнитель:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="50,10,0,5"/>
-                <ComboBox x:Name="CmbExecutor" Text="{Binding ExecutorID}" DisplayMemberPath="ID" Height="35" Width="700" HorizontalAlignment="Left" Margin="25,0,0,0"/>
+                <ComboBox x:Name="CmbExecutor" Text="{Binding ExecutorID}" DisplayMemberPath="ID" Height="35" Width="770" HorizontalAlignment="Left" Margin="25,0,0,0"/>
             </StackPanel>
 
             <StackPanel Orientation="Horizontal">
@@ -54,7 +54,7 @@
                 </StackPanel>
                 <StackPanel Orientation="Vertical" Width="250">
                     <TextBlock Text="Время выполнения:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="240" Margin="10,10,0,5"/>
-                    <TextBox x:Name="TimeTB" Text="{Binding Time}" Margin="10,0,25,0" Height="35" FontSize="30" FontFamily="Comic Sans Ms"/>
+                    <TextBox x:Name="TimeTB" Text="{Binding Time}" Margin="10,0,25,0" Style="{DynamicResource AddTaskTB}"/>
                 </StackPanel>
             </StackPanel>
         </StackPanel>

ROGOZ/Pages/AddEditPage.xaml.cs

@@ -73,8 +73,8 @@ namespace ROGOZ.Pages
             {
                 if (_currentTask != null)
                 {
-                    //try
-                    //{
+                    try
+                    {
                         var selectedTask = new Task
                         {
                             ExecutorID = int.Parse(CmbExecutor.Text),
@@ -96,12 +96,12 @@ namespace ROGOZ.Pages
                         user1Entities.GetContext().SaveChanges();
                         MessageBox.Show("Ну вроде получилось");
                         NavigationService.GoBack();
-                    //}
-                    //catch
-                    //{
-                    //    MessageBox.Show(CheckErrors(), "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                    catch
+                    {
+                        MessageBox.Show(CheckErrors(), "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
 
-                    //}
+                    }
                 }
 
             }