From eb3598e7e27619c759ef33bb9ec4ffb8898523de Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Fri, 20 Sep 2013 00:45:16 -0400 Subject: Refactor status-bar text for multiple items, was very broken Fixed bugs: - https://launchpad.net/bugs/1199192 (bzr r12550) --- src/selection-describer.cpp | 108 ++++++++------------------------------------ 1 file changed, 20 insertions(+), 88 deletions(-) (limited to 'src/selection-describer.cpp') diff --git a/src/selection-describer.cpp b/src/selection-describer.cpp index 4c2229667..fc6cb7f91 100644 --- a/src/selection-describer.cpp +++ b/src/selection-describer.cpp @@ -38,64 +38,22 @@ #include "sp-polyline.h" #include "sp-spiral.h" -// CPPIFY: this is ugly. -static const gchar * -type2term(SPItem *item) +// Returns a list of terms for the items to be used in the statusbar +const 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; - return "Selektion-Describer ---"; -} - -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)->display_name(); + if (term != NULL && g_slist_find (check, term) == NULL) { + check = g_slist_prepend (check, (void *) term); + ss << (first ? "" : ", ") << "" << term << ""; + first = false; + } } - return r; + return ss.str().c_str(); } // Returns the number of filtered items in the list @@ -201,7 +159,8 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select g_free (parent_name); if (!items->next) { // one item - char *item_desc = item->description(); + char *item_desc = item->getDetailedDescription(); + if (SP_IS_USE(item) && SP_IS_SYMBOL(item->firstChild())) { _context.setF(Inkscape::NORMAL_MESSAGE, "%s%s. %s. %s.", item_desc, in_phrase, @@ -229,38 +188,11 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select g_free(item_desc); } else { // multiple items int object_count = g_slist_length((GSList *)items); + const 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("%i object selected", "%i 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("%i object of type %s", "%i objects of type %s", 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("%i object of types %s, %s", "%i objects of types %s, %s", 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("%i object of types %s, %s, %s", "%i objects of types %s, %s, %s", 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("%i object of %i types", "%i objects of %i types", object_count), - object_count, n_terms); - } - g_slist_free (terms); - + gchar *objects_str = + g_strdup_printf( "%i objects selected of types %s", + object_count, terms ); // indicate all, some, or none filtered gchar *filt_str = NULL; -- cgit v1.2.3 From 0d4a38635fc26ed09d56b46e462b373489c8a4e2 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 21 Sep 2013 11:42:33 +0100 Subject: Fix format security errors Fixed bugs: - https://launchpad.net/bugs/1193025 (bzr r12563) --- src/selection-describer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/selection-describer.cpp') diff --git a/src/selection-describer.cpp b/src/selection-describer.cpp index fc6cb7f91..96ef3d0d1 100644 --- a/src/selection-describer.cpp +++ b/src/selection-describer.cpp @@ -146,7 +146,7 @@ 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 { -- cgit v1.2.3 From 6f65ca557f8ad953b55b9a703643bbc790eb8da5 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 24 Sep 2013 11:09:43 -0400 Subject: change names for displayName and detailedDescription, improve char code and remove const. (bzr r12584) --- src/selection-describer.cpp | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'src/selection-describer.cpp') diff --git a/src/selection-describer.cpp b/src/selection-describer.cpp index 96ef3d0d1..5dddb0832 100644 --- a/src/selection-describer.cpp +++ b/src/selection-describer.cpp @@ -39,21 +39,21 @@ #include "sp-spiral.h" // Returns a list of terms for the items to be used in the statusbar -const char* collect_terms (GSList *items) +char* collect_terms (GSList *items) { 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)->display_name(); + 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 ? "" : ", ") << "" << term << ""; first = false; } } - return ss.str().c_str(); + return g_strdup(ss.str().c_str()); } // Returns the number of filtered items in the list @@ -150,16 +150,16 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select else in_phrase = g_strdup_printf(_(" in group %s (%s)"), parent_name, layer_name); } else { - in_phrase = g_strdup_printf(ngettext(" in %i parents (%s)", " in %i parents (%s)", num_parents), num_parents, layer_name); + in_phrase = g_strdup_printf(ngettext(" in %i parent (%s)", " in %i parents (%s)", num_parents), num_parents, layer_name); } } else { - in_phrase = g_strdup_printf(ngettext(" in %i layers", " in %i layers", num_layers), num_layers); + in_phrase = g_strdup_printf(ngettext(" in %i layer", " in %i layers", num_layers), num_layers); } g_free (layer_name); g_free (parent_name); if (!items->next) { // one item - char *item_desc = item->getDetailedDescription(); + char *item_desc = item->detailedDescription(); if (SP_IS_USE(item) && SP_IS_SYMBOL(item->firstChild())) { _context.setF(Inkscape::NORMAL_MESSAGE, "%s%s. %s. %s.", @@ -187,12 +187,13 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select } g_free(item_desc); } else { // multiple items - int object_count = g_slist_length((GSList *)items); - const char *terms = collect_terms ((GSList *)items); + int objcount = g_slist_length((GSList *)items); + char *terms = collect_terms ((GSList *)items); - gchar *objects_str = - g_strdup_printf( "%i objects selected of types %s", - object_count, terms ); + gchar *objects_str = g_strdup_printf( + "%i objects selected of types %s", objcount, terms); + + g_free(terms); // indicate all, some, or none filtered gchar *filt_str = NULL; @@ -201,7 +202,7 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select filt_str = g_strdup_printf(ngettext("; %d filtered object ", "; %d filtered objects ", 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); @@ -211,7 +212,7 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select } if (filt_str) { g_free(filt_str); - objects_str = 0; + filt_str = 0; } } -- cgit v1.2.3