diff --git a/src/modules/colorPicker/ColorPicker/ColorPicker.rc b/src/modules/colorPicker/ColorPicker/ColorPicker.base.rc similarity index 82% rename from src/modules/colorPicker/ColorPicker/ColorPicker.rc rename to src/modules/colorPicker/ColorPicker/ColorPicker.base.rc index 2b44820fa713..b22c9c2e8041 100644 --- a/src/modules/colorPicker/ColorPicker/ColorPicker.rc +++ b/src/modules/colorPicker/ColorPicker/ColorPicker.base.rc @@ -1,12 +1,10 @@ #include #include "resource.h" -#include "../../../common/version.h" +#include "../../../../common/version.h" -STRINGTABLE -BEGIN - IDS_COLORPICKER_NAME L"ColorPicker" - IDS_COLORPICKER_SETTINGS_DESC L"This feature requires Windows 10 version 1903 or higher" -END +#define APSTUDIO_READONLY_SYMBOLS +#include "winres.h" +#undef APSTUDIO_READONLY_SYMBOLS 1 VERSIONINFO FILEVERSION FILE_VERSION diff --git a/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj b/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj index 17ac49700cd6..4f0c2f7fb357 100644 --- a/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj +++ b/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj @@ -11,6 +11,9 @@ x64 + + + 15.0 Win32Proj @@ -101,8 +104,9 @@ + - + @@ -116,12 +120,16 @@ {74485049-c722-400f-abe5-86ac52d929b3} - - + + + + + + diff --git a/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj.filters b/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj.filters index 14ca2d569973..6bb6e599f5dd 100644 --- a/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj.filters +++ b/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj.filters @@ -13,6 +13,9 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {875a08c6-f610-4667-bd0f-80171ed96072} + @@ -21,6 +24,9 @@ Source Files + + Generated Files + @@ -35,5 +41,19 @@ + + Resource Files + + + Header Files + + + Resource Files + + + + + Generated Files + \ No newline at end of file diff --git a/src/modules/colorPicker/ColorPicker/LocProject.json b/src/modules/colorPicker/ColorPicker/LocProject.json new file mode 100644 index 000000000000..61159da2329f --- /dev/null +++ b/src/modules/colorPicker/ColorPicker/LocProject.json @@ -0,0 +1,14 @@ +{ + "Projects": [ + { + "LanguageSet": "Azure_Languages", + "LocItems": [ + { + "SourceFile": "src\\modules\\colorPicker\\ColorPicker\\Resources.resx", + "CopyOption": "LangIDOnName", + "OutputPath": "src\\modules\\colorPicker\\ColorPicker" + } + ] + } + ] +} diff --git a/src/modules/colorPicker/ColorPicker/Resources.resx b/src/modules/colorPicker/ColorPicker/Resources.resx new file mode 100644 index 000000000000..a33728ac7f0d --- /dev/null +++ b/src/modules/colorPicker/ColorPicker/Resources.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + ColorPicker + + + This feature requires Windows 10 version 1903 or higher + + \ No newline at end of file diff --git a/src/modules/colorPicker/ColorPicker/dllmain.cpp b/src/modules/colorPicker/ColorPicker/dllmain.cpp index 7f9261170411..06277ac9d682 100644 --- a/src/modules/colorPicker/ColorPicker/dllmain.cpp +++ b/src/modules/colorPicker/ColorPicker/dllmain.cpp @@ -3,7 +3,7 @@ #include #include #include "trace.h" -#include "resource.h" +#include "Generated Files/resource.h" #include #include diff --git a/src/modules/colorPicker/ColorPicker/resource.h b/src/modules/colorPicker/ColorPicker/resource.base.h similarity index 78% rename from src/modules/colorPicker/ColorPicker/resource.h rename to src/modules/colorPicker/ColorPicker/resource.base.h index 2a54fc183c07..5b21b24ee4b6 100644 --- a/src/modules/colorPicker/ColorPicker/resource.h +++ b/src/modules/colorPicker/ColorPicker/resource.base.h @@ -11,6 +11,3 @@ // Non-localizable ////////////////////////////// - -#define IDS_COLORPICKER_NAME 601 -#define IDS_COLORPICKER_SETTINGS_DESC 602 diff --git a/src/modules/imageresizer/dll/ContextMenuHandler.h b/src/modules/imageresizer/dll/ContextMenuHandler.h index 256d48a41140..f2cbb83928d3 100644 --- a/src/modules/imageresizer/dll/ContextMenuHandler.h +++ b/src/modules/imageresizer/dll/ContextMenuHandler.h @@ -3,7 +3,7 @@ #define ID_RESIZE_PICTURES 0 #define RESIZE_PICTURES_VERBW L"resize" #include "pch.h" -#include "resource.h" +#include "Generated Files/resource.h" #include "ImageResizerExt_i.h" #if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA) diff --git a/src/modules/imageresizer/dll/ImageResizerExt.base.rc b/src/modules/imageresizer/dll/ImageResizerExt.base.rc new file mode 100644 index 000000000000..a71939136c49 --- /dev/null +++ b/src/modules/imageresizer/dll/ImageResizerExt.base.rc @@ -0,0 +1,85 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" +#include "../../../../common/version.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#ifndef APSTUDIO_INVOKED +#include "../targetver.h" +#endif +#include "winres.h" +#include "verrsrc.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION FILE_VERSION + PRODUCTVERSION PRODUCT_VERSION + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", COMPANY_NAME + VALUE "FileDescription", "ImageResizer PowerToy" + VALUE "FileVersion", FILE_VERSION_STRING + VALUE "InternalName", "ImageResizerExt.dll" + VALUE "LegalCopyright", COPYRIGHT_NOTE + VALUE "OriginalFilename", "ImageResizerExt.dll" + VALUE "ProductName", "ImageResizerExt PowerToy" + VALUE "ProductVersion", PRODUCT_VERSION_STRING + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +///////////////////////////////////////////////////////////////////////////// +// +// REGISTRY +// + +IDR_IMAGERESIZEREXT REGISTRY "ImageResizerExt.rgs" + +IDR_CONTEXTMENUHANDLER REGISTRY "ContextMenuHandler.rgs" + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +1 TYPELIB "ImageResizerExt.tlb" + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + +///////////////////////////////////////////////////////////////////////////// + +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_RESIZE_PICTURES ICON "..\ui\Resources\ImageResizer.ico" diff --git a/src/modules/imageresizer/dll/ImageResizerExt.cpp b/src/modules/imageresizer/dll/ImageResizerExt.cpp index 2999fd4876bf..848fce8e6c41 100644 --- a/src/modules/imageresizer/dll/ImageResizerExt.cpp +++ b/src/modules/imageresizer/dll/ImageResizerExt.cpp @@ -1,5 +1,5 @@ #include "pch.h" -#include "resource.h" +#include "Generated Files/resource.h" #include "ImageResizerExt_i.h" #include "dllmain.h" diff --git a/src/modules/imageresizer/dll/ImageResizerExt.rc b/src/modules/imageresizer/dll/ImageResizerExt.rc deleted file mode 100644 index 2af0b8d0136c..000000000000 Binary files a/src/modules/imageresizer/dll/ImageResizerExt.rc and /dev/null differ diff --git a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj index c42bf97da086..f8c49c3ac2c5 100644 --- a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj +++ b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj @@ -2,14 +2,6 @@ - - Debug - Win32 - - - Release - Win32 - Debug x64 @@ -19,6 +11,9 @@ x64 + + + {0B43679E-EDFA-4DA0-AD30-F4628B308B1B} 10.0.17134.0 @@ -26,20 +21,6 @@ false - - DynamicLibrary - true - Static - v142 - Unicode - - - DynamicLibrary - false - Static - v142 - Unicode - DynamicLibrary true @@ -59,12 +40,6 @@ - - - - - - @@ -72,63 +47,18 @@ - - true - true - $(SolutionDir)$(Platform)\$(Configuration)\modules\ - true true $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer\ $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - true - false - $(SolutionDir)$(Platform)\$(Configuration)\modules\ - true false $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer\ $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - true - MultiThreadedDebug - ..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories) - stdcpplatest - - - false - Win32 - _DEBUG;%(PreprocessorDefinitions) - ImageResizerExt_i.h - ImageResizerExt_i.c - ImageResizerExt_p.c - true - $(IntDir)ImageResizerExt.tlb - - true - - - 0x0409 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ImageResizerExt.def - true - true - true - - Level3 @@ -163,43 +93,6 @@ true - - - Level3 - MaxSpeed - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - true - MultiThreaded - ..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories) - stdcpplatest - - - false - Win32 - NDEBUG;%(PreprocessorDefinitions) - ImageResizerExt_i.h - ImageResizerExt_i.c - ImageResizerExt_p.c - true - $(IntDir)ImageResizerExt.tlb - - true - - - 0x0409 - $(IntDir);%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - - - Windows - .\ImageResizerExt.def - true - true - true - true - true - - Level3 @@ -268,15 +161,17 @@ + - + - + + @@ -295,6 +190,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj.filters b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj.filters index dc2723e5b802..b33294fc4aa4 100644 --- a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj.filters +++ b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj.filters @@ -51,9 +51,6 @@ Header Files - - Header Files - Header Files @@ -72,11 +69,9 @@ Header Files - - - - Resource Files - + + Generated Files + @@ -89,6 +84,75 @@ Resource Files + + Resource Files + + + Header Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + @@ -100,4 +164,9 @@ Source Files + + + Generated Files + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/LocProject.json b/src/modules/imageresizer/dll/LocProject.json new file mode 100644 index 000000000000..cf893425fae3 --- /dev/null +++ b/src/modules/imageresizer/dll/LocProject.json @@ -0,0 +1,14 @@ +{ + "Projects": [ + { + "LanguageSet": "Azure_Languages", + "LocItems": [ + { + "SourceFile": "src\\modules\\imageresizer\\dll\\Resources.resx", + "CopyOption": "LangIDOnName", + "OutputPath": "src\\modules\\imageresizer\\dll" + } + ] + } + ] +} diff --git a/src/modules/imageresizer/dll/Resources.ar.resx b/src/modules/imageresizer/dll/Resources.ar.resx new file mode 100644 index 000000000000..e115822c2192 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.ar.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + إعادة تحجيم الصور + + + إعادة تحجيم الصور هنا + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.bg.resx b/src/modules/imageresizer/dll/Resources.bg.resx new file mode 100644 index 000000000000..2adc3c3a1147 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.bg.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Преоразмери каратини + + + Преоразмери каратините тук + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.ca.resx b/src/modules/imageresizer/dll/Resources.ca.resx new file mode 100644 index 000000000000..90192b0a59e7 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.ca.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Redimensiona les imatges + + + Redimensiona les imatges aquí + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.cs.resx b/src/modules/imageresizer/dll/Resources.cs.resx new file mode 100644 index 000000000000..9cd32977a82f --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.cs.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Změnit velikost + + + Změnit velikost zde + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.de.resx b/src/modules/imageresizer/dll/Resources.de.resx new file mode 100644 index 000000000000..dd97c5cfab82 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.de.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Bilder neu skalieren + + + Bilder hier neu skalieren + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.es.resx b/src/modules/imageresizer/dll/Resources.es.resx new file mode 100644 index 000000000000..d0641c348205 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.es.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Redimensionar imágenes + + + Redimensionar imágenes aquí + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.eu-ES.resx b/src/modules/imageresizer/dll/Resources.eu-ES.resx new file mode 100644 index 000000000000..a2dee4b30d52 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.eu-ES.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Tamainaz aldatu + + + Tamainaz aldatu hemen + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.fr.resx b/src/modules/imageresizer/dll/Resources.fr.resx new file mode 100644 index 000000000000..bac44f6a3b0c --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.fr.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Redimensionner des images + + + Redimensionner des images ici + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.he.resx b/src/modules/imageresizer/dll/Resources.he.resx new file mode 100644 index 000000000000..1acb7263061e --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.he.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + שנה גודל התמונות + + + שנה את גודל התמונות כאן + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.hu.resx b/src/modules/imageresizer/dll/Resources.hu.resx new file mode 100644 index 000000000000..b8cf0205c661 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.hu.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Képek átméretezése + + + Képek átméretezése itt + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.it.resx b/src/modules/imageresizer/dll/Resources.it.resx new file mode 100644 index 000000000000..8d3b455da0fe --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.it.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Ridimensiona immagini + + + Ridimensiona immagini qui + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.nb-NO.resx b/src/modules/imageresizer/dll/Resources.nb-NO.resx new file mode 100644 index 000000000000..60a89be28900 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.nb-NO.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Endre bildestørrelse + + + Endre bildestørrelsen her + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.nl.resx b/src/modules/imageresizer/dll/Resources.nl.resx new file mode 100644 index 000000000000..024697743ac5 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.nl.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Afbeeldingsformaat wijzigen + + + Wijzig het afbeeldingsformaat hier + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.pl.resx b/src/modules/imageresizer/dll/Resources.pl.resx new file mode 100644 index 000000000000..87b874d15924 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.pl.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Zmień rozmiar obrazów + + + Zmień rozmiar obrazów tutaj + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.pt-BR.resx b/src/modules/imageresizer/dll/Resources.pt-BR.resx new file mode 100644 index 000000000000..7f455293106d --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.pt-BR.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Redimensionar imagens + + + Redimensionar imagens aqui + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.resx b/src/modules/imageresizer/dll/Resources.resx new file mode 100644 index 000000000000..15dd06dd60f4 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Resize pictures + + + Resize pictures here + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.ro.resx b/src/modules/imageresizer/dll/Resources.ro.resx new file mode 100644 index 000000000000..12ffc70500b4 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.ro.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Redimensionare imagini + + + Redimensionare imagini aici + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.ru.resx b/src/modules/imageresizer/dll/Resources.ru.resx new file mode 100644 index 000000000000..b838ca9a16c0 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.ru.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Изменение размеров изображений + + + Изменить размеры здесь + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.sk.resx b/src/modules/imageresizer/dll/Resources.sk.resx new file mode 100644 index 000000000000..16d983620dc7 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.sk.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Zmeň veľkosť obrázkov + + + Zmeň veľkosť obrázkov tu + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.tr.resx b/src/modules/imageresizer/dll/Resources.tr.resx new file mode 100644 index 000000000000..70b849481933 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.tr.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Resimleri yeniden boyutlandır + + + Resimleri burada yeniden boyutlandır + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Resources.zh-Hans.resx b/src/modules/imageresizer/dll/Resources.zh-Hans.resx new file mode 100644 index 000000000000..35d2205aac40 --- /dev/null +++ b/src/modules/imageresizer/dll/Resources.zh-Hans.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 重设图片大小 + + + 点此重设图片大小 + + + Image Resizer + + + A Windows Shell extension for bulk image resizing. + + + Settings can be accessed from within Image Resizer. + + + Settings header for Image Resizer + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/dllmain.cpp b/src/modules/imageresizer/dll/dllmain.cpp index 8d3a76129169..93f30e4a0250 100644 --- a/src/modules/imageresizer/dll/dllmain.cpp +++ b/src/modules/imageresizer/dll/dllmain.cpp @@ -1,5 +1,5 @@ #include "pch.h" -#include "resource.h" +#include "Generated Files/resource.h" #include "ImageResizerExt_i.h" #include "dllmain.h" #include diff --git a/src/modules/imageresizer/dll/pch.h b/src/modules/imageresizer/dll/pch.h index 32d2b50dc3c7..4fef14e85a2a 100644 --- a/src/modules/imageresizer/dll/pch.h +++ b/src/modules/imageresizer/dll/pch.h @@ -10,7 +10,7 @@ #define ATL_NO_ASSERT_ON_DESTROY_NONEXISTENT_WINDOW #include "targetver.h" -#include "resource.h" +#include "Generated Files/resource.h" #include #include diff --git a/src/modules/imageresizer/dll/resource.base.h b/src/modules/imageresizer/dll/resource.base.h new file mode 100644 index 000000000000..8c806391aed6 --- /dev/null +++ b/src/modules/imageresizer/dll/resource.base.h @@ -0,0 +1,14 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by ImageResizerExt.rc +// + +////////////////////////////// +// Non-localizable + +#define IDR_IMAGERESIZEREXT 1001 +#define IDR_CONTEXTMENUHANDLER 1002 +#define IDI_RESIZE_PICTURES 1003 + +// Non-localizable +////////////////////////////// diff --git a/src/modules/imageresizer/dll/resource.h b/src/modules/imageresizer/dll/resource.h deleted file mode 100644 index f7b26fc9a18c..000000000000 --- a/src/modules/imageresizer/dll/resource.h +++ /dev/null @@ -1,24 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by ImageResizerExt.rc -// -#define IDS_RESIZE_PICTURES 100 -#define IDS_RESIZE_PICTURES_HERE 101 -#define IDR_IMAGERESIZEREXT 102 -#define IDR_CONTEXTMENUHANDLER 104 -#define IDI_RESIZE_PICTURES 105 -#define IDS_IMAGERESIZER 106 -#define IDS_SETTINGS_DESCRIPTION 107 -#define IDS_SETTINGS_HEADER 108 -#define IDS_SETTINGS_HEADER_DESCRIPTION 109 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 201 -#define _APS_NEXT_COMMAND_VALUE 32768 -#define _APS_NEXT_CONTROL_VALUE 201 -#define _APS_NEXT_SYMED_VALUE 103 -#endif -#endif diff --git a/src/modules/keyboardmanager/Directory.Build.targets b/src/modules/keyboardmanager/Directory.Build.targets new file mode 100644 index 000000000000..d37c24b6555b --- /dev/null +++ b/src/modules/keyboardmanager/Directory.Build.targets @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/modules/keyboardmanager/common/Helpers.cpp b/src/modules/keyboardmanager/common/Helpers.cpp index 32704e40c5a9..40f03db1c0af 100644 --- a/src/modules/keyboardmanager/common/Helpers.cpp +++ b/src/modules/keyboardmanager/common/Helpers.cpp @@ -4,7 +4,7 @@ #include "../common/shared_constants.h" #include #include "../../common/common.h" -#include "keyboardmanager/dll/resource.h" +#include "keyboardmanager/dll/Generated Files/resource.h" #include "../common/keyboard_layout.h" extern "C" IMAGE_DOS_HEADER __ImageBase; diff --git a/src/modules/keyboardmanager/common/KeyboardManagerConstants.h b/src/modules/keyboardmanager/common/KeyboardManagerConstants.h index 607573b0dba0..77dd64797b29 100644 --- a/src/modules/keyboardmanager/common/KeyboardManagerConstants.h +++ b/src/modules/keyboardmanager/common/KeyboardManagerConstants.h @@ -2,7 +2,7 @@ #include #include #include "../../common/common.h" -#include "keyboardmanager/dll/resource.h" +#include "keyboardmanager/dll/Generated Files/resource.h" extern "C" IMAGE_DOS_HEADER __ImageBase; namespace KeyboardManagerConstants diff --git a/src/modules/keyboardmanager/dll/KeyboardManager.base.rc b/src/modules/keyboardmanager/dll/KeyboardManager.base.rc new file mode 100644 index 000000000000..49cd57cb989e --- /dev/null +++ b/src/modules/keyboardmanager/dll/KeyboardManager.base.rc @@ -0,0 +1,42 @@ +#include +#include "resource.h" +#include "../../../../common/version.h" + +#define APSTUDIO_READONLY_SYMBOLS +#include "winres.h" +#undef APSTUDIO_READONLY_SYMBOLS + +IDS_KEYBOARDMANAGER_ICON ICON L"../Keyboard.ico" + +1 VERSIONINFO +FILEVERSION FILE_VERSION +PRODUCTVERSION PRODUCT_VERSION +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG +FILEFLAGS VS_FF_DEBUG +#else +FILEFLAGS 0x0L +#endif +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_DLL +FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset + BEGIN + VALUE "CompanyName", COMPANY_NAME + VALUE "FileDescription", FILE_DESCRIPTION + VALUE "FileVersion", FILE_VERSION_STRING + VALUE "InternalName", INTERNAL_NAME + VALUE "LegalCopyright", COPYRIGHT_NOTE + VALUE "OriginalFilename", ORIGINAL_FILENAME + VALUE "ProductName", PRODUCT_NAME + VALUE "ProductVersion", PRODUCT_VERSION_STRING + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset + END +END diff --git a/src/modules/keyboardmanager/dll/KeyboardManager.rc b/src/modules/keyboardmanager/dll/KeyboardManager.rc deleted file mode 100644 index 401a8b2d02f2..000000000000 --- a/src/modules/keyboardmanager/dll/KeyboardManager.rc +++ /dev/null @@ -1,91 +0,0 @@ -#include -#include "resource.h" -#include "../../../common/version.h" - -STRINGTABLE -BEGIN - IDS_SETTINGS_DESCRIPTION L"This feature requires Windows 10 version 1903 or higher" - IDS_KEYBOARDMANAGER L"Keyboard Manager" - IDS_CREATEWINDOWFAILED_ERRORMESSAGE L"Call to CreateWindow failed!" - IDS_CREATEWINDOWFAILED_ERRORTITLE L"Error" - IDS_REGISTERCLASSFAILED_ERRORMESSAGE L"Windows registration failed!" - IDS_REGISTERCLASSFAILED_ERRORTITLE L"Error" - IDS_EDITKEYBOARD_WINDOWNAME L"Remap keys" - IDS_EDITSHORTCUTS_WINDOWNAME L"Remap shortcuts" - IDS_OK_BUTTON L"OK" - IDS_CANCEL_BUTTON L"Cancel" - IDS_CONTINUE_BUTTON L"Continue Anyway" - IDS_EDITKEYBOARD_SOURCEHEADER L"Key:" - IDS_EDITKEYBOARD_TARGETHEADER L"Mapped To:" - IDS_EDITSHORTCUTS_SOURCEHEADER L"Shortcut:" - IDS_EDITSHORTCUTS_TARGETHEADER L"Mapped To:" - IDS_EDITSHORTCUTS_TARGETAPPHEADER L"Target App:" - IDS_EDITKEYBOARD_ORPHANEDDIALOGTITLE L"The following keys are unassigned and you won't be able to use them:" - IDS_EDITKEYBOARD_PARTIALCONFIRMATIONDIALOGTITLE L"Some of the keys could not be remapped. Do you want to continue anyway?" - IDS_EDITSHORTCUTS_PARTIALCONFIRMATIONDIALOGTITLE L"Some of the shortcuts could not be remapped. Do you want to continue anyway?" - IDS_EDITKEYBOARD_INFO L"Select the key you want to change (Key) and then the key or shortcut you want it to become (Mapped To)." - IDS_EDITKEYBOARD_INFOEXAMPLE L"For example, if you want to press A and get ""Ctrl+C"", key ""A"" would be your ""Key"" column and the shortcut ""Ctrl+C"" would be your ""Mapped To"" column." - IDS_EDITSHORTCUTS_INFO L"Select the shortcut you want to change (Shortcut) and then the key or shortcut you want it to invoke (Mapped To)." - IDS_EDITSHORTCUTS_INFOEXAMPLE L"For example, if you want to press ""Ctrl+C"" and get ""Alt"" only on Microsoft Edge, ""Ctrl+C"" would be your ""Shortcut"" column, the key ""Alt"" would be your ""Mapped To"" column, and ""MSEdge"" would be your ""Target App"" column. If no target app is entered, it will apply globally. The name must be the process name and not the app name." - IDS_TYPE_BUTTON L"Type" - IDS_TYPEKEY_TITLE L"Press a key on selected keyboard:" - IDS_TYPESHORTCUT_TITLE L"Press the keys in shortcut:" - IDS_TYPEKEY_HEADER L"Key Pressed:" - IDS_TYPESHORTCUT_HEADER L"Keys Pressed:" - IDS_TYPE_HOLDENTER L"Hold Enter to continue" - IDS_TYPE_HOLDESC L"Hold Esc to discard" - IDS_EDITSHORTCUTS_ALLAPPS L"All Apps" - IDS_ERRORMESSAGE_REMAPSUCCESSFUL L"Remapping successful" - IDS_ERRORMESSAGE_REMAPUNSUCCESSFUL L"Some remappings were not applied" - IDS_ERRORMESSAGE_SAMEKEYPREVIOUSLYMAPPED L"Cannot remap a key more than once" - IDS_ERRORMESSAGE_MAPPEDTOSAMEKEY L"Cannot remap a key to itself" - IDS_ERRORMESSAGE_CONFLICTINGMODIFIERKEY L"Cannot remap this key as it conflicts with another remapped key" - IDS_ERRORMESSAGE_SAMESHORTCUTPREVIOUSLYMAPPED L"Cannot remap a shortcut more than once for the same target app" - IDS_ERRORMESSAGE_MAPTOSAMESHORTCUT L"Cannot remap a shortcut to itself" - IDS_ERRORMESSAGE_CONFLICTINGMODIFIERSHORTCUT L"Cannot remap this shortcut as it conflicts with another remapped shortcut" - IDS_ERRORMESSAGE_WINL L"Cannot remap from/to Win L" - IDS_ERRORMESSAGE_CTRLALTDEL L"Cannot remap from/to Ctrl Alt Del" - IDS_ERRORMESSAGE_SAVEFAILED L"Failed to save the remappings" - IDS_ERRORMESSAGE_SHORTCUTSTARTWITHMODIFIER L"Shortcut must start with a modifier key" - IDS_ERRORMESSAGE_SHORTCUTNOREPEATEDMODIFIER L"Shortcut cannot contain a repeated modifier" - IDS_ERRORMESSAGE_SHORTCUTATLEAST2KEYS L"Shortcut must have atleast 2 keys" - IDS_ERRORMESSAGE_SHORTCUTONEACTIONKEY L"Shortcut must contain an action key" - IDS_ERRORMESSAGE_SHORTCUTMAXONEACTIONKEY L"Shortcut cannot have more than one action key" - IDS_ERRORMESSAGE_MAXSHORTCUTSIZE L"Shortcuts can only have up to 2 modifier keys" - IDS_ERRORMESSAGE_DEFAULT L"Unexpected error" -END - -IDS_KEYBOARDMANAGER_ICON ICON L"Keyboard.ico" - -1 VERSIONINFO -FILEVERSION FILE_VERSION -PRODUCTVERSION PRODUCT_VERSION -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#else -FILEFLAGS 0x0L -#endif -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_DLL -FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset - BEGIN - VALUE "CompanyName", COMPANY_NAME - VALUE "FileDescription", FILE_DESCRIPTION - VALUE "FileVersion", FILE_VERSION_STRING - VALUE "InternalName", INTERNAL_NAME - VALUE "LegalCopyright", COPYRIGHT_NOTE - VALUE "OriginalFilename", ORIGINAL_FILENAME - VALUE "ProductName", PRODUCT_NAME - VALUE "ProductVersion", PRODUCT_VERSION_STRING - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset - END -END diff --git a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj index 82a3528f64d0..3209148e07b8 100644 --- a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj +++ b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj @@ -118,12 +118,14 @@ - + + + Create @@ -140,7 +142,7 @@ - + @@ -148,6 +150,9 @@ + + + diff --git a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj.filters b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj.filters index 7fc6e2756aa6..9e0e3cc40094 100644 --- a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj.filters +++ b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj.filters @@ -21,12 +21,12 @@ Header Files - - Header Files - Header Files + + Generated Files + @@ -41,6 +41,9 @@ {92a52637-acd2-441f-822d-430b726eade6} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {6581121b-1555-4598-8034-ab196538f593} + @@ -48,11 +51,20 @@ - + + Resource Files - + + + Header Files + + + Resource Files + - + + Generated Files + \ No newline at end of file diff --git a/src/modules/keyboardmanager/dll/LocProject.json b/src/modules/keyboardmanager/dll/LocProject.json new file mode 100644 index 000000000000..5949b906678b --- /dev/null +++ b/src/modules/keyboardmanager/dll/LocProject.json @@ -0,0 +1,14 @@ +{ + "Projects": [ + { + "LanguageSet": "Azure_Languages", + "LocItems": [ + { + "SourceFile": "src\\modules\\keyboardmanager\\dll\\Resources.resx", + "CopyOption": "LangIDOnName", + "OutputPath": "src\\modules\\keyboardmanager\\dll" + } + ] + } + ] +} diff --git a/src/modules/keyboardmanager/dll/Resources.resx b/src/modules/keyboardmanager/dll/Resources.resx new file mode 100644 index 000000000000..03d2d3be6fc5 --- /dev/null +++ b/src/modules/keyboardmanager/dll/Resources.resx @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + This feature requires Windows 10 version 1903 or higher + + + Keyboard Manager + + + Call to CreateWindow failed! + + + Error + + + Windows registration failed! + + + Error + + + Remap keys + + + Remap shortcuts + + + OK + + + Cancel + + + Continue Anyway + + + Key: + + + Mapped To: + + + Shortcut: + + + Mapped To: + + + Target App: + + + The following keys are unassigned and you won't be able to use them: + + + Some of the keys could not be remapped. Do you want to continue anyway? + + + Some of the shortcuts could not be remapped. Do you want to continue anyway? + + + Select the key you want to change (Key) and then the key or shortcut you want it to become (Mapped To). + + + For example, if you want to press A and get ""Ctrl+C"", key ""A"" would be your ""Key"" column and the shortcut ""Ctrl+C"" would be your ""Mapped To"" column. + + + Select the shortcut you want to change (Shortcut) and then the key or shortcut you want it to invoke (Mapped To). + + + For example, if you want to press ""Ctrl+C"" and get ""Alt"" only on Microsoft Edge, ""Ctrl+C"" would be your ""Shortcut"" column, the key ""Alt"" would be your ""Mapped To"" column, and ""MSEdge"" would be your ""Target App"" column. If no target app is entered, it will apply globally. The name must be the process name and not the app name. + + + Type + + + Press a key on selected keyboard: + + + Press the keys in shortcut: + + + Key Pressed: + + + Keys Pressed: + + + Hold Enter to continue + + + Hold Esc to discard + + + All Apps + + + Remapping successful + + + Some remappings were not applied + + + Cannot remap a key more than once + + + Cannot remap a key to itself + + + Cannot remap this key as it conflicts with another remapped key + + + Cannot remap a shortcut more than once for the same target app + + + Cannot remap a shortcut to itself + + + Cannot remap this shortcut as it conflicts with another remapped shortcut + + + Cannot remap from/to Win L + + + Cannot remap from/to Ctrl Alt Del + + + Failed to save the remappings + + + Shortcut must start with a modifier key + + + Shortcut cannot contain a repeated modifier + + + Shortcut must have atleast 2 keys + + + Shortcut must contain an action key + + + Shortcut cannot have more than one action key + + + Shortcuts can only have up to 2 modifier keys + + + Unexpected error + + \ No newline at end of file diff --git a/src/modules/keyboardmanager/dll/dllmain.cpp b/src/modules/keyboardmanager/dll/dllmain.cpp index 4bbb4c882003..1c38f024328e 100644 --- a/src/modules/keyboardmanager/dll/dllmain.cpp +++ b/src/modules/keyboardmanager/dll/dllmain.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "resource.h" +#include "Generated Files/resource.h" #include #include #include diff --git a/src/modules/keyboardmanager/dll/resource.base.h b/src/modules/keyboardmanager/dll/resource.base.h new file mode 100644 index 000000000000..45a7c1b43c1a --- /dev/null +++ b/src/modules/keyboardmanager/dll/resource.base.h @@ -0,0 +1,14 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by KeyboardManager.rc + +////////////////////////////// +// Non-localizable + +#define FILE_DESCRIPTION "PowerToys KeyboardManager" +#define INTERNAL_NAME "KeyboardManager" +#define ORIGINAL_FILENAME "KeyboardManager.dll" +#define IDS_KEYBOARDMANAGER_ICON 1001 + +// Non-localizable +////////////////////////////// diff --git a/src/modules/keyboardmanager/dll/resource.h b/src/modules/keyboardmanager/dll/resource.h deleted file mode 100644 index cbce3521f527..000000000000 --- a/src/modules/keyboardmanager/dll/resource.h +++ /dev/null @@ -1,64 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by KeyboardManager.rc - -////////////////////////////// -// Non-localizable - -#define FILE_DESCRIPTION "PowerToys KeyboardManager" -#define INTERNAL_NAME "KeyboardManager" -#define ORIGINAL_FILENAME "KeyboardManager.dll" - -// Non-localizable -////////////////////////////// - -#define IDS_SETTINGS_DESCRIPTION 101 -#define IDS_KEYBOARDMANAGER 102 -#define IDS_KEYBOARDMANAGER_ICON 103 -#define IDS_CREATEWINDOWFAILED_ERRORMESSAGE 104 -#define IDS_CREATEWINDOWFAILED_ERRORTITLE 105 -#define IDS_REGISTERCLASSFAILED_ERRORMESSAGE 106 -#define IDS_REGISTERCLASSFAILED_ERRORTITLE 107 -#define IDS_EDITKEYBOARD_WINDOWNAME 108 -#define IDS_EDITSHORTCUTS_WINDOWNAME 109 -#define IDS_CANCEL_BUTTON 110 -#define IDS_OK_BUTTON 111 -#define IDS_CONTINUE_BUTTON 112 -#define IDS_EDITKEYBOARD_SOURCEHEADER 113 -#define IDS_EDITKEYBOARD_TARGETHEADER 114 -#define IDS_EDITSHORTCUTS_SOURCEHEADER 115 -#define IDS_EDITSHORTCUTS_TARGETHEADER 116 -#define IDS_EDITSHORTCUTS_TARGETAPPHEADER 117 -#define IDS_EDITKEYBOARD_ORPHANEDDIALOGTITLE 118 -#define IDS_EDITKEYBOARD_PARTIALCONFIRMATIONDIALOGTITLE 119 -#define IDS_EDITSHORTCUTS_PARTIALCONFIRMATIONDIALOGTITLE 120 -#define IDS_EDITKEYBOARD_INFO 121 -#define IDS_EDITKEYBOARD_INFOEXAMPLE 122 -#define IDS_EDITSHORTCUTS_INFO 123 -#define IDS_EDITSHORTCUTS_INFOEXAMPLE 124 -#define IDS_TYPE_BUTTON 125 -#define IDS_TYPEKEY_TITLE 126 -#define IDS_TYPESHORTCUT_TITLE 127 -#define IDS_TYPEKEY_HEADER 128 -#define IDS_TYPESHORTCUT_HEADER 129 -#define IDS_TYPE_HOLDENTER 130 -#define IDS_TYPE_HOLDESC 131 -#define IDS_EDITSHORTCUTS_ALLAPPS 132 -#define IDS_ERRORMESSAGE_REMAPSUCCESSFUL 133 -#define IDS_ERRORMESSAGE_REMAPUNSUCCESSFUL 134 -#define IDS_ERRORMESSAGE_SAMEKEYPREVIOUSLYMAPPED 135 -#define IDS_ERRORMESSAGE_MAPPEDTOSAMEKEY 136 -#define IDS_ERRORMESSAGE_CONFLICTINGMODIFIERKEY 137 -#define IDS_ERRORMESSAGE_SAMESHORTCUTPREVIOUSLYMAPPED 138 -#define IDS_ERRORMESSAGE_MAPTOSAMESHORTCUT 139 -#define IDS_ERRORMESSAGE_CONFLICTINGMODIFIERSHORTCUT 140 -#define IDS_ERRORMESSAGE_WINL 141 -#define IDS_ERRORMESSAGE_CTRLALTDEL 142 -#define IDS_ERRORMESSAGE_SAVEFAILED 143 -#define IDS_ERRORMESSAGE_SHORTCUTSTARTWITHMODIFIER 144 -#define IDS_ERRORMESSAGE_SHORTCUTNOREPEATEDMODIFIER 145 -#define IDS_ERRORMESSAGE_SHORTCUTATLEAST2KEYS 146 -#define IDS_ERRORMESSAGE_SHORTCUTONEACTIONKEY 147 -#define IDS_ERRORMESSAGE_SHORTCUTMAXONEACTIONKEY 148 -#define IDS_ERRORMESSAGE_MAXSHORTCUTSIZE 149 -#define IDS_ERRORMESSAGE_DEFAULT 150 diff --git a/src/modules/keyboardmanager/ui/Dialog.cpp b/src/modules/keyboardmanager/ui/Dialog.cpp index e2db3abf35ed..1cb2f8ce4cae 100644 --- a/src/modules/keyboardmanager/ui/Dialog.cpp +++ b/src/modules/keyboardmanager/ui/Dialog.cpp @@ -2,7 +2,7 @@ #include "Dialog.h" #include #include "common/common.h" -#include "keyboardmanager/dll/resource.h" +#include "keyboardmanager/dll/Generated Files/resource.h" extern "C" IMAGE_DOS_HEADER __ImageBase; using namespace winrt::Windows::Foundation; diff --git a/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp b/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp index 64a255a3183d..f2bf25af051f 100644 --- a/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp +++ b/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp @@ -10,7 +10,7 @@ #include #include "Styles.h" #include "Dialog.h" -#include +#include #include "../common/shared_constants.h" #include "keyboardmanager/common/KeyboardManagerState.h" #include "common/common.h" diff --git a/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp b/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp index c68dbdc015ae..1e3dcaa92969 100644 --- a/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp +++ b/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp @@ -9,7 +9,7 @@ #include #include "Styles.h" #include "Dialog.h" -#include +#include #include #include "common/common.h" #include "LoadingAndSavingRemappingHelper.h" diff --git a/src/modules/keyboardmanager/ui/ShortcutControl.cpp b/src/modules/keyboardmanager/ui/ShortcutControl.cpp index da7d25786e96..b01f3434a4fb 100644 --- a/src/modules/keyboardmanager/ui/ShortcutControl.cpp +++ b/src/modules/keyboardmanager/ui/ShortcutControl.cpp @@ -4,7 +4,7 @@ #include "keyboardmanager/common/KeyboardManagerState.h" #include "keyboardmanager/common/Helpers.h" #include "common/common.h" -#include "keyboardmanager/dll/resource.h" +#include "keyboardmanager/dll/Generated Files/resource.h" extern "C" IMAGE_DOS_HEADER __ImageBase; //Both static members are initialized to null diff --git a/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp b/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp index 2c56feb89be1..d555f69b1358 100644 --- a/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp +++ b/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp @@ -5,7 +5,7 @@ #include "keyboardmanager/common/KeyboardManagerState.h" #include "ShortcutControl.h" #include "common/common.h" -#include "keyboardmanager/dll/resource.h" +#include "keyboardmanager/dll/Generated Files/resource.h" extern "C" IMAGE_DOS_HEADER __ImageBase; //Both static members are initialized to null diff --git a/src/modules/launcher/Microsoft.Launcher/LocProject.json b/src/modules/launcher/Microsoft.Launcher/LocProject.json new file mode 100644 index 000000000000..788cc64e4927 --- /dev/null +++ b/src/modules/launcher/Microsoft.Launcher/LocProject.json @@ -0,0 +1,14 @@ +{ + "Projects": [ + { + "LanguageSet": "Azure_Languages", + "LocItems": [ + { + "SourceFile": "src\\modules\\launcher\\Microsoft.Launcher\\Resources.resx", + "CopyOption": "LangIDOnName", + "OutputPath": "src\\modules\\launcher\\Microsoft.Launcher" + } + ] + } + ] +} diff --git a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.base.rc similarity index 83% rename from src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc rename to src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.base.rc index e207a1e89fdd..05aac10d07ae 100644 Binary files a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc and b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.base.rc differ diff --git a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj index 7601003f02f5..003464bd7ce7 100644 --- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj +++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj @@ -11,6 +11,9 @@ x64 + + + 15.0 {e364f67b-bb12-4e91-b639-355866ebcd8b} @@ -101,7 +104,8 @@ - + + @@ -117,11 +121,15 @@ - + + + + + diff --git a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters index 220aa98370b5..d64a5f3fdf3f 100644 --- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters +++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters @@ -8,8 +8,8 @@ - - Header Files + + Generated Files @@ -19,13 +19,25 @@ {513da898-667d-48e4-bf15-74cf06f07ee1} + + {c90b18da-7f8b-4543-89e6-f968a62c7a25} + - + + + Header Files + + Resource Files - + + + Resource Files + - + + Generated Files + \ No newline at end of file diff --git a/src/modules/launcher/Microsoft.Launcher/Resources.resx b/src/modules/launcher/Microsoft.Launcher/Resources.resx new file mode 100644 index 000000000000..7220424f7902 --- /dev/null +++ b/src/modules/launcher/Microsoft.Launcher/Resources.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + PowerToys Run + + + This feature requires Windows 10 version 1903 or higher + + \ No newline at end of file diff --git a/src/modules/launcher/Microsoft.Launcher/dllmain.cpp b/src/modules/launcher/Microsoft.Launcher/dllmain.cpp index 52a2667a4111..feade6e699a7 100644 --- a/src/modules/launcher/Microsoft.Launcher/dllmain.cpp +++ b/src/modules/launcher/Microsoft.Launcher/dllmain.cpp @@ -3,7 +3,7 @@ #include #include #include "trace.h" -#include "resource.h" +#include "Generated Files/resource.h" #include extern "C" IMAGE_DOS_HEADER __ImageBase; diff --git a/src/modules/launcher/Microsoft.Launcher/resource.h b/src/modules/launcher/Microsoft.Launcher/resource.base.h similarity index 80% rename from src/modules/launcher/Microsoft.Launcher/resource.h rename to src/modules/launcher/Microsoft.Launcher/resource.base.h index 1327743674a8..bdb9a6044c04 100644 --- a/src/modules/launcher/Microsoft.Launcher/resource.h +++ b/src/modules/launcher/Microsoft.Launcher/resource.base.h @@ -11,6 +11,3 @@ // Non-localizable ////////////////////////////// - -#define IDS_LAUNCHER_NAME 601 -#define IDS_LAUNCHER_SETTINGS_DESC 602 diff --git a/src/modules/previewpane/powerpreview/LocProject.json b/src/modules/previewpane/powerpreview/LocProject.json new file mode 100644 index 000000000000..dfc3a6b3744d --- /dev/null +++ b/src/modules/previewpane/powerpreview/LocProject.json @@ -0,0 +1,14 @@ +{ + "Projects": [ + { + "LanguageSet": "Azure_Languages", + "LocItems": [ + { + "SourceFile": "src\\modules\\previewpane\\powerpreview\\Resources.resx", + "CopyOption": "LangIDOnName", + "OutputPath": "src\\modules\\previewpane\\powerpreview" + } + ] + } + ] +} diff --git a/src/modules/previewpane/powerpreview/Resources.resx b/src/modules/previewpane/powerpreview/Resources.resx new file mode 100644 index 000000000000..070fc17cb7f7 --- /dev/null +++ b/src/modules/previewpane/powerpreview/Resources.resx @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + PowerToys add-ons for Windows File Explorer. + + + File Explorer + + + pt-power-preview + + + Settings Group Header Text + + + Explorer Icons + + + Settings Group Header Text + + + Preview pane extensions + + + Markdown Previewer + + + Markdown Previewer + + + Svg Previewer + + + SVG Previewer + + + Svg Thumbnail Provider + + + Render SVG images + + \ No newline at end of file diff --git a/src/modules/previewpane/powerpreview/powerpreview.base.rc b/src/modules/previewpane/powerpreview/powerpreview.base.rc new file mode 100644 index 000000000000..1bc28438ad8c --- /dev/null +++ b/src/modules/previewpane/powerpreview/powerpreview.base.rc @@ -0,0 +1,61 @@ +#include +#include "resource.h" +#include "../../../../common/version.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +1 VERSIONINFO +FILEVERSION FILE_VERSION +PRODUCTVERSION PRODUCT_VERSION +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG +FILEFLAGS VS_FF_DEBUG +#else +FILEFLAGS 0x0L +#endif +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_DLL +FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset + BEGIN + VALUE "CompanyName", COMPANY_NAME + VALUE "FileDescription", FILE_DESCRIPTION + VALUE "FileVersion", FILE_VERSION_STRING + VALUE "InternalName", INTERNAL_NAME + VALUE "LegalCopyright", COPYRIGHT_NOTE + VALUE "OriginalFilename", ORIGINAL_FILENAME + VALUE "ProductName", PRODUCT_NAME + VALUE "ProductVersion", PRODUCT_VERSION_STRING + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset + END +END + +////////////////////////////// +// Non-localizable + +STRINGTABLE +BEGIN + IDS_EXPLR_ICONS_PREV_STTNGS_GROUP_HEADER_ID L"EXPLR_ICONS_PREV_STTNGS_GROUP_HEADER_ID" + IDS_PRVPANE_FILE_PREV_STTNGS_GROUP_HEADER_ID L"PRVPANE_FILE_PREV_STTNGS_GROUP_HEADER_ID" + IDS_PREVPANE_MD_BOOL_TOGGLE_CONTROLL L"PREVPANE_MD_BOOL_TOGGLE_CONTROLL_ID" + IDS_PREVPANE_SVG_BOOL_TOGGLE_CONTROLL L"IDS_PREVPANE_SVG_BOOL_TOGGLE_CONTROLL" + IDS_EXPLR_SVG_BOOL_TOGGLE_CONTROLL L"EXPLR_SVG_BOOL_TOGGLE_CONTROLL" +END + +// Non-localizable +////////////////////////////// diff --git a/src/modules/previewpane/powerpreview/powerpreview.cpp b/src/modules/previewpane/powerpreview/powerpreview.cpp index 113418fa8aa7..61d2a6b0723c 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.cpp +++ b/src/modules/previewpane/powerpreview/powerpreview.cpp @@ -4,7 +4,7 @@ #include "powerpreview.h" #include "trace.h" #include "settings.h" -#include "resource.h" +#include "Generated Files/resource.h" // Destroy the powertoy and free memory. void PowerPreviewModule::destroy() diff --git a/src/modules/previewpane/powerpreview/powerpreview.rc b/src/modules/previewpane/powerpreview/powerpreview.rc deleted file mode 100644 index 52117b6099f2..000000000000 --- a/src/modules/previewpane/powerpreview/powerpreview.rc +++ /dev/null @@ -1,110 +0,0 @@ -#include -#include "resource.h" -#include "../../../common/version.h" - -1 VERSIONINFO -FILEVERSION FILE_VERSION -PRODUCTVERSION PRODUCT_VERSION -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#else -FILEFLAGS 0x0L -#endif -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_DLL -FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset - BEGIN - VALUE "CompanyName", COMPANY_NAME - VALUE "FileDescription", FILE_DESCRIPTION - VALUE "FileVersion", FILE_VERSION_STRING - VALUE "InternalName", INTERNAL_NAME - VALUE "LegalCopyright", COPYRIGHT_NOTE - VALUE "OriginalFilename", ORIGINAL_FILENAME - VALUE "ProductName", PRODUCT_NAME - VALUE "ProductVersion", PRODUCT_VERSION_STRING - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset - END -END - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE 9, 1 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// -STRINGTABLE -BEGIN - IDS_GENERAL_DESCRIPTION L"PowerToys add-ons for Windows File Explorer."; - IDS_MODULE_NAME L"File Explorer"; - IDS_ICON_KEY_NAME L"pt-power-preview"; - IDS_EXPLR_ICONS_PREV_STTNGS_GROUP_HEADER_ID L"EXPLR_ICONS_PREV_STTNGS_GROUP_HEADER_ID"; - IDS_EXPLR_ICONS_PREV_STTNGS_GROUP_DESC L"Settings Group Header Text"; - IDS_EXPLR_ICONS_PREV_STTNGS_GROUP_TEXT L"Explorer Icons"; - IDS_PRVPANE_FILE_PREV_STTNGS_GROUP_HEADER_ID L"PRVPANE_FILE_PREV_STTNGS_GROUP_HEADER_ID"; - IDS_PRVPANE_FILE_PREV_STTNGS_GROUP_DESC L"Settings Group Header Text"; - IDS_PRVPANE_FILE_PREV_STTNGS_GROUP_TEXT L"Preview pane extensions"; - IDS_PREVPANE_MD_BOOL_TOGGLE_CONTROLL L"PREVPANE_MD_BOOL_TOGGLE_CONTROLL_ID" - IDS_PREVPANE_MD_SETTINGS_DESCRIPTION L"Markdown Previewer" - IDS_PREVPANE_MD_SETTINGS_DISPLAYNAME L"Markdown Previewer" - IDS_PREVPANE_SVG_BOOL_TOGGLE_CONTROLL L"IDS_PREVPANE_SVG_BOOL_TOGGLE_CONTROLL" - IDS_PREVPANE_SVG_SETTINGS_DESCRIPTION L"Svg Previewer" - IDS_PREVPANE_SVG_SETTINGS_DISPLAYNAME L"SVG Previewer" - IDS_SVG_THUMBNAIL_PROVIDER_SETTINGS_DESCRIPTION L"Svg Thumbnail Provider" - IDS_EXPLR_SVG_BOOL_TOGGLE_CONTROLL L"EXPLR_SVG_BOOL_TOGGLE_CONTROLL" - IDS_EXPLR_SVG_SETTINGS_DESCRIPTION L"Render SVG images" -END - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED diff --git a/src/modules/previewpane/powerpreview/powerpreview.vcxproj b/src/modules/previewpane/powerpreview/powerpreview.vcxproj index 16926cb6a298..ce130a6fb30e 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.vcxproj +++ b/src/modules/previewpane/powerpreview/powerpreview.vcxproj @@ -11,6 +11,9 @@ x64 + + + 15.0 {217DF501-135C-4E38-BFC8-99D4821032EA} @@ -108,7 +111,8 @@ - + + @@ -124,7 +128,8 @@ - + + @@ -135,6 +140,9 @@ + + + diff --git a/src/modules/previewpane/powerpreview/powerpreview.vcxproj.filters b/src/modules/previewpane/powerpreview/powerpreview.vcxproj.filters index eae9ae3ac27e..584f6254d19e 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.vcxproj.filters +++ b/src/modules/previewpane/powerpreview/powerpreview.vcxproj.filters @@ -1,28 +1,61 @@  - - - - - - + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + - - - - - - - + + Generated Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + Header Files + + Resource Files + + + Resource Files + + + Header Files + @@ -31,10 +64,16 @@ {9999f820-649a-456b-9eb5-e36d0d14ca5d} + + {8db56831-427b-4c55-9a50-7298bf009fa4} + + + {5d9192dd-25e2-46ed-a77a-310eb4d250fb} + - - Resource Files + + Generated Files \ No newline at end of file diff --git a/src/modules/previewpane/powerpreview/resource.base.h b/src/modules/previewpane/powerpreview/resource.base.h new file mode 100644 index 000000000000..a3778660714e --- /dev/null +++ b/src/modules/previewpane/powerpreview/resource.base.h @@ -0,0 +1,18 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by powerpreview.rc + +////////////////////////////// +// Non-localizable + +#define FILE_DESCRIPTION "PowerToys PowerPreview" +#define INTERNAL_NAME "powerpreview" +#define ORIGINAL_FILENAME "powerpreview.dll" +#define IDS_EXPLR_ICONS_PREV_STTNGS_GROUP_HEADER_ID 1001 +#define IDS_PRVPANE_FILE_PREV_STTNGS_GROUP_HEADER_ID 1002 +#define IDS_PREVPANE_MD_BOOL_TOGGLE_CONTROLL 1003 +#define IDS_PREVPANE_SVG_BOOL_TOGGLE_CONTROLL 1004 +#define IDS_EXPLR_SVG_BOOL_TOGGLE_CONTROLL 1005 + +// Non-localizable +////////////////////////////// diff --git a/src/modules/previewpane/powerpreview/resource.h b/src/modules/previewpane/powerpreview/resource.h deleted file mode 100644 index 09e2091794f1..000000000000 --- a/src/modules/previewpane/powerpreview/resource.h +++ /dev/null @@ -1,43 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by powerpreview.rc - -////////////////////////////// -// Non-localizable - -#define FILE_DESCRIPTION "PowerToys PowerPreview" -#define INTERNAL_NAME "powerpreview" -#define ORIGINAL_FILENAME "powerpreview.dll" - -// Non-localizable -////////////////////////////// - -#define IDS_GENERAL_DESCRIPTION 200 -#define IDS_MODULE_NAME 201 -#define IDS_ICON_KEY_NAME 202 -#define IDS_EXPLR_ICONS_PREV_STTNGS_GROUP_HEADER_ID 203 -#define IDS_EXPLR_ICONS_PREV_STTNGS_GROUP_DESC 204 -#define IDS_EXPLR_ICONS_PREV_STTNGS_GROUP_TEXT 205 -#define IDS_PRVPANE_FILE_PREV_STTNGS_GROUP_HEADER_ID 206 -#define IDS_PRVPANE_FILE_PREV_STTNGS_GROUP_DESC 207 -#define IDS_PRVPANE_FILE_PREV_STTNGS_GROUP_TEXT 208 -#define IDS_PREVPANE_MD_BOOL_TOGGLE_CONTROLL 209 -#define IDS_PREVPANE_MD_SETTINGS_DESCRIPTION 210 -#define IDS_PREVPANE_SVG_BOOL_TOGGLE_CONTROLL 211 -#define IDS_PREVPANE_SVG_SETTINGS_DESCRIPTION 212 -#define IDS_EXPLR_SVG_BOOL_TOGGLE_CONTROLL 213 -#define IDS_EXPLR_SVG_SETTINGS_DESCRIPTION 214 -#define IDS_PREVPANE_SVG_SETTINGS_DISPLAYNAME 215 -#define IDS_PREVPANE_MD_SETTINGS_DISPLAYNAME 216 -#define IDS_SVG_THUMBNAIL_PROVIDER_SETTINGS_DESCRIPTION 217 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/src/modules/previewpane/powerpreview/settings.h b/src/modules/previewpane/powerpreview/settings.h index d28bd0256209..3b5225602121 100644 --- a/src/modules/previewpane/powerpreview/settings.h +++ b/src/modules/previewpane/powerpreview/settings.h @@ -1,7 +1,7 @@ #pragma once #include #include -#include "resource.h" +#include "Generated Files/resource.h" #include #include "registry_wrapper_interface.h" diff --git a/tools/build/convert-resx-to-rc.ps1 b/tools/build/convert-resx-to-rc.ps1 new file mode 100644 index 000000000000..767f5606bae9 --- /dev/null +++ b/tools/build/convert-resx-to-rc.ps1 @@ -0,0 +1,189 @@ +# This script is used to move the resources from all the resx files in the directory (args[0]) to a .rc and .h file for use in C++ projects. + +# Root directory which contains the resx files +$parentDirectory = $args[0] + +# File name of the base resource.h which contains all the non-localized resource definitions +$baseHeaderFileName = $args[1] + +# Target file name of the resource header file, which will be used in code - Example: resource.h +$generatedHeaderFileName = $args[2] + +# File name of the base ProjectName.rc which contains all the non-localized resources +$baseRCFileName = $args[3] + +# Target file name of the resource rc file, which will be used in code - Example: ProjectName.rc +$generatedRCFileName = $args[4] + +# Temporary file created used for resgen +$tempFile = "temporaryResourceFile.txt" + +# Flags to check if the first updated has occurred +$headerFileUpdated = $false +$rcFileUpdated = $false + +# Output folder for the new resource files. It will be in ProjectDir\Generated Files so that the files are ignored by .gitignore +$generatedFilesFolder = $parentDirectory + "\Generated Files" + +# Create Generated Files folder if it doesn't exist +if (!(Test-Path -Path $generatedFilesFolder)) +{ + $paramNewItem = @{ + Path = $generatedFilesFolder + ItemType = 'Directory' + Force = $true + } + + New-Item @paramNewItem +} + +# Hash table to get the language codes from the code used in the file name +$languageHashTable = @{ "en" = @("ENU", "ENGLISH", "ENGLISH_US", "English (United States)"); + "zh-Hans" = @("CHS", "CHINESE", "NEUTRAL", "Chinese (Simplified)"); + "cs" = @("CSY", "CZECH", "NEUTRAL", "Czech"); + "hu" = @("HUN", "HUNGARIAN", "NEUTRAL", "Hungarian"); + "pl" = @("PLK", "POLISH", "NEUTRAL", "Polish"); + "ro" = @("ROM", "ROMANIAN", "NEUTRAL", "Romanian"); + "sk" = @("SKY", "SLOVAK", "NEUTRAL", "Slovak"); + "bg" = @("BGR", "BULGARIAN", "NEUTRAL", "Bulgarian"); + "ru" = @("RUS", "RUSSIAN", "NEUTRAL", "Russian"); + "ca" = @("CAT", "CATALAN", "NEUTRAL", "Catalan"); + "de" = @("DEU", "GERMAN", "NEUTRAL", "German"); + "es" = @("ESN", "SPANISH", "NEUTRAL", "Spanish"); + "fr" = @("FRA", "FRENCH", "NEUTRAL", "French"); + "it" = @("ITA", "ITALIAN", "NEUTRAL", "Italian"); + "nl" = @("NLD", "DUTCH", "NEUTRAL", "Dutch"); + "nb-NO" = @("NOR", "NORWEGIAN", "NORWEGIAN_BOKMAL", "Norwegian Bokmål (Norway)"); + "pt-BR" = @("PTB", "PORTUGUESE", "PORTUGUESE_BRAZILIAN", "Portuguese (Brazil)"); + "eu-ES" = @("EUQ", "BASQUE", "DEFAULT", "Basque (Basque)"); + "tr" = @("TRK", "TURKISH", "NEUTRAL", "Turkish"); + "he" = @("HEB", "HEBREW", "NEUTRAL", "Hebrew"); + "ar" = @("ARA", "ARABIC", "NEUTRAL", "Arabic"); + "ja" = @("JPN", "JAPANESE", "NEUTRAL", "Japanese"); + "ko" = @("KOR", "KOREAN", "NEUTRAL", "Korean"); + "sv" = @("SVE", "SWEDISH", "NEUTRAL", "Swedish"); + "pt-PT" = @("PTG", "PORTUGUESE", "PORTUGUESE", "Portuguese (Portugal)"); + "zh-Hant" = @("CHT", "CHINESE", "CHINESE_TRADITIONAL", "Chinese (Traditional)") + } + +# Store the content to be written to a buffer +$headerFileContent = "" +$rcFileContent = "" + +# Iterate over all resx files in parent directory +Get-ChildItem $parentDirectory -Filter *.resx | +Foreach-Object { + # Use resgen to parse resx to txt. More details at https://docs.microsoft.com/en-us/dotnet/framework/tools/resgen-exe-resource-file-generator#converting-between-resource-file-types + try { + resgen $_.FullName $tempFile + } + catch { + echo "resgen failed to convert resx file" + exit 0 + } + + # Get language code from file name + $lang = "en" + $tokens = $_.Name -split "\." + if ($tokens.Count -eq 3) { + $lang = $tokens[1] + } + $langData = $languageHashTable[$lang] + + $newLinesForRCFile = "" + $newLinesForHeaderFile = "" + $count = 101 + + try { + foreach ($line in (Get-Content $tempFile -Encoding unicode)) { + # Each line of the resgen text file is of the form ResourceName=ResourceValue with no spaces. + $content = $line -split "=", 2 + + # Each resource is named as IDS_ResxResourceName, in uppercase + $lineInRCFormat = "IDS_" + $content[0].ToUpper() + " L`"" + $content[1] + "`"" + $newLinesForRCFile = $newLinesForRCFile + "`r`n " + $lineInRCFormat + + # Resource header file needs to be updated only for one language + if (!$headerFileUpdated) { + $lineInHeaderFormat = "#define IDS_" + $content[0].ToUpper() + " " + $count.ToString() + $newLinesForHeaderFile = $newLinesForHeaderFile + "`r`n" + $lineInHeaderFormat + $count++ + } + } + } + catch { + echo "Failed to read temporary file." + exit 0 + } + + # Delete temporary text file used by resgen + Remove-Item $tempFile + + # Add string table syntax + $newLinesForRCFile = "`r`nSTRINGTABLE`r`nBEGIN" + $newLinesForRCFile + "`r`nEND" + + $langStart = "`r`n/////////////////////////////////////////////////////////////////////////////`r`n// " + $langData[3] + " resources`r`n`r`n" + $langStart += "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_" + $langData[0] + ")`r`nLANGUAGE LANG_" + $langData[1] + ", SUBLANG_" + $langData[2] + "`r`n" + + $langEnd = "`r`n`r`n#endif // " + $langData[3] + " resources`r`n/////////////////////////////////////////////////////////////////////////////`r`n" + + $newLinesForRCFile = $langStart + $newLinesForRCFile + $langEnd + + # Initialize the rc file with an auto-generation warning and content from the base rc + if (!$rcFileUpdated) { + $rcFileContent = "// This file was auto-generated. Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.`r`n" + try { + $rcFileContent += (Get-Content $parentDirectory\$baseRCFileName -Raw) + } + catch { + echo "Failed to read base rc file." + exit 0 + } + $rcFileUpdated = $true + } + + # Add in the new string table to the rc file + $rcFileContent += $newLinesForRCFile + + # Resource header file needs to be set only once, with an auto-generation warning, content from the base resource header followed by #define for all the resources + if (!$headerFileUpdated) { + $headerFileContent = "// This file was auto-generated. Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.`r`n" + try { + $headerFileContent += (Get-Content $parentDirectory\$baseHeaderFileName -Raw) + } + catch { + echo "Failed to read base header file." + exit 0 + } + $headerFileContent += $newLinesForHeaderFile + $headerFileUpdated = $true + } +} + +# Write to header file if the content has changed or if the file doesnt exist +try { + if (!(Test-Path -Path $generatedFilesFolder\$generatedHeaderFileName) -or (($headerFileContent + "`r`n") -ne (Get-Content $generatedFilesFolder\$generatedHeaderFileName -Raw))) { + Set-Content -Path $generatedFilesFolder\$generatedHeaderFileName -Value $headerFileContent + } + else { + echo "Skipping write to generated header file" + } +} +catch { + echo "Failed to access generated header file." + exit 0 +} + +# Write to rc file if the content has changed or if the file doesnt exist +try { + if (!(Test-Path -Path $generatedFilesFolder\$generatedRCFileName) -or (($rcFileContent + "`r`n") -ne (Get-Content $generatedFilesFolder\$generatedRCFileName -Raw))) { + Set-Content -Path $generatedFilesFolder\$generatedRCFileName -Value $rcFileContent -Encoding unicode + } + else { + echo "Skipping write to generated rc file" + } +} +catch { + echo "Failed to access generated rc file." + exit 0 +} diff --git a/tools/build/convert-stringtable-to-resx.ps1 b/tools/build/convert-stringtable-to-resx.ps1 new file mode 100644 index 000000000000..b79ed1420341 --- /dev/null +++ b/tools/build/convert-stringtable-to-resx.ps1 @@ -0,0 +1,31 @@ +# This script is used to move the resources from a string table txt file to a resx file + +# File containing only the rows of the string table +$stringTableFile = $args[0] + +# Output resx file +$resxFile = $args[1] + +# Temporary text file used by resgen +$tempFile = "temporaryResourceFile.txt" + +$newLinesForTempFile = "" +foreach ($line in Get-Content $stringTableFile) { + # Each line of string table text file is of the form IDS_ResName L"ResourceValue" where there can be any number of spaces between the two. + $content = $line.Trim() -split "\s+", 2 + + # Each line of the resgen text input needs to be of the form ResourceName=ResourceValue with no spaces. + # For the resource name for the resx file, we remove the IDS_ prefix and convert the words to title case. This can be imperfect since the parts between underscores may also comprise of multiple words, so that will have to be manually tweaked + # For the resource value we only keep the content inside L"" + $lineInTempFileFormat = (Get-Culture).TextInfo.ToTitleCase($content[0].Substring(4).Replace("_", " ").ToLower()).Replace(" ", "_") + "=" + $content[1].Substring(2, $content[1].Length - 3) + $newLinesForTempFile = $newLinesForTempFile + "`r`n" + $lineInTempFileFormat +} + +# Save the text to a file +Set-Content -Path $tempFile -Value $newLinesForTempFile + +# Use resgen to parse the txt to resx. More details at https://docs.microsoft.com/en-us/dotnet/framework/tools/resgen-exe-resource-file-generator#converting-between-resource-file-types +resgen $tempFile $resxFile + +# Delete temporary text file used by resgen +Remove-Item $tempFile