Merge lp:~sandra-snan/inkscape/sandra into lp:~inkscape.dev/inkscape/trunk

[Sandra Snan]

Suggested fix for bug #770681, that comma, period, < and > can’t be remapped (annoying for dvorak users), via moving the hard-coded scaling from select-context.cpp to verbs.cpp.

[lp:~sandra-snan/inkscape/sandra]

10862. By Sandra Snan <sandra@ellen> on 2012-01-08

Moved the new verbs in verbs.cpp to match verbs.h

[Sandra Snan (sandra-snan)]

I’ve kinda changed my mind about this merge. There are so many hard-coded GDK_key_name all over Inkscape and so many contexts and the verbs file is already super long. My change just adds fuel to the fire (and even so, the code in the switch that I added should be extracted into methods).

Yes, it’s not acceptable that period and comma are clobbered by some builtins (I really want to remap them, they’re right under my good hand as a dvorak user), but OTOH the entire Inkscape shortcut / verb / context / GDK event system is due for a big rethink.

I’ve got some ideas in mind if / when I get more familiar with the code.
I’m thinking of maybe replacing the switches (both in verbs.cpp and in the various contexts) with polymorphic objects, just tear everything out. I don’t know. I’ll start a new branch for it if I feel brave enough.

[Jon A. Cruz (jon-joncruz)]

On Jan 9, 2012, at 11:28 PM, Sandra Snan wrote:

> I’ve kinda changed my mind about this merge. There are so many hard-coded GDK_key_name all over Inkscape and so many contexts and the verbs file is already super long. My change just adds fuel to the fire (and even so, the code in the switch that I added should be extracted into methods).
>
> Yes, it’s not acceptable that period and comma are clobbered by some builtins (I really want to remap them, they’re right under my good hand as a dvorak user), but OTOH the entire Inkscape shortcut / verb / context / GDK event system is due for a big rethink.
>
> I’ve got some ideas in mind if / when I get more familiar with the code.
> I’m thinking of maybe replacing the switches (both in verbs.cpp and in the various contexts) with polymorphic objects, just tear everything out. I don’t know. I’ll start a new branch for it if I feel brave enough.

Hi Sandra,

Just wanted to let you know I've had some rough idea of what we need to clean up those situations, and also that I've started in on some input changes that might start to touch the areas you might care about. We probably should coordinate a bit and see where I can support some of your efforts.

Also, the bit I'm coding right now is to allow one to use a joystick to modify standard mouse drawing. I'm hooking things in so the analog joysticks can replace the input normally gained from the tit and pressure of

[Sandra Snan (sandra-snan)]

The idea I was having was to make a class that contains or inherits GDK event but also has information about which »verb« / XML-specified key binding to use, which icon and so on.

So code in a something-context.cpp that today looks for, say, GDK_comma will instead hook in an instance of this new class.
Verbs.cpp would be replaced by code that just reads the keybinding XML files to set things up, to make like a factory method that creates these instances.

Still not sure about that either, but I don’t think it’s working the way it is now, with both hard coded things everywhere as well as a huge verbs.cpp file that’s taking on more and more duties.
It needs a rethink.

[jazzynico (jazzynico)]

I've just updated the patch (attached to the bug report) so that it works with trunk rev. 14917.

But the reason why the branch was rejected is unclear to me. Could anyone clarify?

review: Needs Information

Unmerged revisions

10862. By Sandra Snan <sandra@ellen> on 2012-01-08

Moved the new verbs in verbs.cpp to match verbs.h

10861. By Sandra Snan <sandra@ellen> on 2012-01-08

Added myself to AUTHORS file

10860. By Sandra Snan <sandra@ellen> on 2012-01-08

Verbs for scaling to free comma, period, greater and less

=== modified file 'AUTHORS'
--- AUTHORS	2011-12-11 23:21:19 +0000
+++ AUTHORS	2012-01-08 16:11:23 +0000
@@ -129,6 +129,7 @@
 Abhishek Sharma
 Shivaken
 Michael Sloan
+Sandra Snan
 Danilo Šegan
 Boštjan Špetič
 Aaron Spike

=== modified file 'share/icons/icons.svg'
--- share/icons/icons.svg	2012-01-02 23:02:35 +0000
+++ share/icons/icons.svg	2012-01-08 16:11:23 +0000
@@ -1203,6 +1203,60 @@
 <use xlink:href="#use7634" height="1250" width="1250" transform="translate(0,6)" id="use7636" y="0" x="0" />
 <use xlink:href="#path10505" height="1250" width="1250" id="use5413" y="0" x="0" style="display:inline" transform="matrix(-1,0,0,-1,-74.00271,364.9954)" />
 </g>
+<g id="selection-grow" transform="translate(235.0423,-49.96096)" style="display:inline" inkscape:label="#selection_up">
+<rect y="175" x="-45" height="16" width="16" id="rect10473" style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline" />
+<path style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none" d="m -43.97588,175.9908 c 4.97368,0 4.97368,0 4.97368,0" id="path10475" />
+<rect y="178.46091" x="-44.50185" height="2.002599" width="14.99927" id="rect10479" style="color:#000000;fill:url(#linearGradient5837);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5839);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
+<path style="fill:none;stroke:url(#linearGradient5842);stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;display:inline" d="m -44.00221,185.9908 c 7.94048,0 7.94048,0 7.94048,0" id="path10483" />
+<use xlink:href="#path10475" height="1250" width="1250" transform="translate(-0.0387999,6.97005)" id="use7634" y="0" x="0" />
+<use xlink:href="#use7634" height="1250" width="1250" transform="translate(0,6)" id="use7636" y="0" x="0" />
+<use xlink:href="#path10505" height="1250" width="1250" id="use5413" y="0" x="0" style="display:inline" transform="matrix(-1,0,0,-1,-74.00271,364.9954)" />
+</g>
+<g id="selection-grow-screen" transform="translate(235.0423,-49.96096)" style="display:inline" inkscape:label="#selection_up">
+<rect y="175" x="-45" height="16" width="16" id="rect10473" style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline" />
+<path style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none" d="m -43.97588,175.9908 c 4.97368,0 4.97368,0 4.97368,0" id="path10475" />
+<rect y="178.46091" x="-44.50185" height="2.002599" width="14.99927" id="rect10479" style="color:#000000;fill:url(#linearGradient5837);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5839);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
+<path style="fill:none;stroke:url(#linearGradient5842);stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;display:inline" d="m -44.00221,185.9908 c 7.94048,0 7.94048,0 7.94048,0" id="path10483" />
+<use xlink:href="#path10475" height="1250" width="1250" transform="translate(-0.0387999,6.97005)" id="use7634" y="0" x="0" />
+<use xlink:href="#use7634" height="1250" width="1250" transform="translate(0,6)" id="use7636" y="0" x="0" />
+<use xlink:href="#path10505" height="1250" width="1250" id="use5413" y="0" x="0" style="display:inline" transform="matrix(-1,0,0,-1,-74.00271,364.9954)" />
+</g>
+<g id="selection-grow-double" transform="translate(235.0423,-49.96096)" style="display:inline" inkscape:label="#selection_up">
+<rect y="175" x="-45" height="16" width="16" id="rect10473" style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline" />
+<path style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none" d="m -43.97588,175.9908 c 4.97368,0 4.97368,0 4.97368,0" id="path10475" />
+<rect y="178.46091" x="-44.50185" height="2.002599" width="14.99927" id="rect10479" style="color:#000000;fill:url(#linearGradient5837);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5839);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
+<path style="fill:none;stroke:url(#linearGradient5842);stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;display:inline" d="m -44.00221,185.9908 c 7.94048,0 7.94048,0 7.94048,0" id="path10483" />
+<use xlink:href="#path10475" height="1250" width="1250" transform="translate(-0.0387999,6.97005)" id="use7634" y="0" x="0" />
+<use xlink:href="#use7634" height="1250" width="1250" transform="translate(0,6)" id="use7636" y="0" x="0" />
+<use xlink:href="#path10505" height="1250" width="1250" id="use5413" y="0" x="0" style="display:inline" transform="matrix(-1,0,0,-1,-74.00271,364.9954)" />
+</g>
+<g id="selection-shrink" transform="translate(235.0423,-49.96096)" style="display:inline" inkscape:label="#selection_up">
+<rect y="175" x="-45" height="16" width="16" id="rect10473" style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline" />
+<path style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none" d="m -43.97588,175.9908 c 4.97368,0 4.97368,0 4.97368,0" id="path10475" />
+<rect y="178.46091" x="-44.50185" height="2.002599" width="14.99927" id="rect10479" style="color:#000000;fill:url(#linearGradient5837);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5839);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
+<path style="fill:none;stroke:url(#linearGradient5842);stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;display:inline" d="m -44.00221,185.9908 c 7.94048,0 7.94048,0 7.94048,0" id="path10483" />
+<use xlink:href="#path10475" height="1250" width="1250" transform="translate(-0.0387999,6.97005)" id="use7634" y="0" x="0" />
+<use xlink:href="#use7634" height="1250" width="1250" transform="translate(0,6)" id="use7636" y="0" x="0" />
+<use xlink:href="#path10505" height="1250" width="1250" id="use5413" y="0" x="0" style="display:inline" transform="matrix(-1,0,0,-1,-74.00271,364.9954)" />
+</g>
+<g id="selection-shrink-screen" transform="translate(235.0423,-49.96096)" style="display:inline" inkscape:label="#selection_up">
+<rect y="175" x="-45" height="16" width="16" id="rect10473" style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline" />
+<path style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none" d="m -43.97588,175.9908 c 4.97368,0 4.97368,0 4.97368,0" id="path10475" />
+<rect y="178.46091" x="-44.50185" height="2.002599" width="14.99927" id="rect10479" style="color:#000000;fill:url(#linearGradient5837);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5839);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
+<path style="fill:none;stroke:url(#linearGradient5842);stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;display:inline" d="m -44.00221,185.9908 c 7.94048,0 7.94048,0 7.94048,0" id="path10483" />
+<use xlink:href="#path10475" height="1250" width="1250" transform="translate(-0.0387999,6.97005)" id="use7634" y="0" x="0" />
+<use xlink:href="#use7634" height="1250" width="1250" transform="translate(0,6)" id="use7636" y="0" x="0" />
+<use xlink:href="#path10505" height="1250" width="1250" id="use5413" y="0" x="0" style="display:inline" transform="matrix(-1,0,0,-1,-74.00271,364.9954)" />
+</g>
+<g id="selection-shrink-halve" transform="translate(235.0423,-49.96096)" style="display:inline" inkscape:label="#selection_up">
+<rect y="175" x="-45" height="16" width="16" id="rect10473" style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline" />
+<path style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none" d="m -43.97588,175.9908 c 4.97368,0 4.97368,0 4.97368,0" id="path10475" />
+<rect y="178.46091" x="-44.50185" height="2.002599" width="14.99927" id="rect10479" style="color:#000000;fill:url(#linearGradient5837);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5839);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
+<path style="fill:none;stroke:url(#linearGradient5842);stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;display:inline" d="m -44.00221,185.9908 c 7.94048,0 7.94048,0 7.94048,0" id="path10483" />
+<use xlink:href="#path10475" height="1250" width="1250" transform="translate(-0.0387999,6.97005)" id="use7634" y="0" x="0" />
+<use xlink:href="#use7634" height="1250" width="1250" transform="translate(0,6)" id="use7636" y="0" x="0" />
+<use xlink:href="#path10505" height="1250" width="1250" id="use5413" y="0" x="0" style="display:inline" transform="matrix(-1,0,0,-1,-74.00271,364.9954)" />
+</g>
 <g id="selection-lower" transform="translate(235.0423,-29.95179)" style="display:inline" inkscape:label="#selection_down">
 <rect y="175" x="-45" height="16" width="16" id="rect10501" style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline" />
 <path id="path10505" d="m -42,177.9908 1,0 0,1 -1,0 -3e-6,1 2.000003,0 -2.500003,3 -2.499997,-3 1.999997,0 3e-6,-1 1,-1 z" style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" sodipodi:nodetypes="ccccccccccc" />

