From 1ab51b7b8aef1e7b180ac6a2a201c62d268e066a Mon Sep 17 00:00:00 2001 From: "nikbel2004@outlook.com" Date: Fri, 22 Mar 2024 12:02:15 +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=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lab1/Lab1/AssemblyInfo.cs | 10 --- Lab1/Lab1/MainWindow.xaml | 22 ------ Lab1/Lab1.sln => Lab2/Lab2.sln | 14 ++-- {Lab1/Lab1 => Lab2/Lab2}/App.xaml | 4 +- {Lab1/Lab1 => Lab2/Lab2}/App.xaml.cs | 9 +-- Lab2/Lab2/AssemblyInfo.cs | 10 +++ .../Lab1/Lab1.csproj => Lab2/Lab2/Lab2.csproj | 1 + Lab2/Lab2/MainWindow.xaml | 73 ++++++++++++++++++ {Lab1/Lab1 => Lab2/Lab2}/MainWindow.xaml.cs | 10 +-- Lab2/Lab2/src/free2.png | Bin 0 -> 25610 bytes 10 files changed, 99 insertions(+), 54 deletions(-) delete mode 100644 Lab1/Lab1/AssemblyInfo.cs delete mode 100644 Lab1/Lab1/MainWindow.xaml rename Lab1/Lab1.sln => Lab2/Lab2.sln (56%) rename {Lab1/Lab1 => Lab2/Lab2}/App.xaml (77%) rename {Lab1/Lab1 => Lab2/Lab2}/App.xaml.cs (55%) create mode 100644 Lab2/Lab2/AssemblyInfo.cs rename Lab1/Lab1/Lab1.csproj => Lab2/Lab2/Lab2.csproj (84%) create mode 100644 Lab2/Lab2/MainWindow.xaml rename {Lab1/Lab1 => Lab2/Lab2}/MainWindow.xaml.cs (78%) create mode 100644 Lab2/Lab2/src/free2.png diff --git a/Lab1/Lab1/AssemblyInfo.cs b/Lab1/Lab1/AssemblyInfo.cs deleted file mode 100644 index 8b5504e..0000000 --- a/Lab1/Lab1/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Windows; - -[assembly: ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] diff --git a/Lab1/Lab1/MainWindow.xaml b/Lab1/Lab1/MainWindow.xaml deleted file mode 100644 index 73e100d..0000000 --- a/Lab1/Lab1/MainWindow.xaml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/Lab1/Lab1.sln b/Lab2/Lab2.sln similarity index 56% rename from Lab1/Lab1.sln rename to Lab2/Lab2.sln index 3ea3f7c..1f404ec 100644 --- a/Lab1/Lab1.sln +++ b/Lab2/Lab2.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.7.34202.233 +VisualStudioVersion = 17.9.34622.214 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lab1", "Lab1\Lab1.csproj", "{CB9F367A-8891-4D9F-AB59-2589A6E55AD6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lab2", "Lab2\Lab2.csproj", "{53416734-E4DD-4E45-9FBA-AD26097BEA8F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,15 +11,15 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CB9F367A-8891-4D9F-AB59-2589A6E55AD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB9F367A-8891-4D9F-AB59-2589A6E55AD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB9F367A-8891-4D9F-AB59-2589A6E55AD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB9F367A-8891-4D9F-AB59-2589A6E55AD6}.Release|Any CPU.Build.0 = Release|Any CPU + {53416734-E4DD-4E45-9FBA-AD26097BEA8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {53416734-E4DD-4E45-9FBA-AD26097BEA8F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {53416734-E4DD-4E45-9FBA-AD26097BEA8F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {53416734-E4DD-4E45-9FBA-AD26097BEA8F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E5181B13-8E6F-4A35-9922-9298F305A85A} + SolutionGuid = {9792C90A-8C03-49A8-862B-A01F8115DAE1} EndGlobalSection EndGlobal diff --git a/Lab1/Lab1/App.xaml b/Lab2/Lab2/App.xaml similarity index 77% rename from Lab1/Lab1/App.xaml rename to Lab2/Lab2/App.xaml index 7f864ae..065386e 100644 --- a/Lab1/Lab1/App.xaml +++ b/Lab2/Lab2/App.xaml @@ -1,7 +1,7 @@ - diff --git a/Lab1/Lab1/App.xaml.cs b/Lab2/Lab2/App.xaml.cs similarity index 55% rename from Lab1/Lab1/App.xaml.cs rename to Lab2/Lab2/App.xaml.cs index 9e51d69..72d7662 100644 --- a/Lab1/Lab1/App.xaml.cs +++ b/Lab2/Lab2/App.xaml.cs @@ -1,12 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Configuration; +using System.Configuration; using System.Data; -using System.Linq; -using System.Threading.Tasks; using System.Windows; -namespace Lab1 +namespace Lab2 { /// /// Interaction logic for App.xaml @@ -14,4 +10,5 @@ namespace Lab1 public partial class App : Application { } + } diff --git a/Lab2/Lab2/AssemblyInfo.cs b/Lab2/Lab2/AssemblyInfo.cs new file mode 100644 index 0000000..b0ec827 --- /dev/null +++ b/Lab2/Lab2/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/Lab1/Lab1/Lab1.csproj b/Lab2/Lab2/Lab2.csproj similarity index 84% rename from Lab1/Lab1/Lab1.csproj rename to Lab2/Lab2/Lab2.csproj index 4106cb0..18b9a12 100644 --- a/Lab1/Lab1/Lab1.csproj +++ b/Lab2/Lab2/Lab2.csproj @@ -4,6 +4,7 @@ WinExe net6.0-windows enable + enable true diff --git a/Lab2/Lab2/MainWindow.xaml b/Lab2/Lab2/MainWindow.xaml new file mode 100644 index 0000000..8824e21 --- /dev/null +++ b/Lab2/Lab2/MainWindow.xaml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +