diff --git a/src/modules/shortcut_guide/LocProject.json b/src/modules/shortcut_guide/LocProject.json new file mode 100644 index 0000000000..3ae183d254 --- /dev/null +++ b/src/modules/shortcut_guide/LocProject.json @@ -0,0 +1,14 @@ +{ + "Projects": [ + { + "LanguageSet": "Azure_Languages", + "LocItems": [ + { + "SourceFile": "src\\modules\\shortcut_guide\\Resources.resx", + "CopyOption": "LangIDOnName", + "OutputPath": "src\\modules\\shortcut_guide" + } + ] + } + ] +} diff --git a/src/modules/shortcut_guide/Resources.resx b/src/modules/shortcut_guide/Resources.resx new file mode 100644 index 0000000000..dd305d7917 --- /dev/null +++ b/src/modules/shortcut_guide/Resources.resx @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + How long to press the Windows key before showing the Shortcut Guide (ms) + + + Opacity of the Shortcut Guide's overlay background (%) + + + Choose Shortcut Guide overlay color + + + Light + + + Dark + + + System default app mode + + + Shows a help overlay with Windows shortcuts when the Windows key is pressed. + + + Shortcut Guide + + + No action + + + Restore + + + Snap right + + + Snap left + + + Snap upper right + + + Snap upper left + + + Snap lower right + + + Snap lower left + + + Minimize + + + Maximize + + \ No newline at end of file diff --git a/src/modules/shortcut_guide/overlay_window.cpp b/src/modules/shortcut_guide/overlay_window.cpp index b778902832..40e340375c 100644 --- a/src/modules/shortcut_guide/overlay_window.cpp +++ b/src/modules/shortcut_guide/overlay_window.cpp @@ -6,7 +6,7 @@ #include "keyboard_state.h" #include "shortcut_guide.h" #include "trace.h" -#include "resource.h" +#include "Generated Files/resource.h" #include extern "C" IMAGE_DOS_HEADER __ImageBase; diff --git a/src/modules/shortcut_guide/resource.base.h b/src/modules/shortcut_guide/resource.base.h new file mode 100644 index 0000000000..b2361e1dd9 --- /dev/null +++ b/src/modules/shortcut_guide/resource.base.h @@ -0,0 +1,13 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by ShortcutGuide.rc + +////////////////////////////// +// Non-localizable + +#define FILE_DESCRIPTION "PowerToys ShortcutGuide" +#define INTERNAL_NAME "ShortcutGuide" +#define ORIGINAL_FILENAME "ShortcutGuide.dll" + +// Non-localizable +////////////////////////////// diff --git a/src/modules/shortcut_guide/resource.h b/src/modules/shortcut_guide/resource.h deleted file mode 100644 index c0b7cd69aa..0000000000 --- a/src/modules/shortcut_guide/resource.h +++ /dev/null @@ -1,32 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by ShortcutGuide.rc - -////////////////////////////// -// Non-localizable - -#define FILE_DESCRIPTION "PowerToys ShortcutGuide" -#define INTERNAL_NAME "ShortcutGuide" -#define ORIGINAL_FILENAME "ShortcutGuide.dll" - -// Non-localizable -////////////////////////////// - -#define IDS_SETTING_DESCRIPTION_PRESS_TIME 101 -#define IDS_SETTING_DESCRIPTION_OVERLAY_OPACITY 102 -#define IDS_SETTING_DESCRIPTION_THEME 103 -#define IDS_SETTING_DESCRIPTION_THEME_LIGHT 104 -#define IDS_SETTING_DESCRIPTION_THEME_DARK 105 -#define IDS_SETTING_DESCRIPTION_THEME_SYSTEM 106 -#define IDS_SETTINGS_DESCRIPTION 107 -#define IDS_SHORTCUT_GUIDE 108 -#define IDS_NO_ACTION 109 -#define IDS_RESTORE 110 -#define IDS_SNAP_RIGHT 111 -#define IDS_SNAP_LEFT 112 -#define IDS_SNAP_UPPER_RIGHT 113 -#define IDS_SNAP_UPPER_LEFT 114 -#define IDS_SNAP_LOWER_RIGHT 115 -#define IDS_SNAP_LOWER_LEFT 116 -#define IDS_MINIMIZE 117 -#define IDS_MAXIMIZE 118 diff --git a/src/modules/shortcut_guide/shortcut_guide.base.rc b/src/modules/shortcut_guide/shortcut_guide.base.rc new file mode 100644 index 0000000000..68bc93d49c Binary files /dev/null and b/src/modules/shortcut_guide/shortcut_guide.base.rc differ diff --git a/src/modules/shortcut_guide/shortcut_guide.cpp b/src/modules/shortcut_guide/shortcut_guide.cpp index 788763b33e..f59d210cdf 100644 --- a/src/modules/shortcut_guide/shortcut_guide.cpp +++ b/src/modules/shortcut_guide/shortcut_guide.cpp @@ -2,7 +2,6 @@ #include "shortcut_guide.h" #include "target_state.h" #include "trace.h" -#include "resource.h" #include #include diff --git a/src/modules/shortcut_guide/shortcut_guide.h b/src/modules/shortcut_guide/shortcut_guide.h index 4adeed0687..1af0b06b51 100644 --- a/src/modules/shortcut_guide/shortcut_guide.h +++ b/src/modules/shortcut_guide/shortcut_guide.h @@ -2,7 +2,7 @@ #include #include "overlay_window.h" -#include "resource.h" +#include "Generated Files/resource.h" #include diff --git a/src/modules/shortcut_guide/shortcut_guide.rc b/src/modules/shortcut_guide/shortcut_guide.rc deleted file mode 100644 index 73b0f9a3a7..0000000000 Binary files a/src/modules/shortcut_guide/shortcut_guide.rc and /dev/null differ diff --git a/src/modules/shortcut_guide/shortcut_guide.vcxproj b/src/modules/shortcut_guide/shortcut_guide.vcxproj index 8c9722c463..c606c3f689 100644 --- a/src/modules/shortcut_guide/shortcut_guide.vcxproj +++ b/src/modules/shortcut_guide/shortcut_guide.vcxproj @@ -11,6 +11,9 @@ x64 + + + 15.0 {A46629C4-1A6C-40FA-A8B6-10E5102BB0BA} @@ -104,7 +107,8 @@ - + + @@ -127,11 +131,15 @@ - + + + + + diff --git a/src/modules/shortcut_guide/shortcut_guide.vcxproj.filters b/src/modules/shortcut_guide/shortcut_guide.vcxproj.filters index 73c727557a..4ee893ee3b 100644 --- a/src/modules/shortcut_guide/shortcut_guide.vcxproj.filters +++ b/src/modules/shortcut_guide/shortcut_guide.vcxproj.filters @@ -36,8 +36,8 @@ Header Files - - Header Files + + Generated Files @@ -50,13 +50,25 @@ {d7932c11-20ad-4625-adbc-0780ea5e308d} - - - - Resource Files - + + {41a2f27e-76b5-4799-94c3-90a33a71786b} + + + Resource Files + + + Resource Files + + + Header Files + + + + + Generated Files + \ No newline at end of file