From 690208fd4eedb317a25fd43065fb2d7c4b3ba567 Mon Sep 17 00:00:00 2001 From: Yevhenii Holovachov <55396981+yevhenii44@users.noreply.github.com> Date: Wed, 24 Jun 2020 18:08:55 +0300 Subject: [PATCH] Fixed info for powerrename, previewpane and shortcutguide (#4447) --- .../powerrename/UWPui/PowerRenameUWPUI.rc | 44 +++++++-- .../UWPui/PowerRenameUWPUI.vcxproj | 2 +- .../UWPui/PowerRenameUWPUI.vcxproj.filters | 4 +- src/modules/powerrename/UWPui/resource.h | 13 +++ src/modules/powerrename/dll/PowerRenameExt.rc | 85 ++++++++---------- src/modules/powerrename/dll/resource.h | 15 +++- .../powerrename/testapp/PowerRenameTest.rc | 41 +++++++-- .../testapp/PowerRenameTest.vcxproj | 2 +- .../testapp/PowerRenameTest.vcxproj.filters | 6 +- src/modules/powerrename/testapp/resource.h | 14 ++- .../powerrename/ui/PowerRenameUI.vcxproj | 2 +- .../ui/PowerRenameUI.vcxproj.filters | 34 +++++++ src/modules/powerrename/ui/resource.h | Bin 3808 -> 3806 bytes .../unittests/PowerRenameLibUnitTests.vcxproj | 4 + .../PowerRenameLibUnitTests.vcxproj.filters | 39 ++++++++ .../unittests/PowerRenameUnitTests.rc | 36 ++++++++ src/modules/powerrename/unittests/resource.h | 13 +++ .../MarkDownPreviewHandler.csproj | 8 +- .../UnitTests-MarkdownPreviewHandler.csproj | 10 ++- .../SvgPreviewHandler.csproj | 10 ++- .../UnitTests-PreviewHandlerCommon.csproj | 12 +-- .../UnitTests-SvgPreviewHandler.csproj | 10 ++- .../common/PreviewHandlerCommon.csproj | 10 ++- .../previewpane/powerpreview/powerpreview.rc | 79 +++++++++++----- .../powerpreview/powerpreview.vcxproj.filters | 20 ++++- .../previewpane/powerpreview/resource.h | 46 ++++++---- .../powerpreviewTest/powerpreviewTest.rc | 36 ++++++++ .../powerpreviewTest/powerpreviewTest.vcxproj | 4 + .../powerpreviewTest.vcxproj.filters | 8 ++ .../previewpane/powerpreviewTest/resource.h | 13 +++ src/modules/shortcut_guide/resource.h | 14 +++ src/modules/shortcut_guide/shortcut_guide.rc | 34 +++---- .../shortcut_guide.vcxproj.filters | 15 +++- 33 files changed, 523 insertions(+), 160 deletions(-) create mode 100644 src/modules/powerrename/UWPui/resource.h create mode 100644 src/modules/powerrename/ui/PowerRenameUI.vcxproj.filters create mode 100644 src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj.filters create mode 100644 src/modules/powerrename/unittests/PowerRenameUnitTests.rc create mode 100644 src/modules/powerrename/unittests/resource.h create mode 100644 src/modules/previewpane/powerpreviewTest/powerpreviewTest.rc create mode 100644 src/modules/previewpane/powerpreviewTest/resource.h diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.rc b/src/modules/powerrename/UWPui/PowerRenameUWPUI.rc index a504197c1..58c53031a 100644 --- a/src/modules/powerrename/UWPui/PowerRenameUWPUI.rc +++ b/src/modules/powerrename/UWPui/PowerRenameUWPUI.rc @@ -1,11 +1,44 @@ -// Microsoft Visual C++ generated resource script. -// +#include #include "resource.h" +#include "../../../common/version.h" // We need both DLL and UI resource files for UWP UI. -#include "..\dll\PowerRenameExt.rc" +#include "../dll/PowerRenameExt.rc" #undef IDC_STATIC -#include "..\ui\PowerRenameUI.rc" +#include "../ui/PowerRenameUI.rc" + +2 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 ///////////////////////////////////////////////////////////////////////////// @@ -51,14 +84,11 @@ END #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// - - #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 3 resource. // - ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj index cbdae9861..97c9e5729 100644 --- a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj +++ b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj @@ -105,8 +105,8 @@ - + diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters index 9914abe92..04d311d56 100644 --- a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters +++ b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters @@ -18,10 +18,10 @@ Header Files - + Header Files - + Header Files diff --git a/src/modules/powerrename/UWPui/resource.h b/src/modules/powerrename/UWPui/resource.h new file mode 100644 index 000000000..f8edaf6a5 --- /dev/null +++ b/src/modules/powerrename/UWPui/resource.h @@ -0,0 +1,13 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by PowerRenameUWPUI.rc + +////////////////////////////// +// Non-localizable + +#define FILE_DESCRIPTION "PowerToys PowerRenameUWPUI" +#define INTERNAL_NAME "PowerRenameUWPUI" +#define ORIGINAL_FILENAME "PowerRenameUWPUI.exe" + +// Non-localizable +////////////////////////////// diff --git a/src/modules/powerrename/dll/PowerRenameExt.rc b/src/modules/powerrename/dll/PowerRenameExt.rc index d0232d1ca..2ed4706a7 100644 --- a/src/modules/powerrename/dll/PowerRenameExt.rc +++ b/src/modules/powerrename/dll/PowerRenameExt.rc @@ -1,8 +1,45 @@ -ÿþ// Microsoft Visual C++ generated resource script. -// +ÿþ#include <windows.h> #include "resource.h" #include "../../../common/version.h" +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +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 ///////////////////////////////////////////////////////////////////////////// // @@ -44,46 +81,6 @@ #endif // APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// 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", "PowerRename PowerToy" - VALUE "FileVersion", FILE_VERSION_STRING - VALUE "InternalName", "PowerRenameExt.dll" - VALUE "LegalCopyright", COPYRIGHT_NOTE - VALUE "OriginalFilename", "PowerRenameExt.dll" - VALUE "ProductName", "PowerRename PowerToy" - VALUE "ProductVersion", PRODUCT_VERSION_STRING - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - ///////////////////////////////////////////////////////////////////////////// // // String Table @@ -105,16 +102,12 @@ #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// - - #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 3 resource. // - ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED - \ No newline at end of file diff --git a/src/modules/powerrename/dll/resource.h b/src/modules/powerrename/dll/resource.h index fef898711..de17c7c45 100644 --- a/src/modules/powerrename/dll/resource.h +++ b/src/modules/powerrename/dll/resource.h @@ -1,3 +1,17 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by PowerRenameExt.rc + +////////////////////////////// +// Non-localizable + +#define FILE_DESCRIPTION "PowerToys PowerRenameExt" +#define INTERNAL_NAME "PowerRenameExt" +#define ORIGINAL_FILENAME "PowerRenameExt.dll" + +// Non-localizable +////////////////////////////// + #define IDS_POWERRENAME 801 #define IDI_RENAME 132 #define IDS_POWERRENAME_APP_NAME 2101 @@ -10,7 +24,6 @@ #define IDS_EXTENDED_MENU_INFO 2108 // Next default values for new objects - // #ifdef APSTUDIO_INVOKED diff --git a/src/modules/powerrename/testapp/PowerRenameTest.rc b/src/modules/powerrename/testapp/PowerRenameTest.rc index 051800940..00a8eddde 100644 --- a/src/modules/powerrename/testapp/PowerRenameTest.rc +++ b/src/modules/powerrename/testapp/PowerRenameTest.rc @@ -1,6 +1,39 @@ -ÿþ// Microsoft Visual C++ generated resource script. -// +ÿþ#include <windows.h> #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 ///////////////////////////////////////////////////////////////////////////// @@ -56,16 +89,12 @@ #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// - - #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 3 resource. // - ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED - \ No newline at end of file diff --git a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj index 3cf61eb4e..69d594d27 100644 --- a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj +++ b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj @@ -173,7 +173,7 @@ - + diff --git a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj.filters b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj.filters index ef08cb86a..c893f4172 100644 --- a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj.filters +++ b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj.filters @@ -18,15 +18,15 @@ Header Files - - Header Files - Header Files Header Files + + Header Files + diff --git a/src/modules/powerrename/testapp/resource.h b/src/modules/powerrename/testapp/resource.h index df92773a3..12cf08e31 100644 --- a/src/modules/powerrename/testapp/resource.h +++ b/src/modules/powerrename/testapp/resource.h @@ -1,13 +1,23 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by PowerRenameTest.rc -// + +////////////////////////////// +// Non-localizable + +#define FILE_DESCRIPTION "PowerToys PowerRename Test" +#define INTERNAL_NAME "PowerRenameTest" +#define ORIGINAL_FILENAME "PowerRenameTest.exe" + +// Non-localizable +////////////////////////////// + #define IDD_POWERRENAMETEST_DIALOG 402 #define IDR_MAINFRAME 428 #define IDC_STATIC -1 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/src/modules/powerrename/ui/PowerRenameUI.vcxproj b/src/modules/powerrename/ui/PowerRenameUI.vcxproj index 9f0169a9d..49444163f 100644 --- a/src/modules/powerrename/ui/PowerRenameUI.vcxproj +++ b/src/modules/powerrename/ui/PowerRenameUI.vcxproj @@ -158,7 +158,7 @@ - + diff --git a/src/modules/powerrename/ui/PowerRenameUI.vcxproj.filters b/src/modules/powerrename/ui/PowerRenameUI.vcxproj.filters new file mode 100644 index 000000000..31f0ffc89 --- /dev/null +++ b/src/modules/powerrename/ui/PowerRenameUI.vcxproj.filters @@ -0,0 +1,34 @@ + + + + + + + + + + + + Header Files + + + + + + + + + + + {e6495fd5-e473-4d50-b8bf-8456bb457595} + + + {dc9de3c4-d79b-45f9-9a5c-671f310928a3} + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/modules/powerrename/ui/resource.h b/src/modules/powerrename/ui/resource.h index 12e05dcce58d4233b9ede09a3f3cbd2fef5cde2c..36b9b36fce11223d67f1c62ee9c911d7566fac37 100644 GIT binary patch delta 12 TcmaDLdrx*l9na9S@_z=31UaCIBot1oHp@ diff --git a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj index 7b08b8097..03f533960 100644 --- a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj +++ b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj @@ -184,6 +184,7 @@ + @@ -206,6 +207,9 @@ + + + diff --git a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj.filters b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj.filters new file mode 100644 index 000000000..0a8707b07 --- /dev/null +++ b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj.filters @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + {d3bb184f-a1c9-40f6-a6e5-0b4c879fe4a3} + + + {d34a343a-52ef-4296-83c9-a94fa62062ff} + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/modules/powerrename/unittests/PowerRenameUnitTests.rc b/src/modules/powerrename/unittests/PowerRenameUnitTests.rc new file mode 100644 index 000000000..a08ecc180 --- /dev/null +++ b/src/modules/powerrename/unittests/PowerRenameUnitTests.rc @@ -0,0 +1,36 @@ +#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 diff --git a/src/modules/powerrename/unittests/resource.h b/src/modules/powerrename/unittests/resource.h new file mode 100644 index 000000000..1f777ba9b --- /dev/null +++ b/src/modules/powerrename/unittests/resource.h @@ -0,0 +1,13 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by PowerRenameUnitTests.rc + +////////////////////////////// +// Non-localizable + +#define FILE_DESCRIPTION "PowerToys PowerRename UnitTests" +#define INTERNAL_NAME "PowerRenameUnitTests" +#define ORIGINAL_FILENAME "PowerRenameUnitTests.dll" + +// Non-localizable +////////////////////////////// diff --git a/src/modules/previewpane/MarkDownPreviewHandler/MarkDownPreviewHandler.csproj b/src/modules/previewpane/MarkDownPreviewHandler/MarkDownPreviewHandler.csproj index 517f45643..5d95e4754 100644 --- a/src/modules/previewpane/MarkDownPreviewHandler/MarkDownPreviewHandler.csproj +++ b/src/modules/previewpane/MarkDownPreviewHandler/MarkDownPreviewHandler.csproj @@ -5,8 +5,10 @@ MarkdownPreviewHandler + PowerToys MarkdownPreviewHandler Microsoft Corp. - Copyright (C) 2019 Microsoft Corp. + Copyright (C) 2020 Microsoft Corporation + PowerToys @@ -22,11 +24,11 @@ - + - + diff --git a/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj b/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj index 93628a799..51fe5c5c4 100644 --- a/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj @@ -4,9 +4,11 @@ - PreviewPaneUnitTests + UnitTests-MarkdownPreviewHandler + PowerToys UnitTests-MarkdownPreviewHandler Microsoft Corp. - Copyright (C) 2019 Microsoft Corp. + Copyright (C) 2020 Microsoft Corp. + PowerToys @@ -22,11 +24,11 @@ - + - + diff --git a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj index b63ca02e9..5b6726285 100644 --- a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj +++ b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj @@ -5,8 +5,10 @@ SvgPreviewHandler - Microsoft Corp. - Copyright (C) 2019 Microsoft Corp. + PowerToys SvgPreviewHandler + Microsoft Corporation + Copyright (C) 2020 Microsoft Corporation + PowerToys @@ -22,11 +24,11 @@ - + - + diff --git a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj index eeaa8bd8c..3849e1f33 100644 --- a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj @@ -4,9 +4,11 @@ - UnitTests_PreviewHandlerCommon - Microsoft Corp. - Copyright (C) 2019 Microsoft Corp. + UnitTests-PreviewHandlerCommon + PowerToys UnitTests-PreviewHandlerCommon + Microsoft Corporation + Copyright (C) 2019 Microsoft Corporation + PowerToys @@ -22,11 +24,11 @@ - + - + diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj index c7aa66023..da87aad00 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj @@ -5,8 +5,10 @@ UnitTests-SvgPreviewHandler - Microsoft Corp. - Copyright (C) 2019 Microsoft Corp. + PowerToys UnitTests-SvgPreviewHandler + Microsoft Corporation + Copyright (C) 2020 Microsoft Corporation + PowerToys @@ -22,11 +24,11 @@ - + - + diff --git a/src/modules/previewpane/common/PreviewHandlerCommon.csproj b/src/modules/previewpane/common/PreviewHandlerCommon.csproj index 4c237c672..9fab8b07d 100644 --- a/src/modules/previewpane/common/PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/common/PreviewHandlerCommon.csproj @@ -5,8 +5,10 @@ PreviewHandlerCommon - Microsoft Corp. - Copyright (C) 2019 Microsoft Corp. + PowerToys PreviewHandlerCommon + Microsoft Corporation + Copyright (C) 2020 Microsoft Corporation + PowerToys @@ -22,11 +24,11 @@ - + - + diff --git a/src/modules/previewpane/powerpreview/powerpreview.rc b/src/modules/previewpane/powerpreview/powerpreview.rc index 738cd8e3c..442127f81 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.rc +++ b/src/modules/previewpane/powerpreview/powerpreview.rc @@ -1,6 +1,39 @@ -// Microsoft Visual C++ generated resource script. -// +#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 ///////////////////////////////////////////////////////////////////////////// @@ -24,18 +57,18 @@ LANGUAGE 9, 1 // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include ""winres.h""\r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" @@ -47,32 +80,30 @@ END ///////////////////////////////////////////////////////////////////////////// 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_EXPLR_SVG_BOOL_TOGGLE_CONTROLL L"EXPLR_SVG_BOOL_TOGGLE_CONTROLL" - IDS_EXPLR_SVG_SETTINGS_DESCRIPTION L"Render SVG images" + 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_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.filters b/src/modules/previewpane/powerpreview/powerpreview.vcxproj.filters index 737fddd26..eae9ae3ac 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.vcxproj.filters +++ b/src/modules/previewpane/powerpreview/powerpreview.vcxproj.filters @@ -11,18 +11,30 @@ - - - - + + Header Files + + + + {b7f5e645-7a71-434f-b1de-3f92cb78f610} + + + {9999f820-649a-456b-9eb5-e36d0d14ca5d} + + + + + Resource Files + + \ No newline at end of file diff --git a/src/modules/previewpane/powerpreview/resource.h b/src/modules/previewpane/powerpreview/resource.h index 939a5addf..8e9dd3d63 100644 --- a/src/modules/previewpane/powerpreview/resource.h +++ b/src/modules/previewpane/powerpreview/resource.h @@ -2,26 +2,36 @@ // Microsoft Visual C++ generated include file. // Used by powerpreview.rc -#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 +////////////////////////////// +// 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 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 diff --git a/src/modules/previewpane/powerpreviewTest/powerpreviewTest.rc b/src/modules/previewpane/powerpreviewTest/powerpreviewTest.rc new file mode 100644 index 000000000..a08ecc180 --- /dev/null +++ b/src/modules/previewpane/powerpreviewTest/powerpreviewTest.rc @@ -0,0 +1,36 @@ +#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 diff --git a/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj b/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj index ef11abfff..39098691d 100644 --- a/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj +++ b/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj @@ -171,6 +171,7 @@ + @@ -180,6 +181,9 @@ + + + diff --git a/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj.filters b/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj.filters index 0ab423a08..5eb023f39 100644 --- a/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj.filters +++ b/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj.filters @@ -26,8 +26,16 @@ Header Files + + Header Files + + + + Resource Files + + \ No newline at end of file diff --git a/src/modules/previewpane/powerpreviewTest/resource.h b/src/modules/previewpane/powerpreviewTest/resource.h new file mode 100644 index 000000000..6faf5a39a --- /dev/null +++ b/src/modules/previewpane/powerpreviewTest/resource.h @@ -0,0 +1,13 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by powerpreviewTest.rc + +////////////////////////////// +// Non-localizable + +#define FILE_DESCRIPTION "PowerToys PowerPreview Test" +#define INTERNAL_NAME "powerpreviewTest" +#define ORIGINAL_FILENAME "powerpreviewTest.dll" + +// Non-localizable +////////////////////////////// diff --git a/src/modules/shortcut_guide/resource.h b/src/modules/shortcut_guide/resource.h index 3c5e7ead2..c0b7cd69a 100644 --- a/src/modules/shortcut_guide/resource.h +++ b/src/modules/shortcut_guide/resource.h @@ -1,3 +1,17 @@ +//{{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 diff --git a/src/modules/shortcut_guide/shortcut_guide.rc b/src/modules/shortcut_guide/shortcut_guide.rc index e55ce78a6..73b0f9a3a 100644 --- a/src/modules/shortcut_guide/shortcut_guide.rc +++ b/src/modules/shortcut_guide/shortcut_guide.rc @@ -1,4 +1,5 @@ -ÿþ#include "resource.h" +ÿþ#include <windows.h> +#include "resource.h" #include "../../common/version.h" STRINGTABLE @@ -24,34 +25,35 @@ END 1 VERSIONINFO - FILEVERSION FILE_VERSION - PRODUCTVERSION PRODUCT_VERSION - FILEFLAGSMASK 0x3fL +FILEVERSION FILE_VERSION +PRODUCTVERSION PRODUCT_VERSION +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG - FILEFLAGS 0x1L +FILEFLAGS VS_FF_DEBUG #else - FILEFLAGS 0x0L +FILEFLAGS 0x0L #endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_DLL +FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040904b0" + BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset BEGIN VALUE "CompanyName", COMPANY_NAME - VALUE "FileDescription", "Shortcut Guide PowerToy Module" + VALUE "FileDescription", FILE_DESCRIPTION VALUE "FileVersion", FILE_VERSION_STRING - VALUE "InternalName", "Shortcut Guide PowerToy" + VALUE "InternalName", INTERNAL_NAME VALUE "LegalCopyright", COPYRIGHT_NOTE - VALUE "OriginalFilename", "shortcut_guide.dll" - VALUE "ProductName", "Shortcut Guide PowerToy" + VALUE "OriginalFilename", ORIGINAL_FILENAME + VALUE "ProductName", PRODUCT_NAME VALUE "ProductVersion", PRODUCT_VERSION_STRING END END BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0x409, 1200 + VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset END -END \ No newline at end of file +END + \ No newline at end of file diff --git a/src/modules/shortcut_guide/shortcut_guide.vcxproj.filters b/src/modules/shortcut_guide/shortcut_guide.vcxproj.filters index 9222c2fe2..ab9ccfcb2 100644 --- a/src/modules/shortcut_guide/shortcut_guide.vcxproj.filters +++ b/src/modules/shortcut_guide/shortcut_guide.vcxproj.filters @@ -36,7 +36,9 @@ Header Files - + + Header Files + @@ -45,11 +47,16 @@ {aa4b6713-589d-42ef-804d-3a045833f83f} - - - + + {d7932c11-20ad-4625-adbc-0780ea5e308d} + + + + Resource Files + + \ No newline at end of file