![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/tools-switch.cpp b/src/tools-switch.cpp
index 51516ccb88e3578c3607c1a62ac2943fa44627d1..e9fca952eb93c65ba2c4671169091b1135295710 100644 (file)
--- a/src/tools-switch.cpp
+++ b/src/tools-switch.cpp
# include "config.h"
#endif
+#include <cstring>
+#include <string>
+
#include "inkscape-private.h"
#include "desktop.h"
#include "desktop-handles.h"
#include <xml/repr.h>
#include "select-context.h"
-#include "node-context.h"
+#include "ui/tool/node-tool.h"
+#include "tweak-context.h"
+#include "spray-context.h"
#include "sp-path.h"
#include "rect-context.h"
#include "sp-rect.h"
+#include "box3d-context.h"
+#include "box3d.h"
#include "arc-context.h"
#include "sp-ellipse.h"
#include "star-context.h"
#include "spiral-context.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 "sp-text.h"
#include "sp-flowtext.h"
static char const *const tool_names[] = {
NULL,
- "tools.select",
- "tools.nodes",
- "tools.shapes.rect",
- "tools.shapes.arc",
- "tools.shapes.star",
- "tools.shapes.spiral",
- "tools.freehand.pencil",
- "tools.freehand.pen",
- "tools.calligraphic",
- "tools.text",
- "tools.gradient",
- "tools.zoom",
- "tools.dropper",
- "tools.connector",
- "tools.paintbucket",
- NULL
-};
-
-static char const *const tool_ids[] = {
- NULL,
- "select",
- "nodes",
- "rect",
- "arc",
- "star",
- "spiral",
- "pencil",
- "pen",
- "calligraphic",
- "text",
- "gradient",
- "zoom",
- "dropper",
- "connector",
- "paintbucket",
+ "/tools/select",
+ "/tools/nodes",
+ "/tools/tweak",
+ "/tools/spray",
+ "/tools/shapes/rect",
+ "/tools/shapes/3dbox",
+ "/tools/shapes/arc",
+ "/tools/shapes/star",
+ "/tools/shapes/spiral",
+ "/tools/freehand/pencil",
+ "/tools/freehand/pen",
+ "/tools/calligraphic",
+ "/tools/text",
+ "/tools/gradient",
+ "/tools/zoom",
+ "/tools/dropper",
+ "/tools/connector",
+ "/tools/paintbucket",
+ "/tools/eraser",
+ "/tools/lpetool",
NULL
};
static int
-tools_id2num(char const *id)
+tools_prefpath2num(char const *id)
{
int i = 1;
- while (tool_ids[i]) {
- if (strcmp(tool_ids[i], id) == 0)
+ while (tool_names[i]) {
+ if (strcmp(tool_names[i], id) == 0)
return i;
else i++;
}
int
tools_isactive(SPDesktop *dt, unsigned num)
{
- g_assert( num < G_N_ELEMENTS(tool_ids) );
+ g_assert( num < G_N_ELEMENTS(tool_names) );
if (SP_IS_EVENT_CONTEXT(dt->event_context))
- return (!strcmp(dt->event_context->prefs_repr->attribute("id"), tool_ids[num]));
+ return dt->event_context->pref_observer->observed_path == tool_names[num];
else return FALSE;
}
int
tools_active(SPDesktop *dt)
{
- return (tools_id2num(dt->event_context->prefs_repr->attribute("id")));
+ return tools_prefpath2num(dt->event_context->pref_observer->observed_path.data());
}
void
inkscape_eventcontext_set(sp_desktop_event_context(dt));
break;
case TOOLS_NODES:
- dt->set_event_context(SP_TYPE_NODE_CONTEXT, 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));
+ 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, _("To edit a path, <b>click</b>, <b>Shift+click</b>, or <b>drag around</b> nodes to select them, then <b>drag</b> nodes and handles. <b>Click</b> on an object to select."));
+ dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("To spray a path by pushing, select it and drag over it."));
break;
case TOOLS_SHAPES_RECT:
dt->set_event_context(SP_TYPE_RECT_CONTEXT, tool_names[num]);
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);
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. Start drawing with <b>Shift</b> to append to selected path."));
+ 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."));
+ 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 paint a calligraphic stroke. <b>Left</b>/<b>right</b> arrow keys adjust width, <b>up</b>/<b>down</b> adjust angle."));
+ 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]);
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;
}
}
-void
-tools_switch_current(int num)
-{
- SPDesktop *dt = SP_ACTIVE_DESKTOP;
- if (dt) tools_switch(dt, num);
-}
-
-void tools_switch_by_item(SPDesktop *dt, SPItem *item)
+void tools_switch_by_item(SPDesktop *dt, SPItem *item, Geom::Point const p)
{
if (SP_IS_RECT(item)) {
tools_switch(dt, TOOLS_SHAPES_RECT);
+ } else if (SP_IS_BOX3D(item)) {
+ tools_switch(dt, TOOLS_SHAPES_3DBOX);
} else if (SP_IS_GENERICELLIPSE(item)) {
tools_switch(dt, TOOLS_SHAPES_ARC);
} else if (SP_IS_STAR(item)) {
}
} else if (SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item)) {
tools_switch(dt, TOOLS_TEXT);
+ sp_text_context_place_cursor_at (SP_TEXT_CONTEXT(dt->event_context), SP_OBJECT(item), p);
} else if (SP_IS_OFFSET(item)) {
tools_switch(dt, TOOLS_NODES);
}
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :