Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Large update 4/25/2024 #11

Merged
merged 16 commits into from
Apr 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
# Color Scheme Change
Tested & Working 1/26/2024 :white_check_mark:
![image](https://github.com/EnziTheViking/PrettyWinUtil/assets/79238110/36221761-a7df-4a69-8bfd-167b08f6c392)

![image](https://github.com/EnziTheViking/PrettyWinUtil/assets/79238110/a971c00a-4aa5-4045-a106-3bf7264ef98b)

![image](https://github.com/EnziTheViking/PrettyWinUtil/assets/79238110/3f422f4c-9781-4411-b246-54c0707c500b)

![image](https://github.com/EnziTheViking/PrettyWinUtil/assets/79238110/b599c6c5-42a7-45a1-ac39-1c8a4e27a781)

![image](https://github.com/EnziTheViking/PrettyWinUtil/assets/79238110/dfcb1aa3-cf8e-4a4f-b87e-57917aedff86)


---




# Chris Titus Tech's Windows Utility

This utility is a compilation of Windows tasks I perform on each Windows system I use. It is meant to streamline *installs*, debloat with *tweaks*, troubleshoot with *config*, and fix Windows *updates*. I am extremely picky about any contributions to keep this project clean and efficient.
Expand Down
146 changes: 88 additions & 58 deletions config/themes.json
Original file line number Diff line number Diff line change
@@ -1,65 +1,95 @@
{
"Classic": {
"ComboBoxBackgroundColor": "#FFFFFF",
"LabelboxForegroundColor": "#000000",
"MainForegroundColor": "#000000",
"MainBackgroundColor": "#FFFFFF",
"LabelBackgroundColor": "#FAFAFA",
"LinkForegroundColor": "#000000",
"LinkHoverForegroundColor": "#000000",
"GroupBorderBackgroundColor": "#000000",
"ComboBoxForegroundColor": "#000000",
"ButtonInstallBackgroundColor": "#FFFFFF",
"ButtonTweaksBackgroundColor": "#FFFFFF",
"ButtonConfigBackgroundColor": "#FFFFFF",
"ButtonUpdatesBackgroundColor": "#FFFFFF",
"ButtonInstallForegroundColor": "#000000",
"ButtonTweaksForegroundColor": "#000000",
"ButtonConfigForegroundColor": "#000000",
"ButtonUpdatesForegroundColor": "#000000",
"ButtonBackgroundColor": "#F5F5F5",
"ButtonBackgroundPressedColor": "#1A1A1A",
"CheckboxMouseOverColor": "#999999",
"ButtonBackgroundMouseoverColor": "#C2C2C2",
"ButtonBackgroundSelectedColor": "#F0F0F0",
"ButtonForegroundColor": "#000000",
"ButtonBorderThickness": "1",
"ButtonMargin": "1",
"ButtonCornerRadius": "2",
"ToggleButtonHeight": "25",
"BorderColor": "#000000",
"BorderOpacity": "0.2",
"ShadowPulse": "Forever"
"ComboBoxForegroundColor": "#fcfcfd",
"ComboBoxBackgroundColor": "#1f72b5",
"LabelboxForegroundColor": "#fcfcfd",

"MainForegroundColor": "#fcfcfd",
"MainBackgroundColor": "#1f1f1f",

"LabelBackgroundColor": "#1f1f1f",
"LinkForegroundColor": "#1f72b5",
"LinkHoverForegroundColor": "#000000",
"GroupBorderBackgroundColor": "#000000",

"ButtonInstallBackgroundColor": "#1f72b5",
"ButtonTweaksBackgroundColor": "#1f72b5",
"ButtonConfigBackgroundColor": "#1f72b5",
"ButtonUpdatesBackgroundColor": "#1f72b5",

"ButtonInstallForegroundColor": "#fcfcfd",
"ButtonTweaksForegroundColor": "#fcfcfd",
"ButtonConfigForegroundColor": "#fcfcfd",
"ButtonUpdatesForegroundColor": "#fcfcfd",

"ButtonForegroundColor": "#fcfcfd",

"ButtonBackgroundMouseoverColor": "#144974",
"ButtonBackgroundSelectedColor": "#0d2e49",

"ButtonPage1BackgroundColor": "#1f72b5",
"ButtonBackgroundColor": "#000000",

"ButtonBackgroundPressedColor": "#1f72b5",

"CheckboxMouseOverColor": "#fcfcfd",

"ToggleOn": "#35b355",
"ToggleOff": "#ff5757",

"ButtonBorderThickness": "1",
"ButtonMargin": "1",
"ButtonCornerRadius": "2",
"ToggleButtonHeight": "25",
"BorderColor": "#000000",
"BorderOpacity": "0.0",
"ShadowPulse": "0:0:0"
},
"Matrix": {
"ComboBoxBackgroundColor": "#000000",
"LabelboxForegroundColor": "#FFEE58",
"MainForegroundColor": "#9CCC65",
"MainBackgroundColor": "#000000",
"LabelBackgroundColor": "#000000",
"LinkForegroundColor": "#add8e6",
"LinkHoverForegroundColor": "#FFFFFF",
"ComboBoxForegroundColor": "#FFEE58",
"ButtonInstallBackgroundColor": "#222222",
"ButtonTweaksBackgroundColor": "#333333",
"ButtonConfigBackgroundColor": "#444444",
"ButtonUpdatesBackgroundColor": "#555555",
"ButtonInstallForegroundColor": "#FFFFFF",
"ButtonTweaksForegroundColor": "#FFFFFF",
"ButtonConfigForegroundColor": "#FFFFFF",
"ButtonUpdatesForegroundColor": "#FFFFFF",
"ButtonBackgroundColor": "#000019",
"ButtonBackgroundPressedColor": "#FFFFFF",
"ButtonBackgroundMouseoverColor": "#A55A64",
"ButtonBackgroundSelectedColor": "#FF5733",
"ButtonForegroundColor": "#9CCC65",
"ButtonBorderThickness": "1",
"ButtonMargin": "1",
"ButtonCornerRadius": "2",
"ToggleButtonHeight": "25",
"BorderColor": "#FFAC1C",
"BorderOpacity": "0.8",
"ShadowPulse": "0:0:3"
"ComboBoxForegroundColor": "#fcfcfd",
"ComboBoxBackgroundColor": "#1f72b5",
"LabelboxForegroundColor": "#fcfcfd",

"MainForegroundColor": "#fcfcfd",
"MainBackgroundColor": "#1f1f1f",

"LabelBackgroundColor": "#1f1f1f",
"LinkForegroundColor": "#1f72b5",
"LinkHoverForegroundColor": "#000000",
"GroupBorderBackgroundColor": "#000000",

"ButtonInstallBackgroundColor": "#1f72b5",
"ButtonTweaksBackgroundColor": "#1f72b5",
"ButtonConfigBackgroundColor": "#1f72b5",
"ButtonUpdatesBackgroundColor": "#1f72b5",

"ButtonInstallForegroundColor": "#fcfcfd",
"ButtonTweaksForegroundColor": "#fcfcfd",
"ButtonConfigForegroundColor": "#fcfcfd",
"ButtonUpdatesForegroundColor": "#fcfcfd",

"ButtonForegroundColor": "#fcfcfd",

"ButtonBackgroundMouseoverColor": "#144974",
"ButtonBackgroundSelectedColor": "#0d2e49",

"ButtonPage1BackgroundColor": "#1f72b5",
"ButtonBackgroundColor": "#000000",

"ButtonBackgroundPressedColor": "#1f72b5",

"CheckboxMouseOverColor": "#fcfcfd",

"ToggleOn": "#35b355",
"ToggleOff": "#ff5757",

"ButtonBorderThickness": "1",
"ButtonMargin": "1",
"ButtonCornerRadius": "2",
"ToggleButtonHeight": "25",
"BorderColor": "#000000",
"BorderOpacity": "0.0",
"ShadowPulse": "0:0:0"
},
"Dark": {
"ComboBoxBackgroundColor": "#000000",
Expand Down
4 changes: 2 additions & 2 deletions functions/private/Show-CustomDialog.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function Show-CustomDialog {
$foregroundColor = [Windows.Media.Brushes]::White
$backgroundColor = [Windows.Media.Brushes]::Black
$font = New-Object Windows.Media.FontFamily("Consolas")
$borderColor = [Windows.Media.Brushes]::Green
$borderColor = [Windows.Media.Brushes]::White
$buttonBackgroundColor = [Windows.Media.Brushes]::Black
$buttonForegroundColor = [Windows.Media.Brushes]::White
$shadowColor = [Windows.Media.ColorConverter]::ConvertFromString("#AAAAAAAA")
Expand All @@ -49,7 +49,7 @@ function Show-CustomDialog {
$dialog.Background = $backgroundColor
$dialog.FontFamily = $font

# Create a Border for the green edge with rounded corners
# Create a Border for the White edge with rounded corners
$border = New-Object Windows.Controls.Border
$border.BorderBrush = $borderColor
$border.BorderThickness = New-Object Windows.Thickness(1) # Adjust border thickness as needed
Expand Down
7 changes: 6 additions & 1 deletion scripts/main.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -441,14 +441,19 @@ $sync["AboutMenuItem"].Add_Click({
$sync["SettingsPopup"].IsOpen = $false
# Example usage
$authorInfo = @"
FORK : PrettyWinUtil
Author : @EnziTheViking
GitHub : https://github.com/EnziTheViking/PrettyWinUtil

OG Software
Author : @christitustech
Runspace : @DeveloperDurp
GUI : @KonTy
MicroWin : @KonTy
GitHub : https://github.com/ChrisTitusTech/winutil
Version : $($sync.version)
"@
Show-CustomDialog -Message $authorInfo -Width 400
Show-CustomDialog -Message $authorInfo -Width 400 -height 270
})

$sync["Form"].ShowDialog() | out-null
Expand Down
30 changes: 15 additions & 15 deletions xaml/inputXML.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
<Setter TargetName="BackgroundBorder" Property="Background" Value="{ButtonBackgroundMouseoverColor}"/>
<Setter Property="Effect">
<Setter.Value>
<DropShadowEffect Opacity="1" ShadowDepth="5" Color="Gold" Direction="-100" BlurRadius="45"/>
<DropShadowEffect Opacity="0" ShadowDepth="5" Color="Gold" Direction="-100" BlurRadius="45"/>
</Setter.Value>
</Setter>
<Setter Property="Panel.ZIndex" Value="2000"/>
Expand All @@ -219,7 +219,7 @@
<Setter TargetName="BackgroundBorder" Property="Background" Value="{ButtonBackgroundSelectedColor}"/>
<Setter Property="Effect">
<Setter.Value>
<DropShadowEffect Opacity="1" ShadowDepth="2" Color="Gold" Direction="-111" BlurRadius="25"/>
<DropShadowEffect Opacity="0" ShadowDepth="2" Color="Gold" Direction="-111" BlurRadius="25"/>
</Setter.Value>
</Setter>
</Trigger>
Expand Down Expand Up @@ -430,7 +430,7 @@

<ControlTemplate.Triggers>
<Trigger Property="ToggleButton.IsChecked" Value="False">
<Setter TargetName="Border" Property="Background" Value="#C2283B" />
<Setter TargetName="Border" Property="Background" Value="{ToggleOff}" />
<Setter TargetName="Ellipse" Property="Margin" Value="2 2 2 1" />
<Setter TargetName="txtDisable" Property="Opacity" Value="1.0" />
<Setter TargetName="txtEnable" Property="Opacity" Value="0.0" />
Expand All @@ -442,7 +442,7 @@
<Storyboard>
<ColorAnimation Storyboard.TargetName="Border"
Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
To="#34A543" Duration="0:0:0.1" />
To="{ToggleOn}" Duration="0:0:0.1" />

<ThicknessAnimation Storyboard.TargetName="Ellipse"
Storyboard.TargetProperty="Margin"
Expand All @@ -465,7 +465,7 @@
<Storyboard>
<ColorAnimation Storyboard.TargetName="Border"
Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
To="#C2283B" Duration="0:0:0.1" />
To="{ToggleOff}" Duration="0:0:0.1" />

<ThicknessAnimation Storyboard.TargetName="Ellipse"
Storyboard.TargetProperty="Margin"
Expand Down Expand Up @@ -503,13 +503,13 @@
<Style TargetType="Border">
<Setter Property="Background" Value="{MainBackgroundColor}"/>
<Setter Property="BorderBrush" Value="{BorderColor}"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="BorderThickness" Value="3"/>
<Setter Property="CornerRadius" Value="5"/>
<Setter Property="Padding" Value="5"/>
<Setter Property="Margin" Value="5"/>
<Setter Property="Effect">
<Setter.Value>
<DropShadowEffect ShadowDepth="5" BlurRadius="5" Opacity="{BorderOpacity}" Color="{BorderColor}"/>
<DropShadowEffect ShadowDepth="0" BlurRadius="0" Opacity="{BorderOpacity}" Color="{BorderColor}"/>
</Setter.Value>
</Setter>
<Style.Triggers>
Expand All @@ -522,12 +522,12 @@
<!-- <DoubleAnimation
Storyboard.TargetProperty="Effect.(DropShadowEffect.Direction)"
From="0" To="360" Duration="Forever"/> -->
<DoubleAnimation
<!-- <DoubleAnimation
Storyboard.TargetProperty="Effect.(DropShadowEffect.Opacity)"
From="0.5" To="0.94" Duration="{ShadowPulse}" AutoReverse="True"/>
<DoubleAnimation
Storyboard.TargetProperty="Effect.(DropShadowEffect.BlurRadius)"
From="5" To="15" Duration="{ShadowPulse}" AutoReverse="True"/>
From="5" To="15" Duration="{ShadowPulse}" AutoReverse="True"/> -->
</Storyboard>
</BeginStoryboard>
</EventTrigger>
Expand Down Expand Up @@ -658,7 +658,7 @@
IsOpen="False"
PlacementTarget="{Binding ElementName=SettingsButton}" Placement="Bottom"
HorizontalAlignment="Right" VerticalAlignment="Top">
<Border Background="{MainBackgroundColor}" BorderBrush="{MainForegroundColor}" BorderThickness="1" CornerRadius="0" Margin="0">
<Border Background="{MainBackgroundColor}" BorderBrush="{MainForegroundColor}" BorderThickness="0" CornerRadius="0" Margin="0">
<StackPanel Background="{MainBackgroundColor}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<MenuItem Header="Import" Name="ImportMenuItem" Foreground="{MainForegroundColor}"/>
<MenuItem Header="Export" Name="ExportMenuItem" Foreground="{MainForegroundColor}"/>
Expand Down Expand Up @@ -691,11 +691,11 @@
<RowDefinition Height="0.95*"/>
</Grid.RowDefinitions>
<StackPanel Background="{MainBackgroundColor}" Orientation="Horizontal" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3" Margin="5">
<Button Name="WPFinstall" Content=" Install/Upgrade Selected" Margin="2" />
<Button Name="WPFInstallUpgrade" Content=" Upgrade All" Margin="2"/>
<Button Name="WPFuninstall" Content=" Uninstall Selection" Margin="2"/>
<Button Name="WPFGetInstalled" Content=" Get Installed" Margin="2"/>
<Button Name="WPFclearWinget" Content=" Clear Selection" Margin="2"/>
<Button Name="WPFinstall" Content=" Install/Upgrade Selected" Margin="2" Background="{ButtonPage1BackgroundColor}" Foreground="{ButtonForegroundColor}"/>
<Button Name="WPFInstallUpgrade" Content=" Upgrade All" Margin="2" Background="{ButtonPage1BackgroundColor}" Foreground="{ButtonForegroundColor}"/>
<Button Name="WPFuninstall" Content=" Uninstall Selection" Margin="2" Background="{ButtonPage1BackgroundColor}" Foreground="{ButtonForegroundColor}"/>
<Button Name="WPFGetInstalled" Content=" Get Installed" Margin="2" Background="{ButtonPage1BackgroundColor}" Foreground="{ButtonForegroundColor}"/>
<Button Name="WPFclearWinget" Content=" Clear Selection" Margin="2" Background="{ButtonPage1BackgroundColor}" Foreground="{ButtonForegroundColor}"/>
</StackPanel>

<ScrollViewer Grid.Row="1" Grid.Column="0" Padding="-1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
Expand Down
Loading