Skip to content

Commit 1ad16ad

Browse files
alekhyareddy28alekhyareddy28
authored
Localize the Shortcut guide PowerToy (#199) (#1126)
* Localized shortcut_guide.cpp * localized overlay_window.cpp * formatting changes * Localize overlay window * removed the README link from the set of localized resources * Typo: changed upper to lower
1 parent 45e3f02 commit 1ad16ad

File tree

5 files changed

+66
-48
lines changed

5 files changed

+66
-48
lines changed

‎src/modules/shortcut_guide/overlay_window.cpp

+43-40
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66
#include "keyboard_state.h"
77
#include "shortcut_guide.h"
88
#include "trace.h"
9+
#include "resource.h"
910
#include <common/common.h>
1011

12+
extern "C" IMAGE_DOS_HEADER __ImageBase;
13+
1114
D2DOverlaySVG& D2DOverlaySVG::load(const std::wstring& filename, ID2D1DeviceContext5* d2d_dc)
1215
{
1316
D2DSVG::load(filename, d2d_dc);
@@ -791,71 +794,71 @@ void D2DOverlayWindow::render(ID2D1DeviceContext5* d2d_dc)
791794
switch (window_state)
792795
{
793796
case MINIMIZED:
794-
left = L"No action";
797+
left = GET_RESOURCE_STRING(IDS_NO_ACTION);
795798
left_disabled = true;
796-
right = L"No action";
799+
right = GET_RESOURCE_STRING(IDS_NO_ACTION);
797800
right_disabled = true;
798-
up = L"Restore";
799-
down = L"No action";
801+
up = GET_RESOURCE_STRING(IDS_RESTORE);
802+
down = GET_RESOURCE_STRING(IDS_NO_ACTION);
800803
down_disabled = true;
801804
break;
802805
case MAXIMIZED:
803-
left = L"Snap left";
804-
right = L"Snap right";
805-
up = L"No action";
806+
left = GET_RESOURCE_STRING(IDS_SNAP_LEFT);
807+
right = GET_RESOURCE_STRING(IDS_SNAP_RIGHT);
808+
up = GET_RESOURCE_STRING(IDS_NO_ACTION);
806809
up_disabled = true;
807-
down = L"Restore";
810+
down = GET_RESOURCE_STRING(IDS_RESTORE);
808811
break;
809812
case SNAPED_TOP_LEFT:
810-
left = L"Snap upper right";
811-
right = L"Snap upper right";
812-
up = L"Maximize";
813-
down = L"Snap left";
813+
left = GET_RESOURCE_STRING(IDS_SNAP_UPPER_RIGHT);
814+
right = GET_RESOURCE_STRING(IDS_SNAP_UPPER_RIGHT);
815+
up = GET_RESOURCE_STRING(IDS_MAXIMIZE);
816+
down = GET_RESOURCE_STRING(IDS_SNAP_LEFT);
814817
break;
815818
case SNAPED_LEFT:
816-
left = L"Snap right";
817-
right = L"Restore";
818-
up = L"Snap upper left";
819-
down = L"Snap lower left";
819+
left = GET_RESOURCE_STRING(IDS_SNAP_RIGHT);
820+
right = GET_RESOURCE_STRING(IDS_RESTORE);
821+
up = GET_RESOURCE_STRING(IDS_SNAP_UPPER_LEFT);
822+
down = GET_RESOURCE_STRING(IDS_SNAP_LOWER_LEFT);
820823
break;
821824
case SNAPED_BOTTOM_LEFT:
822-
left = L"Snap lower right";
823-
right = L"Snap lower right";
824-
up = L"Snap left";
825-
down = L"Minimize";
825+
left = GET_RESOURCE_STRING(IDS_SNAP_LOWER_RIGHT);
826+
right = GET_RESOURCE_STRING(IDS_SNAP_LOWER_RIGHT);
827+
up = GET_RESOURCE_STRING(IDS_SNAP_LEFT);
828+
down = GET_RESOURCE_STRING(IDS_MINIMIZE);
826829
break;
827830
case SNAPED_TOP_RIGHT:
828-
left = L"Snap upper left";
829-
right = L"Snap upper left";
830-
up = L"Maximize";
831-
down = L"Snap right";
831+
left = GET_RESOURCE_STRING(IDS_SNAP_UPPER_LEFT);
832+
right = GET_RESOURCE_STRING(IDS_SNAP_UPPER_LEFT);
833+
up = GET_RESOURCE_STRING(IDS_MAXIMIZE);
834+
down = GET_RESOURCE_STRING(IDS_SNAP_RIGHT);
832835
break;
833836
case SNAPED_RIGHT:
834-
left = L"Restore";
835-
right = L"Snap left";
836-
up = L"Snap upper right";
837-
down = L"Snap lower right";
837+
left = GET_RESOURCE_STRING(IDS_RESTORE);
838+
right = GET_RESOURCE_STRING(IDS_SNAP_LEFT);
839+
up = GET_RESOURCE_STRING(IDS_SNAP_UPPER_RIGHT);
840+
down = GET_RESOURCE_STRING(IDS_SNAP_LOWER_RIGHT);
838841
break;
839842
case SNAPED_BOTTOM_RIGHT:
840-
left = L"Snap lower left";
841-
right = L"Snap lower left";
842-
up = L"Snap right";
843-
down = L"Minimize";
843+
left = GET_RESOURCE_STRING(IDS_SNAP_LOWER_LEFT);
844+
right = GET_RESOURCE_STRING(IDS_SNAP_LOWER_LEFT);
845+
up = GET_RESOURCE_STRING(IDS_SNAP_RIGHT);
846+
down = GET_RESOURCE_STRING(IDS_MINIMIZE);
844847
break;
845848
case RESTORED:
846-
left = L"Snap left";
847-
right = L"Snap right";
848-
up = L"Maximize";
849-
down = L"Minimize";
849+
left = GET_RESOURCE_STRING(IDS_SNAP_LEFT);
850+
right = GET_RESOURCE_STRING(IDS_SNAP_RIGHT);
851+
up = GET_RESOURCE_STRING(IDS_MAXIMIZE);
852+
down = GET_RESOURCE_STRING(IDS_MINIMIZE);
850853
break;
851854
default:
852-
left = L"No action";
855+
left = GET_RESOURCE_STRING(IDS_NO_ACTION);
853856
left_disabled = true;
854-
right = L"No action";
857+
right = GET_RESOURCE_STRING(IDS_NO_ACTION);
855858
right_disabled = true;
856-
up = L"No action";
859+
up = GET_RESOURCE_STRING(IDS_NO_ACTION);
857860
up_disabled = true;
858-
down = L"No action";
861+
down = GET_RESOURCE_STRING(IDS_NO_ACTION);
859862
down_disabled = true;
860863
}
861864
auto text_color = D2D1::ColorF(light_mode ? 0x222222 : 0xDDDDDD, minature_shown || window_state == MINIMIZED ? 1.0f : 0.3f);

‎src/modules/shortcut_guide/resource.h

+18-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
1-
#define IDS_SETTING_DESCRIPTION_PRESS_TIME 101
2-
#define IDS_SETTING_DESCRIPTION_OVERLAY_OPACITY 102
3-
#define IDS_SETTING_DESCRIPTION_THEME 103
4-
#define IDS_SETTING_DESCRIPTION_THEME_LIGHT 104
5-
#define IDS_SETTING_DESCRIPTION_THEME_DARK 105
6-
#define IDS_SETTING_DESCRIPTION_THEME_SYSTEM 106
1+
#define IDS_SETTING_DESCRIPTION_PRESS_TIME 101
2+
#define IDS_SETTING_DESCRIPTION_OVERLAY_OPACITY 102
3+
#define IDS_SETTING_DESCRIPTION_THEME 103
4+
#define IDS_SETTING_DESCRIPTION_THEME_LIGHT 104
5+
#define IDS_SETTING_DESCRIPTION_THEME_DARK 105
6+
#define IDS_SETTING_DESCRIPTION_THEME_SYSTEM 106
7+
#define IDS_SETTINGS_DESCRIPTION 107
8+
#define IDS_SHORTCUT_GUIDE 108
9+
#define IDS_NO_ACTION 109
10+
#define IDS_RESTORE 110
11+
#define IDS_SNAP_RIGHT 111
12+
#define IDS_SNAP_LEFT 112
13+
#define IDS_SNAP_UPPER_RIGHT 113
14+
#define IDS_SNAP_UPPER_LEFT 114
15+
#define IDS_SNAP_LOWER_RIGHT 115
16+
#define IDS_SNAP_LOWER_LEFT 116
17+
#define IDS_MINIMIZE 117
18+
#define IDS_MAXIMIZE 118

‎src/modules/shortcut_guide/shortcut_guide.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "shortcut_guide.h"
33
#include "target_state.h"
44
#include "trace.h"
5+
#include "resource.h"
56

67
#include <common/common.h>
78
#include <common/settings_objects.h>
@@ -12,12 +13,13 @@ OverlayWindow* instance = nullptr;
1213

1314
OverlayWindow::OverlayWindow()
1415
{
16+
app_name = GET_RESOURCE_STRING(IDS_SHORTCUT_GUIDE);
1517
init_settings();
1618
}
1719

1820
const wchar_t* OverlayWindow::get_name()
1921
{
20-
return L"Shortcut Guide";
22+
return app_name.c_str();
2123
}
2224

2325
const wchar_t** OverlayWindow::get_events()
@@ -31,7 +33,7 @@ bool OverlayWindow::get_config(wchar_t* buffer, int* buffer_size)
3133
HINSTANCE hinstance = reinterpret_cast<HINSTANCE>(&__ImageBase);
3234

3335
PowerToysSettings::Settings settings(hinstance, get_name());
34-
settings.set_description(L"Shows a help overlay with Windows shortcuts when the Windows key is pressed.");
36+
settings.set_description(GET_RESOURCE_STRING(IDS_SETTINGS_DESCRIPTION));
3537
settings.set_overview_link(L"https://github.com/microsoft/PowerToys/blob/master/src/modules/shortcut_guide/README.md");
3638
settings.set_icon_key(L"pt-shortcut-guide");
3739

‎src/modules/shortcut_guide/shortcut_guide.h

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class OverlayWindow : public PowertoyModuleIface
3535
virtual void destroy() override;
3636

3737
private:
38+
std::wstring app_name;
3839
std::unique_ptr<TargetState> target_state;
3940
std::unique_ptr<D2DOverlayWindow> winkey_popup;
4041
bool _enabled = false;

‎src/modules/shortcut_guide/shortcut_guide.rc

1.04 KB
Binary file not shown.

0 commit comments

Comments
 (0)