![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index fad40ca7e56c1e17208476e238b1c3a75b54c71e..d5158255abe473f0f700032445257229a59c8b2c 100644 (file)
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
#include "display/guideline.h"
#include "helper/unit-menu.h"
#include "helper/units.h"
#include "dialogs/dialog-events.h"
#include "message-context.h"
#include "xml/repr.h"
-
-static void sp_dt_simple_guide_dialog(SPGuide *guide, SPDesktop *desktop);
-
+#include "dialogs/guidelinedialog.h"
+#include "snap.h"
+#include "display/canvas-grid.h"
+#include "display/canvas-axonomgrid.h"
+#include <2geom/point.h>
/* Root item handler */
-
-int sp_desktop_root_handler(SPCanvasItem *item, GdkEvent *event, SPDesktop *desktop)
+int sp_desktop_root_handler(SPCanvasItem */*item*/, GdkEvent *event, SPDesktop *desktop)
{
return sp_event_context_root_handler(desktop->event_context, event);
}
-/*
- * fixme: this conatins a hack, to deal with deleting a view, which is
- * completely on another view, in which case active_desktop will not be updated
- *
- */
-
-int sp_desktop_item_handler(SPCanvasItem *item, GdkEvent *event, gpointer data)
-{
- gpointer ddata = gtk_object_get_data(GTK_OBJECT(item->canvas), "SPDesktop");
- g_return_val_if_fail(ddata != NULL, FALSE);
-
- SPDesktop *desktop = static_cast<SPDesktop*>(ddata);
-
- return sp_event_context_item_handler(desktop->event_context, SP_ITEM(data), event);
-}
-
static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw, bool horiz)
{
static bool dragging = false;
static SPCanvasItem *guide = NULL;
+ static Geom::Point normal;
int wx, wy;
SPDesktop *desktop = dtw->desktop;
gdk_window_get_pointer(GTK_WIDGET(dtw->canvas)->window, &wx, &wy, NULL);
NR::Point const event_win(wx, wy);
+ gint width, height;
+ gdk_window_get_geometry(GTK_WIDGET(dtw->canvas)->window, NULL /*x*/, NULL /*y*/, &width, &height, NULL/*depth*/);
+
switch (event->type) {
- case GDK_BUTTON_PRESS:
+ case GDK_BUTTON_PRESS:
if (event->button.button == 1) {
dragging = true;
NR::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
@@ -87,51 +70,83 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
sp_repr_set_boolean(repr, "showguides", TRUE);
sp_repr_set_boolean(repr, "inkscape:guide-bbox", TRUE);
- double const guide_pos_dt = event_dt[ horiz
- ? NR::Y
- : NR::X ];
- guide = sp_guideline_new(desktop->guides, guide_pos_dt, !horiz);
+ // calculate the normal of the guidelines when dragged from the edges of rulers.
+ Geom::Point normal_bl_to_tr(-1.,1.); //bottomleft to topright
+ Geom::Point normal_tr_to_bl(1.,1.); //topright to bottomleft
+ normal_bl_to_tr.normalize();
+ normal_tr_to_bl.normalize();
+ Inkscape::CanvasGrid * grid = sp_namedview_get_first_enabled_grid(desktop->namedview);
+ if ( grid && grid->getGridType() == Inkscape::GRID_AXONOMETRIC ) {
+ Inkscape::CanvasAxonomGrid *axonomgrid = dynamic_cast<Inkscape::CanvasAxonomGrid *>(grid);
+ if (event->button.state & GDK_CONTROL_MASK) {
+ // guidelines normal to gridlines
+ normal_bl_to_tr = Geom::Point::polar(-axonomgrid->angle_rad[0], 1.0);
+ normal_tr_to_bl = Geom::Point::polar(axonomgrid->angle_rad[2], 1.0);
+ } else {
+ normal_bl_to_tr = rot90(Geom::Point::polar(axonomgrid->angle_rad[2], 1.0));
+ normal_tr_to_bl = rot90(Geom::Point::polar(-axonomgrid->angle_rad[0], 1.0));
+ }
+ }
+ if (horiz) {
+ if (wx < 50) {
+ normal = normal_bl_to_tr;
+ } else if (wx > width - 50) {
+ normal = normal_tr_to_bl;
+ } else {
+ normal = Geom::Point(0.,1.);
+ }
+ } else {
+ if (wy < 50) {
+ normal = normal_bl_to_tr;
+ } else if (wy > height - 50) {
+ normal = normal_tr_to_bl;
+ } else {
+ normal = Geom::Point(1.,0.);
+ }
+ }
+
+ guide = sp_guideline_new(desktop->guides, event_dt.to_2geom(), normal);
sp_guideline_set_color(SP_GUIDELINE(guide), desktop->namedview->guidehicolor);
gdk_pointer_grab(widget->window, FALSE,
- (GdkEventMask)(GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK),
+ (GdkEventMask)(GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK ),
NULL, NULL,
event->button.time);
}
break;
- case GDK_MOTION_NOTIFY:
+ case GDK_MOTION_NOTIFY:
if (dragging) {
NR::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
- NR::Point const event_dt(desktop->w2d(event_w));
- double const guide_pos_dt = event_dt[ horiz
- ? NR::Y
- : NR::X ];
- sp_guideline_set_position(SP_GUIDELINE(guide), guide_pos_dt);
+ NR::Point event_dt(desktop->w2d(event_w));
+
+ SnapManager const &m = desktop->namedview->snap_manager;
+ event_dt = m.guideSnap(event_dt, normal).getPoint();
+
+ sp_guideline_set_position(SP_GUIDELINE(guide), event_dt.to_2geom());
desktop->set_coordinate_status(event_dt);
desktop->setPosition (event_dt);
}
break;
- case GDK_BUTTON_RELEASE:
+ case GDK_BUTTON_RELEASE:
if (dragging && event->button.button == 1) {
gdk_pointer_ungrab(event->button.time);
NR::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
- NR::Point const event_dt(desktop->w2d(event_w));
+ NR::Point event_dt(desktop->w2d(event_w));
+
+ SnapManager const &m = desktop->namedview->snap_manager;
+ event_dt = m.guideSnap(event_dt, normal).getPoint();
+
dragging = false;
gtk_object_destroy(GTK_OBJECT(guide));
guide = NULL;
- if ( ( horiz
- ? wy
- : wx )
- >= 0 )
- {
- Inkscape::XML::Node *repr = sp_repr_new("sodipodi:guide");
- repr->setAttribute("orientation", (horiz) ? "horizontal" : "vertical");
- double const guide_pos_dt = event_dt[ horiz
- ? NR::Y
- : NR::X ];
- sp_repr_set_svg_double(repr, "position", guide_pos_dt);
+ if ((horiz ? wy : wx) >= 0) {
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+ Inkscape::XML::Node *repr = xml_doc->createElement("sodipodi:guide");
+ sp_repr_set_point(repr, "orientation", normal);
+ sp_repr_set_point(repr, "position", event_dt.to_2geom());
SP_OBJECT_REPR(desktop->namedview)->appendChild(repr);
Inkscape::GC::release(repr);
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
+ _("Create guide"));
}
desktop->set_coordinate_status(event_dt);
}
SPGuide *guide = SP_GUIDE(data);
SPDesktop *desktop = static_cast<SPDesktop*>(gtk_object_get_data(GTK_OBJECT(item->canvas), "SPDesktop"));
- switch (event->type) {
+ switch (event->type) {
case GDK_2BUTTON_PRESS:
if (event->button.button == 1) {
dragging = false;
sp_canvas_item_ungrab(item, event->button.time);
- sp_dt_simple_guide_dialog(guide, desktop);
+ Inkscape::UI::Dialogs::GuidelinePropertiesDialog::showDialog(guide, desktop);
ret = TRUE;
}
break;
sp_canvas_item_grab(item,
( GDK_BUTTON_RELEASE_MASK |
GDK_BUTTON_PRESS_MASK |
- GDK_POINTER_MOTION_MASK |
- GDK_POINTER_MOTION_HINT_MASK ),
+ GDK_POINTER_MOTION_MASK ),
NULL,
event->button.time);
ret = TRUE;
}
break;
- case GDK_MOTION_NOTIFY:
+ case GDK_MOTION_NOTIFY:
if (dragging) {
NR::Point const motion_w(event->motion.x,
event->motion.y);
- NR::Point const motion_dt(desktop->w2d(motion_w));
- sp_guide_moveto(*guide, sp_guide_position_from_pt(guide, motion_dt), false);
+ NR::Point motion_dt(desktop->w2d(motion_w));
+
+ // This is for snapping while dragging existing guidelines. New guidelines,
+ // which are dragged off the ruler, are being snapped in sp_dt_ruler_event
+ SnapManager const &m = desktop->namedview->snap_manager;
+ motion_dt = m.guideSnap(motion_dt, guide->normal_to_line).getPoint();
+
+ sp_guide_moveto(*guide, motion_dt.to_2geom(), false);
moved = true;
desktop->set_coordinate_status(motion_dt);
desktop->setPosition (motion_dt);
ret = TRUE;
}
break;
- case GDK_BUTTON_RELEASE:
+ case GDK_BUTTON_RELEASE:
if (dragging && event->button.button == 1) {
if (moved) {
NR::Point const event_w(event->button.x,
event->button.y);
- NR::Point const event_dt(desktop->w2d(event_w));
+ NR::Point event_dt(desktop->w2d(event_w));
+
+ SnapManager const &m = desktop->namedview->snap_manager;
+ event_dt = m.guideSnap(event_dt, guide->normal_to_line).getPoint();
+
if (sp_canvas_world_pt_inside_window(item->canvas, event_w)) {
- sp_guide_moveto(*guide, sp_guide_position_from_pt(guide, event_dt), true);
+ sp_guide_moveto(*guide, event_dt.to_2geom(), true);
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
+ _("Move guide"));
} else {
/* Undo movement of any attached shapes. */
- sp_guide_moveto(*guide, guide->position, false);
+ sp_guide_moveto(*guide, guide->point_on_line, false);
sp_guide_remove(guide);
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
+ _("Delete guide"));
}
moved = false;
- sp_document_done(SP_DT_DOCUMENT(desktop));
desktop->set_coordinate_status(event_dt);
desktop->setPosition (event_dt);
}
sp_canvas_item_ungrab(item, event->button.time);
ret=TRUE;
}
- case GDK_ENTER_NOTIFY:
- {
-
+ case GDK_ENTER_NOTIFY:
+ {
sp_guideline_set_color(SP_GUIDELINE(item), guide->hicolor);
- GString *position_string = SP_PX_TO_METRIC_STRING(guide->position, desktop->namedview->getDefaultMetric());
char *guide_description = sp_guide_description(guide);
-
- desktop->guidesMessageContext()->setF(Inkscape::NORMAL_MESSAGE, _("%s at %s"), guide_description, position_string->str);
-
+ desktop->guidesMessageContext()->setF(Inkscape::NORMAL_MESSAGE, "%s", guide_description);
g_free(guide_description);
- g_string_free(position_string, TRUE);
break;
- }
- case GDK_LEAVE_NOTIFY:
+ }
+ case GDK_LEAVE_NOTIFY:
sp_guideline_set_color(SP_GUIDELINE(item), guide->color);
desktop->guidesMessageContext()->clear();
break;
- default:
+ default:
break;
}
}
-
-/*
- * simple guideline dialog
- */
-
-static GtkWidget *d = NULL;
-static GtkWidget *l1;
-static GtkWidget *l2;
-static GtkWidget *e;
-static GtkWidget *u;
-static GtkWidget *m;
-static gdouble oldpos;
-static bool mode;
-static gpointer g;
-
-
-static void guide_dialog_mode_changed(GtkWidget *widget)
-{
- if (mode) {
- // TRANSLATORS: This string appears when double-clicking on a guide.
- // This is the distance by which the guide is to be moved.
- gtk_label_set_text(GTK_LABEL(m), _(" relative by "));
- mode = false;
- } else {
- // TRANSLATORS: This string appears when double-clicking on a guide.
- // This is the target location where the guide is to be moved.
- gtk_label_set_text(GTK_LABEL(m), _(" absolute to "));
- mode = true;
- }
-}
-
-static void guide_dialog_close(GtkWidget *widget, gpointer data)
-{
- gtk_widget_hide(GTK_WIDGET(d));
-}
-
-static void guide_dialog_apply(SPGuide &guide)
-{
- gdouble const raw_dist = gtk_spin_button_get_value_as_float(GTK_SPIN_BUTTON(e));
- SPUnit const &unit = *sp_unit_selector_get_unit(SP_UNIT_SELECTOR(u));
- gdouble const points = sp_units_get_pixels(raw_dist, unit);
- gdouble const newpos = ( mode
- ? points
- : guide.position + points );
- sp_guide_moveto(guide, newpos, true);
- sp_document_done(SP_OBJECT_DOCUMENT(&guide));
-}
-
-static void guide_dialog_ok(GtkWidget *widget, gpointer g)
-{
- SPGuide &guide = **static_cast<SPGuide**>(g);
- guide_dialog_apply(guide);
- guide_dialog_close(NULL, GTK_DIALOG(widget));
-}
-
-static void guide_dialog_delete(GtkWidget *widget, SPGuide **guide)
-{
- SPDocument *doc = SP_OBJECT_DOCUMENT(*guide);
- sp_guide_remove(*guide);
- sp_document_done(doc);
- guide_dialog_close(NULL, GTK_DIALOG(widget));
-}
-
-static void guide_dialog_response(GtkDialog *dialog, gint response, gpointer data)
-{
- GtkWidget *widget = GTK_WIDGET(dialog);
-
- switch (response) {
- case GTK_RESPONSE_OK:
- guide_dialog_ok(widget, data);
- break;
- case -12:
- guide_dialog_delete(widget, (SPGuide**) data);
- break;
- case GTK_RESPONSE_CLOSE:
- guide_dialog_close(widget, (GtkDialog*) data);
- break;
- case GTK_RESPONSE_DELETE_EVENT:
- break;
-/* case GTK_RESPONSE_APPLY:
- guide_dialog_apply(widget, data);
- break;
-*/
- default:
- g_assert_not_reached();
- }
-}
-
-static void sp_dt_simple_guide_dialog(SPGuide *guide, SPDesktop *desktop)
-{
- if (!GTK_IS_WIDGET(d)) {
- // create dialog
- d = gtk_dialog_new_with_buttons(_("Guideline"),
- NULL,
- GTK_DIALOG_MODAL,
- GTK_STOCK_OK,
- GTK_RESPONSE_OK,
- GTK_STOCK_DELETE,
- -12, /* DELETE */
- GTK_STOCK_CLOSE,
- GTK_RESPONSE_CLOSE,
- NULL);
- sp_transientize(d);
- gtk_widget_hide(d);
-
- GtkWidget *b1 = gtk_hbox_new(FALSE, 4);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->vbox), b1, FALSE, FALSE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(b1), 4);
- gtk_widget_show(b1);
-
- GtkWidget *b2 = gtk_vbox_new(FALSE, 4);
- gtk_box_pack_end(GTK_BOX(b1), b2, TRUE, TRUE, 0);
- gtk_widget_show(b2);
-
- //labels
- GtkWidget *b3 = gtk_hbox_new(FALSE, 4);
- gtk_box_pack_start(GTK_BOX(b2), b3, TRUE, TRUE, 0);
- gtk_widget_show(b3);
-
- l1 = gtk_label_new("foo1");
- gtk_box_pack_start(GTK_BOX(b3), l1, TRUE, TRUE, 0);
- gtk_misc_set_alignment(GTK_MISC(l1), 1.0, 0.5);
- gtk_widget_show(l1);
-
- l2 = gtk_label_new("foo2");
- gtk_box_pack_start(GTK_BOX(b3), l2, TRUE, TRUE, 0);
- gtk_misc_set_alignment(GTK_MISC(l2), 0.0, 0.5);
- gtk_widget_show(l2);
-
- GtkWidget *b4 = gtk_hbox_new(FALSE, 4);
- gtk_box_pack_start(GTK_BOX(b2), b4, FALSE, FALSE, 0);
- gtk_widget_show(b4);
- // mode button
- GtkWidget *but = gtk_button_new();
- gtk_button_set_relief(GTK_BUTTON(but), GTK_RELIEF_NONE);
- gtk_box_pack_start(GTK_BOX(b4), but, FALSE, TRUE, 0);
- gtk_signal_connect_while_alive(GTK_OBJECT(but), "clicked", GTK_SIGNAL_FUNC(guide_dialog_mode_changed),
- NULL , GTK_OBJECT(but));
- gtk_widget_show(but);
- m = gtk_label_new(_(" absolute to "));
- mode = true;
- gtk_container_add(GTK_CONTAINER(but), m);
- gtk_widget_show(m);
-
- // unitmenu
- /* fixme: We should allow percents here too, as percents of the canvas size */
- u = sp_unit_selector_new(SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE);
- sp_unit_selector_set_unit(SP_UNIT_SELECTOR(u), desktop->namedview->doc_units);
-
- // spinbutton
- GtkObject *a = gtk_adjustment_new(0.0, -SP_DESKTOP_SCROLL_LIMIT, SP_DESKTOP_SCROLL_LIMIT, 1.0, 10.0, 10.0);
- sp_unit_selector_add_adjustment(SP_UNIT_SELECTOR(u), GTK_ADJUSTMENT(a));
- e = gtk_spin_button_new(GTK_ADJUSTMENT(a), 1.0 , 2);
- gtk_widget_show(e);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(e), TRUE);
- gtk_box_pack_start(GTK_BOX(b4), e, TRUE, TRUE, 0);
- gtk_signal_connect_object(GTK_OBJECT(e), "activate",
- GTK_SIGNAL_FUNC(gtk_window_activate_default),
- GTK_OBJECT(d));
-/* gnome_dialog_editable_enters(GNOME_DIALOG(d), GTK_EDITABLE(e)); */
-
- gtk_widget_show(u);
- gtk_box_pack_start(GTK_BOX(b4), u, FALSE, FALSE, 0);
-
-
- // dialog
- gtk_dialog_set_default_response(GTK_DIALOG(d), GTK_RESPONSE_OK);
- gtk_signal_connect(GTK_OBJECT(d), "response", GTK_SIGNAL_FUNC(guide_dialog_response), &g);
- gtk_signal_connect(GTK_OBJECT(d), "delete_event", GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete), GTK_WIDGET(d));
- }
-
- // initialize dialog
- g = guide;
- oldpos = guide->position;
- {
- char *guide_description = sp_guide_description(guide);
- char *label = g_strdup_printf(_("Move %s"), guide_description);
- g_free(guide_description);
- gtk_label_set(GTK_LABEL(l1), label);
- g_free(label);
- }
-
- SPUnit const &unit = *sp_unit_selector_get_unit(SP_UNIT_SELECTOR(u));
- gdouble const val = sp_pixels_get_units(oldpos, unit);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(e), val);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(e), val);
- gtk_widget_grab_focus(e);
- gtk_editable_select_region(GTK_EDITABLE(e), 0, 20);
- gtk_window_set_position(GTK_WINDOW(d), GTK_WIN_POS_MOUSE);
-
- gtk_widget_show(d);
-}
-
-
/*
Local Variables:
mode:c++