![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index 3ffd3eda2d88ff63d9bea1e95057041b62764818..f5edf7d97cf3a63baf9820d97bf57822ae640f1b 100644 (file)
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
static void sp_guide_init(SPGuide *guide)
{
- guide->normal_to_line = component_vectors[NR::Y];
+ guide->normal_to_line = component_vectors[Geom::Y];
guide->point_on_line = Geom::Point(0.,0.);
guide->color = 0x0000ff7f;
guide->hicolor = 0xff00007f;
SPGuide *guide = (SPGuide *) object;
while (guide->views) {
- gtk_object_destroy(GTK_OBJECT(guide->views->data));
+ sp_guideline_delete(SP_GUIDELINE(guide->views->data));
guide->views = g_slist_remove(guide->views, guide->views->data);
}
@@ -185,9 +185,9 @@ static void sp_guide_set(SPObject *object, unsigned int key, const gchar *value)
{
if (value && !strcmp(value, "horizontal")) {
/* Visual representation of a horizontal line, constrain vertically (y coordinate). */
- guide->normal_to_line = component_vectors[NR::Y];
+ guide->normal_to_line = component_vectors[Geom::Y];
} else if (value && !strcmp(value, "vertical")) {
- guide->normal_to_line = component_vectors[NR::X];
+ guide->normal_to_line = component_vectors[Geom::X];
} else if (value) {
gchar ** strarray = g_strsplit(value, ",", 2);
double newx, newy;
@@ -200,13 +200,13 @@ static void sp_guide_set(SPObject *object, unsigned int key, const gchar *value)
guide->normal_to_line = direction;
} else {
// default to vertical line for bad arguments
- guide->normal_to_line = component_vectors[NR::X];
+ guide->normal_to_line = component_vectors[Geom::X];
}
} else {
// default to vertical line for bad arguments
- guide->normal_to_line = component_vectors[NR::X];
+ guide->normal_to_line = component_vectors[Geom::X];
}
- sp_guide_set_normal(*guide, guide->normal_to_line.to_2geom(), false);
+ sp_guide_set_normal(*guide, guide->normal_to_line, false);
}
break;
case SP_ATTR_POSITION:
sp_guide_pt_pairs_to_guides(dt, pts);
- sp_document_done (doc, SP_VERB_NONE, _("Guides around page"));
+ sp_document_done (doc, SP_VERB_NONE, _("Guides Around Page"));
}
void sp_guide_show(SPGuide *guide, SPCanvasGroup *group, GCallback handler)
{
- SPCanvasItem *item = sp_guideline_new(group, guide->point_on_line, guide->normal_to_line.to_2geom());
+ SPCanvasItem *item = sp_guideline_new(group, guide->point_on_line, guide->normal_to_line);
sp_guideline_set_color(SP_GUIDELINE(item), guide->color);
g_signal_connect(G_OBJECT(item), "event", G_CALLBACK(handler), guide);
for (GSList *l = guide->views; l != NULL; l = l->next) {
if (canvas == SP_CANVAS_ITEM(l->data)->canvas) {
- gtk_object_destroy(GTK_OBJECT(l->data));
+ sp_guideline_delete(SP_GUIDELINE(l->data));
guide->views = g_slist_remove(guide->views, l->data);
return;
}
g_assert_not_reached();
}
-Geom::Point sp_guide_position_from_pt(SPGuide const *guide, NR::Point const &pt)
+Geom::Point sp_guide_position_from_pt(SPGuide const *guide, Geom::Point const &pt)
{
- return -(pt.to_2geom() - guide->point_on_line);
+ return -(pt - guide->point_on_line);
}
double sp_guide_distance_from_pt(SPGuide const *guide, Geom::Point const &pt)
{
- return dot(pt - guide->point_on_line, guide->normal_to_line);
+ return Geom::dot(pt - guide->point_on_line, guide->normal_to_line);
}
/**
@@ -404,32 +404,45 @@ void sp_guide_set_normal(SPGuide const &guide, Geom::Point const normal_to_line,
/**
* Returns a human-readable description of the guideline for use in dialog boxes and status bar.
+ * If verbose is false, only positioning information is included (useful for dialogs).
*
* The caller is responsible for freeing the string.
*/
-char *sp_guide_description(SPGuide const *guide)
+char *sp_guide_description(SPGuide const *guide, const bool verbose)
{
- using NR::X;
- using NR::Y;
+ using Geom::X;
+ using Geom::Y;
- GString *position_string_x = SP_PX_TO_METRIC_STRING(guide->point_on_line[X], SP_ACTIVE_DESKTOP->namedview->getDefaultMetric());
- GString *position_string_y = SP_PX_TO_METRIC_STRING(guide->point_on_line[Y], SP_ACTIVE_DESKTOP->namedview->getDefaultMetric());
-
- if ( guide->normal_to_line == component_vectors[X] ||
- guide->normal_to_line == -component_vectors[X]) {
- return g_strdup_printf(_("vertical, at %s"), position_string_x->str);
- } else if ( guide->normal_to_line == component_vectors[Y] ||
- guide->normal_to_line == -component_vectors[Y]) {
- return g_strdup_printf(_("horizontal, at %s"), position_string_y->str);
+ GString *position_string_x = SP_PX_TO_METRIC_STRING(guide->point_on_line[X],
+ SP_ACTIVE_DESKTOP->namedview->getDefaultMetric());
+ GString *position_string_y = SP_PX_TO_METRIC_STRING(guide->point_on_line[Y],
+ SP_ACTIVE_DESKTOP->namedview->getDefaultMetric());
+
+ gchar *shortcuts = g_strdup_printf("; %s", _("<b>Shift+drag</b> to rotate, <b>Ctrl+drag</b> to move origin, <b>Del</b> to delete"));
+ gchar *descr;
+
+ if ( are_near(guide->normal_to_line, component_vectors[X]) ||
+ are_near(guide->normal_to_line, -component_vectors[X]) ) {
+ descr = g_strdup_printf(_("vertical, at %s"), position_string_x->str);
+ } else if ( are_near(guide->normal_to_line, component_vectors[Y]) ||
+ are_near(guide->normal_to_line, -component_vectors[Y]) ) {
+ descr = g_strdup_printf(_("horizontal, at %s"), position_string_y->str);
} else {
double const radians = guide->angle();
double const degrees = Geom::rad_to_deg(radians);
int const degrees_int = (int) round(degrees);
- return g_strdup_printf(_("at %d degrees, through (%s,%s); <b>Ctrl</b>+click to delete"), degrees_int, position_string_x->str, position_string_y->str);
+ descr = g_strdup_printf(_("at %d degrees, through (%s,%s)"),
+ degrees_int, position_string_x->str, position_string_y->str);
}
g_string_free(position_string_x, TRUE);
g_string_free(position_string_y, TRUE);
+
+ if (verbose) {
+ descr = g_strconcat(descr, shortcuts, NULL);
+ }
+ g_free(shortcuts);
+ return descr;
}
void sp_guide_remove(SPGuide *guide)