mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-11-27 23:19:13 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Adjustments (#24254)

Browse Source
This commit is contained in:
Clint Rutkas 2023-02-22 14:55:25 -08:00 committed by GitHub
parent 995fd2ed50
commit d122f7ff99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 1458 additions and 1517 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/actions/spell-check/expect.txt vendored
View File

@ -87,7 +87,6 @@ ARPPRODUCTICON
ARRAYSIZE
arsinh
artanh
Artsakh
asdf
AShortcut
ASingle
@ -180,6 +179,7 @@ BUTTONUP
BValue
BYPOSITION
bytearray
Cabo
Caiguna
CALG
callbackptr
@ -401,9 +401,9 @@ deu
devblogs
devdocs
devenum
devmgmt
DEVMON
devpkey
devmgmt
DEVSOURCE
DIIRFLAG
dimm
@ -652,8 +652,8 @@ HCRYPTHASH
HCRYPTPROV
hcwhite
hdc
hdwwiz
hdrop
hdwwiz
HEB
Heiko
Helpline
@ -826,6 +826,7 @@ Ittoqqortoormiit
IUI
IUnknown
ivirtualdesktopmanager
Ivoire
IWbem
IWIC
iwr
@ -1385,8 +1386,8 @@ prevpane
prgms
pri
Primorsky
printmanagement
PRINTCLIENT
printmanagement
prm
proactively
PROCESSKEY
@ -1691,8 +1692,8 @@ spam
spdisp
spdlog
spdo
spec'ing
specialfolder
spec'ing
spesi
splitwstring
spsi
@ -2132,13 +2133,14 @@ WVC
Wwan
Wwanpp
XAttribute
XAxis
Xbox
XBUTTON
XBUTTONDBLCLK
XBUTTONDOWN
XBUTTONUP
xcopy
XControl
xcopy
XDocument
XElement
XFile
@ -2152,6 +2154,7 @@ xsi
XStr
XVIRTUALSCREEN
Yamalia
YAxis
YIncrement
yinle
yinwang

14
doc/devdocs/modules/launcher/plugins/timeZone.md
View File

@ -32,7 +32,7 @@ A minimum entry for the `TimeZone.json` looks like:
```json
{
"Offset": "11:55",
"Name": "My crazy time zone",
"Name": "My unique time zone",
}
```
@ -41,26 +41,26 @@ A full entry for the `TimeZone.json` looks like:
```json
{
"Offset": "11:55",
"Name": "My crazy time zone",
"Name": "My unique time zone",
"Shortcut" : "MYTZ",
"MilitaryName" : "Order Time Zone",
"TimeNamesStandard": [
"My crazy standard time"
"My unique standard time"
],
"ShortcutsStandard": [
"MCST"
],
"TimeNamesDaylight": [
"My crazy daylight time"
"My unique daylight time"
],
"ShortcutsDaylight": [
"MCDT"
],
"CountriesStandard": [
"Crazy Land East"
"unique Land East"
],
"CountriesDaylight": [
"Crazy Land West"
"Unique Land West"
]
}
```
@ -138,4 +138,4 @@ Because the JSON file must have a object as root type, instead of a array.
#### Projects
* `Wox.Infrastructure`
* `Wox.Plugin`
* `Wox.Plugin`

4
src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.cpp
View File

@ -37,8 +37,8 @@ namespace JsonUtils
for (uint32_t i = 0; i < size; ++i)
{
json::JsonObject zoneJson = zonesJson.GetObjectAt(i);
const int x = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::XID));
const int y = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::YID));
const int x = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::XAxisID));
const int y = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::YAxisID));
const int width = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::WidthID));
const int height = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::HeightID));
FancyZonesDataTypes::CanvasLayoutInfo::Rect zone{ x, y, width, height };

4
src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.h
View File

@ -30,8 +30,8 @@ namespace NonLocalizable
const static wchar_t* RefHeightID = L"ref-height";
const static wchar_t* RefWidthID = L"ref-width";
const static wchar_t* ZonesID = L"zones";
const static wchar_t* XID = L"X";
const static wchar_t* YID = L"Y";
const static wchar_t* XAxisID = L"X";
const static wchar_t* YAxisID = L"Y";
const static wchar_t* WidthID = L"width";
const static wchar_t* HeightID = L"height";

