Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mouse Utils - Mouse Highlighter #14496

Merged
merged 36 commits into from Nov 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
1cd00cd
New PowerToys template
jaimecbernardo Nov 16, 2021
cecacbf
Add CppWinRt to empty PowerToy
jaimecbernardo Nov 16, 2021
d1e7834
Add Settings reference to empty PowerToy
jaimecbernardo Nov 16, 2021
9b3c92c
Use proper output dir
jaimecbernardo Nov 16, 2021
14b5461
Proper WindowsTargetPlatformVersion
jaimecbernardo Nov 16, 2021
5f6f7aa
Add filters to vcxproj
jaimecbernardo Nov 16, 2021
c93e072
Proper resource file generation
jaimecbernardo Nov 16, 2021
6f012b2
Add MouseHighlighter proof of concept code
jaimecbernardo Nov 16, 2021
4726405
Abstract implementation into a struct
jaimecbernardo Nov 16, 2021
182b325
Enable module
jaimecbernardo Nov 17, 2021
3d1e10b
Disable module
jaimecbernardo Nov 17, 2021
e0d1c55
Add enable module to settings page
jaimecbernardo Nov 17, 2021
b678cf1
Can change the hotkey in settings
jaimecbernardo Nov 17, 2021
6c8dced
Remove remaining boilerplate code
jaimecbernardo Nov 17, 2021
734e719
Add logging
jaimecbernardo Nov 17, 2021
639dc28
Add telemetry
jaimecbernardo Nov 17, 2021
40e234a
Add Oobe entry
jaimecbernardo Nov 17, 2021
fa0e73a
Add installer instructions
jaimecbernardo Nov 17, 2021
d4b5fd6
Add dll to pipelines
jaimecbernardo Nov 17, 2021
566e8d4
fix spellchecker
jaimecbernardo Nov 17, 2021
a2f0cb5
Add more configurability
jaimecbernardo Nov 17, 2021
6f0d9ca
Make settings a bit prettier
jaimecbernardo Nov 17, 2021
2217d40
Fix spellchecker
jaimecbernardo Nov 17, 2021
96a271b
Fix wrong default fade timers
jaimecbernardo Nov 17, 2021
b35d1ed
Fix user facing strings
jaimecbernardo Nov 17, 2021
6113d9d
Tweak default duration values
jaimecbernardo Nov 17, 2021
1de98a1
Fix to appear in every virtual desktop
jaimecbernardo Nov 17, 2021
c761513
[Mouse Highlighter] Show highlight on mouse drag (#14529)
jaimecbernardo Nov 18, 2021
017970b
[MU] UI tweaks (#14544)
niels9001 Nov 19, 2021
9e6d3de
tweak default values
jaimecbernardo Nov 19, 2021
48f57a9
PR feedback: use wstring_view
jaimecbernardo Nov 22, 2021
a99f77b
PR feedback: Log error on json error
jaimecbernardo Nov 22, 2021
d585d3a
PR feedback: don't throw 1
jaimecbernardo Nov 22, 2021
26ca1a1
PR feedback: fix copy-pasta leftColor->rightColor
jaimecbernardo Nov 22, 2021
adb297e
PR feedback:Add another error message on exception
jaimecbernardo Nov 22, 2021
833ed41
PR feedback: add todo to use commons/utils/json.h
jaimecbernardo Nov 22, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/actions/spell-check/expect.txt
Expand Up @@ -762,8 +762,10 @@ hglobal
hhk
HHmmss
HHOOK
hhx
HICON
HIDEWINDOW
highlighter
HIMAGELIST
himl
hinst
Expand Down Expand Up @@ -2083,6 +2085,7 @@ Switchbetweenvirtualdesktops
SWP
swprintf
SWRESTORE
swscanf
SYMED
SYMOPT
SYNCMFT
Expand Down
1 change: 1 addition & 0 deletions .pipelines/pipeline.user.windows.yml
Expand Up @@ -171,6 +171,7 @@ build:
- 'modules\launcher\Wox.Infrastructure.dll'
- 'modules\launcher\Wox.Plugin.dll'
- 'modules\MouseUtils\FindMyMouse.dll'
- 'modules\MouseUtils\MouseHighlighter.dll'
- 'modules\PowerRename\PowerRenameExt.dll'
- 'modules\PowerRename\PowerRenameUILib.dll'
- 'modules\PowerRename\PowerRename.exe'
Expand Down
9 changes: 9 additions & 0 deletions PowerToys.sln
Expand Up @@ -371,6 +371,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MouseUtils", "MouseUtils",
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FindMyMouse", "src\modules\MouseUtils\FindMyMouse\FindMyMouse.vcxproj", "{E94FD11C-0591-456F-899F-EFC0CA548336}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MouseHighlighter", "src\modules\MouseUtils\MouseHighlighter\MouseHighlighter.vcxproj", "{782A61BE-9D85-4081-B35C-1CCC9DCC1E88}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Expand Down Expand Up @@ -986,6 +988,12 @@ Global
{E94FD11C-0591-456F-899F-EFC0CA548336}.Release|x64.ActiveCfg = Release|x64
{E94FD11C-0591-456F-899F-EFC0CA548336}.Release|x64.Build.0 = Release|x64
{E94FD11C-0591-456F-899F-EFC0CA548336}.Release|x86.ActiveCfg = Release|x64
{782A61BE-9D85-4081-B35C-1CCC9DCC1E88}.Debug|x64.ActiveCfg = Debug|x64
{782A61BE-9D85-4081-B35C-1CCC9DCC1E88}.Debug|x64.Build.0 = Debug|x64
{782A61BE-9D85-4081-B35C-1CCC9DCC1E88}.Debug|x86.ActiveCfg = Debug|x64
{782A61BE-9D85-4081-B35C-1CCC9DCC1E88}.Release|x64.ActiveCfg = Release|x64
{782A61BE-9D85-4081-B35C-1CCC9DCC1E88}.Release|x64.Build.0 = Release|x64
{782A61BE-9D85-4081-B35C-1CCC9DCC1E88}.Release|x86.ActiveCfg = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1105,6 +1113,7 @@ Global
{4642D596-723F-4BFC-894C-46811219AC4A} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
{322566EF-20DC-43A6-B9F8-616AF942579A} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
{E94FD11C-0591-456F-899F-EFC0CA548336} = {322566EF-20DC-43A6-B9F8-616AF942579A}
{782A61BE-9D85-4081-B35C-1CCC9DCC1E88} = {322566EF-20DC-43A6-B9F8-616AF942579A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
Expand Down
Binary file added doc/images/icons/Find My Mouse.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/icons/Mouse Highlighter.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions installer/PowerToysSetup/Product.wxs
Expand Up @@ -657,6 +657,9 @@
<Component Id="Module_FindMyMouse" Guid="60D0E4AE-188F-4403-BF06-1465AACC1BC5" Win64="yes">
<File Source="$(var.BinX64Dir)modules\$(var.MouseUtilsProjectName)\FindMyMouse.dll" KeyPath="yes" />
</Component>
<Component Id="Module_MouseHighlighter" Guid="3BAEA39F-A73D-48D2-9616-BBED5B8C86D3" Win64="yes">
<File Source="$(var.BinX64Dir)modules\$(var.MouseUtilsProjectName)\MouseHighlighter.dll" KeyPath="yes" />
</Component>
</DirectoryRef>

<!-- Shortcut guide -->
Expand Down Expand Up @@ -971,6 +974,7 @@
<ComponentRef Id="Module_Awake_runtime_netcoreapp30"/>
<ComponentRef Id="Module_Awake_runtime_netcoreapp21"/>
<ComponentRef Id="Module_FindMyMouse"/>
<ComponentRef Id="Module_MouseHighlighter"/>
<ComponentRef Id="SettingsV2" />
<ComponentRef Id="SettingsV2Assets" />
<ComponentRef Id="SettingsV2AssetsModules" />
Expand Down
1 change: 1 addition & 0 deletions src/common/logger/logger_settings.h
Expand Up @@ -26,6 +26,7 @@ struct LogSettings
inline const static std::string keyboardManagerLoggerName = "keyboard-manager";
inline const static std::wstring keyboardManagerLogPath = L"Logs\\keyboard-manager-log.txt";
inline const static std::string findMyMouseLoggerName = "find-my-mouse";
inline const static std::string mouseHighlighterLoggerName = "mouse-highlighter";
inline const static std::string powerRenameLoggerName = "powerrename";
inline const static int retention = 30;
std::wstring logLevel;
Expand Down
@@ -0,0 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
<Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 .\ resource.base.h resource.h MouseHighlighter.base.rc MouseHighlighter.rc" />
</Target>
</Project>
40 changes: 40 additions & 0 deletions src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.base.rc
@@ -0,0 +1,40 @@
#include <windows.h>
#include "resource.h"
#include "../../../../common/version/version.h"

#define APSTUDIO_READONLY_SYMBOLS
#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