From 0c640b3321a000725d560760878320e6c10f491a Mon Sep 17 00:00:00 2001 From: VictoriaPresnyakova Date: Sat, 3 Dec 2022 20:28:56 +0400 Subject: [PATCH] 7 --- Catamaran/App.config | 54 +++++++++++------------ Catamaran/BoatDelegate.cs | 15 ------- Catamaran/Catamaran.csproj | 4 +- Catamaran/MapsCollection.cs | 12 +---- Catamaran/Program.cs | 4 +- Catamaran/Properties/Settings.Designer.cs | 30 ++++++------- 6 files changed, 46 insertions(+), 73 deletions(-) delete mode 100644 Catamaran/BoatDelegate.cs diff --git a/Catamaran/App.config b/Catamaran/App.config index 99add49..2744ee6 100644 --- a/Catamaran/App.config +++ b/Catamaran/App.config @@ -1,58 +1,58 @@ - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - \ No newline at end of file + diff --git a/Catamaran/BoatDelegate.cs b/Catamaran/BoatDelegate.cs deleted file mode 100644 index c4bbd0b..0000000 --- a/Catamaran/BoatDelegate.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Catamaran -{ - - /// - /// Делегат для передачи объекта-лодки - /// - /// - public delegate void BoatDelegate(DrawingBoat boat); -} diff --git a/Catamaran/Catamaran.csproj b/Catamaran/Catamaran.csproj index 23fce1a..40a6757 100644 --- a/Catamaran/Catamaran.csproj +++ b/Catamaran/Catamaran.csproj @@ -8,10 +8,11 @@ WinExe Catamaran Catamaran - v4.7.2 + v4.8 512 true true + AnyCPU @@ -123,7 +124,6 @@ - diff --git a/Catamaran/MapsCollection.cs b/Catamaran/MapsCollection.cs index 51d7015..80ca7a6 100644 --- a/Catamaran/MapsCollection.cs +++ b/Catamaran/MapsCollection.cs @@ -80,17 +80,7 @@ namespace Catamaran /// /// Строка, которую следует записать /// Поток для записи - private static void WriteToFile(string text, FileStream stream) - { - byte[] info = new UTF8Encoding(true).GetBytes(text); - stream.Write(info, 0, info.Length); - } - - /// - /// Сохранение информации про лодки м в хранилище в файл - /// - /// Путь и имя файла - /// + public void SaveData(string filename) { if (File.Exists(filename)) diff --git a/Catamaran/Program.cs b/Catamaran/Program.cs index 53e4ec9..a331085 100644 --- a/Catamaran/Program.cs +++ b/Catamaran/Program.cs @@ -17,7 +17,9 @@ namespace Catamaran [STAThread] static void Main() { - ApplicationConfiguration.Initialize(); + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + var services = new ServiceCollection(); ConfigureServices(services); using (ServiceProvider serviceProvider = services.BuildServiceProvider()) diff --git a/Catamaran/Properties/Settings.Designer.cs b/Catamaran/Properties/Settings.Designer.cs index 749d268..90ae974 100644 --- a/Catamaran/Properties/Settings.Designer.cs +++ b/Catamaran/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. // //------------------------------------------------------------------------------ -namespace Catamaran.Properties -{ - - +namespace Catamaran.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } }