From 7872e263f7c7dbf983ca304e371beef9d2b62a9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=81=D1=82=D1=80=D0=BE=D0=B2=20=D0=9C=D0=B8?=
 =?UTF-8?q?=D1=85=D0=B0=D0=B8=D0=BB=20=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D1=8C?=
 =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=87?= <bystrov_moon@mail.ru>
Date: Wed, 3 Dec 2025 17:31:53 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BE=20=D0=BE=D0=BA=D0=BD=D0=BE=20"=D0=9E=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B8=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D0=B8"=20+=20=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B8=D0=B5=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Визуальная составляющая: Изменено окно "О приложении". Цвет фона теперь синий. Надпись теперь на русском (взята с ReadMe). Небольшие правки: Кнопка "настройки" на главном экране теперь открывает окно настроек. Кнопка "о приложении" теперь открывает окно "о приложении"
---
 src/KeyKeeper/AboutWindow.cs                    |  4 +++-
 src/KeyKeeper/SettingsWindow.cs                 | 14 +++-----------
 src/KeyKeeper/ViewModels/MainWindowViewModel.cs |  7 +++++++
 src/KeyKeeper/Views/MainWindow.axaml            |  6 ++++--
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/KeyKeeper/AboutWindow.cs b/src/KeyKeeper/AboutWindow.cs
index 80df398..8538642 100644
--- a/src/KeyKeeper/AboutWindow.cs
+++ b/src/KeyKeeper/AboutWindow.cs
@@ -12,6 +12,8 @@ public class AboutWindow : Window
         this.Width = 600;
         this.Height = 400;
 
+        this.Background = new SolidColorBrush(Color.Parse("#2328c4"));
+
         var AboutKeyKeeper = new TextBlock
         {
             Text = "About Keykeeper",
@@ -22,7 +24,7 @@ public class AboutWindow : Window
 
         var AboutText = new TextBlock
         {
-            Text = "KeyKeeper is a personal password and key manager\nwhere you can save passwords and other login\ninformation, configure one-time code generation,\nand create encryption keys for personal use",
+            Text = "KeyKeeper - личный менеджер паролей и ключей,\nгде пользователь сможет сохранять свои логины, пароли, адреса электронной почты, ключи восстановления с различных веб-сайтов и\nиз приложений и управлять ими. Ключи и пароли\nбудут храниться исключительно локально на\nкомпьютере пользователя и всё хранилище\nцеликом можно будет защитить мастер-паролем.",
             HorizontalAlignment = HorizontalAlignment.Left,
             FontSize = 16,
             TextAlignment = TextAlignment.Left,
diff --git a/src/KeyKeeper/SettingsWindow.cs b/src/KeyKeeper/SettingsWindow.cs
index 4f7ad2e..088c6e5 100644
--- a/src/KeyKeeper/SettingsWindow.cs
+++ b/src/KeyKeeper/SettingsWindow.cs
@@ -5,27 +5,19 @@ using Avalonia.Media;
 namespace KeyKeeper.Views;
 public class SettingsWindow : Window
 {
-    private async void OpenAbout()
-    {
-        var AboutWindow = new AboutWindow();
-        await AboutWindow.ShowDialog(this);
-    }
-
     public SettingsWindow()
     {
         this.Title = "Настройки";
         this.Width = 400;
         this.Height = 300;
-        var AboutButton = new Button
+        var textBlock = new TextBlock
         {
-            Content = "О приложении",
+            Text = "Окно настроек",
             HorizontalAlignment = Avalonia.Layout.HorizontalAlignment.Center,
             VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center,
             FontSize = 16
         };
 
-        AboutButton.Click += (sender, e) => OpenAbout();
-
-        this.Content = AboutButton;
+        this.Content = textBlock;
     }
 }
diff --git a/src/KeyKeeper/ViewModels/MainWindowViewModel.cs b/src/KeyKeeper/ViewModels/MainWindowViewModel.cs
index 6cc0439..7903556 100644
--- a/src/KeyKeeper/ViewModels/MainWindowViewModel.cs
+++ b/src/KeyKeeper/ViewModels/MainWindowViewModel.cs
@@ -36,6 +36,13 @@ public partial class MainWindowViewModel : ViewModelBase
         var settingsWindow = new SettingsWindow();
         await settingsWindow.ShowDialog(GetMainWindow()!);
     }
+
+    [RelayCommand]
+    private async Task OpenAbout()
+    {
+        var AboutWindow = new AboutWindow();
+        await AboutWindow.ShowDialog(GetMainWindow()!);
+    }
     private static Window? GetMainWindow()
     {
         return App.Current?.ApplicationLifetime is Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime desktop
diff --git a/src/KeyKeeper/Views/MainWindow.axaml b/src/KeyKeeper/Views/MainWindow.axaml
index 9b43550..cecc123 100644
--- a/src/KeyKeeper/Views/MainWindow.axaml
+++ b/src/KeyKeeper/Views/MainWindow.axaml
@@ -42,8 +42,10 @@
                 </StackPanel>
 
                 <StackPanel Grid.Row="2" Orientation="Horizontal" Spacing="25">
-                    <Svg Path="/Assets/settings.svg" Width="61" Height="61"/>
-                    <Button Command="{Binding OpenSettingsCommand}">
+					<Button Command="{Binding OpenSettingsCommand}">
+                        <Svg Path="/Assets/settings.svg" Width="61" Height="61"/>
+					</Button>
+                    <Button Command="{Binding OpenAboutCommand}">
                         <Svg Path="/Assets/about.svg" Width="61" Height="61"/>
                     </Button>
                 </StackPanel>