=== modified file 'share/keys/default.xml'
--- share/keys/default.xml	2011-06-21 09:18:10 +0000
+++ share/keys/default.xml	2012-01-08 16:11:23 +0000
@@ -365,10 +365,19 @@
 
   <bind key="Page_Up" action="SelectionRaise" display="true" />
   <bind key="KP_Page_Up" action="SelectionRaise" />
-
   <bind key="Page_Down" action="SelectionLower" display="true" />
   <bind key="KP_Page_Down" action="SelectionLower" />
 
+  <bind key="comma" action="SelectionShrink" display="true" />
+  <bind key="comma" modifiers="Alt" action="SelectionShrinkScreen" />
+  <bind key="comma" modifiers="Ctrl" action="SelectionShrinkHalve" />
+  <bind key="period" action="SelectionGrow" display="true" />
+  <bind key="period" modifiers="Alt" action="SelectionGrowScreen" />
+  <bind key="period" modifiers="Ctrl" action="SelectionGrowDouble" />
+
+
+
+
   <bind key="g" modifiers="Ctrl" action="SelectionGroup" display="true" />
   <bind key="G" modifiers="Ctrl" action="SelectionGroup" />
   <bind key="u" modifiers="Ctrl,Shift" action="SelectionGroup" />

=== modified file 'share/keys/inkscape.xml'
--- share/keys/inkscape.xml	2011-02-21 22:28:50 +0000
+++ share/keys/inkscape.xml	2012-01-08 16:11:23 +0000
@@ -119,6 +119,9 @@
 
   <bind action="ArcPrefs" />
 
