Update to trunk

(bzr r11950.1.141)

1 files changed, 46 insertions, 44 deletions

diff --git a/src/tools-switch.cpp b/src/tools-switch.cpp
index 9e7dfa3f9..fd160e518 100644
--- a/src/tools-switch.cpp
+++ b/src/tools-switch.cpp
@@ -122,136 +122,138 @@ tools_switch(SPDesktop *dt, int num)
         dt->_tool_changed.emit(num);
     }
 
+    dt->set_event_context2(tool_names[num]);
+
     switch (num) {
         case TOOLS_SELECT:
-            dt->set_event_context(SP_TYPE_SELECT_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_SELECT_CONTEXT, tool_names[num]);
             /* fixme: This is really ugly hack. We should bind and unbind class methods */
             dt->activate_guides(true);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             break;
         case TOOLS_NODES:
-            dt->set_event_context(INK_TYPE_NODE_TOOL, tool_names[num]);
+            //dt->set_event_context(INK_TYPE_NODE_TOOL, tool_names[num]);
             dt->activate_guides(true);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             break;
         case TOOLS_TWEAK:
-            dt->set_event_context(SP_TYPE_TWEAK_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_TWEAK_CONTEXT, tool_names[num]);
             dt->activate_guides(true);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("To tweak a path by pushing, select it and drag over it."));
             break;
         case TOOLS_SPRAY:
-            dt->set_event_context(SP_TYPE_SPRAY_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_SPRAY_CONTEXT, tool_names[num]);
             dt->activate_guides(true);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b>, <b>click</b> or <b>click and scroll</b> to spray the selected objects."));
             break;
         case TOOLS_SHAPES_RECT:
-            dt->set_event_context(SP_TYPE_RECT_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_RECT_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> to create a rectangle. <b>Drag controls</b> to round corners and resize. <b>Click</b> to select."));
             break;
         case TOOLS_SHAPES_3DBOX:
-            dt->set_event_context(SP_TYPE_BOX3D_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_BOX3D_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> to create a 3D box. <b>Drag controls</b> to resize in perspective. <b>Click</b> to select (with <b>Ctrl+Alt</b> for single faces)."));
             break;
         case TOOLS_SHAPES_ARC:
-            dt->set_event_context(SP_TYPE_ARC_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_ARC_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> to create an ellipse. <b>Drag controls</b> to make an arc or segment. <b>Click</b> to select."));
             break;
         case TOOLS_SHAPES_STAR:
-            dt->set_event_context(SP_TYPE_STAR_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_STAR_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> to create a star. <b>Drag controls</b> to edit the star shape. <b>Click</b> to select."));
             break;
         case TOOLS_SHAPES_SPIRAL:
-            dt->set_event_context(SP_TYPE_SPIRAL_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_SPIRAL_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> to create a spiral. <b>Drag controls</b> to edit the spiral shape. <b>Click</b> to select."));
             break;
         case TOOLS_FREEHAND_PENCIL:
-            dt->set_event_context(SP_TYPE_PENCIL_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_PENCIL_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> to create a freehand line. <b>Shift</b> appends to selected path, <b>Alt</b> activates sketch mode."));
             break;
         case TOOLS_FREEHAND_PEN:
-            dt->set_event_context(SP_TYPE_PEN_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_PEN_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> or <b>click and drag</b> to start a path; with <b>Shift</b> to append to selected path. <b>Ctrl+click</b> to create single dots (straight line modes only)."));
             break;
         case TOOLS_CALLIGRAPHIC:
-            dt->set_event_context(SP_TYPE_DYNA_DRAW_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_DYNA_DRAW_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> to draw a calligraphic stroke; with <b>Ctrl</b> to track a guide path. <b>Arrow keys</b> adjust width (left/right) and angle (up/down)."));
             break;
         case TOOLS_TEXT:
-            dt->set_event_context(SP_TYPE_TEXT_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_TEXT_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> to select or create text, <b>drag</b> to create flowed text; then type."));
             break;
         case TOOLS_GRADIENT:
-            dt->set_event_context(SP_TYPE_GRADIENT_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_GRADIENT_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> or <b>double click</b> to create a gradient on selected objects, <b>drag handles</b> to adjust gradients."));
             break;
         case TOOLS_MESH:
-            dt->set_event_context(SP_TYPE_MESH_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_MESH_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> or <b>double click</b> to create a mesh on selected objects, <b>drag handles</b> to adjust meshes."));
             break;
         case TOOLS_ZOOM:
-            dt->set_event_context(SP_TYPE_ZOOM_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_ZOOM_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> or <b>drag around an area</b> to zoom in, <b>Shift+click</b> to zoom out."));
             break;
         case TOOLS_MEASURE:
-            dt->set_event_context(SP_TYPE_MEASURE_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_MEASURE_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> to measure the dimensions of objects."));
             break;
         case TOOLS_DROPPER:
-            dt->set_event_context(SP_TYPE_DROPPER_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_DROPPER_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> to set fill, <b>Shift+click</b> to set stroke; <b>drag</b> to average color in area; with <b>Alt</b> to pick inverse color; <b>Ctrl+C</b> to copy the color under mouse to clipboard"));
             break;
         case TOOLS_CONNECTOR:
-            dt->set_event_context(SP_TYPE_CONNECTOR_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_CONNECTOR_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Click and drag</b> between shapes to create a connector."));
             break;
         case TOOLS_PAINTBUCKET:
-            dt->set_event_context(SP_TYPE_FLOOD_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_FLOOD_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> to paint a bounded area, <b>Shift+click</b> to union the new fill with the current selection, <b>Ctrl+click</b> to change the clicked object's fill and stroke to the current setting."));
             break;
         case TOOLS_ERASER:
-            dt->set_event_context(SP_TYPE_ERASER_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_ERASER_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> to erase."));
             break;
         case TOOLS_LPETOOL:
-            dt->set_event_context(SP_TYPE_LPETOOL_CONTEXT, tool_names[num]);
+            //dt->set_event_context(SP_TYPE_LPETOOL_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
+            inkscape_eventcontext_set(dt->getEventContext());
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Choose a subtool from the toolbar"));
             break;
     }