Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 03:37:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apply xaml styling + add conditional for pruning bug in VS2026

Browse Source
This commit is contained in:
Zach Teutsch
2025-11-26 20:48:55 -05:00
parent 97131c88a7
commit 6b3c4a7770
9 changed files with 35 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Directory.Build.props
View File

@@ -17,6 +17,7 @@
<NuGetAuditMode>direct</NuGetAuditMode> <NuGetAuditMode>direct</NuGetAuditMode>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion> <!-- Don't add source revision hash to the product version of binaries. --> <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion> <!-- Don't add source revision hash to the product version of binaries. -->
<PlatformTarget>$(Platform)</PlatformTarget> <PlatformTarget>$(Platform)</PlatformTarget>
<RestoreEnablePackagePruning Condition=" '$(VisualStudioVersion)' == '17.0'">false </RestoreEnablePackagePruning>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'"> <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">

40
src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/AppPageInputControl.xaml
View File

@@ -44,39 +44,31 @@
</ToggleButton.Content> </ToggleButton.Content>
</ToggleButton> </ToggleButton>
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal" Spacing="8">
Spacing="8"> <TextBlock Text="{x:Bind helper:ResourceLoaderInstance.GetString('ProgramsPage_ExampleHeader')}" />
<TextBlock Text="{x:Bind helper:ResourceLoaderInstance.GetString('ProgramsPage_ExampleHeader')}"/> <TextBox x:Name="ProgramPathInput" />
<TextBox
x:Name="ProgramPathInput"/>
<Button <Button
x:Name="ProgramPathSelectButton" x:Name="ProgramPathSelectButton"
Content="Select Program" Click="ProgramPathSelectButton_Click"
Click="ProgramPathSelectButton_Click"/> Content="Select Program" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal" Spacing="8">
Spacing="8"> <TextBlock Text="{x:Bind helper:ResourceLoaderInstance.GetString('ProgramsPage_Arguments')}" />
<TextBlock Text="{x:Bind helper:ResourceLoaderInstance.GetString('ProgramsPage_Arguments')}"/> <TextBox x:Name="ProgramArgsInput" />
<TextBox
x:Name="ProgramArgsInput"/>
</StackPanel> </StackPanel>
<StackPanel <StackPanel Orientation="Horizontal" Spacing="8">
Orientation="Horizontal"
Spacing="8">
<TextBlock> <TextBlock>
Start in Start in
</TextBlock> </TextBlock>
<TextBox <TextBox x:Name="StartInPathInput" />
x:Name="StartInPathInput"/>
<Button <Button
x:Name="StartInSelectButton" x:Name="StartInSelectButton"
Content="Select Starting Directory" Click="StartInSelectButton_Click"
Click="StartInSelectButton_Click"/> Content="Select Starting Directory" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal" Spacing="8">
Spacing="8"> <ComboBox
<ComboBox
x:Name="ElevationComboBox" x:Name="ElevationComboBox"
Header="Elevation" Header="Elevation"
SelectedValue="Normal"> SelectedValue="Normal">
@@ -104,7 +96,7 @@
<x:String>Maximized</x:String> <x:String>Maximized</x:String>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>

8
src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/InputControl.xaml
View File

@@ -23,13 +23,9 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock <TextBlock x:Uid="InputControlOriginalKeysTextBlock" Margin="0,12,0,0" />
x:Uid="InputControlOriginalKeysTextBlock"
Margin="0,12,0,0" />
<Grid Grid.Column="2"> <Grid Grid.Column="2">
<TextBlock <TextBlock x:Uid="InputControlNewKeysTextBlock" Margin="0,12,0,0" />
x:Uid="InputControlNewKeysTextBlock"
Margin="0,12,0,0" />
</Grid> </Grid>
<Grid Grid.Row="1" Margin="0,8,0,0"> <Grid Grid.Row="1" Margin="0,8,0,0">
<ToggleButton <ToggleButton

4
src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/TextPageInputControl.xaml
View File

@@ -19,7 +19,7 @@
<TextBlock <TextBlock
x:Uid="TextPageInputControlShortcutKeysTextBlock" x:Uid="TextPageInputControlShortcutKeysTextBlock"
Margin="0,12,0,8" Margin="0,12,0,8"
FontWeight="SemiBold"/> FontWeight="SemiBold" />
<ToggleButton <ToggleButton
x:Name="ShortcutToggleBtn" x:Name="ShortcutToggleBtn"
@@ -67,6 +67,6 @@
x:Uid="TextPageInputControlAllAppsTextBox" x:Uid="TextPageInputControlAllAppsTextBox"
Background="{ThemeResource TextControlBackgroundFocused}" Background="{ThemeResource TextControlBackgroundFocused}"
BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}" BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}"
IsEnabled="{Binding ElementName=AllAppsCheckBox, Path=IsChecked}"/> IsEnabled="{Binding ElementName=AllAppsCheckBox, Path=IsChecked}" />
</StackPanel> </StackPanel>
</UserControl> </UserControl>

9
src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/UrlPageInputControl.xaml
View File

