diff --git a/Lab4/Lab4.sln b/Lab5/Lab5.sln similarity index 60% rename from Lab4/Lab4.sln rename to Lab5/Lab5.sln index f5dbf80..84ca365 100644 --- a/Lab4/Lab4.sln +++ b/Lab5/Lab5.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}") = "Lab4", "Lab4\Lab4.csproj", "{E5D79941-0705-43CF-8F48-9C0FD532C9CF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lab5", "Lab5\Lab5.csproj", "{6E87FC45-CDAB-4A76-A01A-D44F275756B4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,15 +11,15 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {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 + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {4E809292-D6D4-4727-8BAF-CBC36EEB4783} + SolutionGuid = {7579837F-AA08-4D2A-8320-610BB818B417} EndGlobalSection EndGlobal diff --git a/Lab4/Lab4/App.xaml b/Lab5/Lab5/App.xaml similarity index 77% rename from Lab4/Lab4/App.xaml rename to Lab5/Lab5/App.xaml index 5823401..dbf938e 100644 --- a/Lab4/Lab4/App.xaml +++ b/Lab5/Lab5/App.xaml @@ -1,7 +1,7 @@ - diff --git a/Lab4/Lab4/App.xaml.cs b/Lab5/Lab5/App.xaml.cs similarity index 95% rename from Lab4/Lab4/App.xaml.cs rename to Lab5/Lab5/App.xaml.cs index f0f0615..78e6f1a 100644 --- a/Lab4/Lab4/App.xaml.cs +++ b/Lab5/Lab5/App.xaml.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Threading.Tasks; using System.Windows; -namespace Lab4 +namespace Lab5 { /// /// Interaction logic for App.xaml diff --git a/Lab4/Lab4/AssemblyInfo.cs b/Lab5/Lab5/AssemblyInfo.cs similarity index 100% rename from Lab4/Lab4/AssemblyInfo.cs rename to Lab5/Lab5/AssemblyInfo.cs diff --git a/Lab4/Lab4/Images/exit.png b/Lab5/Lab5/Images/exit.png similarity index 100% rename from Lab4/Lab4/Images/exit.png rename to Lab5/Lab5/Images/exit.png diff --git a/Lab4/Lab4/Images/foto.jpg b/Lab5/Lab5/Images/foto.jpg similarity index 100% rename from Lab4/Lab4/Images/foto.jpg rename to Lab5/Lab5/Images/foto.jpg diff --git a/Lab4/Lab4/Images/foto2.jpg b/Lab5/Lab5/Images/foto2.jpg similarity index 100% rename from Lab4/Lab4/Images/foto2.jpg rename to Lab5/Lab5/Images/foto2.jpg diff --git a/Lab4/Lab4/Images/foto3.jpg b/Lab5/Lab5/Images/foto3.jpg similarity index 100% rename from Lab4/Lab4/Images/foto3.jpg rename to Lab5/Lab5/Images/foto3.jpg diff --git a/Lab4/Lab4/Images/unnamed.jpg b/Lab5/Lab5/Images/unnamed.jpg similarity index 100% rename from Lab4/Lab4/Images/unnamed.jpg rename to Lab5/Lab5/Images/unnamed.jpg diff --git a/Lab4/Lab4/Lab4.csproj b/Lab5/Lab5/Lab5.csproj similarity index 100% rename from Lab4/Lab4/Lab4.csproj rename to Lab5/Lab5/Lab5.csproj diff --git a/Lab4/Lab4/MainWindow.xaml b/Lab5/Lab5/MainWindow.xaml similarity index 66% rename from Lab4/Lab4/MainWindow.xaml rename to Lab5/Lab5/MainWindow.xaml index bce2473..3dd6f24 100644 --- a/Lab4/Lab4/MainWindow.xaml +++ b/Lab5/Lab5/MainWindow.xaml @@ -1,19 +1,61 @@ - - + Title="MainWindow" Height="640" Width="900"> + + + + + + + + + + + + + + + + + + + + + + + + + + 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">