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 @@ - - +