Color the Description in the Update tab where the text was talking the blue and didn't had it own color. Fixed some color contrast issue (#2722)

* Fix the way arguments are passed to the runspace

* Add $handle return

* Fix Choco Install logic

config/themes.json

@@ -104,7 +104,7 @@
   },
   "Matrix": {
     "ComboBoxBackgroundColor": "#232629",
-        "LabelboxForegroundColor":  "#81a1c1",
+    "LabelboxForegroundColor": "#f7f7f7",
     "MainForegroundColor": "#F7F7F7",
     "MainBackgroundColor": "#232629",
     "LabelBackgroundColor": "#232629",
@@ -136,14 +136,14 @@
     "ShadowPulse": "0:0:3"
   },
   "Dark": {
-        "ComboBoxBackgroundColor":  "#232629",
-        "LabelboxForegroundColor":  "#81a1c1",
+    "ComboBoxBackgroundColor": "#1e3747",
+    "LabelboxForegroundColor": "#0567ff",
     "MainForegroundColor": "#F7F7F7",
-        "MainBackgroundColor":  "#232629",
-        "LabelBackgroundColor":  "#232629",
+    "MainBackgroundColor": "#121212",
+    "LabelBackgroundColor": "#121212",
     "LinkForegroundColor": "#add8e6",
     "LinkHoverForegroundColor": "#F7F7F7",
-        "ComboBoxForegroundColor":  "#81a1c1",
+    "ComboBoxForegroundColor": "#f7f7f7",
 
     "ProgressBarForegroundColor": "#222222",
     "ProgressBarBackgroundColor": "Transparent",
@@ -164,6 +164,6 @@
     "ButtonForegroundColor": "#F7F7F7",
     "ToggleButtonOnColor": "#2e77ff",
 
-        "BorderColor": "#0b1215"
+    "BorderColor": "#2F373D"
   }
 }

functions/private/Install-WinUtilChoco.ps1

