← Back to branch summary

~ubuntu-branches/ubuntu/natty/inkscape/natty

« back to all changes in this revision

Viewing changes to src/tools-switch.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alex Valavanis
  • Date: 2010-09-12 19:44:58 UTC
  • mfrom: (1.1.12 upstream) (45.1.3 maverick)
  • Revision ID: james.westby@ubuntu.com-20100912194458-4sjwmbl7dlsrk5dc
Tags: 0.48.0-1ubuntu1
https://launchpad.net/bugs/628048
https://launchpad.net/bugs/401567
https://launchpad.net/bugs/456248
https://launchpad.net/bugs/463602
https://launchpad.net/bugs/591986
https://launchpad.net/bugs/513319
* Merge with Debian unstable (LP: #628048, LP: #401567, LP: #456248, 
  LP: #463602, LP: #591986)
* debian/control: 
  - Ubuntu maintainers
  - Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Demote pstoedit to Suggests (universe package).
  - Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319)
* debian/rules:
  - Run intltool-update on build (Ubuntu-specific).
  - Add translation domain to .desktop files (Ubuntu-specific).
* debian/dirs:
  - Add usr/share/pixmaps.  Allow inkscape.xpm installation
* drop 50-poppler-API.dpatch (now upstream)
* drop 51-paste-in-unwritable-directory.dpatch (now upstream) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/tools-switch.cpp
26
26
#include <xml/repr.h>
27
27
 
28
28
#include "select-context.h"
29
 
#include "node-context.h"
 
29
#include "ui/tool/node-tool.h"
30
30
#include "tweak-context.h"
 
31
#include "spray-context.h"
31
32
#include "sp-path.h"
32
33
#include "rect-context.h"
33
34
#include "sp-rect.h"
62
63
    "/tools/select",
63
64
    "/tools/nodes",
64
65
    "/tools/tweak",
 
66
    "/tools/spray",
65
67
    "/tools/shapes/rect",
66
68
    "/tools/shapes/3dbox",
67
69
    "/tools/shapes/arc",
124
126
            inkscape_eventcontext_set(sp_desktop_event_context(dt));
125
127
            break;
126
128
        case TOOLS_NODES:
127
 
            dt->set_event_context(SP_TYPE_NODE_CONTEXT, tool_names[num]);
 
129
            dt->set_event_context(INK_TYPE_NODE_TOOL, tool_names[num]);
128
130
            dt->activate_guides(true);
129
131
            inkscape_eventcontext_set(sp_desktop_event_context(dt));
130
 
            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."));
131
132
            break;
132
133
        case TOOLS_TWEAK:
133
134
            dt->set_event_context(SP_TYPE_TWEAK_CONTEXT, tool_names[num]);
135
136
            inkscape_eventcontext_set(sp_desktop_event_context(dt));
136
137
            dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("To tweak a path by pushing, select it and drag over it."));
137
138
            break;
 
139
        case TOOLS_SPRAY:
 
140
            dt->set_event_context(SP_TYPE_SPRAY_CONTEXT, tool_names[num]);
 
141
            dt->activate_guides(true);
 
142
            inkscape_eventcontext_set(sp_desktop_event_context(dt));
 
143
            dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("To spray a path by pushing, select it and drag over it."));
 
144
            break;
138
145
        case TOOLS_SHAPES_RECT:
139
146
            dt->set_event_context(SP_TYPE_RECT_CONTEXT, tool_names[num]);
140
147
            dt->activate_guides(false);