Jelajahi Sumber

Сделала лаб 3

Ksenia Bajanova 1 tahun lalu
induk
melakukan
ff679a814e
30 mengubah file dengan 86 tambahan dan 429 penghapusan
  1. TEMPAT SAMPAH
      .vs/WpfApp2/FileContentIndex/05567fce-aa1c-49a1-9686-913a4bdeebe8.vsidx
  2. TEMPAT SAMPAH
      .vs/WpfApp2/FileContentIndex/88bda68d-c4b8-4f69-a729-af7478547a5d.vsidx
  3. TEMPAT SAMPAH
      .vs/WpfApp2/FileContentIndex/d67146bd-3947-422e-84de-d556e3028b5d.vsidx
  4. TEMPAT SAMPAH
      .vs/WpfApp2/v17/.suo
  5. 20 16
      WpfApp2/Dictionary1.xaml
  6. 27 57
      WpfApp2/MainWindow.xaml
  7. 1 1
      WpfApp2/MainWindow.xaml.cs
  8. 0 12
      WpfApp2/Window.xaml
  9. 0 27
      WpfApp2/Window.xaml.cs
  10. 0 7
      WpfApp2/WpfApp2.csproj
  11. TEMPAT SAMPAH
      WpfApp2/bin/Debug/WpfApp2.exe
  12. TEMPAT SAMPAH
      WpfApp2/bin/Debug/WpfApp2.pdb
  13. TEMPAT SAMPAH
      WpfApp2/obj/Debug/App.baml
  14. TEMPAT SAMPAH
      WpfApp2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  15. TEMPAT SAMPAH
      WpfApp2/obj/Debug/Dictionary1.baml
  16. TEMPAT SAMPAH
      WpfApp2/obj/Debug/MainWindow.baml
  17. 1 71
      WpfApp2/obj/Debug/MainWindow.g.cs
  18. 1 71
      WpfApp2/obj/Debug/MainWindow.g.i.cs
  19. TEMPAT SAMPAH
      WpfApp2/obj/Debug/Page1.baml
  20. 0 75
      WpfApp2/obj/Debug/Window.g.cs
  21. 0 75
      WpfApp2/obj/Debug/Window.g.i.cs
  22. 1 1
      WpfApp2/obj/Debug/WpfApp2.csproj.CoreCompileInputs.cache
  23. 20 0
      WpfApp2/obj/Debug/WpfApp2.csproj.FileListAbsolute.txt
  24. TEMPAT SAMPAH
      WpfApp2/obj/Debug/WpfApp2.exe
  25. TEMPAT SAMPAH
      WpfApp2/obj/Debug/WpfApp2.g.resources
  26. TEMPAT SAMPAH
      WpfApp2/obj/Debug/WpfApp2.pdb
  27. 6 6
      WpfApp2/obj/Debug/WpfApp2_MarkupCompile.cache
  28. 5 5
      WpfApp2/obj/Debug/WpfApp2_MarkupCompile.i.cache
  29. 2 2
      WpfApp2/obj/Debug/WpfApp2_MarkupCompile.i.lref
  30. 2 3
      WpfApp2/obj/Debug/WpfApp2_MarkupCompile.lref

TEMPAT SAMPAH
.vs/WpfApp2/FileContentIndex/05567fce-aa1c-49a1-9686-913a4bdeebe8.vsidx


TEMPAT SAMPAH
.vs/WpfApp2/FileContentIndex/21dd083b-f397-4df7-ae92-b10fcb879109.vsidx → .vs/WpfApp2/FileContentIndex/88bda68d-c4b8-4f69-a729-af7478547a5d.vsidx


TEMPAT SAMPAH
.vs/WpfApp2/FileContentIndex/d67146bd-3947-422e-84de-d556e3028b5d.vsidx


TEMPAT SAMPAH
.vs/WpfApp2/v17/.suo


+ 20 - 16
WpfApp2/Dictionary1.xaml

@@ -1,22 +1,26 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <LinearGradientBrush x:Key ="BackgroundWindowResource">
+        <GradientStop Offset="0.00" Color="#FF87A0DE"/>
+        <GradientStop Offset="0.50" Color="Azure"/>
+        <GradientStop Offset="1.00" Color="#FF009CFF"/>
+    </LinearGradientBrush>
 
