diff --git a/MainWindow.xaml b/MainWindow.xaml index 5684d4f..c9baa52 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -126,6 +126,11 @@ + + + + + @@ -142,7 +147,6 @@ - diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index b1b2543..0c41128 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -553,7 +553,7 @@ public void EnsureWindowsSystemDispatcherQueueController() } } - private void Window_Activated(object sender, WindowActivatedEventArgs args) + private void Window_Activated(object sender, Microsoft.UI.Xaml.WindowActivatedEventArgs args) { m_configurationSource.IsInputActive = args.WindowActivationState != WindowActivationState.Deactivated; } @@ -631,6 +631,7 @@ public MainWindow() } //Select the first navigation item + //TODO: This will need to be adjusted once Dashboard and All Scripts are available, should this be a setting? MainNav.SelectedItem = MainNav.MenuItems[1]; //Index 1 because 0 is the "Categories" text header //We've got to check for updates in the main window due to a WinUI limitation that currently exists @@ -666,7 +667,7 @@ private async void CheckForUpdates() LoadingText.Text = "Downloading update..."; string scriptName = "Updater.ps1"; string scriptPath = Environment.CurrentDirectory + "\\" + scriptName; - LaunchScript(scriptPath, " -InstallPath \"" + Environment.CurrentDirectory + "\" -DownloadURL \"" + updateXMLData.Attribute("link").Value + "\"", "PS5", "None", "false", "true", "true"); //TODO: Should this be moved to run with the integrated host? Probably can't until elevation support is added to Windows App SDK with v1.1 + LaunchScript(scriptPath, " -InstallPath \"" + Environment.CurrentDirectory + "\" -DownloadURL \"" + updateXMLData.Attribute("link").Value + "\"", "PS5", "None", "false", "true", "true"); await Task.Run(() => Task.Delay(1000000)); //TODO: This needs fixed, for some reason WaitForExit() isn't working //TODO: Run LoadingPhrase() on a loop }