mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-01-19 06:53:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Settings] Reduce ambiguity of some settings (#13882)

Browse Source 
* Improved FancyZones setting

* Image Resizer update

* PowerRename

* Update Resources.resw

Co-authored-by: Laute <Niels.Laute@philips.com>
This commit is contained in:
Niels Laute 2021-10-19 15:54:44 +02:00 committed by GitHub
parent de446c4240
commit 0e5c654d5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 76 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -493,10 +493,16 @@
<value>Move newly created windows to the current active monitor (Experimental)</value>
</data>
<data name="FancyZones_UseCursorPosEditorStartupScreen.Header" xml:space="preserve">
<value>Launch editor where mouse cursor is</value>
<value>Launch editor on the display</value>
</data>
<data name="FancyZones_UseCursorPosEditorStartupScreen.Description" xml:space="preserve">
<value>When using multiple screens, the editor will launch on the screen where the mouse cursor is</value>
<value>When using multiple displays</value>
</data>
<data name="FancyZones_LaunchPositionMouse.Content" xml:space="preserve">
<value>Where the mouse pointer is</value>
</data>
<data name="FancyZones_LaunchPositionScreen.Content" xml:space="preserve">
<value>With active focus</value>
</data>
<data name="FancyZones_ZoneBehavior_GroupSettings.Header" xml:space="preserve">
<value>Zone behavior</value>
@ -561,11 +567,20 @@
<data name="RadioButtons_Name_Theme.Text" xml:space="preserve">
<value>Settings theme</value>
</data>
<data name="PowerRename_Toggle_EnableOnContextMenu.Header" xml:space="preserve">
<value>Show icon on context menu</value>
<data name="PowerRename_Toggle_HideIcon.Content" xml:space="preserve">
<value>Hide icon in context menu</value>
</data>
<data name="PowerRename_Toggle_EnableOnExtendedContextMenu.Header" xml:space="preserve">
<value>Appear only in extended context menu</value>
<data name="PowerRename_Toggle_ContextMenu.Header" xml:space="preserve">
<value>Show PowerRename in</value>
</data>
<data name="PowerRename_Toggle_ContextMenu.Description" xml:space="preserve">
<value>Press shift + right-click on files to open the extended menu</value>
</data>
<data name="PowerRename_Toggle_StandardContextMenu.Content" xml:space="preserve">
<value>Default and extended context menu</value>
</data>
<data name="PowerRename_Toggle_ExtendedContextMenu.Content" xml:space="preserve">
<value>Extended context menu only</value>
</data>
<data name="PowerRename_Toggle_EnableOnExtendedContextMenu.Description" xml:space="preserve">
<value>Press Shift + right-click on files to open the extended menu</value>
@ -896,11 +911,17 @@
<data name="ImageResizer_FilenameFormatHeader.Header" xml:space="preserve">
<value>Filename format</value>
</data>
<data name="ImageResizer_UseOriginalDate.Header" xml:space="preserve">
<value>Use original date modified</value>
<data name="ImageResizer_FileModifiedDate.Header" xml:space="preserve">
<value>File modified timestamp</value>
</data>
<data name="ImageResizer_UseOriginalDate.Description" xml:space="preserve">
<value>Keep the original modified date of the file (instead of the resize date)</value>
<data name="ImageResizer_FileModifiedDate.Description" xml:space="preserve">
<value>Used as the 'modified timestamp' in the file properties</value>
</data>
<data name="ImageResizer_UseOriginalDate.Content" xml:space="preserve">
<value>Original file timestamp</value>
</data>
<data name="ImageResizer_UseResizeDate.Content" xml:space="preserve">
<value>Timestamp of resize action</value>
</data>
<data name="Encoding.Header" xml:space="preserve">
<value>Encoding</value>
@ -1157,7 +1178,7 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
<value>Plugins</value>
</data>
<data name="Run_PluginUseDescription.Description" xml:space="preserve">
<value>You can include or remove each plugin from the global results, change the direct activation phrase and configure additional options</value>
<value>Include or remove plugins from the global results, change the direct activation phrase and configure additional options</value>
</data>
<data name="Run_PositionAppearance_GroupSettings.Header" xml:space="preserve">
<value>Position &amp; appearance</value>
@ -1198,7 +1219,7 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
<value>Enable quick layout switch</value>
</data>
<data name="FancyZones_QuickLayoutSwitch.Description" xml:space="preserve">
<value>You can configure layout-specific shortcuts in the editor</value>
<value>Layout-specific shortcuts can be configured in the editor</value>
</data>
<data name="FancyZones_QuickLayoutSwitch_GroupSettings.Text" xml:space="preserve">
<value>Quick layout switch</value>

37
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
View File

@ -41,29 +41,22 @@
</controls:Setting.ActionContent>
</controls:Setting>
</Button>
<controls:Setting x:Uid="Activation_Shortcut" Icon="&#xEDA7;">
<controls:Setting.ActionContent>
<controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}"
HotkeySettings="{x:Bind Path=ViewModel.EditorHotkey, Mode=TwoWay}"/>
</controls:Setting.ActionContent>
</controls:Setting>
<controls:SettingExpander IsExpanded="True">
<controls:SettingExpander.Header>
<controls:Setting x:Uid="Activation_Shortcut" Icon="&#xEDA7;" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.ActionContent>
<controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}"
HotkeySettings="{x:Bind Path=ViewModel.EditorHotkey, Mode=TwoWay}"/>
</controls:Setting.ActionContent>
</controls:Setting>
</controls:SettingExpander.Header>
<controls:SettingExpander.Content>
<StackPanel>
<controls:Setting x:Uid="FancyZones_UseCursorPosEditorStartupScreen" Style="{StaticResource ExpanderContentSettingStyle}">
<controls:Setting.ActionContent>
<ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.UseCursorPosEditorStartupScreen}"/>
</controls:Setting.ActionContent>
</controls:Setting>
</StackPanel>
</controls:SettingExpander.Content>
</controls:SettingExpander>
<controls:Setting x:Uid="FancyZones_UseCursorPosEditorStartupScreen" Icon="&#xE7F9;">
<controls:Setting.ActionContent>
<ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.UseCursorPosEditorStartupScreen, Converter={StaticResource BoolToComboBoxIndexConverter}}" MinWidth="{StaticResource SettingActionControlMinWidth}">
<ComboBoxItem x:Uid="FancyZones_LaunchPositionScreen" />
<ComboBoxItem x:Uid="FancyZones_LaunchPositionMouse" />
</ComboBox>
</controls:Setting.ActionContent>
</controls:Setting>
</controls:SettingsGroup>

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

