haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve gesture lables for better consistency with key labels.

This commit is contained in:
Jeff Young 2019-06-14 16:53:53 +01:00
parent 3d9690302c
commit e90cfa1d40
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/hotkey_store.cpp
View File

@ -40,13 +40,13 @@ public:
}; };
static GESTURE_PSEUDO_ACTION* g_gesturePseudoActions[] = { static GESTURE_PSEUDO_ACTION* g_gesturePseudoActions[] = {
new GESTURE_PSEUDO_ACTION( _( "Highlight Net" ), MD_CTRL + PSEUDO_WXK_LMB ), new GESTURE_PSEUDO_ACTION( _( "Highlight Net" ), MD_CTRL + PSEUDO_WXK_CLICK ),
new GESTURE_PSEUDO_ACTION( _( "Clear Net Highlighting" ), MD_CTRL + PSEUDO_WXK_LMB ), new GESTURE_PSEUDO_ACTION( _( "Clear Net Highlighting" ), MD_CTRL + PSEUDO_WXK_CLICK ),
new GESTURE_PSEUDO_ACTION( _( "Pan Left/Right" ), MD_CTRL + PSEUDO_WXK_WHEEL ), new GESTURE_PSEUDO_ACTION( _( "Pan Left/Right" ), MD_CTRL + PSEUDO_WXK_WHEEL ),
new GESTURE_PSEUDO_ACTION( _( "Pan Up/Down" ), MD_SHIFT + PSEUDO_WXK_WHEEL ), new GESTURE_PSEUDO_ACTION( _( "Pan Up/Down" ), MD_SHIFT + PSEUDO_WXK_WHEEL ),
new GESTURE_PSEUDO_ACTION( _( "Finish Drawing" ), PSEUDO_WXK_DBLCLICK ), new GESTURE_PSEUDO_ACTION( _( "Finish Drawing" ), PSEUDO_WXK_DBLCLICK ),
new GESTURE_PSEUDO_ACTION( _( "Add to Selection" ), MD_SHIFT + PSEUDO_WXK_LMB ), new GESTURE_PSEUDO_ACTION( _( "Add to Selection" ), MD_SHIFT + PSEUDO_WXK_CLICK ),
new GESTURE_PSEUDO_ACTION( _( "Remove from Selection" ), MD_CTRL + PSEUDO_WXK_LMB ), new GESTURE_PSEUDO_ACTION( _( "Remove from Selection" ), MD_CTRL + PSEUDO_WXK_CLICK ),
new GESTURE_PSEUDO_ACTION( _( "Ignore Grid Snaps" ), MD_ALT ), new GESTURE_PSEUDO_ACTION( _( "Ignore Grid Snaps" ), MD_ALT ),
new GESTURE_PSEUDO_ACTION( _( "Ignore Other Snaps" ), MD_SHIFT ), new GESTURE_PSEUDO_ACTION( _( "Ignore Other Snaps" ), MD_SHIFT ),
}; };

8
common/hotkeys_basic.cpp
View File

@ -98,11 +98,9 @@ static struct hotkey_name_descr hotkeyNameList[] =
{ wxT( "" ), 0 }, { wxT( "" ), 0 },
{ wxT( "Left Button" ), PSEUDO_WXK_LMB }, { wxT( "Click" ), PSEUDO_WXK_CLICK },
{ wxT( "Middle Button" ), PSEUDO_WXK_MMB }, { wxT( "DblClick" ), PSEUDO_WXK_DBLCLICK },
{ wxT( "Right Button" ), PSEUDO_WXK_RMB }, { wxT( "Wheel" ), PSEUDO_WXK_WHEEL },
{ wxT( "Mouse Wheel" ), PSEUDO_WXK_WHEEL },
{ wxT( "Double-click" ), PSEUDO_WXK_DBLCLICK },
// Do not change this line: end of list // Do not change this line: end of list
{ wxT( "" ), KEY_NON_FOUND } { wxT( "" ), KEY_NON_FOUND }

8
include/hotkeys_basic.h
View File

@ -47,11 +47,9 @@ class EDA_BASE_FRAME;
/* /*
* Keep these out of the ASCII range, and out of the WXK range * Keep these out of the ASCII range, and out of the WXK range
*/ */
#define PSEUDO_WXK_LMB 400 #define PSEUDO_WXK_CLICK 400
#define PSEUDO_WXK_MMB 401 #define PSEUDO_WXK_DBLCLICK 401
#define PSEUDO_WXK_RMB 402 #define PSEUDO_WXK_WHEEL 402
#define PSEUDO_WXK_WHEEL 403
#define PSEUDO_WXK_DBLCLICK 404
/** /**
* Function KeyCodeFromKeyName * Function KeyCodeFromKeyName