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

Adjusting image and wording in settings (#20151)

Browse Source 
* adding in warning for measuring

* Adjust verbiage

* adjusting base image for screen ruler

* tweak image

* Update src/settings-ui/Settings.UI/Strings/en-us/Resources.resw

Co-authored-by: Heiko <61519853+htcfreek@users.noreply.github.com>

* Update src/settings-ui/Settings.UI/Strings/en-us/Resources.resw

* This mode -> The continuous capture mode

Co-authored-by: Heiko <61519853+htcfreek@users.noreply.github.com>
This commit is contained in:
Clint Rutkas
2022-08-30 05:36:15 -07:00
committed by GitHub
parent a4f4d5985a
commit 55c5cf850f
3 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/settings-ui/Settings.UI/Assets/Modules/ScreenRuler.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 29 KiB

20
src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
View File

@@ -158,7 +158,7 @@ Inspired by Roolr.</value>
<value>Capture screen continuously during measuring</value>
</data>
<data name="MeasureTool_ContinuousCapture.Description" xml:space="preserve">
<value>Refresh screen contexts in real-time instead of making a screenshot once. If enabled, tracing is slightly offset from the cursor position to not intersect with previously rendered cross lines.</value>
<value>Refresh screen contexts in real-time instead of making a screenshot once. </value>
</data>
<data name="MeasureTool_PerColorChannelEdgeDetection.Header" xml:space="preserve">
<value>Per color channel edge detection</value>
@@ -1420,7 +1420,7 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
<data name="Oobe_Run.Description" xml:space="preserve">
<value>PowerToys Run is a quick launcher for power users that contains some additional features without sacrificing performance.</value>
</data>
<data name="Oobe_MeasureTool.Description" xml:space="preserve">
<data name="Oobe_MeasureTool.Description" xml:space="preserve">
<value>Screen Ruler is a quick and easy way to measure pixels on your screen.</value>
</data>
<data name="Oobe_ShortcutGuide.Description" xml:space="preserve">
@@ -1520,7 +1520,7 @@ From there, simply click on one of the supported files in the File Explorer and
<data name="Oobe_MeasureTool_HowToLaunch.Text" xml:space="preserve">
<value>The Bounds mode lets you select a specific area to measure. You can also shift-drag an area to persist in on screen. The various Spacing modes allows tracing similar pixels along horizontal and vertical axes with a customizable pixel tolerance threshold (use settings or mouse wheel to adjust it).</value>
</data>
<data name="Oobe_MeasureTool.Title" xml:space="preserve">
<data name="Oobe_MeasureTool.Title" xml:space="preserve">
<value>Screen Ruler</value>
<comment>Do not localize this string</comment>
</data>
@@ -1767,7 +1767,7 @@ From there, simply click on one of the supported files in the File Explorer and
<value>Learn more about PowerToys Run</value>
<comment>PowerToys Run is a product name, do not loc</comment>
</data>
<data name="LearnMore_MeasureTool.Text" xml:space="preserve">
<data name="LearnMore_MeasureTool.Text" xml:space="preserve">
<value>Learn more about Screen Ruler</value>
<comment>Screen Ruler is a product name, do not loc</comment>
</data>
@@ -2247,7 +2247,9 @@ From there, simply click on one of the supported files in the File Explorer and
<value>PowerAccent</value>
</data>
<data name="PowerAccent.ModuleDescription" xml:space="preserve">
<value>PowerAccent is an alternative way to type accented characters, useful for when a keyboard doesn't support that specific accent. While holding the key for the character you want to add an accent to, press the Activation Key (space key or left and right arrow keys) and an overlay to select the accented character will appear.</value>
<value>PowerAccent is an alternative way to type accented characters, useful for when a keyboard doesn't support that specific accent.
Activate by holding the key for the character you want to add an accent to, then press the Activation Key (space key or left and right arrow keys). If you continue to hold, an overlay to select the accented between multiple characters will appear!</value>
<comment>key refers to a physical key on a keyboard</comment>
</data>
<data name="PowerAccent.ModuleTitle" xml:space="preserve">
@@ -2273,7 +2275,7 @@ From there, simply click on one of the supported files in the File Explorer and
<value>Activation key</value>
</data>
<data name="PowerAccent_Activation_Shortcut.Description" xml:space="preserve">
<value>Select the activation key to activate this module by holding down the letter and pressing the activation key</value>
<value>This is the extra key needed to activate after you are holding your target letter.</value>
</data>
<data name="PowerAccent_Activation_Key_Arrows.Content" xml:space="preserve">
<value>Left/Right Arrow</value>
@@ -2364,4 +2366,8 @@ From there, simply click on one of the supported files in the File Explorer and
<data name="Run_ConflictingKeywordInfo_Link.Content" xml:space="preserve">
<value>Learn more about conflicting activation commands</value>
</data>
</root>
<data name="MeasureTool_ContinuousCapture_Information.Title" xml:space="preserve">
<value>The continuous capture mode will consume more resources when in use. In addition, the UI will be slightly offset from the pointer position.</value>
<comment>pointer as in mouse pointer. resources refer to things like CPU, GPU, RAM</comment>
</data>
</root>

21
src/settings-ui/Settings.UI/Views/MeasureToolPage.xaml
View File

@@ -7,7 +7,12 @@
mc:Ignorable="d"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
AutomationProperties.LandmarkType="Main">
<Page.Resources>
<converters:BoolToObjectConverter x:Key="BoolToVisibilityConverter" TrueValue="Visible" FalseValue="Collapsed"/>
</Page.Resources>
<controls:SettingsPageControl x:Uid="MeasureTool"
ModuleImageSource="ms-appx:///Assets/Modules/ScreenRuler.png">
<controls:SettingsPageControl.ModuleContent>
@@ -30,14 +35,21 @@
</controls:Setting.ActionContent>
</controls:Setting>
</controls:SettingsGroup>
<controls:SettingsGroup x:Uid="MeasureTool_Settings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<controls:Setting x:Uid="MeasureTool_ContinuousCapture" Icon="&#xE7FB;">
<controls:Setting.ActionContent>
<ToggleSwitch IsOn="{x:Bind ViewModel.ContinuousCapture, Mode=TwoWay}" x:Uid="MeasureTool_ContinuousCapture_ToggleSwitch" />
</controls:Setting.ActionContent>
</controls:Setting>
<muxc:InfoBar
Severity="Warning"
x:Uid="MeasureTool_ContinuousCapture_Information"
IsOpen="True"
IsTabStop="True"
IsClosable="False"
Visibility="{Binding Mode=OneWay, Path=ContinuousCapture, Converter={StaticResource BoolToVisibilityConverter}}" />
<controls:Setting x:Uid="MeasureTool_PerColorChannelEdgeDetection" Icon="&#xE7FB;">
<controls:Setting.ActionContent>
<ToggleSwitch
@@ -45,7 +57,6 @@
x:Uid="MeasureTool_PerColorChannelEdgeDetection_ToggleSwitch" />
</controls:Setting.ActionContent>
</controls:Setting>
<controls:Setting x:Uid="MeasureTool_PixelTolerance">
<controls:Setting.ActionContent>
<Slider Minimum="0"
@@ -54,7 +65,7 @@
Value="{x:Bind Mode=TwoWay, Path=ViewModel.PixelTolerance}"/>
</controls:Setting.ActionContent>
</controls:Setting>
<controls:Setting x:Uid="MeasureTool_DrawFeetOnCross">
<controls:Setting.ActionContent>
<ToggleSwitch IsOn="{x:Bind ViewModel.DrawFeetOnCross, Mode=TwoWay}" x:Uid="MeasureTool_DrawFeetOnCross_ToggleSwitch" />
@@ -66,8 +77,8 @@
<controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.CrossColor, Mode=TwoWay}" />
</controls:Setting.ActionContent>
</controls:Setting>
</controls:SettingsGroup>
</StackPanel>
</controls:SettingsPageControl.ModuleContent>
<controls:SettingsPageControl.PrimaryLinks>