@ -15,6 +15,7 @@
<converters:ImageResizerFitToStringConverter x:Key="ImageResizerFitToStringConverter" />
<converters:ImageResizerUnitToStringConverter x:Key="ImageResizerUnitToStringConverter" />
<toolkitconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" TrueValue="Visible" FalseValue="Collapsed" />
<toolkitconverters:BoolToObjectConverter x:Key="BoolToComboBoxIndexConverter" TrueValue="0" FalseValue="1"/>
</Page.Resources>
<controls:SettingsPageControl x:Uid="ImageResizer"
@ -263,9 +264,12 @@
</controls:Setting.ActionContent>
</controls:Setting>
<controls:Setting x:Uid="ImageResizer_UseOriginalDate">
<controls:Setting x:Uid="ImageResizer_FileModifiedDate">
<controls:Setting.ActionContent>
<ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.KeepDateModified}" />
<ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.KeepDateModified, Converter={StaticResource BoolToComboBoxIndexConverter}}" MinWidth="{StaticResource SettingActionControlMinWidth}">
<ComboBoxItem x:Uid="ImageResizer_UseOriginalDate"/>
<ComboBoxItem x:Uid="ImageResizer_UseResizeDate"/>
</ComboBox>
</controls:Setting.ActionContent>
</controls:Setting>
</controls:SettingsGroup>

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

@ -39,7 +39,7 @@
<controls:Setting x:Uid="Activation_Shortcut" Icon="&#xEDA7;" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.ActionContent>
<controls:ShortcutControl HotkeySettings="{x:Bind Path=ViewModel.OpenPowerLauncher, Mode=TwoWay}"
MinWidth="{StaticResource SettingActionControlMinWidth}"/>
MinWidth="{StaticResource SettingActionControlMinWidth}"/>
</controls:Setting.ActionContent>
</controls:Setting>
</controls:SettingExpander.Header>

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

@ -5,10 +5,13 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
mc:Ignorable="d"
AutomationProperties.LandmarkType="Main">
<Page.Resources>
<converters:BoolToObjectConverter x:Key="BoolToComboBoxIndexConverter" TrueValue="1" FalseValue="0"/>
<converters:BoolNegationConverter x:Key="BoolNegationConverter" />
</Page.Resources>
<controls:SettingsPageControl x:Uid="PowerRename"
ModuleImageSource="ms-appx:///Assets/Modules/PowerRename.png">
<controls:SettingsPageControl.ModuleContent>
@ -26,17 +29,25 @@
</controls:Setting>
<controls:SettingsGroup x:Uid="PowerRename_ShellIntegration" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<controls:Setting x:Uid="PowerRename_Toggle_EnableOnContextMenu">
<controls:SettingExpander IsExpanded="True">
<controls:SettingExpander.Header>
<controls:Setting x:Uid="PowerRename_Toggle_ContextMenu" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.ActionContent>
<ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.EnabledOnContextMenu}"/>
<ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.EnabledOnContextExtendedMenu, Converter={StaticResource BoolToComboBoxIndexConverter}}" MinWidth="{StaticResource SettingActionControlMinWidth}">
<ComboBoxItem x:Uid="PowerRename_Toggle_StandardContextMenu" />
<ComboBoxItem x:Uid="PowerRename_Toggle_ExtendedContextMenu" />
</ComboBox>
</controls:Setting.ActionContent>
</controls:Setting>
<controls:Setting x:Uid="PowerRename_Toggle_EnableOnExtendedContextMenu">
<controls:Setting.ActionContent>
<ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.EnabledOnContextExtendedMenu}"/>
</controls:Setting.ActionContent>
</controls:Setting>
</controls:SettingExpander.Header>
<controls:SettingExpander.Content>
<StackPanel HorizontalAlignment="Stretch">
<CheckBox x:Uid="PowerRename_Toggle_HideIcon"
IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.EnabledOnContextMenu, Converter={StaticResource BoolNegationConverter}}"
Margin="{StaticResource ExpanderSettingMargin}"/>
</StackPanel>
</controls:SettingExpander.Content>
</controls:SettingExpander>
</controls:SettingsGroup>
<controls:SettingsGroup x:Uid="PowerRename_AutoCompleteHeader" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">