-    <Style TargetType="Button">
-        <Setter Property="Background" Value="#FF4285F4"/>
-        <Setter Property="Foreground" Value="White"/>
-        <Setter Property="BorderBrush" Value="#FF4285F4"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="10,5"/>
-        <Setter Property="FontWeight" Value="Bold"/>
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="#FF3367D6"/>
-            </Trigger>
-        </Style.Triggers>
+    <Style TargetType="TextBlock" x:Key="baseTextBlockResource">
+        <Setter Property="Margin" Value="25,15,25,5"/>
+        <Setter Property="FontSize" Value="15"/>
+        <Setter Property="FontFamily" Value="Verdana"/>
     </Style>
-
-    <Style TargetType="Hyperlink">
-        <Setter Property="FontStyle" Value="Oblique"/>
-        <Setter Property="Foreground" Value="Black"/>
+        
+    <Style TargetType="TextBlock" BasedOn="{StaticResource baseTextBlockResource}" x:Key="hederTextBlockResource">
+        <Setter Property="FontSize" Value="25" />
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+    </Style>
+    
+    <Style TargetType="Button" x:Key="buttonResource">
+        <Setter Property="Margin" Value="25,15"/>
+        <Setter Property="Width" Value="60"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
     </Style>
+        
 </ResourceDictionary>

+ 27 - 57
WpfApp2/MainWindow.xaml

@@ -4,15 +4,14 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        Title="MainWindow" Height="720"
+        Title="MainWindow" Height="715"
         Width="1200"
         WindowStartupLocation="CenterScreen"
         Background="Transparent"
         AllowsTransparency="True"
         WindowStyle="None">
 
-
-    <Grid Margin="-50,-29,0,0">
+    <Grid>
         <Grid.Background>
             <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
                 <GradientStop Color="Aquamarine" Offset="0"/>
@@ -21,59 +20,30 @@
             </LinearGradientBrush>
         </Grid.Background>
 
-
-        <TextBlock Text="Система внутреннего учета инвестиционной компании" Foreground="#2E2E2E" FontSize="30" FontWeight="Bold"  HorizontalAlignment="Center" Margin="0,90,0,584" Width="820"/>
-
-        <TextBlock HorizontalAlignment="Left" Width="100" Margin="61,200,0,0" VerticalAlignment="Top" Height="25" FontSize="15">
-            <Hyperlink NavigateUri="NavigateToPage1" Click="Hyperlink_Click">
-                <TextBlock Text="СОТРУДНИКИ"/>
-     
-            </Hyperlink>
-               
-        </TextBlock>
-        <Frame x:Name="mainFrame" Margin="190,141,10,24" />
-
-
-        <TextBlock HorizontalAlignment="Left" Width="73" Margin="60,230,0,0" VerticalAlignment="Top" Height="20" FontSize="15">
-        <Hyperlink Click="NavigateToPage2">
-            <TextBlock Text="КЛИЕНТЫ"/>
-        </Hyperlink>
-       </TextBlock>
-
-
-        <TextBlock HorizontalAlignment="Left" Width="80" Margin="60,260,0,0" VerticalAlignment="Top" Height="20" FontSize="15">
-        <Hyperlink Click="NavigateToPage3">
-            <TextBlock Text="ДОГОВОРА"/>
-        </Hyperlink>
-       </TextBlock>
-
-        <TextBlock HorizontalAlignment="Left" Width="130" Margin="60,290,0,0" VerticalAlignment="Top" Height="20" FontSize="15">
-        <Hyperlink Click="NavigateToPage4">
-            <TextBlock Text="ЦЕННЫЕ БУМАГИ" Width="123" Height="27"/>
-        </Hyperlink>
-       </TextBlock>
-
-        <TextBlock HorizontalAlignment="Left" Width="63" Margin="60,320,0,0" VerticalAlignment="Top" Height="20" FontSize="15">
-        <Hyperlink Click="NavigateToPage5">
-            <TextBlock Text="СДЕЛКИ" Height="22" Width="72"/>
-        </Hyperlink>
-       </TextBlock>
-
-        <TextBlock HorizontalAlignment="Left" Width="69" Margin="60,0,0,0" VerticalAlignment="Center" Height="49" FontSize="15" RenderTransformOrigin="0.413,-0.425">
-        <Hyperlink Click="NavigateToPage6">
-            <InlineUIContainer>
-            <TextBlock Height="26" Width="86" RenderTransformOrigin="0.388,1.655"><Run Language="ru-ru" Text="СПРАВКА"/></TextBlock>
-            </InlineUIContainer>
-        </Hyperlink>
-       </TextBlock>
-
-        <Button Content="Выход" FontSize="22" Margin="51,618,0,0" HorizontalAlignment="Left" Click="ExitApplication" Foreground="Black" VerticalAlignment="Top" Width="130" FontFamily="Perpetua Titling MT" BorderBrush="{x:Null}" Height="52">
-            <Button.Background>
-                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                    <GradientStop Color="#FF258DB9"/>
-                    <GradientStop Color="#FFFFE3E3" Offset="1"/>
-                </LinearGradientBrush>
-            </Button.Background>
-        </Button>
+        <StackPanel Background="{StaticResource BackgroundWindowResource}" HorizontalAlignment="Center" Width="1198" Margin="0,0,0,-10">
+            <TextBlock Style="{StaticResource hederTextBlockResource}">
+               Система внутреннего учета инвестиционной компании
+            </TextBlock>
+            <TextBlock Style="{StaticResource baseTextBlockResource}">
+                 <Hyperlink NavigateUri="PageEmployee.xaml">Сотрудники</Hyperlink>
+            </TextBlock>
+            <TextBlock Style="{StaticResource baseTextBlockResource}">
+                 <Hyperlink>Клиенты</Hyperlink>
+            </TextBlock>
+            <TextBlock Style="{StaticResource baseTextBlockResource}">
+                 <Hyperlink>Договора</Hyperlink>
+            </TextBlock>
+            <TextBlock Style="{StaticResource baseTextBlockResource}">
+                 <Hyperlink>Ценные бумаги</Hyperlink>
+            </TextBlock>
+            <TextBlock Style="{StaticResource baseTextBlockResource}">
+                 <Hyperlink>Сделки</Hyperlink>
+            </TextBlock>
+            <TextBlock Style="{StaticResource baseTextBlockResource}">
+                 <Hyperlink>Справка</Hyperlink>
+            </TextBlock>
+
+            <Button Style="{StaticResource buttonResource}" Command="Close">Выход</Button>
+        </StackPanel>
     </Grid>
 </Window>

