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/sp-tref.cpp | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'src/sp-tref.cpp') diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index 1872cdf7c..f0a4af667 100644 --- a/src/sp-tref.cpp +++ b/src/sp-tref.cpp @@ -233,28 +233,30 @@ Geom::OptRect SPTRef::bbox(Geom::Affine const &transform, SPItem::BBoxType type) return bbox; } +const char* SPTRef::display_name() { + return _("Cloned Character Data"); +} + gchar* SPTRef::description() { - SPObject *referred = this->getObjectReferredTo(); + SPObject *referred = this->getObjectReferredTo(); - if (this->getObjectReferredTo()) { - char *child_desc; + if (this->getObjectReferredTo()) { + char *child_desc; - if (SP_IS_ITEM(referred)) { - child_desc = SP_ITEM(referred)->getDetailedDescription(); - } else { - child_desc = g_strdup(""); - } + if (SP_IS_ITEM(referred)) { + child_desc = SP_ITEM(referred)->getDetailedDescription(); + } else { + child_desc = g_strdup(""); + } - char *ret = g_strdup_printf( - _("Cloned character data%s%s"), - (SP_IS_ITEM(referred) ? _(" from ") : ""), - child_desc); - g_free(child_desc); + char *ret = g_strdup_printf("%s%s", + (SP_IS_ITEM(referred) ? _(" from ") : ""), child_desc); + g_free(child_desc); - return ret; - } + return ret; + } - return g_strdup(_("Orphaned cloned character data")); + return g_strdup(_("[orphaned]")); } -- 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/sp-tref.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sp-tref.cpp') diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index f0a4af667..4f9947a04 100644 --- a/src/sp-tref.cpp +++ b/src/sp-tref.cpp @@ -233,7 +233,7 @@ Geom::OptRect SPTRef::bbox(Geom::Affine const &transform, SPItem::BBoxType type) return bbox; } -const char* SPTRef::display_name() { +const char* SPTRef::displayName() { return _("Cloned Character Data"); } @@ -244,7 +244,7 @@ gchar* SPTRef::description() { char *child_desc; if (SP_IS_ITEM(referred)) { - child_desc = SP_ITEM(referred)->getDetailedDescription(); + child_desc = SP_ITEM(referred)->detailedDescription(); } else { child_desc = g_strdup(""); } -- cgit v1.2.3