Skip to content

A Swiss Army knife for developers.

Updated localization

Etienne Baudouxe4b8f325f908
diff --git a/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs b/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs
index 8c721f2a6..ce530d755 100644
--- a/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs
+++ b/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs
@@ -7,7 +7,6 @@ using DevToys.Core.Tools.Metadata;
using DevToys.Core.Tools.ViewItems;
using DevToys.Localization;
using DevToys.Localization.Strings.MainMenu;
-using DevToys.Localization.Strings.MainWindow;
using FuzzySharp;
using FuzzySharp.PreProcess;
using Microsoft.Extensions.Logging;
@@ -32,7 +31,7 @@ public sealed partial class GuiToolProvider
iconGlyph: "\uF3E9",
groupName: "N/A",
shortDisplayTitleResourceName: "N/A",
- longDisplayTitleResourceName: nameof(MainWindow.SearchNoResultsFound),
+ longDisplayTitleResourceName: nameof(MainMenu.SearchNoResultsFound),
resourceManagerAssemblyIdentifier: nameof(DevToysLocalizationResourceManagerAssemblyIdentifier),
resourceManagerBaseName: "DevToys.Localization.Strings.MainWindow.MainWindow")),
typeof(DevToysLocalizationResourceManagerAssemblyIdentifier).Assembly),
diff --git a/src/app/dev/DevToys.Core/Tools/Metadata/GuiToolMetadata.cs b/src/app/dev/DevToys.Core/Tools/Metadata/GuiToolMetadata.cs
index 20fd56df2..fa178e72d 100644
--- a/src/app/dev/DevToys.Core/Tools/Metadata/GuiToolMetadata.cs
+++ b/src/app/dev/DevToys.Core/Tools/Metadata/GuiToolMetadata.cs
@@ -1,7 +1,7 @@
using DevToys.Api;
using DevToys.Api.Tool.Metadata.Attributes;
using DevToys.Localization;
-using DevToys.Localization.Strings.MainWindow;
+using DevToys.Localization.Strings.MainMenu;
namespace DevToys.Core.Tools.Metadata;
@@ -28,7 +28,7 @@ public sealed class GuiToolMetadata : IOrderableMetadata
{ nameof(ToolDisplayInformationAttribute.IconGlyph), "\uF3E9" },
{ nameof(ToolDisplayInformationAttribute.GroupName), "N/A" },
{ nameof(ToolDisplayInformationAttribute.ShortDisplayTitleResourceName), "N/A" },
- { nameof(ToolDisplayInformationAttribute.LongDisplayTitleResourceName), nameof(MainWindow.SearchNoResultsFound) },
+ { nameof(ToolDisplayInformationAttribute.LongDisplayTitleResourceName), nameof(MainMenu.SearchNoResultsFound) },
{ nameof(ToolDisplayInformationAttribute.ResourceManagerAssemblyIdentifier), nameof(DevToysLocalizationResourceManagerAssemblyIdentifier) },
{ nameof(ToolDisplayInformationAttribute.ResourceManagerBaseName), "DevToys.Localization.Strings.MainWindow.MainWindow" }
});
diff --git a/src/app/dev/DevToys.Localization/DevToys.Localization.csproj b/src/app/dev/DevToys.Localization/DevToys.Localization.csproj
index f0fb95632..09ad472fa 100644
--- a/src/app/dev/DevToys.Localization/DevToys.Localization.csproj
+++ b/src/app/dev/DevToys.Localization/DevToys.Localization.csproj
@@ -15,22 +15,23 @@
<AutoGen>True</AutoGen>
<DependentUpon>MainMenu.resx</DependentUpon>
</Compile>
- <Compile Update="Strings\MainWindow\MainWindow.Designer.cs">
+ <Compile Update="Strings\Settings\Settings.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
- <DependentUpon>MainWindow.resx</DependentUpon>
+ <DependentUpon>Settings.resx</DependentUpon>
</Compile>
- <Compile Update="Strings\Settings\Settings.Designer.cs">
+ <Compile Update="Strings\ToolGroupPage\ToolGroupPage.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
- <DependentUpon>Settings.resx</DependentUpon>
+ <DependentUpon>ToolGroupPage.resx</DependentUpon>
+ </Compile>
+ <Compile Update="Strings\ToolPage\ToolPage.Designer.cs">
+ <DesignTime>True</DesignTime>
+ <AutoGen>True</AutoGen>
+ <DependentUpon>ToolPage.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Update="Strings\MainWindow\MainWindow.resx">
- <Generator>PublicResXFileCodeGenerator</Generator>
- <LastGenOutput>MainWindow.Designer.cs</LastGenOutput>
- </EmbeddedResource>
<EmbeddedResource Update="Strings\Settings\Settings.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -49,4 +50,10 @@
<ItemGroup>
<ProjectReference Include="..\DevToys.Api\DevToys.Api.csproj" />
</ItemGroup>
+ <ItemGroup>
+ <AdditionalFiles Update="Strings\ToolGroupPage\ToolGroupPage.resx">
+ <Generator>PublicResXFileCodeGenerator</Generator>
+ <LastGenOutput>ToolGroupPage.Designer.cs</LastGenOutput>
+ </AdditionalFiles>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/app/dev/DevToys.Localization/Strings/MainMenu/MainMenu.Designer.cs b/src/app/dev/DevToys.Localization/Strings/MainMenu/MainMenu.Designer.cs
index 5931dc592..b525ce8db 100644
--- a/src/app/dev/DevToys.Localization/Strings/MainMenu/MainMenu.Designer.cs
+++ b/src/app/dev/DevToys.Localization/Strings/MainMenu/MainMenu.Designer.cs
@@ -104,5 +104,23 @@ namespace DevToys.Localization.Strings.MainMenu {
return ResourceManager.GetString("RecentToolsDisplayTitle", resourceCulture);
}
}
+
+ /// <summary>
+ /// Looks up a localized string similar to Type to search for tools....
+ /// </summary>
+ public static string Search {
+ get {
+ return ResourceManager.GetString("Search", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to No results found.
+ /// </summary>
+ public static string SearchNoResultsFound {
+ get {
+ return ResourceManager.GetString("SearchNoResultsFound", resourceCulture);
+ }
+ }
}
}
diff --git a/src/app/dev/DevToys.Localization/Strings/MainMenu/MainMenu.resx b/src/app/dev/DevToys.Localization/Strings/MainMenu/MainMenu.resx
index 133371420..ecb934836 100644
--- a/src/app/dev/DevToys.Localization/Strings/MainMenu/MainMenu.resx
+++ b/src/app/dev/DevToys.Localization/Strings/MainMenu/MainMenu.resx
@@ -132,4 +132,10 @@
<data name="RecentToolsDisplayTitle" xml:space="preserve">
<value>Recents</value>
</data>
+ <data name="Search" xml:space="preserve">
+ <value>Type to search for tools...</value>
+ </data>
+ <data name="SearchNoResultsFound" xml:space="preserve">
+ <value>No results found</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/src/app/dev/DevToys.Localization/Strings/ToolGroupPage/ToolGroupPage.Designer.cs b/src/app/dev/DevToys.Localization/Strings/ToolGroupPage/ToolGroupPage.Designer.cs
new file mode 100644
index 000000000..5ce2f5401
--- /dev/null
+++ b/src/app/dev/DevToys.Localization/Strings/ToolGroupPage/ToolGroupPage.Designer.cs
@@ -0,0 +1,90 @@
+//------------------------------------------------------------------------------
+// <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 DevToys.Localization.Strings.ToolGroupPage {
+ 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 ToolGroupPage {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal ToolGroupPage() {
+ }
+
+ /// <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("DevToys.Localization.Strings.ToolGroupPage.ToolGroupPage", typeof(ToolGroupPage).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 Not finding what you&apos;re looking for?.
+ /// </summary>
+ public static string NotFindingTool {
+ get {
+ return ResourceManager.GetString("NotFindingTool", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Open a feature request on GitHub.
+ /// </summary>
+ public static string NotFindingToolOpenFeatureRequest {
+ get {
+ return ResourceManager.GetString("NotFindingToolOpenFeatureRequest", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Suggest your ideas!.
+ /// </summary>
+ public static string NotFindingToolSuggestIdea {
+ get {
+ return ResourceManager.GetString("NotFindingToolSuggestIdea", resourceCulture);
+ }
+ }
+ }
+}
diff --git a/src/app/dev/DevToys.Localization/Strings/ToolGroupPage/ToolGroupPage.resx b/src/app/dev/DevToys.Localization/Strings/ToolGroupPage/ToolGroupPage.resx
new file mode 100644
index 000000000..a25ed3840
--- /dev/null
+++ b/src/app/dev/DevToys.Localization/Strings/ToolGroupPage/ToolGroupPage.resx
@@ -0,0 +1,129 @@
+<?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="NotFindingTool" xml:space="preserve">
+ <value>Not finding what you're looking for?</value>
+ </data>
+ <data name="NotFindingToolOpenFeatureRequest" xml:space="preserve">
+ <value>Open a feature request on GitHub</value>
+ </data>
+ <data name="NotFindingToolSuggestIdea" xml:space="preserve">
+ <value>Suggest your ideas!</value>
+ </data>
+</root>
\ No newline at end of file
diff --git a/src/app/dev/DevToys.Localization/Strings/MainWindow/MainWindow.Designer.cs b/src/app/dev/DevToys.Localization/Strings/ToolPage/ToolPage.Designer.cs
similarity index 83%
rename from src/app/dev/DevToys.Localization/Strings/MainWindow/MainWindow.Designer.cs
rename to src/app/dev/DevToys.Localization/Strings/ToolPage/ToolPage.Designer.cs
index 99ccbd89c..8ab744f3a 100644
--- a/src/app/dev/DevToys.Localization/Strings/MainWindow/MainWindow.Designer.cs
+++ b/src/app/dev/DevToys.Localization/Strings/ToolPage/ToolPage.Designer.cs
@@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
-namespace DevToys.Localization.Strings.MainWindow {
+namespace DevToys.Localization.Strings.ToolPage {
using System;
@@ -22,14 +22,14 @@ namespace DevToys.Localization.Strings.MainWindow {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- public class MainWindow {
+ public class ToolPage {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal MainWindow() {
+ internal ToolPage() {
}
/// <summary>
@@ -39,7 +39,7 @@ namespace DevToys.Localization.Strings.MainWindow {
public static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Localization.Strings.MainWindow.MainWindow", typeof(MainWindow).Assembly);
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Localization.Strings.ToolPage.ToolPage", typeof(ToolPage).Assembly);
resourceMan = temp;
}
return resourceMan;
@@ -87,24 +87,6 @@ namespace DevToys.Localization.Strings.MainWindow {
}
}
- /// <summary>
- /// Looks up a localized string similar to Type to search for tools....
- /// </summary>
- public static string Search {
- get {
- return ResourceManager.GetString("Search", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to No results found.
- /// </summary>
- public static string SearchNoResultsFound {
- get {
- return ResourceManager.GetString("SearchNoResultsFound", resourceCulture);
- }
- }
-
/// <summary>
/// Looks up a localized string similar to Toggle keep the window on top (Ctrl+Up).
/// </summary>
diff --git a/src/app/dev/DevToys.Localization/Strings/MainWindow/MainWindow.resx b/src/app/dev/DevToys.Localization/Strings/ToolPage/ToolPage.resx
similarity index 96%
rename from src/app/dev/DevToys.Localization/Strings/MainWindow/MainWindow.resx
rename to src/app/dev/DevToys.Localization/Strings/ToolPage/ToolPage.resx
index 6dc378257..2a30df2ed 100644
--- a/src/app/dev/DevToys.Localization/Strings/MainWindow/MainWindow.resx
+++ b/src/app/dev/DevToys.Localization/Strings/ToolPage/ToolPage.resx
@@ -126,12 +126,6 @@
<data name="RemoveFromFavorites" xml:space="preserve">
<value>Remove from favorites</value>
</data>
- <data name="Search" xml:space="preserve">
- <value>Type to search for tools...</value>
- </data>
- <data name="SearchNoResultsFound" xml:space="preserve">
- <value>No results found</value>
- </data>
<data name="ToggleCompactOverlayTooltip" xml:space="preserve">
<value>Toggle keep the window on top (Ctrl+Up)</value>
</data>
diff --git a/src/app/dev/DevToys.UI/ViewModels/ToolPageViewModel.cs b/src/app/dev/DevToys.UI/ViewModels/ToolPageViewModel.cs
index d71b1120b..b8cc95dea 100644
--- a/src/app/dev/DevToys.UI/ViewModels/ToolPageViewModel.cs
+++ b/src/app/dev/DevToys.UI/ViewModels/ToolPageViewModel.cs
@@ -2,7 +2,7 @@
using CommunityToolkit.Mvvm.Input;
using DevToys.Core.Tools;
using DevToys.Core.Tools.ViewItems;
-using DevToys.Localization.Strings.MainWindow;
+using DevToys.Localization.Strings.ToolPage;
namespace DevToys.UI.ViewModels;
@@ -53,9 +53,9 @@ internal sealed partial class ToolPageViewModel : ObservableRecipient
{
if (isSelectedMenuItemAFavoriteTool)
{
- return MainWindow.RemoveFromFavorites;
+ return ToolPage.RemoveFromFavorites;
}
- return MainWindow.AddToFavorites;
+ return ToolPage.AddToFavorites;
}
}
diff --git a/src/app/dev/DevToys.UI/Views/MainWindow.xaml b/src/app/dev/DevToys.UI/Views/MainWindow.xaml
index ba241ff31..9bc352a68 100644
--- a/src/app/dev/DevToys.UI/Views/MainWindow.xaml
+++ b/src/app/dev/DevToys.UI/Views/MainWindow.xaml
@@ -12,7 +12,8 @@
xmlns:local="using:DevToys.UI.Views"
xmlns:tools="using:DevToys.Core.Tools.ViewItems"
xmlns:dts="using:DevToys.UI.DataTemplateSelectors"
- xmlns:strings="using:DevToys.Localization.Strings.MainWindow"
+ xmlns:mainmenustrings="using:DevToys.Localization.Strings.MainMenu"
+ xmlns:toolpagestrings="using:DevToys.Localization.Strings.ToolPage"
xmlns:controls="using:DevToys.UI.Framework.Controls"
xmlns:converters="using:DevToys.UI.Framework.Converters"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
@@ -92,8 +93,8 @@
Padding="0"
Visibility="{x:Bind IsCompactOverlayModeSupported, Converter={StaticResource BooleanToVisibilityConverter}}"
IsEnabled="{x:Bind ViewModel.IsSelectedMenuItemATool, Mode=OneWay}"
- ToolTipService.ToolTip="{x:Bind strings:MainWindow.ToggleCompactOverlayTooltip}"
- AutomationProperties.Name="{x:Bind strings:MainWindow.ToggleCompactOverlayTooltip}"
+ ToolTipService.ToolTip="{x:Bind toolpagestrings:ToolPage.ToggleCompactOverlayTooltip}"
+ AutomationProperties.Name="{x:Bind toolpagestrings:ToolPage.ToggleCompactOverlayTooltip}"
Click="CompactOverlayModeButton_Click">
<Button.KeyboardAccelerators>
<KeyboardAccelerator Key="Up" Modifiers="Control"/>
@@ -137,7 +138,7 @@
QueryIcon="Find"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
- PlaceholderText="{x:Bind strings:MainWindow.Search}"
+ PlaceholderText="{x:Bind mainmenustrings:MainMenu.Search}"
UpdateTextOnSelect="False"
ItemsSource="{x:Bind ViewModel.SearchResults, Mode=OneWay}"
Text="{x:Bind ViewModel.SearchQuery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
diff --git a/src/app/dev/DevToys.UI/Views/ToolGroupPage.xaml b/src/app/dev/DevToys.UI/Views/ToolGroupPage.xaml
index 9fcb56577..33a16dd5f 100644
--- a/src/app/dev/DevToys.UI/Views/ToolGroupPage.xaml
+++ b/src/app/dev/DevToys.UI/Views/ToolGroupPage.xaml
@@ -10,7 +10,8 @@
xmlns:ix="using:Microsoft.Xaml.Interactions.Core"
xmlns:i="using:Microsoft.Xaml.Interactivity"
xmlns:tools="using:DevToys.Core.Tools"
- xmlns:strings="using:DevToys.Localization.Strings.MainWindow"
+ xmlns:toolstrings="using:DevToys.Localization.Strings.ToolPage"
+ xmlns:strings="using:DevToys.Localization.Strings.ToolGroupPage"
mc:Ignorable="d">
<Page.Resources>
<Thickness x:Key="GridViewItemMargin">0,12,12,0</Thickness>
@@ -108,7 +109,7 @@
IsOpen="False"
DefaultLabelPosition="Right">
<win:AppBarButton
- Label="{x:Bind strings:MainWindow.PinToStart}">
+ Label="{x:Bind toolstrings:ToolPage.PinToStart}">
<win:AppBarButton.Icon>
<win:FontIcon Glyph="&#xF602;"/>
</win:AppBarButton.Icon>
@@ -224,38 +225,6 @@
Glyph="&#xEE7A;"/>
</Button>
</StackPanel>
- <!--<StackPanel
- x:Name="ToolBar"
- Grid.Row="3"
- Opacity="0"
- Orientation="Horizontal"
- HorizontalAlignment="Center">
- <StackPanel.OpacityTransition>
- <ScalarTransition />
- </StackPanel.OpacityTransition>
- -->
- <!--<Button
- Style="{StaticResource CommandBarFlyoutEllipsisButtonStyle}"
- Height="32"
- Width="32"
- Padding="4"
- AutomationProperties.Name="{Binding Instance.MainPage.OpenInNewWindow, Source={StaticResource LanguageManager}}"
- ToolTipService.ToolTip="{Binding Instance.MainPage.OpenInNewWindow, Source={StaticResource LanguageManager}}"
- Click="OpenInNewWindowButton_Click">
- <FontIcon FontFamily="{StaticResource FluentSystemIcons}" FontSize="16" Glyph="&#xF8B5;"/>
- </Button>
- <Button
- Style="{StaticResource CommandBarFlyoutEllipsisButtonStyle}"
- Height="32"
- Width="32"
- Padding="4"
- AutomationProperties.Name="{Binding Instance.MainPage.PinToolToStart, Source={StaticResource LanguageManager}}"
- ToolTipService.ToolTip="{Binding Instance.MainPage.PinToolToStart, Source={StaticResource LanguageManager}}"
- Click="PinToolToStartCommandButton_Click">
- <FontIcon FontFamily="{StaticResource FluentSystemIcons}" FontSize="16" Glyph="&#xF601;"/>
- </Button>-->
- <!--
- </StackPanel>-->
</Grid>
</DataTemplate>
</GridView.ItemTemplate>
@@ -269,10 +238,10 @@
IsClosable="False"
IsOpen="True"
IsIconVisible="True"
- Title="Not finding what you're looking for?"
- Message="Suggest your ideas!">
+ Title="{x:Bind strings:ToolGroupPage.NotFindingTool}"
+ Message="{x:Bind strings:ToolGroupPage.NotFindingToolSuggestIdea}">
<InfoBar.ActionButton>
- <HyperlinkButton Content="Open a feature request on GitHub" NavigateUri="https://www.example.com" />
+ <HyperlinkButton Content="{x:Bind strings:ToolGroupPage.NotFindingToolOpenFeatureRequest}" NavigateUri="https://www.example.com" />
</InfoBar.ActionButton>
</InfoBar>
</Border>
diff --git a/src/app/dev/DevToys.UI/Views/ToolPage.xaml b/src/app/dev/DevToys.UI/Views/ToolPage.xaml
index 2f292262b..0ccf20a79 100644
--- a/src/app/dev/DevToys.UI/Views/ToolPage.xaml
+++ b/src/app/dev/DevToys.UI/Views/ToolPage.xaml
@@ -11,7 +11,7 @@
xmlns:ix="using:Microsoft.Xaml.Interactions.Core"
xmlns:i="using:Microsoft.Xaml.Interactivity"
xmlns:tools="using:DevToys.Core.Tools"
- xmlns:strings="using:DevToys.Localization.Strings.MainWindow"
+ xmlns:strings="using:DevToys.Localization.Strings.ToolPage"
mc:Ignorable="d">
<Page.Resources>
<converters:BooleanToStringConverter x:Key="BooleanToFavoriteIconGlyph" StringIfTrue="&#xF71A;" StringIfFalse="&#xF70F;"/>
@@ -70,7 +70,7 @@
</AppBarButton.Icon>
</AppBarButton>
<win:AppBarButton
- Label="{x:Bind strings:MainWindow.PinToStart}">
+ Label="{x:Bind strings:ToolPage.PinToStart}">
<win:AppBarButton.Icon>
<win:FontIcon Glyph="&#xF602;"/>
</win:AppBarButton.Icon>
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/NavigationView.razor b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/NavigationView.razor
index c46f1ac98..35a9466dd 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/NavigationView.razor
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/NavigationView.razor
@@ -1,4 +1,4 @@
-@using DevToys.Localization.Strings.MainWindow;
+@using DevToys.Localization.Strings.MainMenu;
@inherits FluentComponentBase
@@ -30,7 +30,7 @@
<FluentButton Style="width: 40px; height: 36px">
<FluentIcon Name="@FluentIcons.Navigation" Size="@IconSize.Size16" Color="Color.Neutral" />
</FluentButton>
- <FluentSearch Placeholder="@MainWindow.Search" Style="margin-top: 2px; margin-bottom: 8px; margin-left: 12px; margin-right: 12px; width: -webkit-fill-available;" />
+ <FluentSearch Placeholder="@MainMenu.Search" Style="margin-top: 2px; margin-bottom: 8px; margin-left: 12px; margin-right: 12px; width: -webkit-fill-available;" />
</StackPanel>
</GridElement>