summaryrefslogtreecommitdiffstats
path: root/src/star-context.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-08-30 21:35:42 +0000
committerMarkus Engel <markus.engel@tum.de>2013-08-30 21:35:42 +0000
commit8756c49b91fd4262b6770ac3b2f229209bdae96b (patch)
tree67ac89d7bc7c69e04e811324734dccafc07f33c9 /src/star-context.cpp
parentMerged from trunk (r12465). (diff)
parentMerge emf/wmf work (diff)
downloadinkscape-8756c49b91fd4262b6770ac3b2f229209bdae96b.tar.gz
inkscape-8756c49b91fd4262b6770ac3b2f229209bdae96b.zip
Merged from trunk (r12488).
(bzr r11608.1.120)
Diffstat (limited to 'src/star-context.cpp')
-rw-r--r--src/star-context.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/star-context.cpp b/src/star-context.cpp
index d4dee3892..1a04f823f 100644
--- a/src/star-context.cpp
+++ b/src/star-context.cpp
@@ -36,7 +36,6 @@
#include "desktop-style.h"
#include "message-context.h"
#include "pixmaps/cursor-star.xpm"
-#include "sp-metrics.h"
#include <glibmm/i18n.h>
#include "preferences.h"
#include "xml/repr.h"
@@ -417,7 +416,8 @@ void SPStarContext::drag(Geom::Point p, guint state)
arg1, arg1 + M_PI / sides, this->isflatsided, this->rounded, this->randomized);
/* status text */
- GString *rads = SP_PX_TO_METRIC_STRING(r1, desktop->namedview->getDefaultMetric());
+ Inkscape::Util::Quantity q = Inkscape::Util::Quantity(r1, "px");
+ GString *rads = g_string_new(q.string(*desktop->namedview->doc_units).c_str());
this->message_context->setF(Inkscape::IMMEDIATE_MESSAGE,
( this->isflatsided?
_("<b>Polygon</b>: radius %s, angle %5g&#176;; with <b>Ctrl</b> to snap angle")