angled guidelines: create angled line when dragging from edge of rulers

(bzr r4296)

3 files changed, 14 insertions, 14 deletions

diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index bb9923680..3d9375d2d 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -408,7 +408,7 @@ CanvasAxonomGrid::readRepr()
         visible = (strcmp(value,"true") == 0);
     }
 
-    if ( (value = repr->attribute("snap_enabled")) ) {
+    if ( (value = repr->attribute("enabled")) ) {
         g_assert(snapper != NULL);
         snapper->setEnabled(strcmp(value,"true") == 0);
     }
@@ -453,7 +453,7 @@ CanvasAxonomGrid::updateWidgets()
 
     _rcb_visible.setActive(visible);
     if (snapper != NULL) {
-        _rcb_snap_enabled.setActive(snapper->getEnabled());
+        _rcb_enabled.setActive(snapper->getEnabled());
     }
 
     _rumg.setUnit (gridunit);
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 021a62f96..8d7bdd0e8 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -174,15 +174,15 @@ CanvasGrid::CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocume
     namelabel.set_markup(str);
     vbox.pack_start(namelabel, true, true);
 
+    _rcb_enabled.init ( _("_Enabled"),
+                        _("Determines whether to snap to this grid or not. Can be 'on' for invisible grids."),
+                         "enabled", _wr, false, repr, doc);
+    vbox.pack_start(*dynamic_cast<Gtk::Widget*>(_rcb_enabled._button), true, true);
+
     _rcb_visible.init ( _("_Visible"),
                         _("Determines whether the grid is displayed or not. Objects are still snapped to invisible grids."),
-                         "visible", _wr, false, repr, doc);
+                         "visible", _wr, true, repr, doc);
     vbox.pack_start(*dynamic_cast<Gtk::Widget*>(_rcb_visible._button), true, true);
-
-    _rcb_snap_enabled.init ( _("_Snapping enabled"),
-                        _("Determines whether to snap to this grid or not. Can be 'on' for invisible grids."),
-                         "snap_enabled", _wr, false, repr, doc);
-    vbox.pack_start(*dynamic_cast<Gtk::Widget*>(_rcb_snap_enabled._button), true, true);
 }
 
 CanvasGrid::~CanvasGrid()
@@ -334,7 +334,7 @@ CanvasGrid::on_repr_attr_changed(Inkscape::XML::Node *repr, gchar const *key, gc
     ((CanvasGrid*) data)->onReprAttrChanged(repr, key, oldval, newval, is_interactive);
 }
 
-bool CanvasGrid::isSnapEnabled() 
+bool CanvasGrid::isEnabled() 
 { 
     if (snapper == NULL) {
        return false;
@@ -657,7 +657,7 @@ CanvasXYGrid::readRepr()
         visible = (strcmp(value,"true") == 0);
     }
     
-    if ( (value = repr->attribute("snap_enabled")) ) {
+    if ( (value = repr->attribute("enabled")) ) {
         g_assert(snapper != NULL);
         snapper->setEnabled(strcmp(value,"true") == 0);
     }
@@ -703,7 +703,7 @@ CanvasXYGrid::updateWidgets()
 
     _rcb_visible.setActive(visible);
     if (snapper != NULL) {
-        _rcb_snap_enabled.setActive(snapper->getEnabled());
+        _rcb_enabled.setActive(snapper->getEnabled());
     }
 
     _rumg.setUnit (gridunit);
diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h
index bc21a14aa..b8ed8174c 100644
--- a/src/display/canvas-grid.h
+++ b/src/display/canvas-grid.h
@@ -98,8 +98,8 @@ public:
 
     static void on_repr_attr_changed (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive, void * data);
 
-    bool isVisible() { return visible; };
-    bool isSnapEnabled();
+    bool isVisible() { return (isEnabled() &&visible); };
+    bool isEnabled();
 
 protected:
     CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument *in_doc, GridType type);
@@ -114,7 +114,7 @@ protected:
     Inkscape::UI::Widget::Registry _wr;
     Inkscape::UI::Widget::RegisteredCheckButton _rcb_visible;
     bool visible;
-    Inkscape::UI::Widget::RegisteredCheckButton _rcb_snap_enabled;
+    Inkscape::UI::Widget::RegisteredCheckButton _rcb_enabled;
     
     GridType gridtype;