Leahnaya/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2026-05-21 06:48:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename _eventRoot to _eventSubscription in all GUI callers

Browse Source 
Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/842795d5-2a89-40f1-8fa1-297f07b9b9dd

Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-04-18 20:13:20 +00:00 committed by GitHub
parent de7da1b957
commit 777fa02033
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DiscordChatExporter.Gui/App.axaml.cs
View File

@ -22,7 +22,7 @@ public class App : Application, IDisposable
private readonly ServiceProvider _services;
private readonly SettingsService _settingsService;
private readonly IDisposable _eventRoot;
private readonly IDisposable _eventSubscription;
private bool _isDisposed;
@ -54,7 +54,7 @@ public class App : Application, IDisposable
_settingsService = _services.GetRequiredService<SettingsService>();
// Re-initialize the theme when the user changes it
_eventRoot = Disposable.Merge(
_eventSubscription = Disposable.Merge(
_settingsService.WatchProperty(
o => o.Theme,
v =>
@ -131,7 +131,7 @@ public class App : Application, IDisposable
_isDisposed = true;
_eventRoot.Dispose();
_eventSubscription.Dispose();
_services.Dispose();
}
}

6
DiscordChatExporter.Gui/Localization/LocalizationManager.cs
View File

@ -10,11 +10,11 @@ namespace DiscordChatExporter.Gui.Localization;
public partial class LocalizationManager : ObservableObject, IDisposable
{
private readonly IDisposable _eventRoot;
private readonly IDisposable _eventSubscription;
public LocalizationManager(SettingsService settingsService)
{
_eventRoot = Disposable.Merge(
_eventSubscription = Disposable.Merge(
settingsService.WatchProperty(o => o.Language, v => Language = v, true),
this.WatchProperty(
o => o.Language,
@ -65,7 +65,7 @@ public partial class LocalizationManager : ObservableObject, IDisposable
return $"Missing localization for '{key}'";
}
public void Dispose() => _eventRoot.Dispose();
public void Dispose() => _eventSubscription.Dispose();
}
public partial class LocalizationManager

6
DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs
View File

@ -29,7 +29,7 @@ public partial class DashboardViewModel : ViewModelBase
private readonly DialogManager _dialogManager;
private readonly SettingsService _settingsService;
private readonly IDisposable _eventRoot;
private readonly IDisposable _eventSubscription;
private readonly AutoResetProgressMuxer _progressMuxer;
private DiscordClient? _discord;
@ -50,7 +50,7 @@ public partial class DashboardViewModel : ViewModelBase
_progressMuxer = Progress.CreateMuxer().WithAutoReset();
_eventRoot = Disposable.Merge(
_eventSubscription = Disposable.Merge(
Progress.WatchProperty(
o => o.Current,
_ => OnPropertyChanged(nameof(IsProgressIndeterminate))
@ -329,7 +329,7 @@ public partial class DashboardViewModel : ViewModelBase
{
if (disposing)
{
_eventRoot.Dispose();
_eventSubscription.Dispose();
}
base.Dispose(disposing);

8
DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs
View File

@ -15,7 +15,7 @@ public class SettingsViewModel : DialogViewModelBase
{
private readonly SettingsService _settingsService;
private readonly IDisposable _eventRoot;
private readonly IDisposable _eventSubscription;
public SettingsViewModel(
SettingsService settingsService,
@ -25,7 +25,9 @@ public class SettingsViewModel : DialogViewModelBase
_settingsService = settingsService;
LocalizationManager = localizationManager;
_eventRoot = Disposable.Merge(_settingsService.WatchAllProperties(OnAllPropertiesChanged));
_eventSubscription = Disposable.Merge(
_settingsService.WatchAllProperties(OnAllPropertiesChanged)
);
}
public LocalizationManager LocalizationManager { get; }
@ -140,7 +142,7 @@ public class SettingsViewModel : DialogViewModelBase
{
if (disposing)
{
_eventRoot.Dispose();
_eventSubscription.Dispose();
}
base.Dispose(disposing);