Commit a merge to trunk, with probabal errors

(bzr r11073.1.36)

1 files changed, 56 insertions, 149 deletions

diff --git a/src/tools-switch.cpp b/src/tools-switch.cpp
index 42eaf4474..fe9d32f43 100644
--- a/src/tools-switch.cpp
+++ b/src/tools-switch.cpp
@@ -25,35 +25,36 @@
 
 #include <xml/repr.h>
 
-#include "select-context.h"
-#include "ui/tool/node-tool.h"
-#include "tweak-context.h"
-#include "spray-context.h"
+#include "ui/tools/select-tool.h"
+#include "ui/tools/node-tool.h"
+#include "ui/tools/tweak-tool.h"
+#include "ui/tools/spray-tool.h"
 #include "sp-path.h"
-#include "rect-context.h"
+#include "ui/tools/rect-tool.h"
 #include "sp-rect.h"
-#include "box3d-context.h"
+#include "ui/tools/box3d-tool.h"
 #include "box3d.h"
-#include "arc-context.h"
+#include "ui/tools/arc-tool.h"
 #include "sp-ellipse.h"
-#include "star-context.h"
+#include "ui/tools/tweak-tool.h"
 #include "sp-star.h"
-#include "spiral-context.h"
+#include "ui/tools/spiral-tool.h"
 #include "sp-spiral.h"
-#include "dyna-draw-context.h"
-#include "eraser-context.h"
-#include "pen-context.h"
-#include "pencil-context.h"
-#include "lpe-tool-context.h"
-#include "text-context.h"
+#include "ui/tools/calligraphic-tool.h"
+#include "ui/tools/eraser-tool.h"
+#include "ui/tools/pen-tool.h"
+#include "ui/tools/pencil-tool.h"
+#include "ui/tools/lpe-tool.h"
+#include "ui/tools/text-tool.h"
 #include "sp-text.h"
 #include "sp-flowtext.h"
-#include "gradient-context.h"
-#include "zoom-context.h"
-#include "measure-context.h"
-#include "dropper-context.h"
-#include "connector-context.h"
-#include "flood-context.h"
+#include "ui/tools/gradient-tool.h"
+#include "ui/tools/mesh-tool.h"
+#include "ui/tools/zoom-tool.h"
+#include "ui/tools/measure-tool.h"
+#include "ui/tools/dropper-tool.h"
+#include "ui/tools/connector-tool.h"
+#include "ui/tools/flood-tool.h"
 #include "sp-offset.h"
 #include "message-context.h"
 
@@ -75,6 +76,7 @@ static char const *const tool_names[] = {
     "/tools/calligraphic",
     "/tools/text",
     "/tools/gradient",
+    "/tools/mesh",
     "/tools/zoom",
     "/tools/measure",
     "/tools/dropper",
@@ -84,6 +86,31 @@ static char const *const tool_names[] = {
     "/tools/lpetool",
     NULL
 };
+static char const *const tool_msg[] = {
+    NULL,
+    N_("<b>Click</b> to Select and Transform objects, <b>Drag</b> to select many objects."),
+    N_("Modify selected path points (nodes) directly."),
+    N_("To tweak a path by pushing, select it and drag over it."),
+    N_("<b>Drag</b>, <b>click</b> or <b>click and scroll</b> to spray the selected objects."),
+    N_("<b>Drag</b> to create a rectangle. <b>Drag controls</b> to round corners and resize. <b>Click</b> to select."),
+    N_("<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)."),
+    N_("<b>Drag</b> to create an ellipse. <b>Drag controls</b> to make an arc or segment. <b>Click</b> to select."),
+    N_("<b>Drag</b> to create a star. <b>Drag controls</b> to edit the star shape. <b>Click</b> to select."),
+    N_("<b>Drag</b> to create a spiral. <b>Drag controls</b> to edit the spiral shape. <b>Click</b> to select."),
+    N_("<b>Drag</b> to create a freehand line. <b>Shift</b> appends to selected path, <b>Alt</b> activates sketch mode."),
+    N_("<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)."),
+    N_("<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)."),
+    N_("<b>Click</b> to select or create text, <b>drag</b> to create flowed text; then type."),
+    N_("<b>Drag</b> or <b>double click</b> to create a gradient on selected objects, <b>drag handles</b> to adjust gradients."),
+    N_("<b>Drag</b> or <b>double click</b> to create a mesh on selected objects, <b>drag handles</b> to adjust meshes."),
+    N_("<b>Click</b> or <b>drag around an area</b> to zoom in, <b>Shift+click</b> to zoom out."),
+    N_("<b>Drag</b> to measure the dimensions of objects."),
+    N_("<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"),
+    N_("<b>Click and drag</b> between shapes to create a connector."),
+    N_("<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."),
+    N_("<b>Drag</b> to erase."),
+    N_("Choose a subtool from the toolbar"),
+};
 
 static int
 tools_prefpath2num(char const *id)
@@ -116,137 +143,17 @@ tools_active(SPDesktop *dt)
 void
 tools_switch(SPDesktop *dt, int num)
 {
+    dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, gettext( tool_msg[num] ) );
     if (dt) {
+        // This event may change the above message
         dt->_tool_changed.emit(num);
     }
 
-    switch (num) {
-        case TOOLS_SELECT:
-            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));
-            break;
-        case TOOLS_NODES:
-            dt->set_event_context(INK_TYPE_NODE_TOOL, tool_names[num]);
-            dt->activate_guides(true);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            break;
-        case TOOLS_TWEAK:
-            dt->set_event_context(SP_TYPE_TWEAK_CONTEXT, tool_names[num]);
-            dt->activate_guides(true);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(true);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b>, <b>click</b> or <b>scroll</b> to spray the selected objects."));
-            break;
-        case TOOLS_SHAPES_RECT:
-            dt->set_event_context(SP_TYPE_RECT_CONTEXT, tool_names[num]);
-            dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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_ZOOM:
-            dt->set_event_context(SP_TYPE_ZOOM_CONTEXT, tool_names[num]);
-            dt->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            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->activate_guides(false);
-            inkscape_eventcontext_set(sp_desktop_event_context(dt));
-            dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Choose a subtool from the toolbar"));
-            break;
-    }
+    dt->set_event_context2(tool_names[num]);
+    /* fixme: This is really ugly hack. We should bind and unbind class methods */
+    /* First 4 tools use guides, first is undefined but we don't care */
+    dt->activate_guides(num < 5);
+    inkscape_eventcontext_set(dt->getEventContext());
 }
 
 void tools_switch_by_item(SPDesktop *dt, SPItem *item, Geom::Point const p)
@@ -262,7 +169,7 @@ void tools_switch_by_item(SPDesktop *dt, SPItem *item, Geom::Point const p)
     } else if (SP_IS_SPIRAL(item)) {
         tools_switch(dt, TOOLS_SHAPES_SPIRAL);
     } else if (SP_IS_PATH(item)) {
-        if (cc_item_is_connector(item)) {
+        if (Inkscape::UI::Tools::cc_item_is_connector(item)) {
             tools_switch(dt, TOOLS_CONNECTOR);
         }
         else {