Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

MacOSX: support pasting values to password fields using keyboard (CMD+V and CMD+A now working properly). This make using password managers with VeraCrypt easier.

Browse Source
This commit is contained in:
Mounir IDRASSI
2018-04-29 17:33:33 +02:00
parent 7a842266b3
commit e39f5fa5d6
8 changed files with 107 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Main/GraphicUserInterface.cpp
View File

@@ -37,6 +37,11 @@
namespace VeraCrypt
{
#ifdef TC_MACOSX
int GraphicUserInterface::g_customIdCmdV = 0;
int GraphicUserInterface::g_customIdCmdA = 0;
#endif
GraphicUserInterface::GraphicUserInterface () :
ActiveFrame (nullptr),
BackgroundMode (false),
@@ -51,6 +56,8 @@ namespace VeraCrypt
#endif
#ifdef TC_MACOSX
g_customIdCmdV = wxNewId();
g_customIdCmdA = wxNewId();
wxApp::s_macHelpMenuTitleName = _("&Help");
#endif
}
@@ -657,6 +664,41 @@ namespace VeraCrypt
{
SetBackgroundMode (false);
}
bool GraphicUserInterface::HandlePasswordEntryCustomEvent (wxEvent& event)
{
bool bHandled = false;
if ( (event.GetEventType() == wxEVT_MENU)
&& ((event.GetId() == g_customIdCmdV) || (event.GetId() == g_customIdCmdA)))
{
wxWindow* focusedCtrl = wxWindow::FindFocus();
if (focusedCtrl
&& (focusedCtrl->IsKindOf(wxCLASSINFO(wxTextCtrl)))
&& (focusedCtrl->GetWindowStyle() & wxTE_PASSWORD))
{
wxTextCtrl* passwordCtrl = (wxTextCtrl*) focusedCtrl;
if (event.GetId() == g_customIdCmdV)
passwordCtrl->Paste ();
else if (event.GetId() == g_customIdCmdA)
passwordCtrl->SelectAll ();
bHandled = true;
}
}
return bHandled;
}
void GraphicUserInterface::InstallPasswordEntryCustomKeyboardShortcuts (wxWindow* window)
{
// we manually handle CMD+V and CMD+A on password fields in order to support
// pasting password values into them. By default, wxWidgets doesn't handle this
// for password entry fields.
wxAcceleratorEntry entries[2];
entries[0].Set(wxACCEL_CMD, (int) 'V', g_customIdCmdV);
entries[1].Set(wxACCEL_CMD, (int) 'A', g_customIdCmdA);
wxAcceleratorTable accel(sizeof(entries) / sizeof(wxAcceleratorEntry), entries);
window->SetAcceleratorTable(accel);
}
#endif
void GraphicUserInterface::MoveListCtrlItem (wxListCtrl *listCtrl, long itemIndex, long newItemIndex) const