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
893618bf
Commit
893618bf
authored
Jul 24, 2014
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a hot key conflict.
parent
13b0784c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
action_manager.cpp
common/tool/action_manager.cpp
+9
-0
common_actions.cpp
pcbnew/tools/common_actions.cpp
+1
-1
No files found.
common/tool/action_manager.cpp
View file @
893618bf
...
...
@@ -58,6 +58,15 @@ void ACTION_MANAGER::RegisterAction( TOOL_ACTION* aAction )
m_actionNameIndex
[
aAction
->
m_name
]
=
aAction
;
m_actionIdIndex
[
aAction
->
m_id
]
=
aAction
;
#ifndef NDEBUG
// Check if there are two global actions assigned to the same hotkey
if
(
aAction
->
GetScope
()
==
AS_GLOBAL
)
{
BOOST_FOREACH
(
const
TOOL_ACTION
*
action
,
m_actionHotKeys
[
aAction
->
m_currentHotKey
]
)
assert
(
action
->
GetScope
()
!=
AS_GLOBAL
);
}
#endif
/* not NDEBUG */
if
(
aAction
->
HasHotKey
()
)
m_actionHotKeys
[
aAction
->
m_currentHotKey
].
push_back
(
aAction
);
}
...
...
pcbnew/tools/common_actions.cpp
View file @
893618bf
...
...
@@ -314,7 +314,7 @@ TOOL_ACTION COMMON_ACTIONS::moduleTextOutlines( "pcbnew.ModuleEditor.textOutline
// Miscellaneous
TOOL_ACTION
COMMON_ACTIONS
::
selectionTool
(
"pcbnew.Control.selectionTool"
,
AS_GLOBAL
,
' '
,
AS_GLOBAL
,
0
,
""
,
""
,
AF_ACTIVATE
);
TOOL_ACTION
COMMON_ACTIONS
::
resetCoords
(
"pcbnew.Control.resetCoords"
,
...
...
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