← Back to branch summary

~ubuntu-branches/ubuntu/precise/inkscape/precise-updates

« back to all changes in this revision

Viewing changes to src/selection-describer.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/selection-describer.cpp
97
97
 
98
98
namespace Inkscape {
99
99
 
100
 
SelectionDescriber::SelectionDescriber(Inkscape::Selection *selection, MessageStack *stack)
101
 
: _context(stack)
 
100
SelectionDescriber::SelectionDescriber(Inkscape::Selection *selection, MessageStack *stack, char *when_selected, char *when_nothing)
 
101
    : _context(stack),
 
102
      _when_selected (when_selected),
 
103
      _when_nothing (when_nothing)
102
104
{
103
105
    _selection_changed_connection = new sigc::connection (
104
106
             selection->connectChanged(
125
127
void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *selection) {
126
128
    GSList const *items = selection->itemList();
127
129
 
128
 
    char const *when_selected = _("Click selection to toggle scale/rotation handles");
129
130
    if (!items) { // no items
130
 
        _context.set(Inkscape::NORMAL_MESSAGE, _("No objects selected. Click, Shift+click, or drag around objects to select."));
 
131
        _context.set(Inkscape::NORMAL_MESSAGE, _when_nothing);
131
132
    } else {
132
133
        SPItem *item = SP_ITEM(items->data);
133
134
        SPObject *layer = selection->desktop()->layerForObject (SP_OBJECT (item));
157
158
 
158
159
        // Parent name
159
160
        SPObject *parent = SP_OBJECT_PARENT (item);
160
 
        gchar *parent_label = SP_OBJECT_ID(parent);
 
161
        gchar const *parent_label = parent->getId();
161
162
        char *quoted_parent_label = xml_quote_strdup(parent_label);
162
163
        gchar *parent_name = g_strdup_printf(_("<i>%s</i>"), quoted_parent_label);
163
164
        g_free(quoted_parent_label);
185
186
            if (SP_IS_USE(item) || (SP_IS_OFFSET(item) && SP_OFFSET (item)->sourceHref)) {
186
187
                _context.setF(Inkscape::NORMAL_MESSAGE, "%s%s. %s. %s.",
187
188
                              item_desc, in_phrase,
188
 
                              _("Use <b>Shift+D</b> to look up original"), when_selected);
 
189
                              _("Use <b>Shift+D</b> to look up original"), _when_selected);
189
190
            } else if (SP_IS_TEXT_TEXTPATH(item)) {
190
191
                _context.setF(Inkscape::NORMAL_MESSAGE, "%s%s. %s. %s.",
191
192
                              item_desc, in_phrase,
192
 
                              _("Use <b>Shift+D</b> to look up path"), when_selected);
 
193
                              _("Use <b>Shift+D</b> to look up path"), _when_selected);
193
194
            } else if (SP_IS_FLOWTEXT(item) && !SP_FLOWTEXT(item)->has_internal_frame()) {
194
195
                _context.setF(Inkscape::NORMAL_MESSAGE, "%s%s. %s. %s.",
195
196
                              item_desc, in_phrase,
196
 
                              _("Use <b>Shift+D</b> to look up frame"), when_selected);
 
197
                              _("Use <b>Shift+D</b> to look up frame"), _when_selected);
197
198
            } else {
198
199
                _context.setF(Inkscape::NORMAL_MESSAGE, "%s%s. %s.",
199
 
                              item_desc, in_phrase, when_selected);
 
200
                              item_desc, in_phrase, _when_selected);
200
201
            }
201
202
            g_free(item_desc);
202
203
        } else { // multiple items
233
234
            }
234
235
            g_slist_free (terms);
235
236
 
236
 
            _context.setF(Inkscape::NORMAL_MESSAGE, _("%s%s. %s."), objects_str, in_phrase, when_selected);
 
237
            _context.setF(Inkscape::NORMAL_MESSAGE, _("%s%s. %s."), objects_str, in_phrase, _when_selected);
237
238
 
238
239
            if (objects_str)
239
240
                g_free ((gchar *) objects_str);