SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

More decoupling App

Browse Source
This commit is contained in:
Matt Nadareski
2023-09-25 21:03:29 -04:00
parent 9914b94716
commit 4c5184eac5
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MPF/App.xaml.cs
View File

@@ -2,7 +2,6 @@
using MPF.Core.Data;
using MPF.Core.Utilities;
using MPF.UI.Core.ViewModels;
using MPF.UI.ViewModels;
using MPF.Windows;
namespace MPF

24
MPF/ViewModels/MainViewModel.cs
View File

@@ -72,30 +72,30 @@ namespace MPF.UI.ViewModels
/// <summary>
/// Initialize the main window after loading
/// </summary>
public void Init()
public void Init(MainWindow instance, LogViewModel logger, MPF.Core.Data.Options options)
{
// Load the log output
App.Instance.LogPanel.IsExpanded = App.Options.OpenLogWindowAtStartup;
instance.LogPanel.IsExpanded = options.OpenLogWindowAtStartup;
// Disable buttons until we load fully
App.Instance.StartStopButton.IsEnabled = false;
App.Instance.MediaScanButton.IsEnabled = false;
App.Instance.UpdateVolumeLabel.IsEnabled = false;
App.Instance.CopyProtectScanButton.IsEnabled = false;
instance.StartStopButton.IsEnabled = false;
instance.MediaScanButton.IsEnabled = false;
instance.UpdateVolumeLabel.IsEnabled = false;
instance.CopyProtectScanButton.IsEnabled = false;
// Add the click handlers to the UI
AddEventHandlers(App.Instance);
AddEventHandlers(instance);
// Display the debug option in the menu, if necessary
if (App.Options.ShowDebugViewMenuItem)
App.Instance.DebugViewMenuItem.Visibility = Visibility.Visible;
if (options.ShowDebugViewMenuItem)
instance.DebugViewMenuItem.Visibility = Visibility.Visible;
// Finish initializing the rest of the values
InitializeUIValues(App.Instance, App.Logger, App.Options, removeEventHandlers: false, rescanDrives: true);
InitializeUIValues(instance, logger, options, removeEventHandlers: false, rescanDrives: true);
// Check for updates, if necessary
if (App.Options.CheckForUpdatesOnStartup)
CheckForUpdates(App.Instance, App.Logger, showIfSame: false);
if (options.CheckForUpdatesOnStartup)
CheckForUpdates(instance, logger, showIfSame: false);
}
#region Population

2
MPF/Windows/MainWindow.xaml.cs
View File

@@ -22,7 +22,7 @@ namespace MPF.Windows
protected override void OnContentRendered(EventArgs e)
{
base.OnContentRendered(e);
MainViewModel.Init();
MainViewModel.Init(App.Instance, App.Logger, App.Options);
}
}
}