[Bug #770681] KEY MAPPING: Comma and period hijacked by scaling.

Fixed bugs:
  - https://launchpad.net/bugs/770681

(bzr r15155)

3 files changed, 53 insertions, 31 deletions

diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index 86a2dbed3..0cdeda0b6 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -1045,37 +1045,7 @@ bool SelectTool::root_handler(GdkEvent* event) {
                     
                     ret = TRUE;
                     break;
-                    
-                case GDK_KEY_less:
-                case GDK_KEY_comma:
-                    if (MOD__ALT(event)) {
-                        gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
-                        sp_selection_scale_screen(selection, -2*mul);
-                    } else if (MOD__CTRL(event)) {
-                        sp_selection_scale_times(selection, 0.5);
-                    } else {
-                        gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
-                        sp_selection_scale(selection, -offset*mul);
-                    }
-                    
-                    ret = TRUE;
-                    break;
-                    
-                case GDK_KEY_greater:
-                case GDK_KEY_period:
-                    if (MOD__ALT(event)) {
-                        gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
-                        sp_selection_scale_screen(selection, 2*mul);
-                    } else if (MOD__CTRL(event)) {
-                        sp_selection_scale_times(selection, 2);
-                    } else {
-                        gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
-                        sp_selection_scale(selection, offset*mul);
-                    }
-                    
-                    ret = TRUE;
-                    break;
-                    
+
                 case GDK_KEY_Return:
                     if (MOD__CTRL_ONLY(event)) {
                         if (selection->singleItem()) {
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 72708a7c0..e061eaab6 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -1101,6 +1101,7 @@ void SelectionVerb::perform(SPAction *action, void *data)
 {
     Inkscape::Selection *selection = sp_action_get_selection(action);
     SPDesktop *dt = sp_action_get_desktop(action);
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
     // Some of these operations have been modified so they work in command-line mode!
     // In this case, all we need is a selection
@@ -1128,6 +1129,38 @@ void SelectionVerb::perform(SPAction *action, void *data)
         case SP_VERB_SELECTION_SLICE:
             sp_selected_path_slice(selection, dt);
             break;
+        case SP_VERB_SELECTION_GROW:
+        {
+            // FIXME these and the other grow/shrink they should use gobble_key_events.
+            // the problem is how to get access to which key, if any, to gobble.
+            sp_selection_scale(selection, prefs->getDoubleLimited("/options/defaultscale/value", 2, 0, 1000));
+            break;
+        }
+        case SP_VERB_SELECTION_GROW_SCREEN:
+        {
+            sp_selection_scale_screen(selection, 2);
+            break;
+        }
+        case SP_VERB_SELECTION_GROW_DOUBLE:
+        {
+            sp_selection_scale_times(selection, 2);
+            break;
+        }
+        case SP_VERB_SELECTION_SHRINK:
+        {
+            sp_selection_scale(selection, -prefs->getDoubleLimited("/options/defaultscale/value", 2, 0, 1000));
+            break;
+        }
+        case SP_VERB_SELECTION_SHRINK_SCREEN:
+        {
+            sp_selection_scale_screen(selection, -2);
+            break;
+        }
+        case SP_VERB_SELECTION_SHRINK_HALVE:
+        {
+            sp_selection_scale_times(selection, 0.5);
+            break;
+        }
         case SP_VERB_SELECTION_TO_FRONT:
             sp_selection_raise_to_top(selection, dt);
             break;
@@ -1858,6 +1891,7 @@ void ZoomVerb::perform(SPAction *action, void *data)
         {
             gint mul = 1 + Inkscape::UI::Tools::gobble_key_events(
                  GDK_KEY_KP_Add, 0); // with any mask
+            // FIXME what if zoom out is bound to something other than subtract?
             // While drawing with the pen/pencil tool, zoom towards the end of the unfinished path
             if (tools_isactive(dt, TOOLS_FREEHAND_PENCIL) || tools_isactive(dt, TOOLS_FREEHAND_PEN)) {
                 SPCurve *rc = SP_DRAW_CONTEXT(ec)->red_curve;
@@ -2587,6 +2621,18 @@ Verb *Verb::_base_verbs[] = {
     // Advanced tutorial for more info
     new SelectionVerb(SP_VERB_SELECTION_SLICE, "SelectionCutPath", N_("Cut _Path"),
                       N_("Cut the bottom path's stroke into pieces, removing fill"), INKSCAPE_ICON("path-cut")),
+    new SelectionVerb(SP_VERB_SELECTION_GROW, "SelectionGrow", N_("_Grow"),
+                      N_("Make selected objects bigger"), INKSCAPE_ICON("selection-grow")),
+    new SelectionVerb(SP_VERB_SELECTION_GROW_SCREEN, "SelectionGrowScreen", N_("_Grow on screen"),
+                      N_("Make selected objects bigger relative to screen"), INKSCAPE_ICON("selection-grow-screen")),
+    new SelectionVerb(SP_VERB_SELECTION_GROW_DOUBLE, "SelectionGrowDouble", N_("_Double size"),
+                      N_("Double the size of selected objects"), INKSCAPE_ICON("selection-grow-double")),
+    new SelectionVerb(SP_VERB_SELECTION_SHRINK, "SelectionShrink", N_("_Shrink"),
+                      N_("Make selected objects smaller"), INKSCAPE_ICON("selection-shrink")),
+    new SelectionVerb(SP_VERB_SELECTION_SHRINK_SCREEN, "SelectionShrinkScreen", N_("_Shrink on screen"),
+                      N_("Make selected objects smaller relative to screen"), INKSCAPE_ICON("selection-shrink-screen")),
+    new SelectionVerb(SP_VERB_SELECTION_SHRINK_HALVE, "SelectionShrinkHalve", N_("_Halve size"),
+                      N_("Halve the size of selected objects"), INKSCAPE_ICON("selection-shrink-halve")),
     // TRANSLATORS: "outset": expand a shape by offsetting the object's path,
     // i.e. by displacing it perpendicular to the path in each point.
     // See also the Advanced Tutorial for explanation.
diff --git a/src/verbs.h b/src/verbs.h
index a273fe76e..1780e0ebf 100644
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -126,6 +126,12 @@ enum {
     SP_VERB_SELECTION_SYMDIFF,
     SP_VERB_SELECTION_CUT,
     SP_VERB_SELECTION_SLICE,
+    SP_VERB_SELECTION_GROW,
+    SP_VERB_SELECTION_GROW_SCREEN,
+    SP_VERB_SELECTION_GROW_DOUBLE,
+    SP_VERB_SELECTION_SHRINK,
+    SP_VERB_SELECTION_SHRINK_SCREEN,
+    SP_VERB_SELECTION_SHRINK_HALVE,
     SP_VERB_SELECTION_OFFSET,
     SP_VERB_SELECTION_OFFSET_SCREEN,
     SP_VERB_SELECTION_OFFSET_SCREEN_10,