Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 19:26:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Niels Laute
2021-08-08 23:42:21 +02:00
parent adf07ff0c3
commit bc93a27e31
12 changed files with 18 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/Setting/Setting.xaml
View File

@@ -9,7 +9,7 @@
<Setter Property="BorderThickness" Value="{ThemeResource CardBorderThickness}" /> <Setter Property="BorderThickness" Value="{ThemeResource CardBorderThickness}" />
<Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" /> <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
<Setter Property="Padding" Value="16" /> <Setter Property="Padding" Value="16" />
<Setter Property="Margin" Value="0,0,0,2"/> <Setter Property="Margin" Value="0,0,0,0"/>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="controls:Setting"> <ControlTemplate TargetType="controls:Setting">
@@ -74,7 +74,7 @@
FontSize="{StaticResource SecondaryTextFontSize}" FontSize="{StaticResource SecondaryTextFontSize}"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"> Foreground="{ThemeResource TextFillColorSecondaryBrush}">
<ContentPresenter.Resources> <ContentPresenter.Resources>
<Style TargetType="TextBlock" BasedOn="{StaticResource CaptionTextBlockStyle}"> <Style TargetType="TextBlock" BasedOn="{StaticResource CaptionTextBlockStyle}">
<Style.Setters> <Style.Setters>
<Setter Property="TextWrapping" Value="WrapWholeWords"/> <Setter Property="TextWrapping" Value="WrapWholeWords"/>
</Style.Setters> </Style.Setters>

21
src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingExpander/SettingExpander.cs
View File

@@ -1,21 +0,0 @@
// Copyright (c) Microsoft Corporation
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.UI.Xaml.Controls;
namespace Microsoft.PowerToys.Settings.UI.Controls
{
public class SettingExpander : Expander
{
public SettingExpander()
{
DefaultStyleKey = typeof(SettingExpander);
}
}
}

15
src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingExpander/SettingExpander.xaml
View File

@@ -1,15 +0,0 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
<Style TargetType="controls:SettingExpander" BasedOn="{StaticResource DefaultExpanderStyle}" >
<Setter Property="Background" Value="{ThemeResource CardBackgroundBrush}" />
<Setter Property="BorderThickness" Value="{ThemeResource CardBorderThickness}" />
<Setter Property="BorderBrush" Value="{ThemeResource CardBorderBrush}" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
</Style>
</ResourceDictionary>

7
src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
View File

@@ -99,7 +99,6 @@
<DependentUpon>HotkeySettingsControl.xaml</DependentUpon> <DependentUpon>HotkeySettingsControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\KeyVisual\KeyVisual.cs" /> <Compile Include="Controls\KeyVisual\KeyVisual.cs" />
<Compile Include="Controls\SettingExpander\SettingExpander.cs" />
<Compile Include="Controls\SettingsGroup\SettingsGroup.cs" /> <Compile Include="Controls\SettingsGroup\SettingsGroup.cs" />
<Compile Include="Controls\Setting\Setting.cs" /> <Compile Include="Controls\Setting\Setting.cs" />
<Compile Include="Controls\ShortcutTextControl.xaml.cs"> <Compile Include="Controls\ShortcutTextControl.xaml.cs">
@@ -282,7 +281,7 @@
<Version>6.1.2</Version> <Version>6.1.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.UI.Xaml"> <PackageReference Include="Microsoft.UI.Xaml">
<Version>2.6.1-prerelease.210709001</Version> <Version>2.6.0-prerelease.210623001</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed"> <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
<Version>2.0.1</Version> <Version>2.0.1</Version>
@@ -313,10 +312,6 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\SettingExpander\SettingExpander.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Controls\SettingsGroup\SettingsGroup.xaml"> <Page Include="Controls\SettingsGroup\SettingsGroup.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>

16
src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
View File

