From 45629c9d7f289275066c85ab9b4dfdec48417cff Mon Sep 17 00:00:00 2001 From: tyrrrz <1935960+Tyrrrz@users.noreply.github.com> Date: Tue, 26 May 2026 15:00:42 +0300 Subject: [PATCH] Refactor message boxes --- DiscordChatExporter.Gui/Framework/ViewModelManager.cs | 5 +++-- .../ViewModels/Dialogs/MessageBoxViewModel.cs | 8 ++++---- DiscordChatExporter.Gui/ViewModels/MainViewModel.cs | 1 - 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DiscordChatExporter.Gui/Framework/ViewModelManager.cs b/DiscordChatExporter.Gui/Framework/ViewModelManager.cs index aaed957d..0e25c2e7 100644 --- a/DiscordChatExporter.Gui/Framework/ViewModelManager.cs +++ b/DiscordChatExporter.Gui/Framework/ViewModelManager.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using DiscordChatExporter.Core.Discord.Data; +using DiscordChatExporter.Gui.Localization; using DiscordChatExporter.Gui.ViewModels; using DiscordChatExporter.Gui.ViewModels.Components; using DiscordChatExporter.Gui.ViewModels.Dialogs; @@ -8,7 +9,7 @@ using Microsoft.Extensions.DependencyInjection; namespace DiscordChatExporter.Gui.Framework; -public class ViewModelManager(IServiceProvider services) +public class ViewModelManager(IServiceProvider services, LocalizationManager localizationManager) { public MainViewModel GetMainViewModel() => services.GetRequiredService(); @@ -46,7 +47,7 @@ public class ViewModelManager(IServiceProvider services) } public MessageBoxViewModel GetMessageBoxViewModel(string title, string message) => - GetMessageBoxViewModel(title, message, "CLOSE", null); + GetMessageBoxViewModel(title, message, localizationManager.CloseButton, null); public SettingsViewModel GetSettingsViewModel() => services.GetRequiredService(); diff --git a/DiscordChatExporter.Gui/ViewModels/Dialogs/MessageBoxViewModel.cs b/DiscordChatExporter.Gui/ViewModels/Dialogs/MessageBoxViewModel.cs index fd695003..75c78f2e 100644 --- a/DiscordChatExporter.Gui/ViewModels/Dialogs/MessageBoxViewModel.cs +++ b/DiscordChatExporter.Gui/ViewModels/Dialogs/MessageBoxViewModel.cs @@ -6,20 +6,20 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs; public partial class MessageBoxViewModel : DialogViewModelBase { [ObservableProperty] - public partial string? Title { get; set; } = "Title"; + public partial string? Title { get; set; } [ObservableProperty] - public partial string? Message { get; set; } = "Message"; + public partial string? Message { get; set; } [ObservableProperty] [NotifyPropertyChangedFor(nameof(IsDefaultButtonVisible))] [NotifyPropertyChangedFor(nameof(ButtonsCount))] - public partial string? DefaultButtonText { get; set; } = "OK"; + public partial string? DefaultButtonText { get; set; } [ObservableProperty] [NotifyPropertyChangedFor(nameof(IsCancelButtonVisible))] [NotifyPropertyChangedFor(nameof(ButtonsCount))] - public partial string? CancelButtonText { get; set; } = "Cancel"; + public partial string? CancelButtonText { get; set; } public bool IsDefaultButtonVisible => !string.IsNullOrWhiteSpace(DefaultButtonText); diff --git a/DiscordChatExporter.Gui/ViewModels/MainViewModel.cs b/DiscordChatExporter.Gui/ViewModels/MainViewModel.cs index dcf3df99..169d50ce 100644 --- a/DiscordChatExporter.Gui/ViewModels/MainViewModel.cs +++ b/DiscordChatExporter.Gui/ViewModels/MainViewModel.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using DiscordChatExporter.Gui.Framework; using DiscordChatExporter.Gui.Localization; using DiscordChatExporter.Gui.Services; -using DiscordChatExporter.Gui.Utils.Extensions; using DiscordChatExporter.Gui.ViewModels.Components; using PowerKit.Extensions;