@@ -13,10 +13,11 @@ function Install-WinUtilChoco {
         if((Test-WinUtilPackageManager -choco) -eq "installed") {
             return
         }
-
+        # Install logic taken from https://chocolatey.org/install#individual
         Write-Host "Seems Chocolatey is not installed, installing now."
-        Start-Process -FilePath "powershell" -ArgumentList "Set-ExecutionPolicy Bypass -Scope Process -Force; Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) -ErrorAction Stop" -Wait -NoNewWindow
-        Start-Process -FilePath "powershell" -ArgumentList "choco feature enable -n allowGlobalConfirmation" -Wait -NoNewWindow
+        Set-ExecutionPolicy Bypass -Scope Process -Force;
+        [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;
+        Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
 
     } catch {
         Write-Host "===========================================" -Foregroundcolor Red

functions/public/Invoke-WPFInstall.ps1

@@ -20,7 +20,7 @@ function Invoke-WPFInstall {
         return
     }
     $ChocoPreference = $($sync.WPFpreferChocolatey.IsChecked)
-    Invoke-WPFRunspace -ArgumentList $PackagesToInstall,$ChocoPreference -DebugPreference $DebugPreference -ScriptBlock {
+    $installHandle = Invoke-WPFRunspace -ParameterList @(("PackagesToInstall", $PackagesToInstall),("ChocoPreference", $ChocoPreference)) -DebugPreference $DebugPreference -ScriptBlock {
         param($PackagesToInstall, $ChocoPreference, $DebugPreference)
         if ($PackagesToInstall.count -eq 1) {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })

functions/public/Invoke-WPFRunspace.ps1

@@ -11,61 +11,50 @@ function Invoke-WPFRunspace {
     .PARAMETER ArgumentList
         A list of arguments to pass to the runspace
 
+    .PARAMETER ParameterList
+        A list of named parameters that should be provided.
     .EXAMPLE
         Invoke-WPFRunspace `
             -ScriptBlock $sync.ScriptsInstallPrograms `
             -ArgumentList "Installadvancedip,Installbitwarden" `
 
+        Invoke-WPFRunspace`
+            -ScriptBlock $sync.ScriptsInstallPrograms `
+            -ParameterList @(("PackagesToInstall", @("Installadvancedip,Installbitwarden")),("ChocoPreference", $true))
     #>
 
     [CmdletBinding()]
     Param (
-        [Parameter(Mandatory=$true)]
-        [scriptblock]$ScriptBlock,
-        [Parameter(Mandatory=$false)]
-        [object[]]$ArgumentList,
-        [Parameter(Mandatory=$false)]
-        [System.Management.Automation.ActionPreference]$DebugPreference = 'SilentlyContinue'
+        $ScriptBlock,
+        $ArgumentList,
+        $ParameterList,
+        $DebugPreference
     )
 
-    try {
     # Create a PowerShell instance
-        $powershell = [powershell]::Create()
+    $script:powershell = [powershell]::Create()
 
     # Add Scriptblock and Arguments to runspace
-        $powershell.AddScript($ScriptBlock)
-        if ($ArgumentList) {
-            foreach ($Argument in $ArgumentList) {
-                $powershell.AddArgument($Argument)
-            }
-        }
-        $powershell.AddArgument($DebugPreference)
+    $script:powershell.AddScript($ScriptBlock)
+    $script:powershell.AddArgument($ArgumentList)
 
-        # Ensure runspace pool is available
-        if (-not $sync.runspace -or $sync.runspace.IsDisposed) {
-            throw "Runspace pool is not initialized or has been disposed."
+    foreach ($parameter in $ParameterList) {
+        $script:powershell.AddParameter($parameter[0], $parameter[1])
     }
-        $powershell.RunspacePool = $sync.runspace
+    $script:powershell.AddArgument($DebugPreference)  # Pass DebugPreference to the script block
+    $script:powershell.RunspacePool = $sync.runspace
 
-        # Execute the RunspacePool asynchronously
-        $handle = $powershell.BeginInvoke()
+    # Execute the RunspacePool
+    $script:handle = $script:powershell.BeginInvoke()
 
-        # Set up an event to handle completion
-        $null = Register-ObjectEvent -InputObject $powershell -EventName InvocationStateChanged -Action {
-            if ($EventArgs.InvocationStateInfo.State -eq "Completed") {
-                $powershell.EndInvoke($handle)
-                $powershell.Dispose()
+    # Clean up the RunspacePool threads when they are complete, and invoke the garbage collector to clean up the memory
+    if ($script:handle.IsCompleted) {
+        $script:powershell.EndInvoke($script:handle)
+        $script:powershell.Dispose()
+        $sync.runspace.Dispose()
+        $sync.runspace.Close()
         [System.GC]::Collect()
-                Unregister-Event -SourceIdentifier $EventSubscriber.SourceIdentifier
     }
-        }
-
     # Return the handle
     return $handle
 }
-    catch {
-        Write-Error "Error in Invoke-WPFRunspace: $_"
-        if ($powershell) { $powershell.Dispose() }
-        throw
-    }
-}

functions/public/Invoke-WPFUnInstall.ps1

@@ -30,7 +30,7 @@ function Invoke-WPFUnInstall {
     if($confirm -eq "No") {return}
     $ChocoPreference = $($sync.WPFpreferChocolatey.IsChecked)
 
-    Invoke-WPFRunspace -ArgumentList $PackagesToInstall, $ChocoPreference -DebugPreference $DebugPreference -ScriptBlock {
+    Invoke-WPFRunspace -ArgumentList @(("PackagesToInstall", $PackagesToInstall),("ChocoPreference", $ChocoPreference)) -DebugPreference $DebugPreference -ScriptBlock {
         param($PackagesToInstall, $ChocoPreference, $DebugPreference)
         if ($PackagesToInstall.count -eq 1) {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })

functions/public/Invoke-WPFtweaksbutton.ps1

@@ -13,66 +13,50 @@ function Invoke-WPFtweaksbutton {
   }
 
   $Tweaks = (Get-WinUtilCheckBoxes)["WPFTweaks"]
-  $DNSChange = $sync["WPFchangedns"].text -ne "Default"
 
-  if ($DNSChange) {
   Set-WinUtilDNS -DNSProvider $sync["WPFchangedns"].text
-  }
 
-  if ($tweaks.count -eq 0 -and -not $DNSChange) {
-    $msg = "Please check the tweaks you wish to perform or select a DNS provider."
+  if ($tweaks.count -eq 0 -and  $sync["WPFchangedns"].text -eq "Default") {
+    $msg = "Please check the tweaks you wish to perform."
     [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
     return
   }
 
   Write-Debug "Number of tweaks to process: $($Tweaks.Count)"
 
-  try {
-    $handle = Invoke-WPFRunspace -ArgumentList $Tweaks, $DNSChange -DebugPreference $DebugPreference -ScriptBlock {
-      param($Tweaks, $DNSChange, $DebugPreference)
+  # The leading "," in the ParameterList is nessecary because we only provide one argument and powershell cannot be convinced that we want a nested loop with only one argument otherwise
+  $tweaksHandle = Invoke-WPFRunspace -ParameterList @(,("tweaks",$tweaks)) -DebugPreference $DebugPreference -ScriptBlock {
+    param(
+      $tweaks,
+      $DebugPreference
+      )
     Write-Debug "Inside Number of tweaks to process: $($Tweaks.Count)"
 
     $sync.ProcessRunning = $true
 
-      if ($Tweaks.count -eq 0 -and $DNSChange) {
-          $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
-      } elseif ($Tweaks.count -eq 1) {
+    if ($Tweaks.count -eq 1) {
         $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
     } else {
         $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" })
     }
+    # Execute other selected tweaks
 
-      # Execute selected tweaks
     for ($i = 0; $i -lt $Tweaks.Count; $i++) {
-        $currentTweak = $Tweaks[$i]
-        Set-WinUtilProgressBar -Label "Applying $currentTweak" -Percent ($i / $Tweaks.Count * 100)
-
-        # Apply the current tweak
-        Invoke-WinUtilTweaks $currentTweak
-
-        # Update taskbar progress
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value (($i + 1) / $Tweaks.Count) })
+      Set-WinUtilProgressBar -Label "Applying $($tweaks[$i])" -Percent ($i / $tweaks.Count * 100)
+      Invoke-WinUtilTweaks $tweaks[$i]
+      $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($i/$Tweaks.Count) })
     }
-
     Set-WinUtilProgressBar -Label "Tweaks finished" -Percent 100
     $sync.ProcessRunning = $false
     $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
     Write-Host "================================="
     Write-Host "--     Tweaks are Finished    ---"
     Write-Host "================================="
-    }
 
-    # Optionally, you can add code here to update the UI or perform other tasks while the runspace is executing
-    # For example, you might want to disable certain UI elements until the runspace completes
-
-    # If you need to wait for completion before proceeding, you can use:
-    # $handle.AsyncWaitHandle.WaitOne()
-    # But be cautious about blocking the UI thread
-
-    Write-Host "Tweaks execution started in background."
-  }
-  catch {
-    Write-Error "Failed to start tweaks execution: $_"
-    [System.Windows.MessageBox]::Show("An error occurred while starting tweaks execution. Please check the logs for more information.", "Error", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
+    # $ButtonType = [System.Windows.MessageBoxButton]::OK
+    # $MessageboxTitle = "Tweaks are Finished "
+    # $Messageboxbody = ("Done")
+    # $MessageIcon = [System.Windows.MessageBoxImage]::Information
+    # [System.Windows.MessageBox]::Show($Messageboxbody, $MessageboxTitle, $ButtonType, $MessageIcon)
   }
 }

xaml/inputXML.xaml

@@ -911,19 +911,19 @@
                     <Border Grid.Row="0" Grid.Column="0" Style="{StaticResource BorderStyle}">
                         <StackPanel Background="{MainBackgroundColor}" SnapsToDevicePixels="True">
                             <Button Name="WPFUpdatesdefault" FontSize="{ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Default (Out of Box) Settings" Margin="20,4,20,10" Padding="10"/>
-                            <TextBlock Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This is the default settings that come with Windows. <LineBreak/><LineBreak/> No modifications are made and will remove any custom windows update settings.<LineBreak/><LineBreak/>Note: If you still encounter update errors, reset all updates in the config tab. That will restore ALL Microsoft Update Services from their servers and reinstall them to default settings.</TextBlock>
+                            <TextBlock Foreground="{ComboBoxForegroundColor}" Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This is the default settings that come with Windows. <LineBreak/><LineBreak/> No modifications are made and will remove any custom windows update settings.<LineBreak/><LineBreak/>Note: If you still encounter update errors, reset all updates in the config tab. That will restore ALL Microsoft Update Services from their servers and reinstall them to default settings.</TextBlock>
                         </StackPanel>
                     </Border>
                     <Border Grid.Row="0" Grid.Column="1" Style="{StaticResource BorderStyle}">
                         <StackPanel Background="{MainBackgroundColor}" SnapsToDevicePixels="True">
                             <Button Name="WPFUpdatessecurity" FontSize="{ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Security (Recommended) Settings" Margin="20,4,20,10" Padding="10"/>
-                            <TextBlock Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This is my recommended setting I use on all computers.<LineBreak/><LineBreak/> It will delay feature updates by 2 years and will install security updates 4 days after release.<LineBreak/><LineBreak/>Feature Updates: Adds features and often bugs to systems when they are released. You want to delay these as long as possible.<LineBreak/><LineBreak/>Security Updates: Typically these are pressing security flaws that need to be patched quickly. You only want to delay these a couple of days just to see if they are safe and don't break other systems. You don't want to go without these for ANY extended periods of time.</TextBlock>
+                            <TextBlock Foreground="{ComboBoxForegroundColor}" Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This is my recommended setting I use on all computers.<LineBreak/><LineBreak/> It will delay feature updates by 2 years and will install security updates 4 days after release.<LineBreak/><LineBreak/>Feature Updates: Adds features and often bugs to systems when they are released. You want to delay these as long as possible.<LineBreak/><LineBreak/>Security Updates: Typically these are pressing security flaws that need to be patched quickly. You only want to delay these a couple of days just to see if they are safe and don't break other systems. You don't want to go without these for ANY extended periods of time.</TextBlock>
                         </StackPanel>
                     </Border>
                     <Border Grid.Row="0" Grid.Column="2" Style="{StaticResource BorderStyle}">
                         <StackPanel Background="{MainBackgroundColor}" SnapsToDevicePixels="True">
                             <Button Name="WPFUpdatesdisable" FontSize="{ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Disable ALL Updates (NOT RECOMMENDED!)" Margin="20,4,20,10" Padding="10,10,10,10"/>
-                            <TextBlock Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This completely disables ALL Windows Updates and is NOT RECOMMENDED.<LineBreak/><LineBreak/> However, it can be suitable if you use your system for a select purpose and do not actively browse the internet. <LineBreak/><LineBreak/>Note: Your system will be easier to hack and infect without security updates.</TextBlock>
+                            <TextBlock Foreground="{ComboBoxForegroundColor}" Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This completely disables ALL Windows Updates and is NOT RECOMMENDED.<LineBreak/><LineBreak/> However, it can be suitable if you use your system for a select purpose and do not actively browse the internet. <LineBreak/><LineBreak/>Note: Your system will be easier to hack and infect without security updates.</TextBlock>
                             <TextBlock Text=" " Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300"/>
                         </StackPanel>
                         </Border>