@@ -268,19 +268,15 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<value>Select the profile to display the active key remap and shortcuts</value> <value>Select the profile to display the active key remap and shortcuts</value>
<comment>Keyboard Manager configuration dropdown description</comment> <comment>Keyboard Manager configuration dropdown description</comment>
</data> </data>
<data name="KeyboardManager_RemapKeyboardButton.Content" xml:space="preserve"> <data name="KeyboardManager_RemapKeyboardButton.Header" xml:space="preserve">
<value>Remap a key</value> <value>Remap a key</value>
<comment>Keyboard Manager remap keyboard button content</comment> <comment>Keyboard Manager remap keyboard button content</comment>
</data>
<data name="KeyboardManager_RemapKeys.Header" xml:space="preserve">
<value>Remap keys</value>
<comment>Keyboard Manager remap keyboard header</comment>
</data> </data>
<data name="KeyboardManager_Keys.Header" xml:space="preserve"> <data name="KeyboardManager_Keys.Header" xml:space="preserve">
<value>Keys</value> <value>Keys</value>
<comment>Keyboard Manager remap keyboard header</comment> <comment>Keyboard Manager remap keyboard header</comment>
</data> </data>
<data name="KeyboardManager_RemapShortcutsButton.Content" xml:space="preserve"> <data name="KeyboardManager_RemapShortcutsButton.Header" xml:space="preserve">
<value>Remap a shortcut</value> <value>Remap a shortcut</value>
<comment>Keyboard Manager remap shortcuts button</comment> <comment>Keyboard Manager remap shortcuts button</comment>
</data> </data>
@@ -288,10 +284,6 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<value>Shortcuts</value> <value>Shortcuts</value>
<comment>Keyboard Manager remap keyboard header</comment> <comment>Keyboard Manager remap keyboard header</comment>
</data> </data>
<data name="KeyboardManager_RemapShortcuts.Header" xml:space="preserve">
<value>Remap shortcuts</value>
<comment>Keyboard Manager remap shortcuts header</comment>
</data>
<data name="RemapKeysList.AutomationProperties.Name" xml:space="preserve"> <data name="RemapKeysList.AutomationProperties.Name" xml:space="preserve">
<value>Current Key Remappings</value> <value>Current Key Remappings</value>
</data> </data>
@@ -836,10 +828,10 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<data name="Encoding.Header" xml:space="preserve"> <data name="Encoding.Header" xml:space="preserve">
<value>Encoding</value> <value>Encoding</value>
</data> </data>
<data name="KeyboardManager_RemapKeys.Description" xml:space="preserve"> <data name="KeyboardManager_RemapKeyboardButton.Description" xml:space="preserve">
<value>Remap keys to other keys or shortcuts.</value> <value>Remap keys to other keys or shortcuts.</value>
</data> </data>
<data name="KeyboardManager_RemapShortcuts.Description" xml:space="preserve"> <data name="KeyboardManager_RemapShortcutsButton.Description" xml:space="preserve">
<value>Remap shortcuts to other shortcuts or keys. Additionally, mappings can be targeted to specific applications as well.</value> <value>Remap shortcuts to other shortcuts or keys. Additionally, mappings can be targeted to specific applications as well.</value>
</data> </data>
<data name="General.ModuleDescription" xml:space="preserve"> <data name="General.ModuleDescription" xml:space="preserve">

1
src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/Generic.xaml
View File

@@ -5,6 +5,5 @@
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="ms-appx:///Controls/Setting/Setting.xaml" /> <ResourceDictionary Source="ms-appx:///Controls/Setting/Setting.xaml" />
<ResourceDictionary Source="ms-appx:///Controls/SettingsGroup/SettingsGroup.xaml" /> <ResourceDictionary Source="ms-appx:///Controls/SettingsGroup/SettingsGroup.xaml" />
<ResourceDictionary Source="ms-appx:///Controls/SettingExpander/SettingExpander.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml
View File

@@ -40,7 +40,7 @@
</controls:Setting.ActionContent> </controls:Setting.ActionContent>
</controls:Setting> </controls:Setting>
<muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}"> <muxc:Expander IsExpanded="True">
<muxc:Expander.Header> <muxc:Expander.Header>
<controls:Setting x:Uid="Awake_Mode" Icon="&#xEC4E;" Style="{StaticResource ExpanderHeaderSettingStyle}" /> <controls:Setting x:Uid="Awake_Mode" Icon="&#xEC4E;" Style="{StaticResource ExpanderHeaderSettingStyle}" />
</muxc:Expander.Header> </muxc:Expander.Header>

4
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
View File

@@ -43,7 +43,7 @@
<muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"> <muxc:Expander IsExpanded="True" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<muxc:Expander.Header> <muxc:Expander.Header>
<controls:Setting x:Uid="ColorPicker_ActivationAction" Icon="&#xEC4E;" Style="{StaticResource ExpanderHeaderSettingStyle}" /> <controls:Setting x:Uid="ColorPicker_ActivationAction" Icon="&#xEC4E;" Style="{StaticResource ExpanderHeaderSettingStyle}" />
</muxc:Expander.Header> </muxc:Expander.Header>
@@ -81,7 +81,7 @@
<controls:SettingsGroup x:Uid="ColorFormats" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"> <controls:SettingsGroup x:Uid="ColorFormats" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}"> <muxc:Expander IsExpanded="True">
<muxc:Expander.Header> <muxc:Expander.Header>
<controls:Setting x:Uid="ColorPicker_CopiedColorRepresentation" Icon="&#xEF3C;" Style="{StaticResource ExpanderHeaderSettingStyle}"> <controls:Setting x:Uid="ColorPicker_CopiedColorRepresentation" Icon="&#xEF3C;" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>

5
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
View File

