mirror of
https://github.com/ChrisTitusTech/winutil.git
synced 2025-01-15 09:20:36 -06:00
cleanup
This commit is contained in:
MyDrift
parent
4c6990b515
commit
a22d6b0d10
@ -86,7 +86,7 @@
|
|||||||
"HeaderFontFamily": "Consolas, Monaco",
|
"HeaderFontFamily": "Consolas, Monaco",
|
||||||
|
|
||||||
"CheckBoxBulletDecoratorFontSize": "14",
|
"CheckBoxBulletDecoratorFontSize": "14",
|
||||||
"CheckBoxMargin": "5,0,0,2",
|
"CheckBoxMargin": "5,0,0,1",
|
||||||
|
|
||||||
"TabButtonFontSize": "14",
|
"TabButtonFontSize": "14",
|
||||||
"TabButtonWidth": "100",
|
"TabButtonWidth": "100",
|
||||||
@ -158,7 +158,7 @@
|
|||||||
"HeaderFontFamily": "Consolas, Monaco",
|
"HeaderFontFamily": "Consolas, Monaco",
|
||||||
|
|
||||||
"CheckBoxBulletDecoratorFontSize": "14",
|
"CheckBoxBulletDecoratorFontSize": "14",
|
||||||
"CheckBoxMargin": "5,0,0,2",
|
"CheckBoxMargin": "5,0,0,0.8",
|
||||||
|
|
||||||
"TabButtonFontSize": "14",
|
"TabButtonFontSize": "14",
|
||||||
"TabButtonWidth": "100",
|
"TabButtonWidth": "100",
|
||||||
|
|||||||
@ -48,7 +48,7 @@ function Invoke-WPFUIElements {
|
|||||||
Content = $entryInfo.Content
|
Content = $entryInfo.Content
|
||||||
Choco = $entryInfo.choco
|
Choco = $entryInfo.choco
|
||||||
Winget = $entryInfo.winget
|
Winget = $entryInfo.winget
|
||||||
Panel = if ($entryInfo.Panel -ne $null) { $entryInfo.Panel } else { "0" }
|
Panel = if ($entryInfo.Panel) { $entryInfo.Panel } else { "0" }
|
||||||
Link = $entryInfo.link
|
Link = $entryInfo.link
|
||||||
Description = $entryInfo.description
|
Description = $entryInfo.description
|
||||||
Type = $entryInfo.type
|
Type = $entryInfo.type
|
||||||
@ -222,17 +222,6 @@ function Invoke-WPFUIElements {
|
|||||||
$sync[$entryInfo.Name] = $toggleButton
|
$sync[$entryInfo.Name] = $toggleButton
|
||||||
}
|
}
|
||||||
|
|
||||||
"Image" {
|
|
||||||
$image = New-Object Windows.Controls.Image
|
|
||||||
$image.Name = $entryInfo.Name
|
|
||||||
$image.Source = $entryInfo.Content
|
|
||||||
$image.Height = $theme.ImageHeight
|
|
||||||
$image.Width = $theme.ImageWidth
|
|
||||||
$image.HorizontalAlignment = "Center"
|
|
||||||
$image.Margin = $theme.ImageMargin
|
|
||||||
$stackPanel.Children.Add($image) | Out-Null
|
|
||||||
}
|
|
||||||
|
|
||||||
"Combobox" {
|
"Combobox" {
|
||||||
$horizontalStackPanel = New-Object Windows.Controls.StackPanel
|
$horizontalStackPanel = New-Object Windows.Controls.StackPanel
|
||||||
$horizontalStackPanel.Orientation = "Horizontal"
|
$horizontalStackPanel.Orientation = "Horizontal"
|
||||||
@ -276,17 +265,12 @@ function Invoke-WPFUIElements {
|
|||||||
$button.Margin = "5"
|
$button.Margin = "5"
|
||||||
$button.Padding = "20,5"
|
$button.Padding = "20,5"
|
||||||
$button.FontSize = $theme.ButtonFontSize
|
$button.FontSize = $theme.ButtonFontSize
|
||||||
if ($entryInfo.ButtonWidth -ne $null) {
|
if ($entryInfo.ButtonWidth) {
|
||||||
$button.Width = $entryInfo.ButtonWidth
|
$button.Width = $entryInfo.ButtonWidth
|
||||||
}
|
}
|
||||||
$stackPanel.Children.Add($button) | Out-Null
|
$stackPanel.Children.Add($button) | Out-Null
|
||||||
|
|
||||||
$sync[$entryInfo.Name] = $button
|
$sync[$entryInfo.Name] = $button
|
||||||
|
|
||||||
$sync[$entryInfo.Name].Add_Click({
|
|
||||||
[System.Object]$Sender = $args[0]
|
|
||||||
Invoke-WPFButton $Sender.name
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
default {
|
default {
|
||||||
@ -299,12 +283,12 @@ function Invoke-WPFUIElements {
|
|||||||
$checkBox.FontSize = $theme.FontSize
|
$checkBox.FontSize = $theme.FontSize
|
||||||
$checkBox.ToolTip = $entryInfo.Description
|
$checkBox.ToolTip = $entryInfo.Description
|
||||||
$checkBox.Margin = $theme.CheckBoxMargin
|
$checkBox.Margin = $theme.CheckBoxMargin
|
||||||
if ($entryInfo.Checked -ne $null) {
|
if ($entryInfo.Checked) {
|
||||||
$checkBox.IsChecked = $entryInfo.Checked
|
$checkBox.IsChecked = $entryInfo.Checked
|
||||||
}
|
}
|
||||||
$horizontalStackPanel.Children.Add($checkBox) | Out-Null
|
$horizontalStackPanel.Children.Add($checkBox) | Out-Null
|
||||||
|
|
||||||
if ($entryInfo.Link -ne $null) {
|
if ($entryInfo.Link) {
|
||||||
$textBlock = New-Object Windows.Controls.TextBlock
|
$textBlock = New-Object Windows.Controls.TextBlock
|
||||||
$textBlock.Name = $checkBox.Name + "Link"
|
$textBlock.Name = $checkBox.Name + "Link"
|
||||||
$textBlock.Text = "(?)"
|
$textBlock.Text = "(?)"
|
||||||
|
|||||||
@ -773,32 +773,59 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
<TabItem Header="Tweaks" Visibility="Collapsed" Name="WPFTab2">
|
<TabItem Header="Tweaks" Visibility="Collapsed" Name="WPFTab2">
|
||||||
<ScrollViewer VerticalScrollBarVisibility="Auto">
|
<Grid>
|
||||||
<Grid Background="Transparent">
|
<!-- Main content area with a ScrollViewer -->
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="45px"/>
|
<RowDefinition Height="*" />
|
||||||
<RowDefinition Height=".70*"/>
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height=".10*"/>
|
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<StackPanel Background="{MainBackgroundColor}" Orientation="Horizontal" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="5">
|
|
||||||
<Label Content="Recommended Selections:" FontSize="{FontSize}" VerticalAlignment="Center" Margin="2"/>
|
<ScrollViewer VerticalScrollBarVisibility="Auto" Grid.Row="0">
|
||||||
<Button Name="WPFstandard" Content=" Standard " Margin="2"/>
|
<Grid Background="Transparent">
|
||||||
<Button Name="WPFminimal" Content=" Minimal " Margin="2"/>
|
<Grid.RowDefinitions>
|
||||||
<Button Name="WPFclear" Content=" Clear " Margin="2"/>
|
<RowDefinition Height="45px"/>
|
||||||
<Button Name="WPFGetInstalledTweaks" Content=" Get Installed " Margin="2"/>
|
<RowDefinition Height="*"/>
|
||||||
</StackPanel>
|
<RowDefinition Height="Auto"/>
|
||||||
<Grid Name="tweakspanel" Grid.Row="1">
|
</Grid.RowDefinitions>
|
||||||
</Grid>
|
|
||||||
<Border Grid.ColumnSpan="2" Grid.Row="2" Grid.Column="0">
|
<StackPanel Background="{MainBackgroundColor}" Orientation="Horizontal" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="5">
|
||||||
<StackPanel Background="{MainBackgroundColor}" Orientation="Horizontal" HorizontalAlignment="Left">
|
<Label Content="Recommended Selections:" FontSize="{FontSize}" VerticalAlignment="Center" Margin="2"/>
|
||||||
<TextBlock Padding="10">
|
<Button Name="WPFstandard" Content=" Standard " Margin="2"/>
|
||||||
Note: Hover over items to get a better description. Please be careful as many of these tweaks will heavily modify your system.
|
<Button Name="WPFminimal" Content=" Minimal " Margin="2"/>
|
||||||
<LineBreak/>Recommended selections are for normal users and if you are unsure do NOT check anything else!
|
<Button Name="WPFclear" Content=" Clear " Margin="2"/>
|
||||||
</TextBlock>
|
<Button Name="WPFGetInstalledTweaks" Content=" Get Installed " Margin="2"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
|
<Grid Name="tweakspanel" Grid.Row="1">
|
||||||
|
<!-- Your tweakspanel content goes here -->
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<!-- TextBlock with note on the right half -->
|
||||||
|
<StackPanel Grid.Row="2" Orientation="Horizontal" Margin="5">
|
||||||
|
<TextBlock Padding="5">
|
||||||
|
Note: Hover over items to get a better description. Please be careful as many of these tweaks will heavily modify your system.
|
||||||
|
<LineBreak/>Recommended selections are for normal users and if you are unsure do NOT check anything else!
|
||||||
|
</TextBlock>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
|
|
||||||
|
<!-- Centered border with buttons and text -->
|
||||||
|
<Border Grid.Row="1" Background="{MainBackgroundColor}" BorderBrush="Gray" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" Padding="10">
|
||||||
|
<Grid>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="1*" />
|
||||||
|
<ColumnDefinition Width="1*" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
|
<!-- Buttons on the left half -->
|
||||||
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Column="0">
|
||||||
|
<Button Name="WPFApplyButton" Content="Apply" Margin="5"/>
|
||||||
|
<Button Name="WPFCancelButton" Content="Cancel" Margin="5"/>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
</ScrollViewer>
|
|
||||||
</TabItem>
|
</TabItem>
|
||||||
<TabItem Header="Config" Visibility="Collapsed" Name="WPFTab3">
|
<TabItem Header="Config" Visibility="Collapsed" Name="WPFTab3">
|
||||||
<ScrollViewer VerticalScrollBarVisibility="Auto">
|
<ScrollViewer VerticalScrollBarVisibility="Auto">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user