Changed preference to use file chooser button

[inkscape.git] / src / sp-item-group.cpp

diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index ba96ed0d1b37364187bff01509aca25bdf3ac2b5..f1035e9eef6028a234a0eac680c841f90ed6808a 100644 (file)
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -6,8 +6,9 @@
  * Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   bulia byak <buliabyak@users.sf.net>
+ *   Johan Engelen <j.b.c.engelen@ewi.utwente.nl>
  *
- * Copyright (C) 1999-2005 authors
+ * Copyright (C) 1999-2006 authors
  * Copyright (C) 2000-2001 Ximian, Inc.
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
@@ -33,6 +34,7 @@
 #include "prefs-utils.h"
 #include "sp-clippath.h"
 #include "sp-mask.h"
+#include "sp-path.h"
 
 static void sp_group_class_init (SPGroupClass *klass);
 static void sp_group_init (SPGroup *group);
@@ -204,7 +206,10 @@ sp_group_write (SPObject *object, Inkscape::XML::Node *repr, guint flags)
 
        if (flags & SP_OBJECT_WRITE_BUILD) {
                GSList *l;
-               if (!repr) repr = sp_repr_new ("svg:g");
+               if (!repr) {
+                    Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_OBJECT_DOCUMENT(object));
+                    repr = xml_doc->createElement("svg:g");
+                }
                l = NULL;
                for (child = sp_object_first_child(object); child != NULL; child = SP_OBJECT_NEXT(child) ) {
                        crepr = child->updateRepr(NULL, flags);
@@ -293,8 +298,10 @@ static void sp_group_snappoints (SPItem const *item, SnapPointsIter p)
             o != NULL;
             o = SP_OBJECT_NEXT(o))
        {
-               if (SP_IS_ITEM(o)) {
-                       sp_item_snappoints(SP_ITEM(o), p);
+               if (SP_IS_ITEM(o) && !SP_IS_PATH(o)) {
+            // getSnapPoints() and sp_group_snappoints are only being used in the selector tool,
+            // which should not snap path nodes. Only the node tool should snap those.
+            sp_item_snappoints(SP_ITEM(o), false, p);
                }
        }
 }
@@ -360,7 +367,7 @@ sp_item_group_ungroup (SPGroup *group, GSList **children, bool do_done)
 
                        child->updateRepr();
 
-                       Inkscape::XML::Node *nrepr = SP_OBJECT_REPR (child)->duplicate();
+                       Inkscape::XML::Node *nrepr = SP_OBJECT_REPR (child)->duplicate(prepr->document());
 
                        // Merging transform
                        NR::Matrix ctrans;
@@ -383,17 +390,14 @@ sp_item_group_ungroup (SPGroup *group, GSList **children, bool do_done)
                        // This is just a way to temporarily remember the transform in repr. When repr is
                        // reattached outside of the group, the transform will be written more properly
                        // (i.e. optimized into the object if the corresponding preference is set)
-                       gchar affinestr[80];
-                       if (sp_svg_transform_write(affinestr, 79, ctrans)) {
-                               nrepr->setAttribute("transform", affinestr);
-                       } else {
-                               nrepr->setAttribute("transform", NULL);
-                       }
+                       gchar *affinestr=sp_svg_transform_write(ctrans);
+                       nrepr->setAttribute("transform", affinestr);
+                        g_free(affinestr);
 
                        items = g_slist_prepend (items, nrepr);
 
                } else {
-                       Inkscape::XML::Node *nrepr = SP_OBJECT_REPR (child)->duplicate();
+                       Inkscape::XML::Node *nrepr = SP_OBJECT_REPR (child)->duplicate(prepr->document());
                        objects = g_slist_prepend (objects, nrepr);
                }
        }
@@ -416,7 +420,6 @@ sp_item_group_ungroup (SPGroup *group, GSList **children, bool do_done)
        }
 
        /* Step 4 - add items */
-       gint const preserve = prefs_get_int_attribute("options.preservetransform", "value", 0);
        while (items) {
                Inkscape::XML::Node *repr = (Inkscape::XML::Node *) items->data;
                // add item
@@ -428,22 +431,8 @@ sp_item_group_ungroup (SPGroup *group, GSList **children, bool do_done)
                // fill in the children list if non-null
                SPItem *item = (SPItem *) doc->getObjectByRepr(repr);
 
-               /* Optimize the transform matrix if requested. */
-               // No compensations are required because this is supposed to be a non-transformation visually.
-               // FIXME: this if is wholly lifted from sp_item_write_transform and should stay in sync
-               NR::Matrix transform_attr (item->transform);
-               if ( // run the object's set_transform (i.e. embed transform) only if:
-                               ((SPItemClass *) G_OBJECT_GET_CLASS(item))->set_transform && // it does have a set_transform method
-                               !preserve && // user did not chose to preserve all transforms
-                               !item->clip_ref->getObject() && // the object does not have a clippath
-                               !item->mask_ref->getObject() && // the object does not have a mask
-                               !(!transform_attr.is_translation() && SP_OBJECT_STYLE(item) && SP_OBJECT_STYLE(item)->filter.filter) 
-                               // the object does not have a filter, or the transform is translation (which is supposed to not affect filters)
-                               ) {
-                       transform_attr = ((SPItemClass *) G_OBJECT_GET_CLASS(item))->set_transform(item, item->transform);
-               }
-               sp_item_set_item_transform(item, transform_attr);
-
+               sp_item_write_transform(item, repr, item->transform, NULL, false);
+               
                Inkscape::GC::release(repr);
                if (children && SP_IS_ITEM (item))
                        *children = g_slist_prepend (*children, item);