Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
c4bc7bb4
Commit
c4bc7bb4
authored
Jan 20, 2010
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
enhancements about hot keys
parent
5861a43d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
167 additions
and
162 deletions
+167
-162
drawpanel.cpp
common/drawpanel.cpp
+7
-0
hotkeys_basic.cpp
common/hotkeys_basic.cpp
+160
-125
hotkeys.cpp
eeschema/hotkeys.cpp
+0
-9
menubar.cpp
eeschema/menubar.cpp
+0
-8
onrightclick.cpp
eeschema/onrightclick.cpp
+0
-9
hotkeys.cpp
gerbview/hotkeys.cpp
+0
-3
hotkeys.cpp
pcbnew/hotkeys.cpp
+0
-8
No files found.
common/drawpanel.cpp
View file @
c4bc7bb4
...
...
@@ -1344,6 +1344,13 @@ void WinEDA_DrawPanel::OnKeyEvent( wxKeyEvent& event )
if
(
event
.
ShiftDown
()
&&
(
key
>
256
)
)
localkey
|=
GR_KB_SHIFT
;
/* Normalize keys code to easily handle keys from Ctrl+A to Ctrl+Z
* They have an ascii code from 1 to 27 remapped
* GR_KB_CTRL + 'A' to GR_KB_CTRL + 'Z'
*/
if
(
(
localkey
&
(
GR_KB_CTRL
|
GR_KB_ALT
|
GR_KB_SHIFT
))
==
GR_KB_CTRL
)
localkey
+=
'A'
-
1
;
INSTALL_DC
(
DC
,
this
);
BASE_SCREEN
*
Screen
=
GetScreen
();
...
...
common/hotkeys_basic.cpp
View file @
c4bc7bb4
...
...
@@ -43,13 +43,13 @@ int g_ConfigFileLocationChoice;
Ki_HotkeyInfo
::
Ki_HotkeyInfo
(
const
wxChar
*
infomsg
,
int
idcommand
,
int
keycode
,
int
idmenuevent
)
{
m_KeyCode
=
keycode
;
// Key code (ascii value for ascii keys
// or wxWidgets code for function key
m_InfoMsg
=
infomsg
;
// info message.
m_Idcommand
=
idcommand
;
// internal id for the corresponding
// command (see hotkey_id_commnand list)
m_KeyCode
=
keycode
;
// Key code (ascii value for ascii keys
// or wxWidgets code for function key
m_InfoMsg
=
infomsg
;
// info message.
m_Idcommand
=
idcommand
;
// internal id for the corresponding
// command (see hotkey_id_commnand list)
m_IdMenuEvent
=
idmenuevent
;
// id to call the corresponding event
// (if any) (see id.h)
// (if any) (see id.h)
}
...
...
@@ -58,107 +58,140 @@ Ki_HotkeyInfo::Ki_HotkeyInfo( const wxChar* infomsg, int idcommand,
struct
hotkey_name_descr
{
const
wxChar
*
m_Name
;
int
m_KeyCode
;
int
m_KeyCode
;
};
static
struct
hotkey_name_descr
s_Hotkey_Name_List
[]
=
{
{
wxT
(
"F1"
),
WXK_F1
},
{
wxT
(
"F2"
),
WXK_F2
},
{
wxT
(
"F3"
),
WXK_F3
},
{
wxT
(
"F4"
),
WXK_F4
},
{
wxT
(
"F5"
),
WXK_F5
},
{
wxT
(
"F6"
),
WXK_F6
},
{
wxT
(
"F7"
),
WXK_F7
},
{
wxT
(
"F8"
),
WXK_F8
},
{
wxT
(
"F9"
),
WXK_F9
},
{
wxT
(
"F10"
),
WXK_F10
},
{
wxT
(
"F11"
),
WXK_F11
},
{
wxT
(
"F12"
),
WXK_F12
},
{
wxT
(
"Esc"
),
WXK_ESCAPE
},
{
wxT
(
"Delete"
),
WXK_DELETE
},
{
wxT
(
"Tab"
),
'\t'
},
{
wxT
(
"Backspace"
),
WXK_BACK
},
{
wxT
(
"Insert"
),
WXK_INSERT
},
{
wxT
(
"Home"
),
WXK_HOME
},
{
wxT
(
"End"
),
WXK_END
},
{
wxT
(
"Page Up"
),
WXK_PAGEUP
},
{
wxT
(
"Page Down"
),
WXK_PAGEDOWN
},
{
wxT
(
"+"
),
'+'
},
{
wxT
(
"-"
),
'-'
},
{
wxT
(
"Up"
),
WXK_UP
},
{
wxT
(
"Down"
),
WXK_DOWN
},
{
wxT
(
"Left"
),
WXK_LEFT
},
{
wxT
(
"Right"
),
WXK_RIGHT
},
{
wxT
(
"space"
),
' '
},
{
wxT
(
"?"
),
'?'
},
{
wxT
(
"!"
),
'!'
},
{
wxT
(
":"
),
':'
},
{
wxT
(
","
),
','
},
{
wxT
(
"*"
),
'*'
},
{
wxT
(
"+"
),
'+'
},
{
wxT
(
"-"
),
'-'
},
{
wxT
(
"%%"
),
'%'
},
{
wxT
(
"A"
),
'A'
},
{
wxT
(
"B"
),
'B'
},
{
wxT
(
"C"
),
'C'
},
{
wxT
(
"D"
),
'D'
},
{
wxT
(
"E"
),
'E'
},
{
wxT
(
"F"
),
'F'
},
{
wxT
(
"G"
),
'G'
},
{
wxT
(
"H"
),
'H'
},
{
wxT
(
"I"
),
'I'
},
{
wxT
(
"J"
),
'J'
},
{
wxT
(
"K"
),
'K'
},
{
wxT
(
"L"
),
'L'
},
{
wxT
(
"M"
),
'M'
},
{
wxT
(
"N"
),
'N'
},
{
wxT
(
"O"
),
'O'
},
{
wxT
(
"P"
),
'P'
},
{
wxT
(
"Q"
),
'Q'
},
{
wxT
(
"R"
),
'R'
},
{
wxT
(
"S"
),
'S'
},
{
wxT
(
"T"
),
'T'
},
{
wxT
(
"U"
),
'U'
},
{
wxT
(
"V"
),
'V'
},
{
wxT
(
"W"
),
'W'
},
{
wxT
(
"X"
),
'X'
},
{
wxT
(
"Y"
),
'Y'
},
{
wxT
(
"Z"
),
'Z'
},
{
wxT
(
"Ctrl A"
),
GR_KB_CTRL
+
'A'
},
{
wxT
(
"Ctrl B"
),
GR_KB_CTRL
+
'B'
},
{
wxT
(
"Ctrl C"
),
GR_KB_CTRL
+
'C'
},
{
wxT
(
"Ctrl D"
),
GR_KB_CTRL
+
'D'
},
{
wxT
(
"Ctrl E"
),
GR_KB_CTRL
+
'E'
},
{
wxT
(
"Ctrl F"
),
GR_KB_CTRL
+
'F'
},
{
wxT
(
"Ctrl G"
),
GR_KB_CTRL
+
'G'
},
{
wxT
(
"Ctrl H"
),
GR_KB_CTRL
+
'H'
},
{
wxT
(
"Ctrl I"
),
GR_KB_CTRL
+
'I'
},
{
wxT
(
"Ctrl J"
),
GR_KB_CTRL
+
'J'
},
{
wxT
(
"Ctrl K"
),
GR_KB_CTRL
+
'K'
},
{
wxT
(
"Ctrl L"
),
GR_KB_CTRL
+
'L'
},
{
wxT
(
"Ctrl M"
),
GR_KB_CTRL
+
'M'
},
{
wxT
(
"Ctrl N"
),
GR_KB_CTRL
+
'N'
},
{
wxT
(
"Ctrl O"
),
GR_KB_CTRL
+
'O'
},
{
wxT
(
"Ctrl P"
),
GR_KB_CTRL
+
'P'
},
{
wxT
(
"Ctrl Q"
),
GR_KB_CTRL
+
'Q'
},
{
wxT
(
"Ctrl R"
),
GR_KB_CTRL
+
'R'
},
{
wxT
(
"Ctrl S"
),
GR_KB_CTRL
+
'S'
},
{
wxT
(
"Ctrl T"
),
GR_KB_CTRL
+
'T'
},
{
wxT
(
"Ctrl U"
),
GR_KB_CTRL
+
'U'
},
{
wxT
(
"Ctrl V"
),
GR_KB_CTRL
+
'V'
},
{
wxT
(
"Ctrl W"
),
GR_KB_CTRL
+
'W'
},
{
wxT
(
"Ctrl X"
),
GR_KB_CTRL
+
'X'
},
{
wxT
(
"Ctrl Y"
),
GR_KB_CTRL
+
'Y'
},
{
wxT
(
"Ctrl Z"
),
GR_KB_CTRL
+
'Z'
},
{
wxT
(
""
),
0
}
// Do not change: end of list
{
wxT
(
"F1"
),
WXK_F1
},
{
wxT
(
"F2"
),
WXK_F2
},
{
wxT
(
"F3"
),
WXK_F3
},
{
wxT
(
"F4"
),
WXK_F4
},
{
wxT
(
"F5"
),
WXK_F5
},
{
wxT
(
"F6"
),
WXK_F6
},
{
wxT
(
"F7"
),
WXK_F7
},
{
wxT
(
"F8"
),
WXK_F8
},
{
wxT
(
"F9"
),
WXK_F9
},
{
wxT
(
"F10"
),
WXK_F10
},
{
wxT
(
"F11"
),
WXK_F11
},
{
wxT
(
"F12"
),
WXK_F12
},
{
wxT
(
"Esc"
),
WXK_ESCAPE
},
{
wxT
(
"Del"
),
WXK_DELETE
},
{
wxT
(
"Tab"
),
'\t'
},
{
wxT
(
"BkSp"
),
WXK_BACK
},
{
wxT
(
"Ins"
),
WXK_INSERT
},
{
wxT
(
"Home"
),
WXK_HOME
},
{
wxT
(
"End"
),
WXK_END
},
{
wxT
(
"PgUp"
),
WXK_PAGEUP
},
{
wxT
(
"PgDn"
),
WXK_PAGEDOWN
},
{
wxT
(
"+"
),
'+'
},
{
wxT
(
"-"
),
'-'
},
{
wxT
(
"Up"
),
WXK_UP
},
{
wxT
(
"Down"
),
WXK_DOWN
},
{
wxT
(
"Left"
),
WXK_LEFT
},
{
wxT
(
"Right"
),
WXK_RIGHT
},
{
wxT
(
"space"
),
' '
},
{
wxT
(
"?"
),
'?'
},
{
wxT
(
"!"
),
'!'
},
{
wxT
(
":"
),
':'
},
{
wxT
(
","
),
','
},
{
wxT
(
"*"
),
'*'
},
{
wxT
(
"+"
),
'+'
},
{
wxT
(
"-"
),
'-'
},
{
wxT
(
"%%"
),
'%'
},
{
wxT
(
"A"
),
'A'
},
{
wxT
(
"B"
),
'B'
},
{
wxT
(
"C"
),
'C'
},
{
wxT
(
"D"
),
'D'
},
{
wxT
(
"E"
),
'E'
},
{
wxT
(
"F"
),
'F'
},
{
wxT
(
"G"
),
'G'
},
{
wxT
(
"H"
),
'H'
},
{
wxT
(
"I"
),
'I'
},
{
wxT
(
"J"
),
'J'
},
{
wxT
(
"K"
),
'K'
},
{
wxT
(
"L"
),
'L'
},
{
wxT
(
"M"
),
'M'
},
{
wxT
(
"N"
),
'N'
},
{
wxT
(
"O"
),
'O'
},
{
wxT
(
"P"
),
'P'
},
{
wxT
(
"Q"
),
'Q'
},
{
wxT
(
"R"
),
'R'
},
{
wxT
(
"S"
),
'S'
},
{
wxT
(
"T"
),
'T'
},
{
wxT
(
"U"
),
'U'
},
{
wxT
(
"V"
),
'V'
},
{
wxT
(
"W"
),
'W'
},
{
wxT
(
"X"
),
'X'
},
{
wxT
(
"Y"
),
'Y'
},
{
wxT
(
"Z"
),
'Z'
},
{
wxT
(
"Ctrl++"
),
GR_KB_CTRL
+
'+'
},
{
wxT
(
"Ctrl+-"
),
GR_KB_CTRL
+
'-'
},
{
wxT
(
"Ctrl+A"
),
GR_KB_CTRL
+
'A'
},
{
wxT
(
"Ctrl+B"
),
GR_KB_CTRL
+
'B'
},
{
wxT
(
"Ctrl+C"
),
GR_KB_CTRL
+
'C'
},
{
wxT
(
"Ctrl+D"
),
GR_KB_CTRL
+
'D'
},
{
wxT
(
"Ctrl+E"
),
GR_KB_CTRL
+
'E'
},
{
wxT
(
"Ctrl+F"
),
GR_KB_CTRL
+
'F'
},
{
wxT
(
"Ctrl+G"
),
GR_KB_CTRL
+
'G'
},
{
wxT
(
"Ctrl+H"
),
GR_KB_CTRL
+
'H'
},
{
wxT
(
"Ctrl+I"
),
GR_KB_CTRL
+
'I'
},
{
wxT
(
"Ctrl+J"
),
GR_KB_CTRL
+
'J'
},
{
wxT
(
"Ctrl+K"
),
GR_KB_CTRL
+
'K'
},
{
wxT
(
"Ctrl+L"
),
GR_KB_CTRL
+
'L'
},
{
wxT
(
"Ctrl+M"
),
GR_KB_CTRL
+
'M'
},
{
wxT
(
"Ctrl+N"
),
GR_KB_CTRL
+
'N'
},
{
wxT
(
"Ctrl+O"
),
GR_KB_CTRL
+
'O'
},
{
wxT
(
"Ctrl+P"
),
GR_KB_CTRL
+
'P'
},
{
wxT
(
"Ctrl+Q"
),
GR_KB_CTRL
+
'Q'
},
{
wxT
(
"Ctrl+R"
),
GR_KB_CTRL
+
'R'
},
{
wxT
(
"Ctrl+S"
),
GR_KB_CTRL
+
'S'
},
{
wxT
(
"Ctrl+T"
),
GR_KB_CTRL
+
'T'
},
{
wxT
(
"Ctrl+U"
),
GR_KB_CTRL
+
'U'
},
{
wxT
(
"Ctrl+V"
),
GR_KB_CTRL
+
'V'
},
{
wxT
(
"Ctrl+W"
),
GR_KB_CTRL
+
'W'
},
{
wxT
(
"Ctrl+X"
),
GR_KB_CTRL
+
'X'
},
{
wxT
(
"Ctrl+Y"
),
GR_KB_CTRL
+
'Y'
},
{
wxT
(
"Ctrl+Z"
),
GR_KB_CTRL
+
'Z'
},
{
wxT
(
"Shift+Ctrl++"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'+'
},
{
wxT
(
"Shift+Ctrl+-"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'-'
},
{
wxT
(
"Shift+Ctrl+A"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'A'
},
{
wxT
(
"Shift+Ctrl+B"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'B'
},
{
wxT
(
"Shift+Ctrl+C"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'C'
},
{
wxT
(
"Shift+Ctrl+D"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'D'
},
{
wxT
(
"Shift+Ctrl+E"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'E'
},
{
wxT
(
"Shift+Ctrl+F"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'F'
},
{
wxT
(
"Shift+Ctrl+G"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'G'
},
{
wxT
(
"Shift+Ctrl+H"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'H'
},
{
wxT
(
"Shift+Ctrl+I"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'I'
},
{
wxT
(
"Shift+Ctrl+J"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'J'
},
{
wxT
(
"Shift+Ctrl+K"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'K'
},
{
wxT
(
"Shift+Ctrl+L"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'L'
},
{
wxT
(
"Shift+Ctrl+M"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'M'
},
{
wxT
(
"Shift+Ctrl+N"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'N'
},
{
wxT
(
"Shift+Ctrl+O"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'O'
},
{
wxT
(
"Shift+Ctrl+P"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'P'
},
{
wxT
(
"Shift+Ctrl+Q"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'Q'
},
{
wxT
(
"Shift+Ctrl+R"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'R'
},
{
wxT
(
"Shift+Ctrl+S"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'S'
},
{
wxT
(
"Shift+Ctrl+T"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'T'
},
{
wxT
(
"Shift+Ctrl+U"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'U'
},
{
wxT
(
"Shift+Ctrl+V"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'V'
},
{
wxT
(
"Shift+Ctrl+W"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'W'
},
{
wxT
(
"Shift+Ctrl+X"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'X'
},
{
wxT
(
"Shift+Ctrl+Y"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'Y'
},
{
wxT
(
"Shift+Ctrl+Z"
),
GR_KB_SHIFT
+
GR_KB_CTRL
+
'Z'
},
// Do not change this line: end of list
{
wxT
(
""
),
0
}
};
...
...
@@ -175,11 +208,11 @@ wxString ReturnKeyNameFromKeyCode( int keycode )
int
ii
;
if
(
(
keycode
&
GR_KB_CTRL
)
!=
0
)
modifier
<<
wxT
(
"Ctrl
"
);
modifier
<<
wxT
(
"Ctrl
+
"
);
if
(
(
keycode
&
GR_KB_ALT
)
!=
0
)
modifier
<<
wxT
(
"Alt
"
);
modifier
<<
wxT
(
"Alt
+
"
);
if
(
(
keycode
&
GR_KB_SHIFT
)
!=
0
)
modifier
<<
wxT
(
"Shift
"
);
modifier
<<
wxT
(
"Shift
+
"
);
keycode
&=
~
(
GR_KB_CTRL
|
GR_KB_ALT
|
GR_KB_SHIFT
);
for
(
ii
=
0
;
;
ii
++
)
...
...
@@ -214,7 +247,7 @@ wxString AddHotkeyName( const wxString& text, Ki_HotkeyInfo** List,
wxString
keyname
=
ReturnKeyNameFromCommandId
(
List
,
CommandId
);
if
(
!
keyname
.
IsEmpty
()
)
msg
<<
wxT
(
"
("
)
<<
keyname
<<
wxT
(
")"
)
;
msg
<<
wxT
(
"
\t
"
)
<<
keyname
;
return
msg
;
}
...
...
@@ -240,7 +273,7 @@ wxString AddHotkeyName( const wxString& text,
keyname
=
ReturnKeyNameFromCommandId
(
List
,
CommandId
);
if
(
!
keyname
.
IsEmpty
()
)
{
msg
<<
wxT
(
"
("
)
<<
keyname
<<
wxT
(
")"
)
;
msg
<<
wxT
(
"
\t
"
)
<<
keyname
;
break
;
}
}
...
...
@@ -277,7 +310,7 @@ wxString ReturnKeyNameFromCommandId( Ki_HotkeyInfo** List, int CommandId )
* return the key code from its key name
* Only some wxWidgets key values are handled for function key
* @param keyname = wxString key name to find in s_Hotkey_Name_List[],
*
like F2 or space or an usual (ascii) char.
* like F2 or space or an usual (ascii) char.
* @return the key code
*/
static
int
ReturnKeyCodeFromKeyName
(
const
wxString
&
keyname
)
...
...
@@ -304,7 +337,7 @@ static int ReturnKeyCodeFromKeyName( const wxString& keyname )
* Displays the current hotkey list
* @param frame = current active frame
* @param List = pointer to a Ki_HotkeyInfoSectionDescriptor list
*
(Null terminated)
*(Null terminated)
* @return none
*/
void
DisplayHotkeyList
(
WinEDA_DrawFrame
*
frame
,
...
...
@@ -323,7 +356,7 @@ void DisplayHotkeyList( WinEDA_DrawFrame* frame,
Ki_HotkeyInfo
*
hk_decr
=
*
List
;
msg
+=
_
(
"key "
);
keyname
=
ReturnKeyNameFromKeyCode
(
hk_decr
->
m_KeyCode
);
msg
+=
keyname
+
wxT
(
": "
)
+
hk_decr
->
m_InfoMsg
+
wxT
(
"
\n
"
);
msg
+=
keyname
+
wxT
(
": "
)
+
hk_decr
->
m_InfoMsg
+
wxT
(
"
\n
"
);
}
}
...
...
@@ -353,7 +386,7 @@ Ki_HotkeyInfo* GetDescriptorFromHotkey( int key, Ki_HotkeyInfo** List )
/*
* Create a configuration file (*.key) from the current hotkey list
* @param Filename = default full file name to create. If void, A filename
*
will be asked
* will be asked
* @param List = pointer to the current hotkey list.
* the ouput format is: shortcut "key" "function"
* lines starting with # are comments
...
...
@@ -468,7 +501,7 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile(
* Read a configuration file (<file>.key) and fill the current hotkey list
* with hotkeys
* @param Filename = default full file name to create. If void, A filename
*
will be asked
* will be asked
* @param DescList = current hotkey list descr. to initialise.
* the input format is: shortcut "key" "function"
* lines starting by # are ignored (comments)
...
...
@@ -556,7 +589,7 @@ int WinEDA_BasicFrame::ReadHotkeyConfigFile(
/* Get the command name */
fctname
=
strtok
(
NULL
,
"
\"\n\r
"
);
msg
=
CONV_FROM_UTF8
(
fctname
);
msg
=
CONV_FROM_UTF8
(
fctname
);
/* search the hotkey in current hotkey list */
for
(
Ki_HotkeyInfo
**
List
=
CurrentHotkeyList
;
*
List
!=
NULL
;
List
++
)
...
...
@@ -585,16 +618,17 @@ int WinEDA_BasicFrame::ReadHotkeyConfigFile(
*/
wxString
ReturnHotkeyConfigFilePath
(
int
choice
)
{
wxString
path
;
wxString
path
;
wxAppTraits
*
traits
=
wxGetApp
().
GetTraits
();
switch
(
choice
)
{
case
0
:
path
=
traits
->
GetStandardPaths
().
GetUserConfigDir
()
+
wxFileName
::
GetPathSeparator
();
wxFileName
::
GetPathSeparator
();
case
1
:
/* TODO: This is broken under a normal Poxis system. Users
* generally do no have write permissions to this path
* and there is no provision for prompting for the root
...
...
@@ -621,28 +655,29 @@ void AddHotkeyConfigMenu( wxMenu* aMenu )
return
;
wxMenuItem
*
item
;
wxMenu
*
HotkeySubmenu
=
new
wxMenu
();
wxMenu
*
HotkeySubmenu
=
new
wxMenu
();
/* List existing hotkey menu*/
item
=
new
wxMenuItem
(
HotkeySubmenu
,
ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST
,
_
(
"List Current Keys"
),
_
(
"Displays the current hotkeys list and corresponding commands"
)
);
ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST
,
_
(
"List Current Keys"
),
_
(
"Displays the current hotkeys list and corresponding commands"
)
);
item
->
SetBitmap
(
info_xpm
);
HotkeySubmenu
->
Append
(
item
);
/* (Re)create hotkey file */
item
=
new
wxMenuItem
(
HotkeySubmenu
,
ID_PREFERENCES_HOTKEY_CREATE_CONFIG
,
_
(
"(Re)create Hotkeys File"
),
_
(
"Create or recreate the hotkey configuration file from current hotkey list"
)
_
(
"Create or recreate the hotkey configuration file from current hotkey list"
)
);
item
->
SetBitmap
(
save_setup_xpm
);
HotkeySubmenu
->
Append
(
item
);
/* Reload hotkey file */
item
=
new
wxMenuItem
(
HotkeySubmenu
,
ID_PREFERENCES_HOTKEY_READ_CONFIG
,
_
(
"Reload Hotkeys File"
),
_
(
"Reload the hotkey configuration file"
)
);
_
(
"Reload Hotkeys File"
),
_
(
"Reload the hotkey configuration file"
)
);
item
->
SetBitmap
(
reload_xpm
);
HotkeySubmenu
->
Append
(
item
);
...
...
@@ -656,7 +691,7 @@ void AddHotkeyConfigMenu( wxMenu* aMenu )
/* Append HotkeySubmenu to menu */
ADD_MENUITEM_WITH_HELP_AND_SUBMENU
(
aMenu
,
HotkeySubmenu
,
ID_PREFERENCES_HOTKEY_SUBMENU
,
_
(
"Hotkeys"
),
_
(
"Hotkeys configuration and preferences"
),
hotkeys_xpm
);
_
(
"Hotkeys configuration and preferences"
),
hotkeys_xpm
);
/* Hotkey path */
wxMenu
*
HotkeyLocationSubmenu
=
new
wxMenu
();
...
...
@@ -698,7 +733,7 @@ void HandleHotkeyConfigMenuSelection( WinEDA_DrawFrame* frame, int id )
{
wxMenuBar
*
menu
=
frame
->
GetMenuBar
();
wxConfig
*
config
=
wxGetApp
().
m_EDA_CommonConfig
;
wxConfig
*
config
=
wxGetApp
().
m_EDA_CommonConfig
;
switch
(
id
)
{
...
...
eeschema/hotkeys.cpp
View file @
c4bc7bb4
...
...
@@ -233,10 +233,6 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey,
wxPoint
MousePos
=
GetScreen
()
->
m_MousePosition
;
// Remap the control key Ctrl A (0x01) to GR_KB_CTRL + 'A' (easier to
// handle...)
if
(
(
hotkey
&
GR_KB_CTRL
)
!=
0
)
hotkey
+=
'A'
-
1
;
/* Convert lower to upper case (the usual toupper function has problem
* with non ascii codes like function keys */
if
(
(
hotkey
>=
'a'
)
&&
(
hotkey
<=
'z'
)
)
...
...
@@ -640,11 +636,6 @@ void WinEDA_LibeditFrame::OnHotKey( wxDC* DC, int hotkey,
if
(
hotkey
==
0
)
return
;
// Remap the control key Ctrl A (0x01) to GR_KB_CTRL + 'A' (easier to
// handle...)
if
(
(
hotkey
&
GR_KB_CTRL
)
!=
0
)
hotkey
+=
'A'
-
1
;
/* Convert lower to upper case (the usual toupper function has problem
* with non ascii codes like function keys */
if
(
(
hotkey
>=
'a'
)
&&
(
hotkey
<=
'z'
)
)
...
...
eeschema/menubar.cpp
View file @
c4bc7bb4
...
...
@@ -151,11 +151,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
wxMenu
*
editMenu
=
new
wxMenu
;
/* Undo */
#if !defined( __WXMAC__)
text
=
AddHotkeyName
(
_
(
"Undo"
),
s_Schematic_Hokeys_Descr
,
HK_UNDO
);
#else
text
=
_
(
"Undo
\t
Ctrl+Z"
);
#endif
item
=
new
wxMenuItem
(
editMenu
,
wxID_UNDO
,
text
,
_
(
"Undo last edition"
),
wxITEM_NORMAL
);
...
...
@@ -163,11 +159,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
editMenu
->
Append
(
item
);
/* Redo */
#if !defined( __WXMAC__)
text
=
AddHotkeyName
(
_
(
"Redo"
),
s_Schematic_Hokeys_Descr
,
HK_REDO
);
#else
text
=
_
(
"Redo
\t
Shift+Ctrl+Z"
);
#endif
item
=
new
wxMenuItem
(
editMenu
,
wxID_REDO
,
text
,
_
(
"Redo the last undo command"
),
wxITEM_NORMAL
);
...
...
eeschema/onrightclick.cpp
View file @
c4bc7bb4
...
...
@@ -60,16 +60,10 @@ bool WinEDA_SchematicFrame::OnRightClick( const wxPoint& MousePos,
return
true
;
}
if
(
DrawStruct
)
cout
<<
"Drawstruct Type before: "
<<
DrawStruct
->
Type
()
<<
endl
;
// Try to locate items at cursor position.
if
(
(
DrawStruct
==
NULL
)
||
(
DrawStruct
->
m_Flags
==
0
)
)
{
DrawStruct
=
SchematicGeneralLocateAndDisplay
(
false
);
if
(
DrawStruct
)
cout
<<
"Drawstruct Type locate : "
<<
DrawStruct
->
Type
()
<<
endl
;
if
(
DrawStruct
&&
(
DrawStruct
->
Type
()
==
DRAW_SHEET_STRUCT_TYPE
)
)
{
...
...
@@ -81,9 +75,6 @@ bool WinEDA_SchematicFrame::OnRightClick( const wxPoint& MousePos,
}
}
if
(
DrawStruct
)
cout
<<
"Drawstruct Type : "
<<
DrawStruct
->
Type
()
<<
endl
;
// If Command in progress: add "cancel" and "end tool" menu
if
(
m_ID_current_state
)
{
...
...
gerbview/hotkeys.cpp
View file @
c4bc7bb4
...
...
@@ -84,9 +84,6 @@ void WinEDA_GerberFrame::OnHotKey( wxDC* DC, int hotkey,
wxCommandEvent
cmd
(
wxEVT_COMMAND_MENU_SELECTED
);
cmd
.
SetEventObject
(
this
);
// Remap the control key Ctrl A (0x01) to GR_KB_CTRL + 'A' (easier to handle...)
if
(
(
hotkey
&
GR_KB_CTRL
)
!=
0
)
hotkey
+=
'A'
-
1
;
/* Convert lower to upper case (the usual toupper function has problem with non ascii codes like function keys */
if
(
(
hotkey
>=
'a'
)
&&
(
hotkey
<=
'z'
)
)
hotkey
+=
'A'
-
'a'
;
...
...
pcbnew/hotkeys.cpp
View file @
c4bc7bb4
...
...
@@ -218,10 +218,6 @@ void WinEDA_PcbFrame::OnHotKey( wxDC* DC, int hotkey, EDA_BaseStruct* DrawStruct
MODULE
*
module
=
NULL
;
// Remap the control key Ctrl A (0x01) to GR_KB_CTRL + 'A' (just easier to handle...)
if
(
(
hotkey
&
GR_KB_CTRL
)
!=
0
)
hotkey
+=
'A'
-
1
;
/* Convert lower to upper case
* (the usual toupper function has problem with non ascii codes like function keys
*/
...
...
@@ -676,10 +672,6 @@ void WinEDA_ModuleEditFrame::OnHotKey( wxDC* DC, int hotkey,
wxCommandEvent
cmd
(
wxEVT_COMMAND_MENU_SELECTED
);
cmd
.
SetEventObject
(
this
);
// Remap the control key Ctrl A (0x01) to GR_KB_CTRL + 'A' (just easier to handle...)
if
(
(
hotkey
&
GR_KB_CTRL
)
!=
0
)
hotkey
+=
'A'
-
1
;
/* Convert lower to upper case (the usual toupper function has problem with non ascii codes like function keys */
if
(
(
hotkey
>=
'a'
)
&&
(
hotkey
<=
'z'
)
)
hotkey
+=
'A'
-
'a'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
