diff options
| author | Martin Owens <doctormo@gmail.com> | 2013-06-25 15:56:37 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2013-06-25 15:56:37 +0000 |
| commit | 0e23bb12f20c122c8985757d6e32ca3ebc075fb2 (patch) | |
| tree | 55fc5af3ea34e198ee1c4c438a010eb964e5b144 | |
| parent | Correctly ignore symbolic link to ltmain.sh (diff) | |
| parent | Removed hard coded keybinding from event-context.cpp and added the appropiate... (diff) | |
| download | inkscape-0e23bb12f20c122c8985757d6e32ca3ebc075fb2.tar.gz inkscape-0e23bb12f20c122c8985757d6e32ca3ebc075fb2.zip | |
Merge in: remove-hard-coded-toggle-dropper-keybinding
Fixed bugs:
- https://launchpad.net/bugs/180192
(bzr r12388)
| -rw-r--r-- | src/event-context.cpp | 7 | ||||
| -rw-r--r-- | src/verbs.cpp | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/event-context.cpp b/src/event-context.cpp index 628380a2c..4bbb012e0 100644 --- a/src/event-context.cpp +++ b/src/event-context.cpp @@ -590,13 +590,6 @@ static gint sp_event_context_private_root_handler( ret = sp_shortcut_invoke(shortcut, desktop); break; - case GDK_KEY_D: - case GDK_KEY_d: - if (!MOD__SHIFT(event) && !MOD__CTRL(event) && !MOD__ALT(event)) { - sp_toggle_dropper(desktop); - ret = TRUE; - } - break; case GDK_KEY_Q: case GDK_KEY_q: if (desktop->quick_zoomed()) { diff --git a/src/verbs.cpp b/src/verbs.cpp index 6f83b3dfb..3fdb97365 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -47,6 +47,7 @@ #include "document.h" #include "draw-context.h" #include "extension/effect.h" +#include "event-context.h" #include "file.h" #include "gradient-drag.h" #include "helper/action.h" @@ -1560,7 +1561,7 @@ void ContextVerb::perform(SPAction *action, void *data) tools_switch(dt, TOOLS_MEASURE); break; case SP_VERB_CONTEXT_DROPPER: - tools_switch(dt, TOOLS_DROPPER); + sp_toggle_dropper(dt); // Functionality defined in event-context.cpp break; case SP_VERB_CONTEXT_CONNECTOR: tools_switch(dt, TOOLS_CONNECTOR); |