@@ -29,6 +29,7 @@
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<toolkitcontrols:HeaderedItemsControl x:Uid="General_Version"> <toolkitcontrols:HeaderedItemsControl x:Uid="General_Version">
<controls:Setting Header="{Binding PowerToysVersion}" Icon="&#xE117;"> <controls:Setting Header="{Binding PowerToysVersion}" Icon="&#xE117;">
<controls:Setting.Description> <controls:Setting.Description>
<TextBlock Style="{StaticResource SecondaryTextStyle}"> <TextBlock Style="{StaticResource SecondaryTextStyle}">
@@ -180,7 +181,7 @@
<toolkitcontrols:HeaderedItemsControl x:Uid="Admin_Mode"> <toolkitcontrols:HeaderedItemsControl x:Uid="Admin_Mode">
<muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}"> <muxc:Expander IsExpanded="True">
<muxc:Expander.Header> <muxc:Expander.Header>
<controls:Setting x:Uid="Admin_Mode" Icon="&#xE1A7;" Description="{Binding Mode=TwoWay, Path=RunningAsText}" Style="{StaticResource ExpanderHeaderSettingStyle}"> <controls:Setting x:Uid="Admin_Mode" Icon="&#xE1A7;" Description="{Binding Mode=TwoWay, Path=RunningAsText}" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
@@ -215,7 +216,7 @@
<toolkitcontrols:HeaderedItemsControl IsEnabled="True" x:Uid="ShortcutGuide_Appearance_Behavior"> <toolkitcontrols:HeaderedItemsControl IsEnabled="True" x:Uid="ShortcutGuide_Appearance_Behavior">
<muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}"> <muxc:Expander IsExpanded="True">
<muxc:Expander.Header> <muxc:Expander.Header>
<controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;" Style="{StaticResource ExpanderHeaderSettingStyle}"> <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.Description> <controls:Setting.Description>

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
View File

@@ -219,7 +219,7 @@
<controls:SettingsGroup x:Uid="File" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"> <controls:SettingsGroup x:Uid="File" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}"> <muxc:Expander IsExpanded="True">
<muxc:Expander.Header> <muxc:Expander.Header>
<controls:Setting x:Uid="ImageResizer_FilenameFormatHeader" Style="{StaticResource ExpanderHeaderSettingStyle}"> <controls:Setting x:Uid="ImageResizer_FilenameFormatHeader" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>

4
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
View File

@@ -27,7 +27,7 @@
</controls:Setting> </controls:Setting>
<controls:SettingsGroup x:Uid="PowerRename_ShellIntegration"> <controls:SettingsGroup x:Uid="PowerRename_ShellIntegration">
<muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}"> <muxc:Expander IsExpanded="True">
<muxc:Expander.Header> <muxc:Expander.Header>
<controls:Setting x:Uid="PowerRename_Toggle_EnableOnContextMenu" Icon="&#xE14C;" Style="{StaticResource ExpanderHeaderSettingStyle}"> <controls:Setting x:Uid="PowerRename_Toggle_EnableOnContextMenu" Icon="&#xE14C;" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
@@ -44,7 +44,7 @@
</controls:SettingsGroup> </controls:SettingsGroup>
<controls:SettingsGroup x:Uid="PowerRename_AutoCompleteHeader"> <controls:SettingsGroup x:Uid="PowerRename_AutoCompleteHeader">
<muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}"> <muxc:Expander IsExpanded="True">
<muxc:Expander.Header> <muxc:Expander.Header>
<controls:Setting x:Uid="PowerRename_Toggle_AutoComplete" Style="{StaticResource ExpanderHeaderSettingStyle}"> <controls:Setting x:Uid="PowerRename_Toggle_AutoComplete" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>

4
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
View File

@@ -48,7 +48,7 @@
</controls:Setting> </controls:Setting>
<controls:SettingsGroup x:Uid="ShortcutGuide_Appearance_Behavior" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"> <controls:SettingsGroup x:Uid="ShortcutGuide_Appearance_Behavior" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}"> <muxc:Expander IsExpanded="True">
<muxc:Expander.Header> <muxc:Expander.Header>
<controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;" Style="{StaticResource ExpanderHeaderSettingStyle}"> <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.Description> <controls:Setting.Description>
@@ -77,7 +77,7 @@
</StackPanel> </StackPanel>
</muxc:Expander.Content> </muxc:Expander.Content>
</muxc:Expander> </muxc:Expander>
<muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}"> <muxc:Expander IsExpanded="True">
<muxc:Expander.Header> <muxc:Expander.Header>
<controls:Setting x:Uid="ShortcutGuide_DisabledApps" Style="{StaticResource ExpanderHeaderSettingStyle}"/> <controls:Setting x:Uid="ShortcutGuide_DisabledApps" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
</muxc:Expander.Header> </muxc:Expander.Header>