Майн фюрер

ой
Майн фрэйм

ROGOZ/Dictionary.xaml

@@ -234,13 +234,13 @@
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="HorizontalAlignment" Value="Left"/>
         <Setter Property="Foreground" Value="#f8f8ff"/> 
-        <Setter Property="FontSize" Value="25"/>
-        <Setter Property="Margin" Value="55,0,0,0"/>
+        <Setter Property="FontSize" Value="30"/>
+        <Setter Property="Margin" Value="60,0,0,0"/>
     </Style>
 
     <Style x:Key="NaviButtons" TargetType="Button">
-        <Setter Property="Height" Value="55"/>
-        <Setter Property="Width" Value="250"/>
+        <Setter Property="Height" Value="70"/>
+        <Setter Property="Width" Value="280"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Cursor" Value="Hand"/>

ROGOZ/MainWindow.xaml

@@ -9,7 +9,7 @@
         Background="Transparent"
         WindowStyle="None"
         WindowStartupLocation="CenterScreen"
-        Title="𝖊𝖘𝖔𝖋𝖙" Height="620" Width="1000"
+        Title="𝖊𝖘𝖔𝖋𝖙" Height="680" Width="1100"
         ResizeMode="NoResize"
         MouseDown="Window_MouseDown">
     <Grid>
@@ -29,45 +29,69 @@
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>-->
 
+
+        
         <Border Background="#e6f4ff" CornerRadius="20"/>
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="300"/>
+                <ColumnDefinition Width="280"/>
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="50"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <Frame Name="MainFrame" NavigationUIVisibility="Hidden" Grid.Column="1" Grid.Row="1"/>
         </Grid>
+
         
         <!--Панель навигации-->
 
-        <Grid HorizontalAlignment="Left" Width="250">
+        <Grid HorizontalAlignment="Left" Width="280">
+            
+            
             <Border Background="#4285B4" CornerRadius="20,0,0,20"/>
-            <StackPanel Width="250" Height="450" Cursor="">
+            <Image Source="/Resources/logo.png" VerticalAlignment="Top" Margin="30,15"/>
+
+            <StackPanel Width="280" Height="400" Margin="0,20,0,0">
 
                 <Button Name="General" Style="{DynamicResource NaviButtons}">
-                    <Grid Width="230">
+                    <Grid Width="280">
                         <Image Source="/Resources/GeneralHome.png" Style="{StaticResource ImageStyle}"/>
                         <TextBlock Text="Главная" Style="{StaticResource Text_Style}"/>
                     </Grid>
                 </Button>
-
                 <Separator Height="20" Background="Transparent"/>
-
                 <Button Name="TaskList" Style="{DynamicResource NaviButtons}">
-                    <Grid Width="230">
+                    <Grid Width="280">
                         <TextBlock Text="Задачи" Style="{StaticResource Text_Style}"/>
+                        <Image Source="/Resources/Список задач.png" Style="{StaticResource ImageStyle}"/>
                     </Grid>
                 </Button>
-
                 <Separator Height="20" Background="Transparent"/>
-
                 <Button Name="ExecutorList" Style="{DynamicResource NaviButtons}">
-                    <Grid Width="230">
+                    <Grid Width="280">
                         <TextBlock Text="Исполнители" Style="{StaticResource Text_Style}"/>
+                        <Image Source="/Resources/EMPLOYEE.png" Style="{StaticResource ImageStyle}"/>
+                    </Grid>
+                </Button>
+                <Separator Height="20" Background="Transparent"/>
+                <Button Name="Help" Style="{DynamicResource NaviButtons}">
+                    <Grid Width="280">
+                        <TextBlock Text="Помощь" Style="{StaticResource Text_Style}"/>
+                        <Image Source="/Resources/HELPES.png" Style="{StaticResource ImageStyle}"/>
                     </Grid>
                 </Button>
 
             </StackPanel>
-            
+            <StackPanel VerticalAlignment="Bottom" Height="3" Width="225" Margin="0,0,0,100" Background="#002F55"/>
+            <Button Name="AccExit" Style="{DynamicResource NaviButtons}" VerticalAlignment="Bottom" Margin="0,0,0,15">
+                <Grid Width="280">
+                    <TextBlock Text="Выход" Style="{StaticResource Text_Style}"/>
+                    <Image Source="/Resources/AccExit.png" Style="{StaticResource ImageStyle}"/>
+                </Grid>
+            </Button>
+
         </Grid>
 
     </Grid>

ROGOZ/MainWindow.xaml.cs

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

ROGOZ/Pages/TaskList.xaml

@@ -5,7 +5,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:ROGOZ.Pages"
       mc:Ignorable="d" 
-      d:DesignHeight="450" d:DesignWidth="800"
+      d:DesignHeight="620" d:DesignWidth="750"
       Title="TaskList">
 
     <Grid>

ROGOZ/ROGOZ.csproj

@@ -215,6 +215,10 @@
       <DependentUpon>Model1.edmx</DependentUpon>
       <LastGenOutput>Model1.cs</LastGenOutput>
     </Content>
+    <Resource Include="Resources\AccExit.png" />
+    <Resource Include="Resources\EMPLOYEE.png" />
+    <Resource Include="Resources\HELPES.png" />
+    <Resource Include="Resources\Список задач.png" />
     <Resource Include="Resources\GeneralHome.png" />
     <Resource Include="Resources\Minimize.png" />
     <Resource Include="Resources\Cross.png" />