xstefen/winutil
1
0
Fork 0
mirror of https://github.com/ChrisTitusTech/winutil.git synced 2025-01-15 09:20:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source 
- use correct ctt blue color #0567ff
- remove unneeded comments
- rename Logoview to assets
This commit is contained in:
MyDrift 2024-09-03 21:41:16 +02:00
parent 7cb025621d
commit 4b741ce430
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functions/private/Invoke-WinUtilLogoviewbox.ps1 → functions/private/Invoke-WinUtilAssets.ps1
View File

@ -1,4 +1,4 @@
function Invoke-WinUtilLogoviewbox { function Invoke-WinUtilAssets {
param ( param (
$type, $type,
$Size, $Size,
@ -38,7 +38,7 @@ C 18.00,14.00 45.00,27.74 45.00,27.74
"@ "@
$LogoPath1 = New-Object Windows.Shapes.Path $LogoPath1 = New-Object Windows.Shapes.Path
$LogoPath1.Data = [Windows.Media.Geometry]::Parse($LogoPathData1) $LogoPath1.Data = [Windows.Media.Geometry]::Parse($LogoPathData1)
$LogoPath1.Fill = [Windows.Media.Brushes]::Blue $LogoPath1.Fill = [System.Windows.Media.BrushConverter]::new().ConvertFromString("#0567ff")
$LogoPathData2 = @" $LogoPathData2 = @"
M 107.00,14.00 M 107.00,14.00
@ -54,7 +54,7 @@ C 109.01,19.06 108.93,30.37 104.66,34.21
"@ "@
$LogoPath2 = New-Object Windows.Shapes.Path $LogoPath2 = New-Object Windows.Shapes.Path
$LogoPath2.Data = [Windows.Media.Geometry]::Parse($LogoPathData2) $LogoPath2.Data = [Windows.Media.Geometry]::Parse($LogoPathData2)
$LogoPath2.Fill = [Windows.Media.Brushes]::Blue $LogoPath2.Fill = [System.Windows.Media.BrushConverter]::new().ConvertFromString("#0567ff")
$LogoPathData3 = @" $LogoPathData3 = @"
M 20.00,46.00 M 20.00,46.00

6
functions/private/Set-WinUtilTaskbarItem.ps1
View File

@ -61,13 +61,13 @@ function Set-WinUtilTaskbaritem {
if ($overlay) { if ($overlay) {
switch ($overlay) { switch ($overlay) {
'logo' { 'logo' {
$sync["Form"].taskbarItemInfo.Overlay = (Invoke-WinUtilLogoviewbox -Type "Logo" -Size 80 -Render) $sync["Form"].taskbarItemInfo.Overlay = (Invoke-WinUtilAssets -Type "Logo" -Size 80 -Render)
} }
'checkmark' { 'checkmark' {
$sync["Form"].taskbarItemInfo.Overlay = (Invoke-WinUtilLogoviewbox -Type "checkmark" -Size 512 -Render) $sync["Form"].taskbarItemInfo.Overlay = (Invoke-WinUtilAssets -Type "checkmark" -Size 512 -Render)
} }
'warning' { 'warning' {
$sync["Form"].taskbarItemInfo.Overlay = (Invoke-WinUtilLogoviewbox -Type "warning" -Size 512 -Render) $sync["Form"].taskbarItemInfo.Overlay = (Invoke-WinUtilAssets -Type "warning" -Size 512 -Render)
} }
'None' { 'None' {
$sync["Form"].taskbarItemInfo.Overlay = $null $sync["Form"].taskbarItemInfo.Overlay = $null

2
functions/private/Show-CustomDialog.ps1
View File

@ -129,7 +129,7 @@ function Show-CustomDialog {
[Windows.Controls.Grid]::SetRow($stackPanel, 0) # Set the row to the second row (0-based index) [Windows.Controls.Grid]::SetRow($stackPanel, 0) # Set the row to the second row (0-based index)
# Add SVG path to the stack panel # Add SVG path to the stack panel
$stackPanel.Children.Add((Invoke-WinUtilLogoviewbox -Type "logo" -Size 25)) $stackPanel.Children.Add((Invoke-WinUtilAssets -Type "logo" -Size 25))
# Add "Winutil" text # Add "Winutil" text
$winutilTextBlock = New-Object Windows.Controls.TextBlock $winutilTextBlock = New-Object Windows.Controls.TextBlock

5
scripts/main.ps1
View File

@ -446,7 +446,7 @@ $sync["Form"].Add_Loaded({
}) })
$NavLogoPanel = $sync["Form"].FindName("NavLogoPanel") $NavLogoPanel = $sync["Form"].FindName("NavLogoPanel")
$NavLogoPanel.Children.Add((Invoke-WinUtilLogoviewbox -Type "logo" -Size 25)) | Out-Null $NavLogoPanel.Children.Add((Invoke-WinUtilAssets -Type "logo" -Size 25)) | Out-Null
# Initialize the hashtable # Initialize the hashtable
$winutildir = @{} $winutildir = @{}
@ -457,9 +457,6 @@ $winutildir["path"] = "$env:LOCALAPPDATA\winutil\"
$winutildir["logo.ico"] = $winutildir["path"] + "cttlogo.ico" $winutildir["logo.ico"] = $winutildir["path"] + "cttlogo.ico"
#$sync["Form"].Icon = [System.Drawing.Icon]::ExtractAssociatedIcon($winutildir["logo.ico"]).ToBitmap()
#$sync["logo.svg"] = [System.Drawing.Bitmap]::FromStream([System.IO.MemoryStream]::new([System.Convert]::FromBase64String($sync["icon.svg"])))
Set-WinUtilTaskbaritem -overlay "logo" Set-WinUtilTaskbaritem -overlay "logo"
$sync["Form"].Add_Activated({ $sync["Form"].Add_Activated({