+ 1 - 1
WpfApp2/MainWindow.xaml.cs

@@ -62,7 +62,7 @@ namespace WpfApp2
 
         private void Hyperlink_Click(object sender, RoutedEventArgs e)
         {
-            mainFrame.Content = new Page1();
+           
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)

+ 0 - 12
WpfApp2/Window.xaml

@@ -1,12 +0,0 @@
-<Window x:Class="WpfApp2.Window"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:WpfApp2"
-        mc:Ignorable="d"
-        Title="Window" Height="450" Width="800">
-    <Grid>
-        
-    </Grid>
-</Window>

+ 0 - 27
WpfApp2/Window.xaml.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace WpfApp2
-{
-    /// <summary>
-    /// Логика взаимодействия для Window.xaml
-    /// </summary>
-    public partial class Window : Window
-    {
-        public Window()
-        {
-            InitializeComponent();
-        }
-    }
-}

+ 0 - 7
WpfApp2/WpfApp2.csproj

@@ -55,9 +55,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="Window.xaml.cs">
-      <DependentUpon>Window.xaml</DependentUpon>
-    </Compile>
     <Page Include="Dictionary1.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -78,10 +75,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Window.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Page1.xaml.cs">

TEMPAT SAMPAH
WpfApp2/bin/Debug/WpfApp2.exe


TEMPAT SAMPAH
WpfApp2/bin/Debug/WpfApp2.pdb


TEMPAT SAMPAH
WpfApp2/obj/Debug/App.baml


TEMPAT SAMPAH
WpfApp2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


TEMPAT SAMPAH
WpfApp2/obj/Debug/Dictionary1.baml


TEMPAT SAMPAH
WpfApp2/obj/Debug/MainWindow.baml


+ 1 - 71
WpfApp2/obj/Debug/MainWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "395CC41F1173684B7701C6B5EB3341EE67A277062AD85326474FB34C99A7D081"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AF51C4BA5CAFB9CA1494D77DCA53386C0FA74020FEFAD12199E4AD73C2DD86F4"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -39,14 +39,6 @@ namespace WpfApp2 {
     /// </summary>
     public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
