From 08b1fee7c13ab89969f6ad9cfd43b22972aa4a90 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Fri, 21 Mar 2008 07:46:43 +0000 Subject: Adding axis detection to new input dialog (bzr r5140) --- src/verbs.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/verbs.cpp') diff --git a/src/verbs.cpp b/src/verbs.cpp index 060f6aae3..b9dfec271 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -47,9 +47,7 @@ #include "dialogs/extensions.h" #include "dialogs/swatches.h" #include "dialogs/layers-panel.h" -#ifndef USE_NEW_INPUT_DEVICES #include "dialogs/input.h" -#endif #ifdef WITH_INKBOARD #include "jabber_whiteboard/session-manager.h" @@ -1748,11 +1746,10 @@ DialogVerb::perform(SPAction *action, void *data, void */*pdata*/) } #endif case SP_VERB_DIALOG_INPUT: -#ifdef USE_NEW_INPUT_DEVICES - dt->_dlg_mgr->showDialog("InputDevices"); -#else sp_input_dialog(); -#endif + break; + case SP_VERB_DIALOG_INPUT2: + dt->_dlg_mgr->showDialog("InputDevices"); break; case SP_VERB_DIALOG_EXTENSIONEDITOR: dt->_dlg_mgr->showDialog("ExtensionEditor"); @@ -2557,6 +2554,8 @@ Verb *Verb::_base_verbs[] = { #endif new DialogVerb(SP_VERB_DIALOG_INPUT, "DialogInput", N_("_Input Devices..."), N_("Configure extended input devices, such as a graphics tablet"), "input_devices"), + new DialogVerb(SP_VERB_DIALOG_INPUT2, "DialogInput2", N_("_Input Devices (new)..."), + N_("Configure extended input devices, such as a graphics tablet"), "input_devices"), new DialogVerb(SP_VERB_DIALOG_EXTENSIONEDITOR, "org.inkscape.dialogs.extensioneditor", N_("_Extensions..."), N_("Query information about extensions"), NULL), new DialogVerb(SP_VERB_DIALOG_LAYERS, "DialogLayers", N_("Layer_s..."), -- cgit v1.2.3