update to trunk + resolve conflicts

(bzr r14504.1.9)

1 files changed, 41 insertions, 0 deletions

diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index fa62cf169..c03019572 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -51,7 +51,9 @@ using Inkscape::Util::unit_table;
 #define DEFAULTPAGECOLOR 0xffffff00
 
 static void sp_namedview_setup_guides(SPNamedView * nv);
+static void sp_namedview_lock_guides(SPNamedView * nv);
 static void sp_namedview_show_single_guide(SPGuide* guide, bool show);
+static void sp_namedview_lock_single_guide(SPGuide* guide, bool show);
 
 static gboolean sp_str_to_bool(const gchar *str);
 static gboolean sp_nv_read_opacity(const gchar *str, guint32 *color);
@@ -79,6 +81,7 @@ SPNamedView::SPNamedView() : SPObjectGroup(), snap_manager(this) {
 
     this->editable = TRUE;
     this->showguides = TRUE;
+    this->lockguides = false;
     this->grids_visible = false;
     this->showborder = TRUE;
     this->showpageshadow = TRUE;
@@ -240,6 +243,7 @@ void SPNamedView::build(SPDocument *document, Inkscape::XML::Node *repr) {
     this->readAttr( "inkscape:snap-page" );
     this->readAttr( "inkscape:current-layer" );
     this->readAttr( "inkscape:connector-spacing" );
+    this->readAttr( "inkscape:lockguides" );
 
     /* Construct guideline list */
     for (SPObject *o = this->firstChild() ; o; o = o->getNext() ) {
@@ -588,6 +592,11 @@ void SPNamedView::set(unsigned int key, const gchar* value) {
             this->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
     }
+    case SP_ATTR_INKSCAPE_LOCKGUIDES:
+        this->lockguides = value ? sp_str_to_bool(value) : FALSE;
+        sp_namedview_lock_guides(this);
+        this->requestModified(SP_OBJECT_MODIFIED_FLAG);
+        break;
     default:
             SPObjectGroup::set(key, value);
             break;
@@ -662,6 +671,7 @@ void SPNamedView::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *r
                     }
 
                     sp_namedview_show_single_guide(SP_GUIDE(g), this->showguides);
+                    sp_namedview_lock_single_guide(SP_GUIDE(g), this->lockguides);
                 }
             }
         }
@@ -712,6 +722,7 @@ void SPNamedView::show(SPDesktop *desktop)
             (*it)->sensitize(desktop->getCanvas(), TRUE);
         }
         sp_namedview_show_single_guide((*it), showguides);
+        sp_namedview_lock_single_guide((*it), lockguides);
     }
 
     views.push_back(desktop);
@@ -928,6 +939,13 @@ static void sp_namedview_setup_guides(SPNamedView *nv)
     }
 }
 
+static void sp_namedview_lock_guides(SPNamedView *nv)
+{
+    for(std::vector<SPGuide *>::iterator it=nv->guides.begin();it!=nv->guides.end();++it ) {
+        sp_namedview_lock_single_guide(*it, nv->lockguides);
+    }
+}
+
 static void sp_namedview_show_single_guide(SPGuide* guide, bool show)
 {
     if (show) {
@@ -937,6 +955,11 @@ static void sp_namedview_show_single_guide(SPGuide* guide, bool show)
     }
 }
 
+static void sp_namedview_lock_single_guide(SPGuide* guide, bool locked)
+{
+    guide->set_locked(locked, true);
+}
+
 void sp_namedview_toggle_guides(SPDocument *doc, Inkscape::XML::Node *repr)
 {
     unsigned int v;
@@ -955,6 +978,23 @@ void sp_namedview_toggle_guides(SPDocument *doc, Inkscape::XML::Node *repr)
     doc->setModifiedSinceSave();
 }
 
+void sp_namedview_guides_toggle_lock(SPDocument *doc, Inkscape::XML::Node *repr)
+{
+    unsigned int v;
+    unsigned int set = sp_repr_get_boolean(repr, "inkscape:lockguides", &v);
+    if (!set) { // hide guides if not specified, for backwards compatibility
+        v = true;
+    } else {
+        v = !v;
+    }
+
+    bool saved = DocumentUndo::getUndoSensitive(doc);
+    DocumentUndo::setUndoSensitive(doc, false);
+    sp_repr_set_boolean(repr, "inkscape:lockguides", v);
+    DocumentUndo::setUndoSensitive(doc, saved);
+    doc->setModifiedSinceSave();
+}
+
 void sp_namedview_show_grids(SPNamedView * namedview, bool show, bool dirty_document)
 {
     namedview->grids_visible = show;
@@ -1053,6 +1093,7 @@ void SPNamedView::setGuides(bool v)
     g_assert(this->getRepr() != NULL);
     sp_repr_set_boolean(this->getRepr(), "showguides", v);
     sp_repr_set_boolean(this->getRepr(), "inkscape:guide-bbox", v);
+    sp_repr_set_boolean(this->getRepr(), "inkscape:locked", false);
 }
 
 bool SPNamedView::getGuides()