From 38d99503cd3738fa7dc0685ef75a7ff48471f480 Mon Sep 17 00:00:00 2001
From: "nikbel2004@outlook.com" <nikbel2004@outlook.com>
Date: Fri, 5 Apr 2024 11:59:35 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=204?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Lab3/Lab3/Lab3.csproj                       |  56 --------------------
 Lab3/Lab3.sln => Lab4/Lab4.sln              |  12 ++---
 {Lab3/Lab3 => Lab4/Lab4}/App.xaml           |   4 +-
 {Lab3/Lab3 => Lab4/Lab4}/App.xaml.cs        |   2 +-
 {Lab3/Lab3 => Lab4/Lab4}/AssemblyInfo.cs    |   0
 {Lab3/Lab3 => Lab4/Lab4}/Images/exit.png    | Bin
 {Lab3/Lab3 => Lab4/Lab4}/Images/foto.jpg    | Bin
 {Lab3/Lab3 => Lab4/Lab4}/Images/foto2.jpg   | Bin
 {Lab3/Lab3 => Lab4/Lab4}/Images/foto3.jpg   | Bin
 {Lab3/Lab3 => Lab4/Lab4}/Images/unnamed.jpg | Bin
 Lab4/Lab4/Lab4.csproj                       |  10 ++++
 {Lab3/Lab3 => Lab4/Lab4}/MainWindow.xaml    |  23 ++++----
 {Lab3/Lab3 => Lab4/Lab4}/MainWindow.xaml.cs |   6 +--
 13 files changed, 32 insertions(+), 81 deletions(-)
 delete mode 100644 Lab3/Lab3/Lab3.csproj
 rename Lab3/Lab3.sln => Lab4/Lab4.sln (60%)
 rename {Lab3/Lab3 => Lab4/Lab4}/App.xaml (77%)
 rename {Lab3/Lab3 => Lab4/Lab4}/App.xaml.cs (95%)
 rename {Lab3/Lab3 => Lab4/Lab4}/AssemblyInfo.cs (100%)
 rename {Lab3/Lab3 => Lab4/Lab4}/Images/exit.png (100%)
 rename {Lab3/Lab3 => Lab4/Lab4}/Images/foto.jpg (100%)
 rename {Lab3/Lab3 => Lab4/Lab4}/Images/foto2.jpg (100%)
 rename {Lab3/Lab3 => Lab4/Lab4}/Images/foto3.jpg (100%)
 rename {Lab3/Lab3 => Lab4/Lab4}/Images/unnamed.jpg (100%)
 create mode 100644 Lab4/Lab4/Lab4.csproj
 rename {Lab3/Lab3 => Lab4/Lab4}/MainWindow.xaml (97%)
 rename {Lab3/Lab3 => Lab4/Lab4}/MainWindow.xaml.cs (79%)

diff --git a/Lab3/Lab3/Lab3.csproj b/Lab3/Lab3/Lab3.csproj
deleted file mode 100644
index fe29fbe..0000000
--- a/Lab3/Lab3/Lab3.csproj
+++ /dev/null
@@ -1,56 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
-    <UseWPF>true</UseWPF>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Page Update="MainWindow.xaml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Page>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Source\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="Images\exit.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Images\foto.jpg">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Images\foto2.jpg">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Images\foto3.jpg">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Images\unnamed.jpg">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Source\Forsazh.mp4">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Source\Hobbit.mp4">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Source\Kung-Fu-Panda.mp4">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Source\Piraty-Caribean.mp4">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Source\zv2.wav">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Source\zvuk1.mp3">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
diff --git a/Lab3/Lab3.sln b/Lab4/Lab4.sln
similarity index 60%
rename from Lab3/Lab3.sln
rename to Lab4/Lab4.sln
index 3ce7278..f5dbf80 100644
--- a/Lab3/Lab3.sln
+++ b/Lab4/Lab4.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34202.233
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lab3", "Lab3\Lab3.csproj", "{4C08AD9D-C600-4AE3-A1A9-8F091C10C357}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lab4", "Lab4\Lab4.csproj", "{E5D79941-0705-43CF-8F48-9C0FD532C9CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,15 +11,15 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4C08AD9D-C600-4AE3-A1A9-8F091C10C357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C08AD9D-C600-4AE3-A1A9-8F091C10C357}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C08AD9D-C600-4AE3-A1A9-8F091C10C357}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C08AD9D-C600-4AE3-A1A9-8F091C10C357}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5D79941-0705-43CF-8F48-9C0FD532C9CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5D79941-0705-43CF-8F48-9C0FD532C9CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5D79941-0705-43CF-8F48-9C0FD532C9CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5D79941-0705-43CF-8F48-9C0FD532C9CF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {DA7E26C5-8A91-4254-8966-F6347AE928E4}
+		SolutionGuid = {4E809292-D6D4-4727-8BAF-CBC36EEB4783}
 	EndGlobalSection
 EndGlobal
