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

Measure Tool UI (#27265)

Browse Source 
sizes and strings
This commit is contained in:
Jay
2023-07-11 16:13:01 +02:00
committed by GitHub
parent 001f68677d
commit 6975c4ca35
3 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/MeasureTool/MeasureToolUI/MainWindow.xaml
View File

@@ -26,6 +26,7 @@
LightTintColor="#F3F3F3" LightTintColor="#F3F3F3"
LightTintOpacity="0" /> LightTintOpacity="0" />
</winuiex:WindowEx.Backdrop> </winuiex:WindowEx.Backdrop>
<Grid> <Grid>
<Grid.Resources> <Grid.Resources>
<SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent" /> <SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent" />
@@ -33,20 +34,16 @@
<StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="ControlSolidFillColorDefaultBrush" /> <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="ControlSolidFillColorDefaultBrush" />
<Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="Button"> <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="Button">
<Setter Property="MinHeight" Value="30" /> <Setter Property="Width" Value="32" />
<Setter Property="MinWidth" Value="30" /> <Setter Property="Height" Value="32" />
<Setter Property="Width" Value="30" />
<Setter Property="Height" Value="30" />
<Setter Property="BorderThickness" Value="0" /> <Setter Property="BorderThickness" Value="0" />
<Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" /> <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
<Setter Property="FontSize" Value="10" /> <Setter Property="FontSize" Value="12" />
<Setter Property="Padding" Value="0" /> <Setter Property="Padding" Value="0" />
</Style> </Style>
<Style x:Key="ToggleButtonRadioButtonStyle" TargetType="ToggleButton"> <Style x:Key="ToggleButtonRadioButtonStyle" TargetType="ToggleButton">
<Setter Property="MinHeight" Value="30" /> <Setter Property="Width" Value="32" />
<Setter Property="MinWidth" Value="30" /> <Setter Property="Height" Value="32" />
<Setter Property="Width" Value="30" />
<Setter Property="Height" Value="30" />
<Setter Property="BorderThickness" Value="0" /> <Setter Property="BorderThickness" Value="0" />
<Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" /> <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
<Setter Property="FontSize" Value="16" /> <Setter Property="FontSize" Value="16" />
@@ -57,7 +54,6 @@
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Center" /> <Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" /> <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
@@ -249,7 +245,6 @@
</Setter> </Setter>
</Style> </Style>
</Grid.Resources> </Grid.Resources>
<StackPanel <StackPanel
@@ -275,7 +270,7 @@
Click="MeasureTool_Click" Click="MeasureTool_Click"
Style="{StaticResource ToggleButtonRadioButtonStyle}" Style="{StaticResource ToggleButtonRadioButtonStyle}"
ToolTipService.ToolTip="{x:Bind p:Resources.Spacing}"> ToolTipService.ToolTip="{x:Bind p:Resources.Spacing}">
<FontIcon Margin="1,0,0,0" Glyph="&#xE948;" /> <FontIcon Glyph="&#xE948;" />
<ToggleButton.KeyboardAccelerators> <ToggleButton.KeyboardAccelerators>
<KeyboardAccelerator Key="Number2" Modifiers="Control" Invoked="KeyboardAccelerator_Invoked"/> <KeyboardAccelerator Key="Number2" Modifiers="Control" Invoked="KeyboardAccelerator_Invoked"/>
</ToggleButton.KeyboardAccelerators> </ToggleButton.KeyboardAccelerators>
@@ -287,7 +282,7 @@
Click="HorizontalMeasureTool_Click" Click="HorizontalMeasureTool_Click"
Style="{StaticResource ToggleButtonRadioButtonStyle}" Style="{StaticResource ToggleButtonRadioButtonStyle}"
ToolTipService.ToolTip="{x:Bind p:Resources.HorizontalSpacing}"> ToolTipService.ToolTip="{x:Bind p:Resources.HorizontalSpacing}">
<FontIcon Margin="1,0,0,0" Glyph="&#xE949;" /> <FontIcon Glyph="&#xE949;" />
<ToggleButton.KeyboardAccelerators> <ToggleButton.KeyboardAccelerators>
<KeyboardAccelerator Key="Number3" Modifiers="Control" Invoked="KeyboardAccelerator_Invoked"/> <KeyboardAccelerator Key="Number3" Modifiers="Control" Invoked="KeyboardAccelerator_Invoked"/>
</ToggleButton.KeyboardAccelerators> </ToggleButton.KeyboardAccelerators>
@@ -307,11 +302,12 @@
<KeyboardAccelerator Key="Number4" Modifiers="Control" Invoked="KeyboardAccelerator_Invoked"/> <KeyboardAccelerator Key="Number4" Modifiers="Control" Invoked="KeyboardAccelerator_Invoked"/>
</ToggleButton.KeyboardAccelerators> </ToggleButton.KeyboardAccelerators>
</ToggleButton> </ToggleButton>
<AppBarSeparator Height="36" /> <AppBarSeparator/>
<Button <Button
Click="ClosePanelTool_Click" Click="ClosePanelTool_Click"
Content="&#xE8BB;" Content="&#xE8BB;"
ToolTipService.ToolTip="Close"> ToolTipService.ToolTip="{x:Bind p:Resources.Close}"
Foreground="{StaticResource CloseButtonBackgroundPointerOver}">
<Button.KeyboardAccelerators> <Button.KeyboardAccelerators>
<KeyboardAccelerator Key="Escape" Invoked="KeyboardAccelerator_Invoked"/> <KeyboardAccelerator Key="Escape" Invoked="KeyboardAccelerator_Invoked"/>
</Button.KeyboardAccelerators> </Button.KeyboardAccelerators>

17
src/modules/MeasureTool/MeasureToolUI/Properties/Resources.Designer.cs generated
View File

@@ -61,7 +61,7 @@ namespace PowerToys.MeasureToolUI.Properties {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Bounds. /// Looks up a localized string similar to Bounds (Ctrl+1).
/// </summary> /// </summary>
public static string Bounds { public static string Bounds {
get { get {
@@ -70,7 +70,16 @@ namespace PowerToys.MeasureToolUI.Properties {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Horizontal spacing. /// Looks up a localized string similar to Close (Esc).
/// </summary>
public static string Close {
get {
return ResourceManager.GetString("Close", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Horizontal spacing (Ctrl+3).
/// </summary> /// </summary>
public static string HorizontalSpacing { public static string HorizontalSpacing {
get { get {
@@ -79,7 +88,7 @@ namespace PowerToys.MeasureToolUI.Properties {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Spacing. /// Looks up a localized string similar to Spacing (Ctrl+2).
/// </summary> /// </summary>
public static string Spacing { public static string Spacing {
get { get {
@@ -88,7 +97,7 @@ namespace PowerToys.MeasureToolUI.Properties {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Vertical spacing. /// Looks up a localized string similar to Vertical spacing (Ctrl+4).
/// </summary> /// </summary>
public static string VerticalSpacing { public static string VerticalSpacing {
get { get {

11
src/modules/MeasureTool/MeasureToolUI/Properties/Resources.resx
View File

@@ -118,15 +118,18 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="Bounds" xml:space="preserve"> <data name="Bounds" xml:space="preserve">
<value>Bounds</value> <value>Bounds (Ctrl+1)</value>
</data> </data>
<data name="Spacing" xml:space="preserve"> <data name="Spacing" xml:space="preserve">
<value>Spacing</value> <value>Spacing (Ctrl+2)</value>
</data> </data>
<data name="HorizontalSpacing" xml:space="preserve"> <data name="HorizontalSpacing" xml:space="preserve">
<value>Horizontal spacing</value> <value>Horizontal spacing (Ctrl+3)</value>
</data> </data>
<data name="VerticalSpacing" xml:space="preserve"> <data name="VerticalSpacing" xml:space="preserve">
<value>Vertical spacing</value> <value>Vertical spacing (Ctrl+4)</value>
</data>
<data name="Close" xml:space="preserve">
<value>Close (Esc)</value>
</data> </data>
</root> </root>