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

Use Strings/*/Resources.resw instead of Properties/ one (#27972)

Browse Source
This commit is contained in:
Stefan Markovic
2023-08-15 18:28:49 +02:00
committed by GitHub
parent 3dcfd93ee8
commit 88b92afe5f
5 changed files with 72 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj
View File

@@ -52,22 +52,6 @@
<NoWarn>0436</NoWarn>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Content Include="Assets\MeasureTool\SplashScreen.scale-200.png" />
<Content Include="Assets\MeasureTool\LockScreenLogo.scale-200.png" />

67
src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml
View File

@@ -26,7 +26,7 @@
LightTintColor="#F3F3F3"
LightTintOpacity="0" />
</winuiex:WindowEx.Backdrop>
<Grid>
<Grid.Resources>
<SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent" />
@@ -249,67 +249,90 @@
<StackPanel
HorizontalAlignment="Center"
Loaded="StackPanel_Loaded"
Orientation="Horizontal"
Spacing="8"
Loaded="StackPanel_Loaded">
Spacing="8">
<ToggleButton
Name="btnBounds"
AutomationProperties.Name="{x:Bind p:Resources.Bounds}"
x:Uid="BtnBounds"
Click="BoundsTool_Click"
Content="&#xEF20;"
Style="{StaticResource ToggleButtonRadioButtonStyle}"
KeyboardAcceleratorPlacementMode="Auto"
ToolTipService.ToolTip="{x:Bind p:Resources.Bounds}">
Style="{StaticResource ToggleButtonRadioButtonStyle}">
<ToolTipService.ToolTip>
<TextBlock x:Uid="BtnBoundsTooltip" />
</ToolTipService.ToolTip>
<ToggleButton.KeyboardAccelerators>
<KeyboardAccelerator Key="Number1" Modifiers="Control" Invoked="KeyboardAccelerator_Invoked"/>
<KeyboardAccelerator
Key="Number1"
Invoked="KeyboardAccelerator_Invoked"
Modifiers="Control" />
</ToggleButton.KeyboardAccelerators>
</ToggleButton>
<ToggleButton
Name="btnSpacing"
AutomationProperties.Name="{x:Bind p:Resources.Spacing}"
x:Uid="BtnSpacing"
Click="MeasureTool_Click"
Style="{StaticResource ToggleButtonRadioButtonStyle}"
ToolTipService.ToolTip="{x:Bind p:Resources.Spacing}">
Style="{StaticResource ToggleButtonRadioButtonStyle}">
<ToolTipService.ToolTip>
<TextBlock x:Uid="BtnSpacingTooltip" />
</ToolTipService.ToolTip>
<FontIcon Glyph="&#xE948;" />
<ToggleButton.KeyboardAccelerators>
<KeyboardAccelerator Key="Number2" Modifiers="Control" Invoked="KeyboardAccelerator_Invoked"/>
<KeyboardAccelerator
Key="Number2"
Invoked="KeyboardAccelerator_Invoked"
Modifiers="Control" />
</ToggleButton.KeyboardAccelerators>
</ToggleButton>
<ToggleButton
Name="btnHorizontalSpacing"
AutomationProperties.Name="{x:Bind p:Resources.HorizontalSpacing}"
x:Uid="BtnHorizontalSpacing"
Click="HorizontalMeasureTool_Click"
Style="{StaticResource ToggleButtonRadioButtonStyle}"
ToolTipService.ToolTip="{x:Bind p:Resources.HorizontalSpacing}">
Style="{StaticResource ToggleButtonRadioButtonStyle}">
<ToolTipService.ToolTip>
<TextBlock x:Uid="BtnHorizontalSpacingTooltip" />
</ToolTipService.ToolTip>
<FontIcon Glyph="&#xE949;" />
<ToggleButton.KeyboardAccelerators>
<KeyboardAccelerator Key="Number3" Modifiers="Control" Invoked="KeyboardAccelerator_Invoked"/>
<KeyboardAccelerator
Key="Number3"
Invoked="KeyboardAccelerator_Invoked"
Modifiers="Control" />
</ToggleButton.KeyboardAccelerators>
</ToggleButton>
<ToggleButton
Name="btnVerticalSpacing"
AutomationProperties.Name="{x:Bind p:Resources.VerticalSpacing}"
x:Uid="BtnVerticalSpacing"
Click="VerticalMeasureTool_Click"
Style="{StaticResource ToggleButtonRadioButtonStyle}"
ToolTipService.ToolTip="{x:Bind p:Resources.VerticalSpacing}">
Style="{StaticResource ToggleButtonRadioButtonStyle}">
<ToolTipService.ToolTip>
<TextBlock x:Uid="BtnVerticalSpacingTooltip" />
</ToolTipService.ToolTip>
<FontIcon Glyph="&#xE949;" RenderTransformOrigin="0.5,0.5">
<FontIcon.RenderTransform>
<RotateTransform Angle="90" />
</FontIcon.RenderTransform>
</FontIcon>
<ToggleButton.KeyboardAccelerators>
<KeyboardAccelerator Key="Number4" Modifiers="Control" Invoked="KeyboardAccelerator_Invoked"/>
<KeyboardAccelerator
Key="Number4"
Invoked="KeyboardAccelerator_Invoked"
Modifiers="Control" />
</ToggleButton.KeyboardAccelerators>
</ToggleButton>
<AppBarSeparator/>
<AppBarSeparator />
<Button
x:Uid="BtnClosePanel"
Click="ClosePanelTool_Click"
Content="&#xE8BB;"
ToolTipService.ToolTip="{x:Bind p:Resources.Close}"
Foreground="{StaticResource CloseButtonBackgroundPointerOver}">
<ToolTipService.ToolTip>
<TextBlock x:Uid="BtnClosePanelTooltip" />
</ToolTipService.ToolTip>
<Button.KeyboardAccelerators>
<KeyboardAccelerator Key="Escape" Invoked="KeyboardAccelerator_Invoked"/>
<KeyboardAccelerator Key="Escape" Invoked="KeyboardAccelerator_Invoked" />
</Button.KeyboardAccelerators>
</Button>
</StackPanel>

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

@@ -1,108 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace PowerToys.MeasureToolUI.Properties {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
public static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PowerToys.MeasureToolUI.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
public static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
/// <summary>
/// Looks up a localized string similar to Bounds (Ctrl+1).
/// </summary>
public static string Bounds {
get {
return ResourceManager.GetString("Bounds", resourceCulture);
}
}
/// <summary>
/// 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>
public static string HorizontalSpacing {
get {
return ResourceManager.GetString("HorizontalSpacing", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Spacing (Ctrl+2).
/// </summary>
public static string Spacing {
get {
return ResourceManager.GetString("Spacing", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Vertical spacing (Ctrl+4).
/// </summary>
public static string VerticalSpacing {
get {
return ResourceManager.GetString("VerticalSpacing", resourceCulture);
}
}
}
}

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

@@ -1,135 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Bounds" xml:space="preserve">
<value>Bounds (Ctrl+1)</value>
</data>
<data name="Spacing" xml:space="preserve">
<value>Spacing (Ctrl+2)</value>
</data>
<data name="HorizontalSpacing" xml:space="preserve">
<value>Horizontal spacing (Ctrl+3)</value>
</data>
<data name="VerticalSpacing" xml:space="preserve">
<value>Vertical spacing (Ctrl+4)</value>
</data>
<data name="Close" xml:space="preserve">
<value>Close (Esc)</value>
</data>
</root>

27
src/modules/MeasureTool/MeasureToolUI/Strings/en-us/Resources.resw
View File

@@ -39,4 +39,31 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="BtnBounds.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Bounds (Ctrl+1)</value>
</data>
<data name="BtnBoundsTooltip.Text" xml:space="preserve">
<value>Bounds (Ctrl+1)</value>
</data>
<data name="BtnSpacing.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Spacing (Ctrl+2)</value>
</data>
<data name="BtnSpacingTooltip.Text" xml:space="preserve">
<value>Spacing (Ctrl+2)</value>
</data>
<data name="BtnHorizontalSpacing.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Horizontal spacing (Ctrl+3)</value>
</data>
<data name="BtnHorizontalSpacingTooltip.Text" xml:space="preserve">
<value>Horizontal spacing (Ctrl+3)</value>
</data>
<data name="BtnVerticalSpacing.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Vertical spacing (Ctrl+4)</value>
</data>
<data name="BtnVerticalSpacingTooltip.Text" xml:space="preserve">
<value>Vertical spacing (Ctrl+4)</value>
</data>
<data name="BtnClosePanelTooltip.Text" xml:space="preserve">
<value>Close (Esc)</value>
</data>
</root>