From aa02bd5976aa148cf58878c8a5e543707da906d9 Mon Sep 17 00:00:00 2001 From: "nikbel2004@outlook.com" Date: Fri, 5 Apr 2024 11:46:20 +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=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lab2/Lab2/AssemblyInfo.cs | 10 -- Lab2/Lab2/Lab2.csproj | 11 -- Lab2/Lab2/MainWindow.xaml | 73 ------------ Lab2/Lab2/src/free2.png | Bin 25610 -> 0 bytes Lab2/Lab2.sln => Lab3/Lab3.sln | 14 +-- {Lab2/Lab2 => Lab3/Lab3}/App.xaml | 4 +- {Lab2/Lab2 => Lab3/Lab3}/App.xaml.cs | 9 +- Lab3/Lab3/AssemblyInfo.cs | 10 ++ Lab3/Lab3/Images/exit.png | Bin 0 -> 12521 bytes Lab3/Lab3/Images/foto.jpg | Bin 0 -> 284782 bytes Lab3/Lab3/Images/foto2.jpg | Bin 0 -> 82973 bytes Lab3/Lab3/Images/foto3.jpg | Bin 0 -> 2359717 bytes Lab3/Lab3/Images/unnamed.jpg | Bin 0 -> 5723 bytes Lab3/Lab3/Lab3.csproj | 56 +++++++++ Lab3/Lab3/MainWindow.xaml | 125 ++++++++++++++++++++ {Lab2/Lab2 => Lab3/Lab3}/MainWindow.xaml.cs | 14 ++- 16 files changed, 217 insertions(+), 109 deletions(-) delete mode 100644 Lab2/Lab2/AssemblyInfo.cs delete mode 100644 Lab2/Lab2/Lab2.csproj delete mode 100644 Lab2/Lab2/MainWindow.xaml delete mode 100644 Lab2/Lab2/src/free2.png rename Lab2/Lab2.sln => Lab3/Lab3.sln (56%) rename {Lab2/Lab2 => Lab3/Lab3}/App.xaml (77%) rename {Lab2/Lab2 => Lab3/Lab3}/App.xaml.cs (55%) create mode 100644 Lab3/Lab3/AssemblyInfo.cs create mode 100644 Lab3/Lab3/Images/exit.png create mode 100644 Lab3/Lab3/Images/foto.jpg create mode 100644 Lab3/Lab3/Images/foto2.jpg create mode 100644 Lab3/Lab3/Images/foto3.jpg create mode 100644 Lab3/Lab3/Images/unnamed.jpg create mode 100644 Lab3/Lab3/Lab3.csproj create mode 100644 Lab3/Lab3/MainWindow.xaml rename {Lab2/Lab2 => Lab3/Lab3}/MainWindow.xaml.cs (63%) diff --git a/Lab2/Lab2/AssemblyInfo.cs b/Lab2/Lab2/AssemblyInfo.cs deleted file mode 100644 index b0ec827..0000000 --- a/Lab2/Lab2/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/Lab2/Lab2/Lab2.csproj b/Lab2/Lab2/Lab2.csproj deleted file mode 100644 index 18b9a12..0000000 --- a/Lab2/Lab2/Lab2.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - WinExe - net6.0-windows - enable - enable - true - - - diff --git a/Lab2/Lab2/MainWindow.xaml b/Lab2/Lab2/MainWindow.xaml deleted file mode 100644 index 8824e21..0000000 --- a/Lab2/Lab2/MainWindow.xaml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Lab2/Lab2/MainWindow.xaml.cs b/Lab3/Lab3/MainWindow.xaml.cs similarity index 63% rename from Lab2/Lab2/MainWindow.xaml.cs rename to Lab3/Lab3/MainWindow.xaml.cs index 9b1c2e3..b9731f3 100644 --- a/Lab2/Lab2/MainWindow.xaml.cs +++ b/Lab3/Lab3/MainWindow.xaml.cs @@ -1,15 +1,23 @@ -using System.Text; +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; 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 Lab2 +namespace Lab3 { /// /// Interaction logic for MainWindow.xaml @@ -21,4 +29,4 @@ namespace Lab2 InitializeComponent(); } } -} \ No newline at end of file +}