diff --git a/Lab5/Lab5/Lab5.csproj b/Lab5/Lab5/Lab5.csproj deleted file mode 100644 index 4106cb0..0000000 --- a/Lab5/Lab5/Lab5.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - WinExe - net6.0-windows - enable - true - - - diff --git a/Lab5/Lab5/MainWindow.xaml.cs b/Lab5/Lab5/MainWindow.xaml.cs deleted file mode 100644 index 7f5db6e..0000000 --- a/Lab5/Lab5/MainWindow.xaml.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Runtime.CompilerServices; -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.Animation; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace Lab5 -{ - /// - /// Interaction logic for MainWindow.xaml - /// - public partial class MainWindow : Window - { - public MainWindow() - { - InitializeComponent(); - } - } -} diff --git a/Lab5/Lab5.sln b/Lab6/Lab6.sln similarity index 60% rename from Lab5/Lab5.sln rename to Lab6/Lab6.sln index 84ca365..f32bf28 100644 --- a/Lab5/Lab5.sln +++ b/Lab6/Lab6.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}") = "Lab5", "Lab5\Lab5.csproj", "{6E87FC45-CDAB-4A76-A01A-D44F275756B4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lab6", "Lab6\Lab6.csproj", "{89D87EF0-C674-45F3-8DEE-EDAB39D2AF21}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,15 +11,15 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6E87FC45-CDAB-4A76-A01A-D44F275756B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E87FC45-CDAB-4A76-A01A-D44F275756B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E87FC45-CDAB-4A76-A01A-D44F275756B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E87FC45-CDAB-4A76-A01A-D44F275756B4}.Release|Any CPU.Build.0 = Release|Any CPU + {89D87EF0-C674-45F3-8DEE-EDAB39D2AF21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89D87EF0-C674-45F3-8DEE-EDAB39D2AF21}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89D87EF0-C674-45F3-8DEE-EDAB39D2AF21}.Release|Any CPU.ActiveCfg = Release|Any CPU + {89D87EF0-C674-45F3-8DEE-EDAB39D2AF21}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {7579837F-AA08-4D2A-8320-610BB818B417} + SolutionGuid = {6933EF1A-3810-40B0-B781-FCA51C06FFD5} EndGlobalSection EndGlobal diff --git a/Lab5/Lab5/App.xaml b/Lab6/Lab6/App.xaml similarity index 77% rename from Lab5/Lab5/App.xaml rename to Lab6/Lab6/App.xaml index dbf938e..4949542 100644 --- a/Lab5/Lab5/App.xaml +++ b/Lab6/Lab6/App.xaml @@ -1,7 +1,7 @@ - diff --git a/Lab5/Lab5/App.xaml.cs b/Lab6/Lab6/App.xaml.cs similarity index 95% rename from Lab5/Lab5/App.xaml.cs rename to Lab6/Lab6/App.xaml.cs index 78e6f1a..286c80e 100644 --- a/Lab5/Lab5/App.xaml.cs +++ b/Lab6/Lab6/App.xaml.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Threading.Tasks; using System.Windows; -namespace Lab5 +namespace Lab6 { /// /// Interaction logic for App.xaml diff --git a/Lab5/Lab5/AssemblyInfo.cs b/Lab6/Lab6/AssemblyInfo.cs similarity index 100% rename from Lab5/Lab5/AssemblyInfo.cs rename to Lab6/Lab6/AssemblyInfo.cs diff --git a/Lab5/Lab5/Images/exit.png b/Lab6/Lab6/Images/exit.png similarity index 100% rename from Lab5/Lab5/Images/exit.png rename to Lab6/Lab6/Images/exit.png diff --git a/Lab5/Lab5/Images/foto.jpg b/Lab6/Lab6/Images/foto.jpg similarity index 100% rename from Lab5/Lab5/Images/foto.jpg rename to Lab6/Lab6/Images/foto.jpg diff --git a/Lab5/Lab5/Images/foto2.jpg b/Lab6/Lab6/Images/foto2.jpg similarity index 100% rename from Lab5/Lab5/Images/foto2.jpg rename to Lab6/Lab6/Images/foto2.jpg diff --git a/Lab5/Lab5/Images/foto3.jpg b/Lab6/Lab6/Images/foto3.jpg similarity index 100% rename from Lab5/Lab5/Images/foto3.jpg rename to Lab6/Lab6/Images/foto3.jpg diff --git a/Lab5/Lab5/Images/unnamed.jpg b/Lab6/Lab6/Images/unnamed.jpg similarity index 100% rename from Lab5/Lab5/Images/unnamed.jpg rename to Lab6/Lab6/Images/unnamed.jpg diff --git a/Lab6/Lab6/Lab6.csproj b/Lab6/Lab6/Lab6.csproj new file mode 100644 index 0000000..23a88e3 --- /dev/null +++ b/Lab6/Lab6/Lab6.csproj @@ -0,0 +1,31 @@ + + + + WinExe + net6.0-windows + enable + true + + + + + Always + + + Always + + + Always + + + Always + + + + + + Always + + + + diff --git a/Lab5/Lab5/MainWindow.xaml b/Lab6/Lab6/MainWindow.xaml similarity index 74% rename from Lab5/Lab5/MainWindow.xaml rename to Lab6/Lab6/MainWindow.xaml index 3dd6f24..a54bb38 100644 --- a/Lab5/Lab5/MainWindow.xaml +++ b/Lab6/Lab6/MainWindow.xaml @@ -1,48 +1,48 @@ - + Title="MainWindow" Height="640" Width="900"> + To="0.1" + Duration="0:0:2" + AutoReverse="True"/> + To="1.0" + Duration="0:0:2" + BeginTime="0:0:2"/> + To="0.1" + Duration="0:0:2" + AutoReverse="True"/> + To="1.0" + Duration="0:0:2" + BeginTime="0:0:2"/> + To="0.1" + Duration="0:0:2" + AutoReverse="True"/> + To="1.0" + Duration="0:0:2" + BeginTime="0:0:2"/> @@ -51,11 +51,11 @@ + ViewportUnits="Absolute" Viewport="0 0 30 20" + ImageSource="E:\2 cource\TSCHMI\Labs\Lab3\Lab3\Lab3\Images\exit.png" Opacity="0.3"/> + ViewportUnits="Absolute" Viewport="0 0 30 20" + ImageSource="E:\2 cource\TSCHMI\Labs\Lab3\Lab3\Lab3\Images\unnamed.jpg" Opacity="0.3">