-        
-        #line 34 "..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Frame mainFrame;
-        
-        #line default
-        #line hidden
-        
         private bool _contentLoaded;
         
         /// <summary>
@@ -75,68 +67,6 @@ namespace WpfApp2 {
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
         void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 28 "..\..\MainWindow.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.Hyperlink_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.mainFrame = ((System.Windows.Controls.Frame)(target));
-            return;
-            case 3:
-            
-            #line 38 "..\..\MainWindow.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToPage2);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            
-            #line 45 "..\..\MainWindow.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToPage3);
-            
-            #line default
-            #line hidden
-            return;
-            case 5:
-            
-            #line 51 "..\..\MainWindow.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToPage4);
-            
-            #line default
-            #line hidden
-            return;
-            case 6:
-            
-            #line 57 "..\..\MainWindow.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToPage5);
-            
-            #line default
-            #line hidden
-            return;
-            case 7:
-            
-            #line 63 "..\..\MainWindow.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToPage6);
-            
-            #line default
-            #line hidden
-            return;
-            case 8:
-            
-            #line 70 "..\..\MainWindow.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.ExitApplication);
-            
-            #line default
-            #line hidden
-            return;
-            }
             this._contentLoaded = true;
         }
     }

+ 1 - 71
WpfApp2/obj/Debug/MainWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "395CC41F1173684B7701C6B5EB3341EE67A277062AD85326474FB34C99A7D081"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AF51C4BA5CAFB9CA1494D77DCA53386C0FA74020FEFAD12199E4AD73C2DD86F4"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -39,14 +39,6 @@ namespace WpfApp2 {
     /// </summary>
     public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
-        
-        #line 34 "..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Frame mainFrame;
-        
-        #line default
-        #line hidden
-        
         private bool _contentLoaded;
         
         /// <summary>
@@ -75,68 +67,6 @@ namespace WpfApp2 {
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
         void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 28 "..\..\MainWindow.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.Hyperlink_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.mainFrame = ((System.Windows.Controls.Frame)(target));
-            return;
-            case 3:
-            
-            #line 38 "..\..\MainWindow.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToPage2);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            
-            #line 45 "..\..\MainWindow.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToPage3);
-            
-            #line default
-            #line hidden
-            return;
-            case 5:
-            
-            #line 51 "..\..\MainWindow.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToPage4);
-            
-            #line default
-            #line hidden
-            return;
-            case 6:
-            
-            #line 57 "..\..\MainWindow.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToPage5);
-            
-            #line default
-            #line hidden
-            return;
-            case 7:
-            
-            #line 63 "..\..\MainWindow.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToPage6);
-            
-            #line default
-            #line hidden
-            return;
-            case 8:
-            
-            #line 70 "..\..\MainWindow.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.ExitApplication);
-            
-            #line default
-            #line hidden
-            return;
-            }
             this._contentLoaded = true;
         }
     }

TEMPAT SAMPAH
WpfApp2/obj/Debug/Page1.baml


+ 0 - 75
WpfApp2/obj/Debug/Window.g.cs