@@ -44,12 +44,9 @@
</ToggleButton.Content> </ToggleButton.Content>
</ToggleButton> </ToggleButton>
<StackPanel Orientation="Vertical" <StackPanel Orientation="Vertical" Spacing="8">
Spacing="8"> <TextBlock Text="URL to open" />
<TextBlock Text="URL to open"/> <TextBox x:Name="UrlPathInput" Width="360" />
<TextBox
x:Name="UrlPathInput"
Width="360"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

4
src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml
View File

@@ -157,12 +157,12 @@
Width="480" Width="480"
MinWidth="600" MinWidth="600"
MaxWidth="600" MaxWidth="600"
PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
PrimaryButtonClick="KeyDialog_PrimaryButtonClick" PrimaryButtonClick="KeyDialog_PrimaryButtonClick"
PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
PrimaryButtonText="{x:Bind helper:ResourceLoaderInstance.GetString('ProgramsPage_KeyDialogPrimary')}" PrimaryButtonText="{x:Bind helper:ResourceLoaderInstance.GetString('ProgramsPage_KeyDialogPrimary')}"
SecondaryButtonText="{x:Bind helper:ResourceLoaderInstance.GetString('ProgramsPage_KeyDialogSecondary')}"> SecondaryButtonText="{x:Bind helper:ResourceLoaderInstance.GetString('ProgramsPage_KeyDialogSecondary')}">
<Grid> <Grid>
<controls:AppPageInputControl x:Name="AppShortcutControl"/> <controls:AppPageInputControl x:Name="AppShortcutControl" />
</Grid> </Grid>
</ContentDialog> </ContentDialog>
</Grid> </Grid>

10
src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Remappings.xaml
View File

@@ -23,16 +23,12 @@
Height="36" Height="36"
Margin="0,12,0,0" Margin="0,12,0,0"
Click="NewRemappingBtn_Click"> Click="NewRemappingBtn_Click">
<StackPanel <StackPanel Orientation="Horizontal" Spacing="8">
Orientation="Horizontal"
Spacing="8">
<FontIcon <FontIcon
FontSize="14" FontSize="14"
Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}" Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
Glyph="&#xE109;" /> Glyph="&#xE109;" />
<TextBlock <TextBlock x:Uid="RemappingsPageNewTextBlock" VerticalAlignment="Center" />
x:Uid="RemappingsPageNewTextBlock"
VerticalAlignment="Center" />
</StackPanel> </StackPanel>
</Button> </Button>
<Grid <Grid
@@ -78,7 +74,7 @@
Margin="12,-2,0,0" Margin="12,-2,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"/> Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
<Rectangle <Rectangle
Grid.ColumnSpan="4" Grid.ColumnSpan="4"

6
src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Text.xaml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<Page <Page
x:Class="KeyboardManagerEditorUI.Pages.Text" x:Class="KeyboardManagerEditorUI.Pages.Text"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -27,9 +27,7 @@
FontSize="14" FontSize="14"
Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}" Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
Glyph="&#xE109;" /> Glyph="&#xE109;" />
<TextBlock <TextBlock x:Uid="TextPageNewTextBlock" VerticalAlignment="Center" />
x:Uid="TextPageNewTextBlock"
VerticalAlignment="Center" />
</StackPanel> </StackPanel>
</Button> </Button>
<Grid <Grid

8
src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/URLs.xaml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<Page <Page
x:Class="KeyboardManagerEditorUI.Pages.URLs" x:Class="KeyboardManagerEditorUI.Pages.URLs"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -126,7 +126,7 @@
BorderThickness="0" BorderThickness="0"
Click="DeleteButton_Click" Click="DeleteButton_Click"
ToolTipService.ToolTip="{x:Bind helper:ResourceLoaderInstance.GetString('RemappingsPage_DeleteTooltip')}"> ToolTipService.ToolTip="{x:Bind helper:ResourceLoaderInstance.GetString('RemappingsPage_DeleteTooltip')}">
<FontIcon <FontIcon
FontFamily="{StaticResource SymbolThemeFontFamily}" FontFamily="{StaticResource SymbolThemeFontFamily}"
FontSize="16" FontSize="16"
Foreground="{ThemeResource TextFillColorSecondaryBrush}" Foreground="{ThemeResource TextFillColorSecondaryBrush}"
@@ -145,12 +145,12 @@
Height="360" Height="360"
MinWidth="600" MinWidth="600"
MaxWidth="600" MaxWidth="600"
PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
PrimaryButtonClick="KeyDialog_PrimaryButtonClick" PrimaryButtonClick="KeyDialog_PrimaryButtonClick"
PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
PrimaryButtonText="{x:Bind helper:ResourceLoaderInstance.GetString('UrlPage_KeyDialogPrimary')}" PrimaryButtonText="{x:Bind helper:ResourceLoaderInstance.GetString('UrlPage_KeyDialogPrimary')}"
SecondaryButtonText="{x:Bind helper:ResourceLoaderInstance.GetString('UrlPage_KeyDialogSecondary')}"> SecondaryButtonText="{x:Bind helper:ResourceLoaderInstance.GetString('UrlPage_KeyDialogSecondary')}">
<Grid> <Grid>
<controls:UrlPageInputControl x:Name="UrlShortcutControl"/> <controls:UrlPageInputControl x:Name="UrlShortcutControl" />
</Grid> </Grid>
</ContentDialog> </ContentDialog>
</Grid> </Grid>