Skip to content

Commit

Permalink
Revert "Fixing policheck flags"
Browse files Browse the repository at this point in the history 
This reverts commit 0e41684.
  • Loading branch information
@crutkas
crutkas committed Feb 22, 2023
1 parent 7fda422 commit aceffe3
Show file tree
Hide file tree
Showing 11 changed files with 110 additions and 74 deletions.
1 change: 1 addition & 0 deletions .github/actions/spell-check/expect.txt
View file
Expand Up @@ -88,6 +88,7 @@ ARPPRODUCTICON
ARRAYSIZE
arsinh
artanh
Artsakh
asdf
AShortcut
ASingle
Expand Down
12 changes: 6 additions & 6 deletions doc/devdocs/modules/launcher/plugins/timeZone.md
View file
Expand Up @@ -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",
}
```

Expand All @@ -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"
]
}
```
Expand Down
4 changes: 2 additions & 2 deletions src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.cpp
View file
Expand Up @@ -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 };
Expand Down
4 changes: 2 additions & 2 deletions src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.h
View file
Expand Up @@ -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";

Expand Down
8 changes: 4 additions & 4 deletions src/modules/fancyzones/FancyZonesTests/UnitTests/CustomLayoutsTests.Spec.cpp
View file
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/modules/fancyzones/FancyZonesTests/UnitTests/Layout.Spec.cpp
View file
Expand Up @@ -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);
Expand Down
95 changes: 61 additions & 34 deletions ...launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 18 additions & 12 deletions ...odules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Properties/Resources.resx
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit aceffe3

Please sign in to comment.