@@ -1,75 +0,0 @@
-#pragma checksum "..\..\Window.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CA8DD6B8240CB5FEDF5A533F27DDF6D669CAEACE9340A8DA39A5497A4A5D19AF"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
-//
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using WpfApp2;
-
-
-namespace WpfApp2 {
-    
-    
-    /// <summary>
-    /// Window
-    /// </summary>
-    public partial class Window : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/WpfApp2;component/window.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\Window.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-

+ 0 - 75
WpfApp2/obj/Debug/Window.g.i.cs

@@ -1,75 +0,0 @@
-#pragma checksum "..\..\Window.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CA8DD6B8240CB5FEDF5A533F27DDF6D669CAEACE9340A8DA39A5497A4A5D19AF"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
-//
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using WpfApp2;
-
-
-namespace WpfApp2 {
-    
-    
-    /// <summary>
-    /// Window
-    /// </summary>
-    public partial class Window : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/WpfApp2;component/window.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\Window.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-

+ 1 - 1
WpfApp2/obj/Debug/WpfApp2.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-478905ce9ec1269d639ce7b14ef292aedb76f7f2
+c0831794167de251122311ee68e4cd86b6e3dca5

+ 20 - 0
WpfApp2/obj/Debug/WpfApp2.csproj.FileListAbsolute.txt

@@ -88,3 +88,23 @@ D:\МДК 05.04 галимова\Лабараторная №1\WpfApp2\obj\Debug
 D:\МДК 05.04 галимова\Лабараторная №1\WpfApp2\obj\Debug\WpfApp2_MarkupCompile.lref
 D:\МДК 05.04 галимова\Лабараторная №1\WpfApp2\obj\Debug\WpfApp2.exe
 D:\МДК 05.04 галимова\Лабараторная №1\WpfApp2\obj\Debug\WpfApp2.pdb
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\WpfApp2.csproj.AssemblyReference.cache
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\WpfApp2.csproj.SuggestedBindingRedirects.cache
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\Dictionary1.baml
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\MainWindow.baml
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\MainWindow.g.cs
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\Page1.g.cs
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\App.g.cs
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\WpfApp2_MarkupCompile.cache
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\WpfApp2_MarkupCompile.lref
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\WpfApp2.exe
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\WpfApp2.pdb
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\bin\Debug\WpfApp2.exe.config
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\bin\Debug\WpfApp2.exe
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\bin\Debug\WpfApp2.pdb
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\App.baml
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\Page1.baml
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\WpfApp2.g.resources
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\WpfApp2.Properties.Resources.resources
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\WpfApp2.csproj.GenerateResource.cache
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\WpfApp2.csproj.CoreCompileInputs.cache

TEMPAT SAMPAH
WpfApp2/obj/Debug/WpfApp2.exe


TEMPAT SAMPAH
WpfApp2/obj/Debug/WpfApp2.g.resources


TEMPAT SAMPAH
WpfApp2/obj/Debug/WpfApp2.pdb


+ 6 - 6
WpfApp2/obj/Debug/WpfApp2_MarkupCompile.cache

@@ -4,17 +4,17 @@
 winexe
 C#
 .cs
-D:\МДК 05.04 галимова\Лабараторная №1\WpfApp2\obj\Debug\
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\
 WpfApp2
 none
 false
 DEBUG;TRACE
-D:\МДК 05.04 галимова\Лабараторная №1\WpfApp2\App.xaml
-4-1845686594
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\App.xaml
+3468083004
 
-71603995787
+6-614471931
 13-1310406943
-Dictionary1.xaml;MainWindow.xaml;Page1.xaml;Window.xaml;
+Dictionary1.xaml;MainWindow.xaml;Page1.xaml;
 
-True
+False
 

+ 5 - 5
WpfApp2/obj/Debug/WpfApp2_MarkupCompile.i.cache

@@ -4,17 +4,17 @@
 winexe
 C#
 .cs
-D:\МДК 05.04 галимова\WpfApp2\WpfApp2\obj\Debug\
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\obj\Debug\
 WpfApp2
 none
 false
 DEBUG;TRACE
-D:\МДК 05.04 галимова\WpfApp2\WpfApp2\App.xaml
-4-1845686594
+D:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\App.xaml
+3468083004
 
-8-478092831
+71598406747
 13-1310406943
-Dictionary1.xaml;MainWindow.xaml;Page1.xaml;Window.xaml;
+Dictionary1.xaml;MainWindow.xaml;Page1.xaml;
 
 True
 

+ 2 - 2
WpfApp2/obj/Debug/WpfApp2_MarkupCompile.i.lref

@@ -1,4 +1,4 @@
 
-
-FD:\МДК 05.04 галимова\WpfApp2\WpfApp2\Window.xaml;;
+FD:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\App.xaml;;
+FD:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\Page1.xaml;;
 

+ 2 - 3
WpfApp2/obj/Debug/WpfApp2_MarkupCompile.lref

@@ -1,5 +1,4 @@
 
-FD:\МДК 05.04 галимова\Лабараторная №1\WpfApp2\App.xaml;;
-FD:\МДК 05.04 галимова\Лабараторная №1\WpfApp2\Page1.xaml;;
-FD:\МДК 05.04 галимова\Лабараторная №1\WpfApp2\Window.xaml;;
+FD:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\App.xaml;;
+FD:\МДК 05.04 галимова\Лабараторная №1-2\WpfApp2\Page1.xaml;;