diff --git a/Lab3/Lab3/App.xaml b/Lab4/Lab4/App.xaml
similarity index 77%
rename from Lab3/Lab3/App.xaml
rename to Lab4/Lab4/App.xaml
index 79b6031..5823401 100644
--- a/Lab3/Lab3/App.xaml
+++ b/Lab4/Lab4/App.xaml
@@ -1,7 +1,7 @@
-<Application x:Class="Lab3.App"
+<Application x:Class="Lab4.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:Lab3"
+             xmlns:local="clr-namespace:Lab4"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
          
diff --git a/Lab3/Lab3/App.xaml.cs b/Lab4/Lab4/App.xaml.cs
similarity index 95%
rename from Lab3/Lab3/App.xaml.cs
rename to Lab4/Lab4/App.xaml.cs
index c315ee7..f0f0615 100644
--- a/Lab3/Lab3/App.xaml.cs
+++ b/Lab4/Lab4/App.xaml.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace Lab3
+namespace Lab4
 {
     /// <summary>
     /// Interaction logic for App.xaml
diff --git a/Lab3/Lab3/AssemblyInfo.cs b/Lab4/Lab4/AssemblyInfo.cs
similarity index 100%
rename from Lab3/Lab3/AssemblyInfo.cs
rename to Lab4/Lab4/AssemblyInfo.cs
diff --git a/Lab3/Lab3/Images/exit.png b/Lab4/Lab4/Images/exit.png
similarity index 100%
rename from Lab3/Lab3/Images/exit.png
rename to Lab4/Lab4/Images/exit.png
diff --git a/Lab3/Lab3/Images/foto.jpg b/Lab4/Lab4/Images/foto.jpg
similarity index 100%
rename from Lab3/Lab3/Images/foto.jpg
rename to Lab4/Lab4/Images/foto.jpg
diff --git a/Lab3/Lab3/Images/foto2.jpg b/Lab4/Lab4/Images/foto2.jpg
similarity index 100%
rename from Lab3/Lab3/Images/foto2.jpg
rename to Lab4/Lab4/Images/foto2.jpg
diff --git a/Lab3/Lab3/Images/foto3.jpg b/Lab4/Lab4/Images/foto3.jpg
similarity index 100%
rename from Lab3/Lab3/Images/foto3.jpg
rename to Lab4/Lab4/Images/foto3.jpg
diff --git a/Lab3/Lab3/Images/unnamed.jpg b/Lab4/Lab4/Images/unnamed.jpg
similarity index 100%
rename from Lab3/Lab3/Images/unnamed.jpg
rename to Lab4/Lab4/Images/unnamed.jpg
diff --git a/Lab4/Lab4/Lab4.csproj b/Lab4/Lab4/Lab4.csproj
new file mode 100644
index 0000000..4106cb0
--- /dev/null
+++ b/Lab4/Lab4/Lab4.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+</Project>
diff --git a/Lab3/Lab3/MainWindow.xaml b/Lab4/Lab4/MainWindow.xaml
similarity index 97%
rename from Lab3/Lab3/MainWindow.xaml
rename to Lab4/Lab4/MainWindow.xaml
index d1f6c08..f6962f0 100644
--- a/Lab3/Lab3/MainWindow.xaml
+++ b/Lab4/Lab4/MainWindow.xaml
@@ -1,12 +1,11 @@
-<Window x:Class="Lab3.MainWindow"
+<Window x:Class="Lab4.MainWindow"
         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:Lab3"
+        xmlns:local="clr-namespace:Lab4"
         mc:Ignorable="d"
         Title="MainWindow" Height="640" Width="900">
-    
     <Window.Resources>
         <ImageBrush x:Key="TileBrush" TileMode="Tile"
                      ViewportUnits="Absolute" Viewport="0 0 30 20"
@@ -24,18 +23,18 @@
             <Setter Property="Border.BorderBrush" Value="#FFA500"/>
             <Setter Property="Border.BorderThickness" Value="3"/>
         </Style>
-        
+
         <Style x:Key="buttons" TargetType="Button">
             <Setter Property="FontFamily" Value="Times New Roman"/>
             <Setter Property="FontSize" Value="16"/>
         </Style>
-        
+
         <Style x:Key="Title" TargetType="Label">
             <Setter Property="FontFamily" Value="Book Antiqua"/>
             <Setter Property="FontSize" Value="24"/>
             <Setter Property="FontWeight" Value="Bold"/>
         </Style>
-        
+
         <Style x:Key="textStyle">
             <Setter Property="TextBlock.FontFamily" Value="Book Antiqua"/>
             <Setter Property="TextBlock.FontSize" Value="12"/>
@@ -45,10 +44,10 @@
             <Setter Property="Control.VerticalAlignment" Value="Center" />
             <Setter Property="Control.HorizontalAlignment" Value="Center" />
         </Style>
-        
+
         <SolidColorBrush x:Key="OrangeBrush" Color="#FFA500" />
     </Window.Resources>
-    
+
     <Grid x:Name="MainGrid" Background="AliceBlue">
         <Grid.RowDefinitions>
             <RowDefinition Height="1.5*"/>
@@ -70,7 +69,7 @@
                 <Button Margin="20" Foreground="Blue" BorderBrush="{StaticResource OrangeBrush}" BorderThickness="3" Background="#90F5DF">
                     Клипы
                 </Button>
-                
+
 
                 <Button x:Name="btnAnimation1" Style="{StaticResource buttons}" Margin="5">
                     <Button.Content>
@@ -87,10 +86,10 @@
                         <Image Source="E:\2 cource\TSCHMI\Labs\Lab3\Lab3\Lab3\Images\foto3.jpg" Stretch="UniformToFill"/>
                     </Button.Content>
                 </Button>
-                
+
             </StackPanel>
         </Border>
-        
+
         <Border Grid.Column="1" Grid.Row="0" BorderBrush="#FFA500" BorderThickness="0, 4, 4, 4" Grid.ColumnSpan="2" Background="#5F5F5F">
             <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
                 <Label Foreground="#FFA500" Style="{StaticResource Title}">
@@ -120,6 +119,8 @@
             </StackPanel>
         </Border>
 
+        <Rectangle Stroke="Black" StrokeThickness="3" Margin="10" Grid.Column="1" Grid.Row="1" MaxHeight="250"/>
+
         <Slider Name="vol" Grid.Column="1" Grid.Row="2" Maximum="1" Value="0.5" LargeChange="0.1" SmallChange="0.01" Margin="10" VerticalAlignment="Center"/>
     </Grid>
 </Window>
diff --git a/Lab3/Lab3/MainWindow.xaml.cs b/Lab4/Lab4/MainWindow.xaml.cs
similarity index 79%
rename from Lab3/Lab3/MainWindow.xaml.cs
rename to Lab4/Lab4/MainWindow.xaml.cs
index b9731f3..ab28b12 100644
--- a/Lab3/Lab3/MainWindow.xaml.cs
+++ b/Lab4/Lab4/MainWindow.xaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -12,12 +9,11 @@ using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Lab3
+namespace Lab4
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml