summaryrefslogtreecommitdiffstats
path: root/src/tools-switch.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2013-10-13 19:40:31 +0000
committerJabiertxof <jtx@jtx.marker.es>2013-10-13 19:40:31 +0000
commit34789891fcdbd099bd390ce3d0465dee24a788db (patch)
tree1b16d78374f9d56c0f03a6b20c9e2e6048f4fb5e /src/tools-switch.cpp
parentupdate to trunk (diff)
parentUI message generalisation (diff)
downloadinkscape-34789891fcdbd099bd390ce3d0465dee24a788db.tar.gz
inkscape-34789891fcdbd099bd390ce3d0465dee24a788db.zip
Update to trunk
(bzr r12588.1.12)
Diffstat (limited to 'src/tools-switch.cpp')
-rw-r--r--src/tools-switch.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools-switch.cpp b/src/tools-switch.cpp
index a3c0f2daa..5f54ad15a 100644
--- a/src/tools-switch.cpp
+++ b/src/tools-switch.cpp
@@ -88,7 +88,7 @@ static char const *const tool_names[] = {
};
static char const *const tool_msg[] = {
NULL,
- N_("<b>Click</b> to Select and Tranform objects, <b>Drag</b> to select many objects."),
+ 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."),
@@ -143,7 +143,9 @@ 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);
}
@@ -152,7 +154,6 @@ tools_switch(SPDesktop *dt, int num)
/* First 4 tools use guides, first is undefined but we don't care */
dt->activate_guides(num < 5);
inkscape_eventcontext_set(dt->getEventContext());
- dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, gettext( tool_msg[num] ) );
}
void tools_switch_by_item(SPDesktop *dt, SPItem *item, Geom::Point const p)