mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-07 01:08:18 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Revert "Fixing policheck flags"

Browse Source 
This reverts commit 0e41684cf0.
This commit is contained in:
Clint Rutkas 2023-02-21 20:50:33 -08:00
parent 7fda4229c3
commit aceffe3212
11 changed files with 110 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,7 @@ ARPPRODUCTICON
ARRAYSIZE
arsinh
artanh
Artsakh
asdf
AShortcut
ASingle

12
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 unique time zone",
"Name": "My crazy time zone",
}
```
@ -41,26 +41,26 @@ A full entry for the `TimeZone.json` looks like:
```json
{
"Offset": "11:55",
"Name": "My unique time zone",
"Name": "My crazy time zone",
"Shortcut" : "MYTZ",
"MilitaryName" : "Order Time Zone",
"TimeNamesStandard": [
"My unique standard time"
"My crazy standard time"
],
"ShortcutsStandard": [
"MCST"
],
"TimeNamesDaylight": [
"My unique daylight time"
"My crazy daylight time"
],
"ShortcutsDaylight": [
"MCDT"
],
"CountriesStandard": [
"unique Land East"
"Crazy Land East"
],
"CountriesDaylight": [
"Unique Land West"
"Crazy Land West"
]
}
```

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::XAxisID));
const int y = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::YAxisID));
const int x = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::XID));
const int y = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::YID));
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* XAxisID = L"X";
const static wchar_t* YAxisID = L"Y";
const static wchar_t* XID = L"X";
const static wchar_t* YID = 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::XAxisID, json::value(0));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YAxisID, json::value(0));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XID, json::value(0));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YID, 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::XAxisID, json::value(1140));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YAxisID, json::value(649));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XID, json::value(1140));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YID, 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::XAxisID, json::value(zoneRect.left));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YAxisID, json::value(zoneRect.top));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XID, json::value(zoneRect.left));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YID, 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);

95
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", "17.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@ -411,6 +411,15 @@ 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>
@ -1023,15 +1032,6 @@ 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,6 +1077,15 @@ 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>
@ -1770,6 +1779,15 @@ 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>
@ -2778,6 +2796,15 @@ 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>
@ -3328,11 +3355,11 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
/// <summary>
/// Looks up a localized string similar to Macao SAR.
/// Looks up a localized string similar to Macau.
/// </summary>
internal static string Macao_SAR {
internal static string Macau {
get {
return ResourceManager.GetString("Macao SAR", resourceCulture);
return ResourceManager.GetString("Macau", resourceCulture);
}
}
@ -4236,6 +4263,15 @@ 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>
@ -4516,11 +4552,11 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties {
}
/// <summary>
/// Looks up a localized string similar to Palestine Authority.
/// Looks up a localized string similar to Palestine.
/// </summary>
internal static string Palestine_Authority {
internal static string Palestine {
get {
return ResourceManager.GetString("Palestine Authority", resourceCulture);
return ResourceManager.GetString("Palestine", resourceCulture);
}
}
@ -5631,6 +5667,15 @@ 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>
@ -5820,15 +5865,6 @@ 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>
@ -6540,15 +6576,6 @@ 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>

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

@ -235,6 +235,9 @@
<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>
@ -455,8 +458,8 @@
<data name="Canary Islands" xml:space="preserve">
<value>Canary Islands</value>
</data>
<data name="Cabo Verde" xml:space="preserve">
<value>Cabo Verde</value>
<data name="Cape Verde" xml:space="preserve">
<value>Cape Verde</value>
</data>
<data name="Cape Verde Time" xml:space="preserve">
<value>Cape Verde Time</value>
@ -692,8 +695,8 @@
<data name="East Nusa Tenggara (Indonesia)" xml:space="preserve">
<value>East Nusa Tenggara (Indonesia)</value>
</data>
<data name="Timor-Leste" xml:space="preserve">
<value>Timor-Leste</value>
<data name="East Timor" xml:space="preserve">
<value>East Timor</value>
</data>
<data name="Easter Island (Chile)" xml:space="preserve">
<value>Easter Island (Chile)</value>
@ -1033,8 +1036,8 @@
<data name="Ittoqqortoormiit (Greenland)" xml:space="preserve">
<value>Ittoqqortoormiit (Greenland)</value>
</data>
<data name="Côte d’Ivoire" xml:space="preserve">
<value>Côte d’Ivoire</value>
<data name="Ivory Coast" xml:space="preserve">
<value>Ivory Coast</value>
</data>
<data name="Jamaica" xml:space="preserve">
<value>Jamaica</value>
@ -1221,8 +1224,8 @@
<data name="Luxembourg" xml:space="preserve">
<value>Luxembourg</value>
</data>
<data name="Macao SAR" xml:space="preserve">
<value>Macao SAR</value>
<data name="Macau" xml:space="preserve">
<value>Macau</value>
</data>
<data name="Macquarie Island Station Time" xml:space="preserve">
<value>Macquarie Island Station Time</value>
@ -1525,6 +1528,9 @@
<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>
@ -1620,8 +1626,8 @@
<data name="Palau Time" xml:space="preserve">
<value>Palau Time</value>
</data>
<data name="Palestine Authority" xml:space="preserve">
<value>Palestine Authority</value>
<data name="Palestine" xml:space="preserve">
<value>Palestine</value>
</data>
<data name="Palmyra Atoll" xml:space="preserve">
<value>Palmyra Atoll</value>
@ -1997,8 +2003,8 @@
<data name="Suriname Time" xml:space="preserve">
<value>Suriname Time</value>
</data>
<data name="Yekaterinburg" xml:space="preserve">
<value>Yekaterinburg</value>
<data name="Sverdlovsk (Russia)" xml:space="preserve">
<value>Sverdlovsk (Russia)</value>
</data>
<data name="Sweden" xml:space="preserve">
<value>Sweden</value>

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

@ -514,7 +514,7 @@
"EGST"
],
"CountriesStandard": [
"Cabo Verde"
"Cape Verde"
],
"CountriesDaylight": [
"Ittoqqortoormiit (Greenland)",
@ -553,7 +553,7 @@
"Guinea-Bissau",
"Guinea",
"Iceland",
"Côte d’Ivoire",
"Ivory Coast",
"Liberia",
"Mali",
"Mauritania",
@ -716,7 +716,8 @@
"Lebanon",
"Lithuania",
"Moldova",
"Palestine Authority",
"Northern Cyprus",
"Palestine",
"Romania",
"Transnistria",
"Syria"
@ -819,6 +820,7 @@
],
"CountriesDaylight": [
"Armenia",
"Artsakh",
"Azerbaijan",
"Crozet Islands (French Southern and Antarctic Lands)",
"Georgia",
@ -894,7 +896,7 @@
"Kurgan (Russia)",
"Orenburg (Russia)",
"Perm (Russia)",
"Yekaterinburg",
"Sverdlovsk (Russia)",
"Tyumen (Russia)",
"Yamalia (Russia)",
"Tajikistan",
@ -1079,7 +1081,7 @@
"South Kalimantan (Indonesia)",
"Sulawesi (Indonesia)",
"West Nusa Tenggara (Indonesia)",
"Macao SAR",
"Macau",
"Malaysia",
"Mongolia (most)",
"Philippines",
@ -1130,7 +1132,7 @@
"YAKT"
],
"CountriesStandard": [
"Timor-Leste",
"East Timor",
"Maluku (Indonesia)",
"North Maluku (Indonesia)",
"Papua (Indonesia)",

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 assembly in AppDomain.CurrentDomain.GetAssemblies())
foreach (var ass in AppDomain.CurrentDomain.GetAssemblies())
{
sb.Append("* ");
sb.Append(assembly.FullName);
sb.Append(ass.FullName);
sb.Append(" (");
if (assembly.IsDynamic)
if (ass.IsDynamic)
{
sb.Append("dynamic assembly doesn't has location");
}
else if (string.IsNullOrEmpty(assembly.Location))
else if (string.IsNullOrEmpty(ass.Location))
{
sb.Append("location is null or empty");
}
else
{
sb.Append(assembly.Location);
sb.Append(ass.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)
Language.GA => GetDefaultLetterKeyGA(letter), // Gaeilge (Irish Gaelic)
Language.GD => GetDefaultLetterKeyGD(letter), // Gàidhlig (Scottish Gaelic)
Language.DE => GetDefaultLetterKeyDE(letter), // German
Language.EST => GetDefaultLetterKeyEST(letter), // Estonian