+  <bind key="m" action="ToolMeasure" />
+  <bind key="M" action="ToolMeasure" display="true" />
+
   <bind key="F9" modifiers="Shift" action="ToolStar" />
   <bind key="asterisk" modifiers="Shift" action="ToolStar" /> 	 
   <bind key="asterisk" action="ToolStar" /> 	 
@@ -362,10 +365,19 @@
 
   <bind key="Page_Up" action="SelectionRaise" display="true" />
   <bind key="KP_Page_Up" action="SelectionRaise" />
-
   <bind key="Page_Down" action="SelectionLower" display="true" />
   <bind key="KP_Page_Down" action="SelectionLower" />
 
+  <bind key="comma" action="SelectionShrink" display="true" />
+  <bind key="comma" modifiers="Alt" action="SelectionShrinkScreen" />
+  <bind key="comma" modifiers="Ctrl" action="SelectionShrinkHalve" />
+  <bind key="period" action="SelectionGrow" display="true" />
+  <bind key="period" modifiers="Alt" action="SelectionGrowScreen" />
+  <bind key="period" modifiers="Ctrl" action="SelectionGrowDouble" />
+
+
+
+
   <bind key="g" modifiers="Ctrl" action="SelectionGroup" display="true" />
   <bind key="G" modifiers="Ctrl" action="SelectionGroup" />
   <bind key="u" modifiers="Ctrl,Shift" action="SelectionGroup" />
@@ -589,4 +601,13 @@
   effect id from the .inx file, for example "org.ekips.filter.addnodes" for the Add
   Nodes effect. -->
 
+ <bind key="g" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer" display="true"/>
+ <bind key="G" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer"/>
+
+ <bind key="h" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer" display="true"/>
+ <bind key="H" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer"/>
+
+ <bind key="j" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer" display="true"/>
+ <bind key="J" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer"/>
+
 </keys>

=== modified file 'share/keys/xara.xml'
--- share/keys/xara.xml	2007-12-23 21:49:49 +0000
+++ share/keys/xara.xml	2012-01-08 16:11:23 +0000
@@ -263,13 +263,13 @@
   <bind key="Z" modifiers="Ctrl" action="EditUndo" display="true"/>
   <bind key="y" modifiers="Ctrl,Shift" action="EditUndo" />
   <bind key="Y" modifiers="Ctrl,Shift" action="EditUndo" />
-  <bind key="less" modifiers="Ctrl" action="EditUndo" /> <!-- FIXME: stolen by scaling, redirect that through a verb -->
-  <bind key="comma" modifiers="Ctrl" action="EditUndo" /> <!-- FIXME: stolen by scaling, redirect that through a verb -->
+  <bind key="less" modifiers="Ctrl" action="EditUndo" />
+  <bind key="comma" modifiers="Ctrl" action="EditUndo" />
 
   <bind key="y" modifiers="Ctrl" action="EditRedo" display="true"/>
   <bind key="Y" modifiers="Ctrl" action="EditRedo" />
-  <bind key="greater" modifiers="Ctrl" action="EditRedo" /> <!-- FIXME: stolen by scaling, redirect that through a verb -->
-  <bind key="period" modifiers="Ctrl" action="EditRedo" /> <!-- FIXME: stolen by scaling, redirect that through a verb -->
+  <bind key="greater" modifiers="Ctrl" action="EditRedo" />
+  <bind key="period" modifiers="Ctrl" action="EditRedo" />
 
   <bind key="x" modifiers="Ctrl" action="EditCut" display="true"/>
   <bind key="X" modifiers="Ctrl" action="EditCut" />

=== modified file 'src/select-context.cpp'
--- src/select-context.cpp	2012-01-04 10:32:50 +0000
+++ src/select-context.cpp	2012-01-08 16:11:23 +0000
@@ -1019,36 +1019,6 @@
                     }
                     ret = TRUE;
                     break;
-                case GDK_less:
-                case GDK_comma:
-                    if (MOD__ALT) {
-                        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) {
-                        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_greater:
-                case GDK_period:
-                    if (MOD__ALT) {
-                        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) {
-                        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_Return:
                     if (MOD__CTRL_ONLY) {
                         if (selection->singleItem()) {

=== modified file 'src/verbs.cpp'
--- src/verbs.cpp	2012-01-03 12:23:35 +0000
+++ src/verbs.cpp	2012-01-08 16:11:23 +0000
@@ -1001,6 +1001,7 @@
 void SelectionVerb::perform(SPAction *action, void *data)
 {
     SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
     if (!dt)
         return;
@@ -1057,6 +1058,44 @@
             sp_selected_path_slice(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.
+            Inkscape::Selection *selection = sp_desktop_selection(dt);
+            sp_selection_scale(selection, prefs->getDoubleLimited("/options/defaultscale/value", 2, 0, 1000));
+            break;
+        }
+        case SP_VERB_SELECTION_GROW_SCREEN:
+        {
+            Inkscape::Selection *selection = sp_desktop_selection(dt);
+            sp_selection_scale_screen(selection, 2);
+            break;
+        }
+        case SP_VERB_SELECTION_GROW_DOUBLE:
+        {
+            Inkscape::Selection *selection = sp_desktop_selection(dt);
+            sp_selection_scale_times(selection, 2);
+            break;
+        }
+        case SP_VERB_SELECTION_SHRINK:
+        {
+            Inkscape::Selection *selection = sp_desktop_selection(dt);
+            sp_selection_scale(selection, -prefs->getDoubleLimited("/options/defaultscale/value", 2, 0, 1000));
+            break;
+        }
+        case SP_VERB_SELECTION_SHRINK_SCREEN:
+        {
+            Inkscape::Selection *selection = sp_desktop_selection(dt);
+            sp_selection_scale_screen(selection, -2);
+            break;
+        }
+        case SP_VERB_SELECTION_SHRINK_HALVE:
+        {
+            Inkscape::Selection *selection = sp_desktop_selection(dt);
+            sp_selection_scale_times(selection, 0.5);
+            break;
+        }
+
         case SP_VERB_SELECTION_OFFSET:
             sp_selected_path_offset(dt);
             break;
@@ -1646,6 +1685,7 @@
         {
             gint mul = 1 + gobble_key_events(
                  GDK_KP_Subtract, 0); // with any mask
+             // FIXME what if zoom out is bound to something other than subtract?
             // While drawing with the pen/pencil tool, zoom away from 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;
@@ -2315,6 +2355,18 @@
     // 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.

=== modified file 'src/verbs.h'
--- src/verbs.h	2011-10-25 07:45:35 +0000
+++ src/verbs.h	2012-01-08 16:11:23 +0000
@@ -111,6 +111,12 @@
     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,