8
src/modules/fancyzones/FancyZonesTests/UnitTests/CustomLayoutsTests.Spec.cpp
View File

@ -32,16 +32,16 @@ namespace FancyZonesUnitTests
json::JsonArray zonesArray{};
{
json::JsonObject zone{};
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XID, json::value(0));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YID, json::value(0));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XAxisID, json::value(0));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YAxisID, json::value(0));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::WidthID, json::value(1140));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::HeightID, json::value(1040));
zonesArray.Append(zone);
}
{
json::JsonObject zone{};
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XID, json::value(1140));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YID, json::value(649));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XAxisID, json::value(1140));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YAxisID, json::value(649));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::WidthID, json::value(780));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::HeightID, json::value(391));
zonesArray.Append(zone);

4
src/modules/fancyzones/FancyZonesTests/UnitTests/Layout.Spec.cpp
View File

@ -65,8 +65,8 @@ namespace FancyZonesUnitTests
for (const auto& zoneRect : zones)
{
json::JsonObject zone{};
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XID, json::value(zoneRect.left));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YID, json::value(zoneRect.top));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XAxisID, json::value(zoneRect.left));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YAxisID, json::value(zoneRect.top));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::WidthID, json::value(zoneRect.right - zoneRect.left));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::HeightID, json::value(zoneRect.bottom - zoneRect.top));
zonesArray.Append(zone);

125
src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Properties/Resources.Designer.cs generated
View File

