summaryrefslogtreecommitdiffstats
path: root/src/selection-describer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/selection-describer.cpp')
-rw-r--r--src/selection-describer.cpp120
1 files changed, 27 insertions, 93 deletions
diff --git a/src/selection-describer.cpp b/src/selection-describer.cpp
index 6ed8ca584..5dddb0832 100644
--- a/src/selection-describer.cpp
+++ b/src/selection-describer.cpp
@@ -38,71 +38,30 @@
#include "sp-polyline.h"
#include "sp-spiral.h"
-static const gchar *
-type2term(SPItem *item)
+// Returns a list of terms for the items to be used in the statusbar
+char* collect_terms (GSList *items)
{
- GType type = G_OBJECT_TYPE( item );
- if (type == SP_TYPE_ANCHOR)
- //TRANSLATORS: "Link" means internet link (anchor)
- { return C_("Web", "Link"); }
- if (type == SP_TYPE_CIRCLE)
- { return _("Circle"); }
- if (type == SP_TYPE_ELLIPSE)
- { return _("Ellipse"); }
- if (type == SP_TYPE_FLOWTEXT)
- { return _("Flowed text"); }
- if (type == SP_TYPE_GROUP)
- { return _("Group"); }
- if (type == SP_TYPE_IMAGE)
- { return _("Image"); }
- if (type == SP_TYPE_LINE)
- { return _("Line"); }
- if (type == SP_TYPE_PATH)
- { return _("Path"); }
- if (type == SP_TYPE_POLYGON)
- { return _("Polygon"); }
- if (type == SP_TYPE_POLYLINE)
- { return _("Polyline"); }
- if (type == SP_TYPE_RECT)
- { return _("Rectangle"); }
- if (type == SP_TYPE_BOX3D)
- { return _("3D Box"); }
- if (type == SP_TYPE_TEXT)
- { return C_("Object", "Text"); }
- if (type == SP_TYPE_USE)
- if (SP_IS_SYMBOL(item->firstChild()))
- { return C_("Object", "Symbol"); }
- // TRANSLATORS: "Clone" is a noun, type of object
- { return C_("Object", "Clone"); }
- if (type == SP_TYPE_ARC)
- { return _("Ellipse"); }
- if (type == SP_TYPE_OFFSET)
- { return _("Offset path"); }
- if (type == SP_TYPE_SPIRAL)
- { return _("Spiral"); }
- if (type == SP_TYPE_STAR)
- { return _("Star"); }
- return NULL;
-}
-
-static GSList *collect_terms (GSList *items)
-{
- GSList *r = NULL;
- for (GSList *i = items; i != NULL; i = i->next) {
- const gchar *term = type2term ( SP_ITEM(i->data) );
- if (term != NULL && g_slist_find (r, term) == NULL)
- r = g_slist_prepend (r, (void *) term);
+ GSList *check = NULL;
+ std::stringstream ss;
+ bool first = true;
+
+ for (GSList *i = (GSList *)items; i != NULL; i = i->next) {
+ const char *term = SP_ITEM(i->data)->displayName();
+ if (term != NULL && g_slist_find (check, term) == NULL) {
+ check = g_slist_prepend (check, (void *) term);
+ ss << (first ? "" : ", ") << "<b>" << term << "</b>";
+ first = false;
+ }
}
- return r;
+ return g_strdup(ss.str().c_str());
}
// Returns the number of filtered items in the list
static int count_filtered (GSList *items)
{
int count=0;
- SPItem *item=NULL;
for (GSList *i = items; i != NULL; i = i->next) {
- item = SP_ITEM(i->data);
+ SPItem *item = SP_ITEM(i->data);
count += item->ifilt();
}
return count;
@@ -187,20 +146,21 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
if (layer == parent)
in_phrase = g_strdup_printf(_(" in %s"), layer_name);
else if (!layer)
- in_phrase = g_strdup_printf(_(" hidden in definitions"));
+ in_phrase = g_strdup_printf("%s", _(" hidden in definitions"));
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);
+ in_phrase = g_strdup_printf(ngettext(" in <b>%i</b> parent (%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);
+ in_phrase = g_strdup_printf(ngettext(" in <b>%i</b> layer", " 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 = item->description();
+ char *item_desc = item->detailedDescription();
+
if (SP_IS_USE(item) && SP_IS_SYMBOL(item->firstChild())) {
_context.setF(Inkscape::NORMAL_MESSAGE, "%s%s. %s. %s.",
item_desc, in_phrase,
@@ -227,39 +187,13 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
}
g_free(item_desc);
} else { // multiple items
- int object_count = g_slist_length((GSList *)items);
+ int objcount = g_slist_length((GSList *)items);
+ char *terms = collect_terms ((GSList *)items);
- gchar *objects_str = NULL;
- GSList *terms = collect_terms ((GSList *)items);
- int n_terms = g_slist_length(terms);
- if (n_terms == 0) {
- objects_str = g_strdup_printf (
- // this is only used with 2 or more objects
- 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> 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> 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> 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> 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);
+ gchar *objects_str = g_strdup_printf(
+ "<b>%i</b> objects selected of types %s", objcount, terms);
+ g_free(terms);
// indicate all, some, or none filtered
gchar *filt_str = NULL;
@@ -268,7 +202,7 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
filt_str = g_strdup_printf(ngettext("; <i>%d filtered object</i> ",
"; <i>%d filtered objects</i> ", n_filt), n_filt);
} else {
- filt_str = g_strdup_printf("%s", "");
+ filt_str = g_strdup("");
}
_context.setF(Inkscape::NORMAL_MESSAGE, "%s%s%s. %s.", objects_str, filt_str, in_phrase, _when_selected);
@@ -278,7 +212,7 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
}
if (filt_str) {
g_free(filt_str);
- objects_str = 0;
+ filt_str = 0;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-01 12:12:16 +0000