![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index a5515f3ab929a45b613a5e3ecb1613434f2702ff..7bc6adf38e454da21c871e2f9f283015919b9d6f 100644 (file)
* Authors:
* MenTaLguY <mental@rydia.net>
* bulia byak <buliabyak@users.sf.net>
+ * Abhishek Sharma
*
- * Copyright (C) 2004 MenTaLguY
+ * Copyright (C) 2004-2006 Authors
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
#include "sp-flowtext.h"
#include "sp-use.h"
#include "sp-rect.h"
+#include "box3d.h"
#include "sp-ellipse.h"
#include "sp-star.h"
#include "sp-anchor.h"
type2term(GType type)
{
if (type == SP_TYPE_ANCHOR)
- { return _("Link"); }
+ //TRANSLATORS: "Link" means internet link (anchor)
+ { return C_("Web", "Link"); }
if (type == SP_TYPE_CIRCLE)
{ return _("Circle"); }
if (type == SP_TYPE_ELLIPSE)
{ return _("Polyline"); }
if (type == SP_TYPE_RECT)
{ return _("Rectangle"); }
+ if (type == SP_TYPE_BOX3D)
+ { return _("3D Box"); }
if (type == SP_TYPE_TEXT)
{ return _("Text"); }
if (type == SP_TYPE_USE)
- { return _("Clone"); }
+ // TRANSLATORS: "Clone" is a noun, type of object
+ { return C_("Object", "Clone"); }
if (type == SP_TYPE_ARC)
{ return _("Ellipse"); }
if (type == SP_TYPE_OFFSET)
namespace Inkscape {
-SelectionDescriber::SelectionDescriber(Inkscape::Selection *selection, MessageStack *stack)
-: _context(stack)
+SelectionDescriber::SelectionDescriber(Inkscape::Selection *selection, MessageStack *stack, char *when_selected, char *when_nothing)
+ : _context(stack),
+ _when_selected (when_selected),
+ _when_nothing (when_nothing)
+{
+ _selection_changed_connection = new sigc::connection (
+ selection->connectChanged(
+ sigc::mem_fun(*this, &SelectionDescriber::_updateMessageFromSelection)));
+ _selection_modified_connection = new sigc::connection (
+ selection->connectModified(
+ sigc::mem_fun(*this, &SelectionDescriber::_selectionModified)));
+ _updateMessageFromSelection(selection);
+}
+
+SelectionDescriber::~SelectionDescriber()
+{
+ _selection_changed_connection->disconnect();
+ _selection_modified_connection->disconnect();
+ delete _selection_changed_connection;
+ delete _selection_modified_connection;
+}
+
+void SelectionDescriber::_selectionModified(Inkscape::Selection *selection, guint /*flags*/)
{
- selection->connectChanged(sigc::mem_fun(*this, &SelectionDescriber::_updateMessageFromSelection));
_updateMessageFromSelection(selection);
}
void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *selection) {
GSList const *items = selection->itemList();
- char const *when_selected = _("Click selection to toggle scale/rotation handles");
if (!items) { // no items
- _context.set(Inkscape::NORMAL_MESSAGE, _("No objects selected. Click, Shift+click, or drag around objects to select."));
+ _context.set(Inkscape::NORMAL_MESSAGE, _when_nothing);
} else {
SPItem *item = SP_ITEM(items->data);
SPObject *layer = selection->desktop()->layerForObject (SP_OBJECT (item));
SPObject *root = selection->desktop()->currentRoot();
- gchar *layer_phrase;
+
+ // Layer name
+ gchar *layer_name;
if (layer == root) {
- layer_phrase = g_strdup(""); // for simplicity
+ layer_name = g_strdup(_("root"));
} else {
- char const *name, *fmt;
+ char const *layer_label;
+ bool is_label = false;
if (layer && layer->label()) {
- name = layer->label();
- fmt = _(" in layer <b>%s</b>");
+ layer_label = layer->label();
+ is_label = true;
} else {
- name = layer->defaultLabel();
- fmt = _(" in layer <b><i>%s</i></b>");
+ layer_label = layer->defaultLabel();
}
- char *quoted_name = xml_quote_strdup(name);
- layer_phrase = g_strdup_printf(fmt, quoted_name);
- g_free(quoted_name);
+ char *quoted_layer_label = xml_quote_strdup(layer_label);
+ if (is_label) {
+ layer_name = g_strdup_printf(_("layer <b>%s</b>"), quoted_layer_label);
+ } else {
+ layer_name = g_strdup_printf(_("layer <b><i>%s</i></b>"), quoted_layer_label);
+ }
+ g_free(quoted_layer_label);
+ }
+
+ // Parent name
+ SPObject *parent = SP_OBJECT_PARENT (item);
+ gchar const *parent_label = parent->getId();
+ char *quoted_parent_label = xml_quote_strdup(parent_label);
+ gchar *parent_name = g_strdup_printf(_("<i>%s</i>"), quoted_parent_label);
+ g_free(quoted_parent_label);
+
+ gchar *in_phrase;
+ guint num_layers = selection->numberOfLayers();
+ guint num_parents = selection->numberOfParents();
+ if (num_layers == 1) {
+ if (num_parents == 1) {
+ if (layer == parent)
+ in_phrase = g_strdup_printf(_(" in %s"), layer_name);
+ else
+ in_phrase = g_strdup_printf(_(" in group %s (%s)"), parent_name, layer_name);
+ } else {
+ in_phrase = g_strdup_printf(ngettext(" in <b>%i</b> parents (%s)", " in <b>%i</b> parents (%s)", num_parents), num_parents, layer_name);
+ }
+ } else {
+ in_phrase = g_strdup_printf(ngettext(" in <b>%i</b> layers", " in <b>%i</b> layers", num_layers), num_layers);
}
+ g_free (layer_name);
+ g_free (parent_name);
if (!items->next) { // one item
- char *item_desc = sp_item_description(item);
+ char *item_desc = item->description();
if (SP_IS_USE(item) || (SP_IS_OFFSET(item) && SP_OFFSET (item)->sourceHref)) {
_context.setF(Inkscape::NORMAL_MESSAGE, "%s%s. %s. %s.",
- item_desc, layer_phrase,
- _("Use <b>Shift+D</b> to look up original"), when_selected);
+ item_desc, in_phrase,
+ _("Use <b>Shift+D</b> to look up original"), _when_selected);
} else if (SP_IS_TEXT_TEXTPATH(item)) {
_context.setF(Inkscape::NORMAL_MESSAGE, "%s%s. %s. %s.",
- item_desc, layer_phrase,
- _("Use <b>Shift+D</b> to look up path"), when_selected);
+ item_desc, in_phrase,
+ _("Use <b>Shift+D</b> to look up path"), _when_selected);
} else if (SP_IS_FLOWTEXT(item) && !SP_FLOWTEXT(item)->has_internal_frame()) {
_context.setF(Inkscape::NORMAL_MESSAGE, "%s%s. %s. %s.",
- item_desc, layer_phrase,
- _("Use <b>Shift+D</b> to look up frame"), when_selected);
+ item_desc, in_phrase,
+ _("Use <b>Shift+D</b> to look up frame"), _when_selected);
} else {
_context.setF(Inkscape::NORMAL_MESSAGE, "%s%s. %s.",
- item_desc, layer_phrase, when_selected);
+ item_desc, in_phrase, _when_selected);
}
g_free(item_desc);
} else { // multiple items
@@ -150,47 +206,38 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
if (n_terms == 0) {
objects_str = g_strdup_printf (
// this is only used with 2 or more objects
- ngettext("", "<b>%i</b> objects selected", object_count),
+ ngettext("<b>%i</b> object selected", "<b>%i</b> objects selected", object_count),
object_count);
} else if (n_terms == 1) {
objects_str = g_strdup_printf (
// this is only used with 2 or more objects
- ngettext("", "<b>%i</b> objects of type <b>%s</b>", object_count),
+ ngettext("<b>%i</b> object of type <b>%s</b>", "<b>%i</b> objects of type <b>%s</b>", object_count),
object_count, (gchar *) terms->data);
} else if (n_terms == 2) {
objects_str = g_strdup_printf (
// this is only used with 2 or more objects
- ngettext("", "<b>%i</b> objects of types <b>%s</b>, <b>%s</b>", object_count),
+ ngettext("<b>%i</b> object of types <b>%s</b>, <b>%s</b>", "<b>%i</b> objects of types <b>%s</b>, <b>%s</b>", object_count),
object_count, (gchar *) terms->data, (gchar *) terms->next->data);
} else if (n_terms == 3) {
objects_str = g_strdup_printf (
// this is only used with 2 or more objects
- ngettext("", "<b>%i</b> objects of types <b>%s</b>, <b>%s</b>, <b>%s</b>", object_count),
+ ngettext("<b>%i</b> object of types <b>%s</b>, <b>%s</b>, <b>%s</b>", "<b>%i</b> objects of types <b>%s</b>, <b>%s</b>, <b>%s</b>", object_count),
object_count, (gchar *) terms->data, (gchar *) terms->next->data, (gchar *) terms->next->next->data);
} else {
objects_str = g_strdup_printf (
// this is only used with 2 or more objects
- ngettext("", "<b>%i</b> objects of <b>%i</b> types", object_count),
+ ngettext("<b>%i</b> object of <b>%i</b> types", "<b>%i</b> objects of <b>%i</b> types", object_count),
object_count, n_terms);
}
g_slist_free (terms);
- if (selection->numberOfLayers() == 1) {
- _context.setF(Inkscape::NORMAL_MESSAGE, _("%s%s. %s."),
- objects_str, layer_phrase, when_selected);
- } else {
- _context.setF(Inkscape::NORMAL_MESSAGE,
- ngettext("%s in <b>%i</b> layer. %s.",
- "%s in <b>%i</b> layers. %s.",
- selection->numberOfLayers()),
- objects_str, selection->numberOfLayers(), when_selected);
- }
+ _context.setF(Inkscape::NORMAL_MESSAGE, _("%s%s. %s."), objects_str, in_phrase, _when_selected);
if (objects_str)
g_free ((gchar *) objects_str);
}
- g_free(layer_phrase);
+ g_free(in_phrase);
}
}
@@ -205,4 +252,4 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
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 :