@ -19,7 +19,7 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
// 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", "16.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@ -411,15 +411,6 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Artsakh.
/// </summary>
internal static string Artsakh {
get {
return ResourceManager.GetString("Artsakh", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Aruba.
/// </summary>
@ -429,15 +420,6 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Ascension and Tristan da Cunha.
/// </summary>
internal static string Ascension_and_Tristan_da_Cunha {
get {
return ResourceManager.GetString("Ascension and Tristan da Cunha", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to ASEAN Common Time.
/// </summary>
@ -1032,6 +1014,15 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Cabo Verde.
/// </summary>
internal static string Cabo_Verde {
get {
return ResourceManager.GetString("Cabo Verde", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Caiguna (Australia).
/// </summary>
@ -1077,15 +1068,6 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Cape Verde.
/// </summary>
internal static string Cape_Verde {
get {
return ResourceManager.GetString("Cape Verde", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Cape Verde Time.
/// </summary>
@ -1779,15 +1761,6 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to East Timor.
/// </summary>
internal static string East_Timor {
get {
return ResourceManager.GetString("East Timor", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Easter Island (Chile).
/// </summary>
@ -2500,11 +2473,11 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
/// <summary>
/// Looks up a localized string similar to Hong Kong.
/// Looks up a localized string similar to Hong Kong SAR.
/// </summary>
internal static string Hong_Kong {
internal static string Hong_Kong_SAR {
get {
return ResourceManager.GetString("Hong Kong", resourceCulture);
return ResourceManager.GetString("Hong Kong SAR", resourceCulture);
}
}
@ -2796,15 +2769,6 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Ivory Coast.
/// </summary>
internal static string Ivory_Coast {
get {
return ResourceManager.GetString("Ivory Coast", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Jamaica.
/// </summary>
@ -3355,11 +3319,11 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
/// <summary>
/// Looks up a localized string similar to Macau.
/// Looks up a localized string similar to Macao SAR.
/// </summary>
internal static string Macau {
internal static string Macao_SAR {
get {
return ResourceManager.GetString("Macau", resourceCulture);
return ResourceManager.GetString("Macao SAR", resourceCulture);
}
}
@ -4263,15 +4227,6 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Northern Cyprus.
/// </summary>
internal static string Northern_Cyprus {
get {
return ResourceManager.GetString("Northern Cyprus", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Northern Mariana Islands.
/// </summary>
@ -4552,11 +4507,11 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
/// <summary>
/// Looks up a localized string similar to Palestine.
/// Looks up a localized string similar to Palestine Authority.
/// </summary>
internal static string Palestine {
internal static string Palestine_Authority {
get {
return ResourceManager.GetString("Palestine", resourceCulture);
return ResourceManager.GetString("Palestine Authority", resourceCulture);
}
}
@ -4993,11 +4948,11 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
/// <summary>
/// Looks up a localized string similar to Saint Helena.
/// Looks up a localized string similar to Saint Helena, Ascension and Tristan da Cunha.
/// </summary>
internal static string Saint_Helena {
internal static string Saint_Helena__Ascension_and_Tristan_da_Cunha {
get {
return ResourceManager.GetString("Saint Helena", resourceCulture);
return ResourceManager.GetString("Saint Helena, Ascension and Tristan da Cunha", resourceCulture);
}
}
@ -5415,15 +5370,6 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Somaliland.
/// </summary>
internal static string Somaliland {
get {
return ResourceManager.GetString("Somaliland", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Sonora (Mexico).
/// </summary>
@ -5667,15 +5613,6 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Sverdlovsk (Russia).
/// </summary>
internal static string Sverdlovsk__Russia_ {
get {
return ResourceManager.GetString("Sverdlovsk (Russia)", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Sweden.
/// </summary>
@ -5865,6 +5802,15 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Timor-Leste.
/// </summary>
internal static string Timor_Leste {
get {
return ResourceManager.GetString("Timor-Leste", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Timor Leste Time.
/// </summary>
@ -6576,6 +6522,15 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Yekaterinburg.
/// </summary>
internal static string Yekaterinburg {
get {
return ResourceManager.GetString("Yekaterinburg", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Yekaterinburg Time.
/// </summary>

46
src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Properties/Resources.resx
View File

@ -235,14 +235,11 @@
<data name="Armenia Time" xml:space="preserve">
<value>Armenia Time</value>
</data>
<data name="Artsakh" xml:space="preserve">
<value>Artsakh</value>
</data>
<data name="Aruba" xml:space="preserve">
<value>Aruba</value>
</data>
<data name="Ascension and Tristan da Cunha" xml:space="preserve">
<value>Ascension and Tristan da Cunha</value>
<data name="Saint Helena, Ascension and Tristan da Cunha" xml:space="preserve">
<value>Saint Helena, Ascension and Tristan da Cunha</value>
</data>
<data name="ASEAN Common Time" xml:space="preserve">
<value>ASEAN Common Time</value>
@ -458,8 +455,8 @@
<data name="Canary Islands" xml:space="preserve">
<value>Canary Islands</value>
</data>
<data name="Cape Verde" xml:space="preserve">
<value>Cape Verde</value>
<data name="Cabo Verde" xml:space="preserve">
<value>Cabo Verde</value>
</data>
<data name="Cape Verde Time" xml:space="preserve">
<value>Cape Verde Time</value>
@ -695,8 +692,8 @@
<data name="East Nusa Tenggara (Indonesia)" xml:space="preserve">
<value>East Nusa Tenggara (Indonesia)</value>
</data>
<data name="East Timor" xml:space="preserve">
<value>East Timor</value>
<data name="Timor-Leste" xml:space="preserve">
<value>Timor-Leste</value>
</data>
<data name="Easter Island (Chile)" xml:space="preserve">
<value>Easter Island (Chile)</value>
@ -935,8 +932,8 @@
<data name="Honduras" xml:space="preserve">
<value>Honduras</value>
</data>
<data name="Hong Kong" xml:space="preserve">
<value>Hong Kong</value>
<data name="Hong Kong SAR" xml:space="preserve">
<value>Hong Kong SAR</value>
</data>
<data name="Hong Kong Time" xml:space="preserve">
<value>Hong Kong Time</value>
@ -1036,8 +1033,8 @@
<data name="Ittoqqortoormiit (Greenland)" xml:space="preserve">
<value>Ittoqqortoormiit (Greenland)</value>
</data>
<data name="Ivory Coast" xml:space="preserve">
<value>Ivory Coast</value>
<data name="Côte d’Ivoire" xml:space="preserve">
<value>Côte d’Ivoire</value>
</data>
<data name="Jamaica" xml:space="preserve">
<value>Jamaica</value>
@ -1224,8 +1221,8 @@
<data name="Luxembourg" xml:space="preserve">
<value>Luxembourg</value>
</data>
<data name="Macau" xml:space="preserve">
<value>Macau</value>
<data name="Macao SAR" xml:space="preserve">
<value>Macao SAR</value>
</data>
<data name="Macquarie Island Station Time" xml:space="preserve">
<value>Macquarie Island Station Time</value>
@ -1528,9 +1525,6 @@
<data name="North Maluku (Indonesia)" xml:space="preserve">
<value>North Maluku (Indonesia)</value>
</data>
<data name="Northern Cyprus" xml:space="preserve">
<value>Northern Cyprus</value>
</data>
<data name="Northern Mariana Islands" xml:space="preserve">
<value>Northern Mariana Islands</value>
</data>
@ -1626,8 +1620,8 @@
<data name="Palau Time" xml:space="preserve">
<value>Palau Time</value>
</data>
<data name="Palestine" xml:space="preserve">
<value>Palestine</value>
<data name="Palestine Authority" xml:space="preserve">
<value>Palestine Authority</value>
</data>
<data name="Palmyra Atoll" xml:space="preserve">
<value>Palmyra Atoll</value>
@ -1776,9 +1770,6 @@
<data name="Saint Barthélemy" xml:space="preserve">
<value>Saint Barthélemy</value>
</data>
<data name="Saint Helena" xml:space="preserve">
<value>Saint Helena</value>
</data>
<data name="Saint Kitts and Nevis" xml:space="preserve">
<value>Saint Kitts and Nevis</value>
</data>
@ -1918,9 +1909,6 @@
<data name="Somalia" xml:space="preserve">
<value>Somalia</value>
</data>
<data name="Somaliland" xml:space="preserve">
<value>Somaliland</value>
</data>
<data name="Sonora (Mexico)" xml:space="preserve">
<value>Sonora (Mexico)</value>
</data>
@ -2003,8 +1991,8 @@
<data name="Suriname Time" xml:space="preserve">
<value>Suriname Time</value>
</data>
<data name="Sverdlovsk (Russia)" xml:space="preserve">
<value>Sverdlovsk (Russia)</value>
<data name="Yekaterinburg" xml:space="preserve">
<value>Yekaterinburg</value>
</data>
<data name="Sweden" xml:space="preserve">
<value>Sweden</value>
@ -2346,4 +2334,4 @@
<data name="Équateur (Democratic Republic of the Congo)" xml:space="preserve">
<value>Équateur (Democratic Republic of the Congo)</value>
</data>
</root>
</root>

2743
src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/timezones.json
View File

File diff suppressed because it is too large Load Diff

10
src/modules/launcher/Wox.Infrastructure/Exception/ExceptionFormatter.cs
View File

@ -91,23 +91,23 @@ namespace Wox.Infrastructure.Exception
// GlobalAssemblyCache - .NET Core and .NET 5 and later: false in all cases.
// Source https://learn.microsoft.com/dotnet/api/system.reflection.assembly.globalassemblycache?view=net-6.0
foreach (var ass in AppDomain.CurrentDomain.GetAssemblies())
foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
{
sb.Append("* ");
sb.Append(ass.FullName);
sb.Append(assembly.FullName);
sb.Append(" (");
if (ass.IsDynamic)
if (assembly.IsDynamic)
{
sb.Append("dynamic assembly doesn't has location");
}
else if (string.IsNullOrEmpty(ass.Location))
else if (string.IsNullOrEmpty(assembly.Location))
{
sb.Append("location is null or empty");
}
else
{
sb.Append(ass.Location);
sb.Append(assembly.Location);
}
sb.AppendLine(")");

2
src/modules/poweraccent/PowerAccent.Core/Languages.cs
View File

@ -53,7 +53,7 @@ namespace PowerAccent.Core
Language.CUR => GetDefaultLetterKeyCUR(letter), // Currency
Language.CY => GetDefaultLetterKeyCY(letter), // Welsh
Language.CZ => GetDefaultLetterKeyCZ(letter), // Czech
Language.GA => GetDefaultLetterKeyGA(letter), // Gaeilge (Irish Gaelic)
Language.GA => GetDefaultLetterKeyGA(letter), // Gaeilge (Irish)
Language.GD => GetDefaultLetterKeyGD(letter), // Gàidhlig (Scottish Gaelic)
Language.DE => GetDefaultLetterKeyDE(letter), // German
Language.EST => GetDefaultLetterKeyEST(letter), // Estonian