X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fselection-chemistry.cpp;h=c6e2e615332d5f9a8afb6918180c32143878d552;hb=99fae8b11f74e464ad0f55a7bfcc02933c4c1747;hp=4cf34e2c565e8f84297ae574995e3797486486b2;hpb=307028df56a44d307292d92f319456ad88d6081f;p=inkscape.git diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index 4cf34e2c5..c6e2e6153 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -1,9 +1,9 @@ #define __SP_SELECTION_CHEMISTRY_C__ -/* - * Miscellanous operations on selected items - * - * Authors: +/** @file + * @brief Miscellanous operations on selected items + */ +/* Authors: * Lauris Kaplinski * Frank Felfe * MenTaLguY @@ -20,6 +20,8 @@ # include "config.h" #endif +#include "selection-chemistry.h" + #include #include "svg/svg.h" @@ -70,6 +72,8 @@ #include "layer-fns.h" #include "context-fns.h" #include +#include +#include #include "helper/units.h" #include "sp-item.h" #include "box3d.h" @@ -78,21 +82,24 @@ #include "sp-filter-reference.h" #include "gradient-drag.h" #include "uri-references.h" -#include "live_effects/lpeobject.h" +#include "libnr/nr-convert2geom.h" +#include "display/curve.h" +#include "display/canvas-bpath.h" -using NR::X; -using NR::Y; +// For clippath editing +#include "tools-switch.h" +#include "shape-editor.h" +#include "node-context.h" +#include "nodepath.h" -#include "selection-chemistry.h" +#include "ui/clipboard.h" -/* fixme: find a better place */ -Inkscape::XML::Document *clipboard_document = NULL; -GSList *clipboard = NULL; -GSList *defs_clipboard = NULL; -SPCSSAttr *style_clipboard = NULL; -NR::Maybe size_clipboard; +using NR::X; +using NR::Y; -static void sp_copy_stuff_used_by_item(GSList **defs_clip, SPItem *item, GSList const *items, Inkscape::XML::Document* xml_doc); +/* The clipboard handling is in ui/clipboard.cpp now. There are some legacy functions left here, +because the layer manipulation code uses them. It should be rewritten specifically +for that purpose. */ /** * Copies repr and its inherited css style elements, along with the accumulated transform 'full_t', @@ -117,66 +124,24 @@ void sp_selection_copy_one (Inkscape::XML::Node *repr, NR::Matrix full_t, GSList *clip = g_slist_prepend(*clip, copy); } -void sp_selection_copy_impl (GSList const *items, GSList **clip, GSList **defs_clip, SPCSSAttr **style_clip, Inkscape::XML::Document* xml_doc) +void sp_selection_copy_impl (GSList const *items, GSList **clip, Inkscape::XML::Document* xml_doc) { + // Sort items: + GSList *sorted_items = g_slist_copy ((GSList *) items); + sorted_items = g_slist_sort((GSList *) sorted_items, (GCompareFunc) sp_object_compare_position); - // Copy stuff referenced by all items to defs_clip: - if (defs_clip) { - for (GSList *i = (GSList *) items; i != NULL; i = i->next) { - sp_copy_stuff_used_by_item (defs_clip, SP_ITEM (i->data), items, xml_doc); - } - *defs_clip = g_slist_reverse(*defs_clip); - } - - // Store style: - if (style_clip) { - SPItem *item = SP_ITEM (items->data); // take from the first selected item - *style_clip = take_style_from_item (item); + // Copy item reprs: + for (GSList *i = (GSList *) sorted_items; i != NULL; i = i->next) { + sp_selection_copy_one (SP_OBJECT_REPR (i->data), sp_item_i2doc_affine(SP_ITEM (i->data)), clip, xml_doc); } - if (clip) { - // Sort items: - GSList *sorted_items = g_slist_copy ((GSList *) items); - sorted_items = g_slist_sort((GSList *) sorted_items, (GCompareFunc) sp_object_compare_position); - - // Copy item reprs: - for (GSList *i = (GSList *) sorted_items; i != NULL; i = i->next) { - sp_selection_copy_one (SP_OBJECT_REPR (i->data), sp_item_i2doc_affine(SP_ITEM (i->data)), clip, xml_doc); - } - - *clip = g_slist_reverse(*clip); - g_slist_free ((GSList *) sorted_items); - } + *clip = g_slist_reverse(*clip); + g_slist_free ((GSList *) sorted_items); } -/** - * Add gradients/patterns/markers referenced by copied objects to defs. - * Iterates through 'defs_clip', and for each item it adds the data - * repr into the global defs. - */ -void -paste_defs (GSList **defs_clip, SPDocument *doc) -{ - if (!defs_clip) - return; - - for (GSList *gl = *defs_clip; gl != NULL; gl = gl->next) { - SPDefs *defs= (SPDefs *) SP_DOCUMENT_DEFS(doc); - Inkscape::XML::Node *repr = (Inkscape::XML::Node *) gl->data; - gchar const *id = repr->attribute("id"); - if (!id || !doc->getObjectById(id)) { - Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc); - Inkscape::XML::Node *copy = repr->duplicate(xml_doc); - SP_OBJECT_REPR(defs)->addChild(copy, NULL); - Inkscape::GC::release(copy); - } - } -} - -GSList *sp_selection_paste_impl (SPDocument *doc, SPObject *parent, GSList **clip, GSList **defs_clip) +GSList *sp_selection_paste_impl (SPDocument *doc, SPObject *parent, GSList **clip) { Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc); - paste_defs (defs_clip, doc); GSList *copied = NULL; // add objects to document @@ -185,7 +150,7 @@ GSList *sp_selection_paste_impl (SPDocument *doc, SPObject *parent, GSList **cli Inkscape::XML::Node *copy = repr->duplicate(xml_doc); // premultiply the item transform by the accumulated parent transform in the paste layer - NR::Matrix local = sp_item_i2doc_affine(SP_ITEM(parent)); + NR::Matrix local (sp_item_i2doc_affine(SP_ITEM(parent))); if (!local.test_identity()) { gchar const *t_str = copy->attribute("transform"); NR::Matrix item_t (NR::identity()); @@ -257,14 +222,28 @@ void sp_selection_delete() _("Delete")); } -/* fixme: sequencing */ -void sp_selection_duplicate() +void add_ids_recursive (std::vector &ids, SPObject *obj) +{ + if (!obj) + return; + + ids.push_back(SP_OBJECT_ID(obj)); + + if (SP_IS_GROUP(obj)) { + for (SPObject *child = sp_object_first_child(obj) ; child != NULL; child = SP_OBJECT_NEXT(child) ) { + add_ids_recursive (ids, child); + } + } +} + +void sp_selection_duplicate(bool suppressDone) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop == NULL) return; - Inkscape::XML::Document* xml_doc = sp_document_repr_doc(desktop->doc()); + SPDocument *doc = desktop->doc(); + Inkscape::XML::Document* xml_doc = sp_document_repr_doc(doc); Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected @@ -277,24 +256,64 @@ void sp_selection_duplicate() selection->clear(); - // sorting items from different parents sorts each parent's subset without possibly mixing them, just what we need + // sorting items from different parents sorts each parent's subset without possibly mixing + // them, just what we need reprs = g_slist_sort(reprs, (GCompareFunc) sp_repr_compare_position); GSList *newsel = NULL; + std::vector old_ids; + std::vector new_ids; + bool relink_clones = prefs_get_int_attribute ("options.relinkclonesonduplicate", "value", 0); + while (reprs) { - Inkscape::XML::Node *parent = ((Inkscape::XML::Node *) reprs->data)->parent(); - Inkscape::XML::Node *copy = ((Inkscape::XML::Node *) reprs->data)->duplicate(xml_doc); + Inkscape::XML::Node *old_repr = (Inkscape::XML::Node *) reprs->data; + Inkscape::XML::Node *parent = old_repr->parent(); + Inkscape::XML::Node *copy = old_repr->duplicate(xml_doc); parent->appendChild(copy); + if (relink_clones) { + SPObject *old_obj = doc->getObjectByRepr(old_repr); + SPObject *new_obj = doc->getObjectByRepr(copy); + add_ids_recursive (old_ids, old_obj); + add_ids_recursive (new_ids, new_obj); + } + newsel = g_slist_prepend(newsel, copy); reprs = g_slist_remove(reprs, reprs->data); Inkscape::GC::release(copy); } - sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DUPLICATE, - _("Duplicate")); + if (relink_clones) { + + g_assert (old_ids.size() == new_ids.size()); + + for(unsigned int i = 0; i < old_ids.size(); i++) { + const gchar *id = old_ids[i]; + SPObject *old_clone = doc->getObjectById(id); + if (SP_IS_USE(old_clone)) { + SPItem *orig = sp_use_get_original(SP_USE(old_clone)); + for(unsigned int j = 0; j < old_ids.size(); j++) { + if (!strcmp(SP_OBJECT_ID(orig), old_ids[j])) { + // we have both orig and clone in selection, relink + // std::cout << id << " old, its ori: " << SP_OBJECT_ID(orig) << "; will relink:" << new_ids[i] << " to " << new_ids[j] << "\n"; + gchar *newref = g_strdup_printf ("#%s", new_ids[j]); + SPObject *new_clone = doc->getObjectById(new_ids[i]); + SP_OBJECT_REPR(new_clone)->setAttribute("xlink:href", newref); + new_clone->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + g_free (newref); + } + } + } + } + } + + + if ( !suppressDone ) { + sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DUPLICATE, + _("Duplicate")); + } selection->setReprList(newsel); @@ -491,7 +510,7 @@ void sp_selection_group() sp_repr_unparent(current); // paste into topmost_parent (temporarily) - GSList *copied = sp_selection_paste_impl (doc, doc->getObjectByRepr(topmost_parent), &temp_clip, NULL); + GSList *copied = sp_selection_paste_impl (doc, doc->getObjectByRepr(topmost_parent), &temp_clip); if (temp_clip) g_slist_free (temp_clip); if (copied) { // if success, // take pasted object (now in topmost_parent) @@ -602,12 +621,12 @@ sp_item_list_common_parent_group(GSList const *items) } /** Finds out the minimum common bbox of the selected items. */ -static NR::Maybe +static boost::optional enclose_items(GSList const *items) { g_assert(items != NULL); - NR::Maybe r = NR::Nothing(); + boost::optional r; for (GSList const *i = items; i; i = i->next) { r = NR::union_bounds(r, sp_item_bbox_desktop((SPItem *) i->data)); } @@ -656,7 +675,7 @@ sp_selection_raise() rev = g_slist_sort(rev, (GCompareFunc) sp_item_repr_compare_position); // Determine the common bbox of the selected items. - NR::Maybe selected = enclose_items(items); + boost::optional selected = enclose_items(items); // Iterate over all objects in the selection (starting from top). if (selected) { @@ -666,7 +685,7 @@ sp_selection_raise() for (SPObject *newref = child->next; newref; newref = newref->next) { // if the sibling is an item AND overlaps our selection, if (SP_IS_ITEM(newref)) { - NR::Maybe newref_bbox = sp_item_bbox_desktop(SP_ITEM(newref)); + boost::optional newref_bbox = sp_item_bbox_desktop(SP_ITEM(newref)); if ( newref_bbox && selected->intersects(*newref_bbox) ) { // AND if it's not one of our selected objects, if (!g_slist_find((GSList *) items, newref)) { @@ -684,7 +703,8 @@ sp_selection_raise() } sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_RAISE, - _("Raise")); + //TRANSLATORS: Only put the word "Raise" in the translation. Means "to raise an object" in the undo history + Q_("undo_action|Raise")); } void sp_selection_raise_to_top() @@ -747,7 +767,7 @@ sp_selection_lower() Inkscape::XML::Node *grepr = SP_OBJECT_REPR(group); // Determine the common bbox of the selected items. - NR::Maybe selected = enclose_items(items); + boost::optional selected = enclose_items(items); /* Construct direct-ordered list of selected children. */ GSList *rev = g_slist_copy((GSList *) items); @@ -762,7 +782,7 @@ sp_selection_lower() for (SPObject *newref = prev_sibling(child); newref; newref = prev_sibling(newref)) { // if the sibling is an item AND overlaps our selection, if (SP_IS_ITEM(newref)) { - NR::Maybe ref_bbox = sp_item_bbox_desktop(SP_ITEM(newref)); + boost::optional ref_bbox = sp_item_bbox_desktop(SP_ITEM(newref)); if ( ref_bbox && selected->intersects(*ref_bbox) ) { // AND if it's not one of our selected objects, if (!g_slist_find((GSList *) items, newref)) { @@ -855,141 +875,6 @@ void sp_selection_cut() sp_selection_delete(); } -void sp_copy_gradient (GSList **defs_clip, SPGradient *gradient, Inkscape::XML::Document* xml_doc) -{ - SPGradient *ref = gradient; - - while (ref) { - // climb up the refs, copying each one in the chain - Inkscape::XML::Node *grad_repr = SP_OBJECT_REPR(ref)->duplicate(xml_doc); - *defs_clip = g_slist_prepend (*defs_clip, grad_repr); - - ref = ref->ref->getObject(); - } -} - -void sp_copy_pattern (GSList **defs_clip, SPPattern *pattern, Inkscape::XML::Document* xml_doc) -{ - SPPattern *ref = pattern; - - while (ref) { - // climb up the refs, copying each one in the chain - Inkscape::XML::Node *pattern_repr = SP_OBJECT_REPR(ref)->duplicate(xml_doc); - *defs_clip = g_slist_prepend (*defs_clip, pattern_repr); - - // items in the pattern may also use gradients and other patterns, so we need to recurse here as well - for (SPObject *child = sp_object_first_child(SP_OBJECT(ref)) ; child != NULL; child = SP_OBJECT_NEXT(child) ) { - if (!SP_IS_ITEM (child)) - continue; - sp_copy_stuff_used_by_item (defs_clip, (SPItem *) child, NULL, xml_doc); - } - - ref = ref->ref->getObject(); - } -} - -void sp_copy_single (GSList **defs_clip, SPObject *thing, Inkscape::XML::Document* xml_doc) -{ - Inkscape::XML::Node *duplicate_repr = SP_OBJECT_REPR(thing)->duplicate(xml_doc); - *defs_clip = g_slist_prepend (*defs_clip, duplicate_repr); -} - - -void sp_copy_textpath_path (GSList **defs_clip, SPTextPath *tp, GSList const *items, Inkscape::XML::Document* xml_doc) -{ - SPItem *path = sp_textpath_get_path_item (tp); - if (!path) - return; - if (items && g_slist_find ((GSList *) items, path)) // do not copy it to defs if it is already in the list of items copied - return; - Inkscape::XML::Node *repr = SP_OBJECT_REPR(path)->duplicate(xml_doc); - *defs_clip = g_slist_prepend (*defs_clip, repr); -} - -/** - * Copies things like patterns, markers, gradients, etc. - */ -void sp_copy_stuff_used_by_item (GSList **defs_clip, SPItem *item, GSList const *items, Inkscape::XML::Document* xml_doc) -{ - SPStyle *style = SP_OBJECT_STYLE (item); - - if (style && (style->fill.isPaintserver())) { - SPObject *server = SP_OBJECT_STYLE_FILL_SERVER(item); - if (SP_IS_LINEARGRADIENT (server) || SP_IS_RADIALGRADIENT (server)) - sp_copy_gradient (defs_clip, SP_GRADIENT(server), xml_doc); - if (SP_IS_PATTERN (server)) - sp_copy_pattern (defs_clip, SP_PATTERN(server), xml_doc); - } - - if (style && (style->stroke.isPaintserver())) { - SPObject *server = SP_OBJECT_STYLE_STROKE_SERVER(item); - if (SP_IS_LINEARGRADIENT (server) || SP_IS_RADIALGRADIENT (server)) - sp_copy_gradient (defs_clip, SP_GRADIENT(server), xml_doc); - if (SP_IS_PATTERN (server)) - sp_copy_pattern (defs_clip, SP_PATTERN(server), xml_doc); - } - - // For shapes, copy all of the shape's markers into defs_clip - if (SP_IS_SHAPE (item)) { - SPShape *shape = SP_SHAPE (item); - for (int i = 0 ; i < SP_MARKER_LOC_QTY ; i++) { - if (shape->marker[i]) { - sp_copy_single (defs_clip, SP_OBJECT (shape->marker[i]), xml_doc); - } - } - - // For shapes, also copy liveeffect if applicable - if (sp_shape_has_path_effect(shape)) { - sp_copy_single (defs_clip, SP_OBJECT(sp_shape_get_livepatheffectobject(shape)), xml_doc); - } - } - - if (SP_IS_TEXT_TEXTPATH (item)) { - sp_copy_textpath_path (defs_clip, SP_TEXTPATH(sp_object_first_child(SP_OBJECT(item))), items, xml_doc); - } - - if (item->clip_ref->getObject()) { - sp_copy_single (defs_clip, item->clip_ref->getObject(), xml_doc); - } - - if (item->mask_ref->getObject()) { - SPObject *mask = item->mask_ref->getObject(); - sp_copy_single (defs_clip, mask, xml_doc); - // recurse into the mask for its gradients etc. - for (SPObject *o = SP_OBJECT(mask)->children; o != NULL; o = o->next) { - if (SP_IS_ITEM(o)) - sp_copy_stuff_used_by_item (defs_clip, SP_ITEM (o), items, xml_doc); - } - } - - if (style->getFilter()) { - SPObject *filter = style->getFilter(); - if (SP_IS_FILTER(filter)) { - sp_copy_single (defs_clip, filter, xml_doc); - } - } - - // recurse - for (SPObject *o = SP_OBJECT(item)->children; o != NULL; o = o->next) { - if (SP_IS_ITEM(o)) - sp_copy_stuff_used_by_item (defs_clip, SP_ITEM (o), items, xml_doc); - } -} - -void -sp_set_style_clipboard (SPCSSAttr *css) -{ - if (css != NULL) { - // clear style clipboard - if (style_clipboard) { - sp_repr_css_attr_unref (style_clipboard); - style_clipboard = NULL; - } - //sp_repr_css_print (css); - style_clipboard = css; - } -} - /** * \pre item != NULL */ @@ -1033,357 +918,105 @@ take_style_from_item (SPItem *item) void sp_selection_copy() { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; - if (desktop == NULL) - return; - - if (!clipboard_document) { - clipboard_document = new Inkscape::XML::SimpleDocument(); - } - - Inkscape::Selection *selection = sp_desktop_selection(desktop); - - if (tools_isactive (desktop, TOOLS_DROPPER)) { - sp_dropper_context_copy(desktop->event_context); - return; // copied color under cursor, nothing else to do - } - - if (desktop->event_context->get_drag() && desktop->event_context->get_drag()->copy()) { - return; // copied selected stop(s), nothing else to do - } - - // check if something is selected - if (selection->isEmpty()) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing was copied.")); - return; - } - - GSList const *items = g_slist_copy ((GSList *) selection->itemList()); - - // 0. Copy text to system clipboard - // FIXME: for non-texts, put serialized Inkscape::XML as text to the clipboard; - //for this sp_repr_write_stream needs to be rewritten with iostream instead of FILE - Glib::ustring text; - if (tools_isactive (desktop, TOOLS_TEXT)) { - text = sp_text_get_selected_text(desktop->event_context); - } - - if (text.empty()) { - guint texts = 0; - for (GSList *i = (GSList *) items; i; i = i->next) { - SPItem *item = SP_ITEM (i->data); - if (SP_IS_TEXT (item) || SP_IS_FLOWTEXT(item)) { - if (texts > 0) // if more than one text object is copied, separate them by spaces - text += " "; - gchar *this_text = sp_te_get_string_multiline (item); - if (this_text) { - text += this_text; - g_free(this_text); - } - texts++; - } - } - } - if (!text.empty()) { - Glib::RefPtr refClipboard = Gtk::Clipboard::get(); - refClipboard->set_text(text); - } - - // clear old defs clipboard - while (defs_clipboard) { - Inkscape::GC::release((Inkscape::XML::Node *) defs_clipboard->data); - defs_clipboard = g_slist_remove (defs_clipboard, defs_clipboard->data); - } - - // clear style clipboard - if (style_clipboard) { - sp_repr_css_attr_unref (style_clipboard); - style_clipboard = NULL; - } - - //clear main clipboard - while (clipboard) { - Inkscape::GC::release((Inkscape::XML::Node *) clipboard->data); - clipboard = g_slist_remove(clipboard, clipboard->data); - } - - sp_selection_copy_impl (items, &clipboard, &defs_clipboard, &style_clipboard, clipboard_document); - - if (tools_isactive (desktop, TOOLS_TEXT)) { // take style from cursor/text selection, overwriting the style just set by copy_impl - SPStyle *const query = sp_style_new(SP_ACTIVE_DOCUMENT); - if (sp_desktop_query_style_all (desktop, query)) { - SPCSSAttr *css = sp_css_attr_from_style (query, SP_STYLE_FLAG_ALWAYS); - sp_set_style_clipboard (css); - } - sp_style_unref(query); - } - - size_clipboard = selection->bounds(); - - g_slist_free ((GSList *) items); + Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get(); + cm->copy(); } -//____________________________________________________________________________ - -/** Paste the bitmap in the clipboard if one is in there. - The bitmap is saved to a PNG file then imported into the document - - @return true if a bitmap was detected and pasted; false if no bitmap -*/ -static bool pastedPicFromClipboard() -{ - SPDesktop *desktop = SP_ACTIVE_DESKTOP; - SPDocument *doc = SP_ACTIVE_DOCUMENT; - if ( desktop == NULL || doc == NULL) - return false; - - Glib::RefPtr refClipboard = Gtk::Clipboard::get(); - Glib::RefPtr pic = refClipboard->wait_for_image(); - - // Stop if the system clipboard doesn't have a bitmap. - if ( pic == 0 ) - { - return false; - } //if - else - { - // Write into a file, then import the file into the document. - // Make a file name based on current time; use the current working dir. - time_t rawtime; - char filename[50]; - const char* path; - - time ( &rawtime ); - strftime (filename,50,"pastedpic_%m%d%Y_%H%M%S.png",localtime( &rawtime )); - path = (char *)prefs_get_string_attribute("dialogs.save_as", "path"); - Glib::ustring finalPath = path; - finalPath.append(G_DIR_SEPARATOR_S).append(filename); - pic->save( finalPath, "png" ); - file_import(doc, finalPath, NULL); - - // Clear the clipboard so that the bitmap in there won't always over - // ride the normal inkscape clipboard.This isn't the ideal solution. - refClipboard->set_text(""); - return true; - } //else - - return false; -} //pastedPicFromClipboard - -//____________________________________________________________________________ - void sp_selection_paste(bool in_place) { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; - - if (desktop == NULL) { - return; - } - - SPDocument *document = sp_desktop_document(desktop); - - if (Inkscape::have_viable_layer(desktop, desktop->messageStack()) == false) { - return; - } - - Inkscape::Selection *selection = sp_desktop_selection(desktop); - - if (tools_isactive (desktop, TOOLS_TEXT)) { - if (sp_text_paste_inline(desktop->event_context)) - return; // pasted from system clipboard into text, nothing else to do - } - - // check if something is in the clipboard - - // Stop if successfully pasted a clipboard bitmap. - if ( pastedPicFromClipboard() ) - return; - - - if (clipboard == NULL) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing in the clipboard.")); - return; - } - - GSList *copied = sp_selection_paste_impl(document, desktop->currentLayer(), &clipboard, &defs_clipboard); - // add pasted objects to selection - selection->setReprList((GSList const *) copied); - g_slist_free (copied); - - if (!in_place) { - sp_document_ensure_up_to_date(document); - - NR::Maybe sel_bbox = selection->bounds(); - NR::Point m( desktop->point() ); - if (sel_bbox) { - m -= sel_bbox->midpoint(); - } - - sp_selection_move_relative(selection, m); - } - - sp_document_done(document, SP_VERB_EDIT_PASTE, _("Paste")); + Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get(); + if(cm->paste(in_place)) + sp_document_done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_PASTE, _("Paste")); } void sp_selection_paste_style() { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; - if (desktop == NULL) return; - - Inkscape::Selection *selection = sp_desktop_selection(desktop); - - // check if something is in the clipboard - if (style_clipboard == NULL) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing on the style clipboard.")); - return; - } + Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get(); + if(cm->pasteStyle()) + sp_document_done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_PASTE_STYLE, _("Paste style")); +} - // check if something is selected - if (selection->isEmpty()) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to paste style to.")); - return; - } - paste_defs (&defs_clipboard, sp_desktop_document(desktop)); +void sp_selection_paste_livepatheffect() +{ + Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get(); + if(cm->pastePathEffect()) + sp_document_done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_PASTE_LIVEPATHEFFECT, + _("Paste live path effect")); +} - sp_desktop_set_style (desktop, style_clipboard); - sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_PASTE_STYLE, - _("Paste style")); +void sp_selection_remove_livepatheffect_impl(SPItem *item) +{ + if ( item && SP_IS_LPE_ITEM(item) ) { + sp_lpe_item_remove_all_path_effects(SP_LPE_ITEM(item), false); + } } -void sp_selection_paste_livepatheffect() +void sp_selection_remove_livepatheffect() { SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop == NULL) return; Inkscape::Selection *selection = sp_desktop_selection(desktop); - // check if something is in the clipboard - if (clipboard == NULL) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing on the clipboard.")); - return; - } - // check if something is selected if (selection->isEmpty()) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to paste live path effect to.")); - return; - } - - SPDocument *doc = sp_desktop_document(desktop); - paste_defs (&defs_clipboard, doc); - - Inkscape::XML::Node *repr = (Inkscape::XML::Node *) clipboard->data; - char const *effecturi = repr->attribute("inkscape:path-effect"); - if (!effecturi) { - SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Clipboard does not contain a live path effect.")); + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to remove live path effects from.")); return; } for ( GSList const *itemlist = selection->itemList(); itemlist != NULL; itemlist = g_slist_next(itemlist) ) { SPItem *item = reinterpret_cast(itemlist->data); - if ( item && SP_IS_SHAPE(item) ) { - SPShape * shape = SP_SHAPE(item); - - // create a private LPE object! - SPObject * obj = sp_uri_reference_resolve(doc, effecturi); - LivePathEffectObject * lpeobj = LIVEPATHEFFECT(obj)->fork_private_if_necessary(0); - - sp_shape_set_path_effect(shape, lpeobj); - - // set inkscape:original-d for paths. the other shapes don't need this. - if ( SP_IS_PATH(item) ) { - Inkscape::XML::Node *pathrepr = SP_OBJECT_REPR(item); - if ( ! pathrepr->attribute("inkscape:original-d") ) { - pathrepr->setAttribute("inkscape:original-d", pathrepr->attribute("d")); - } - } - } + + sp_selection_remove_livepatheffect_impl(item); + } - sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_PASTE_LIVEPATHEFFECT, - _("Paste live path effect")); + sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_REMOVE_LIVEPATHEFFECT, + _("Remove live path effect")); } -void sp_selection_paste_size (bool apply_x, bool apply_y) +void sp_selection_remove_filter () { SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop == NULL) return; Inkscape::Selection *selection = sp_desktop_selection(desktop); - // check if something is in the clipboard - if (!size_clipboard) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing on the clipboard.")); - return; - } - // check if something is selected if (selection->isEmpty()) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to paste size to.")); + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to remove filters from.")); return; } - NR::Maybe current = selection->bounds(); - if ( !current || current->isEmpty() ) { - return; - } + SPCSSAttr *css = sp_repr_css_attr_new(); + sp_repr_css_unset_property(css, "filter"); + sp_desktop_set_style(desktop, css); + sp_repr_css_attr_unref(css); - double scale_x = size_clipboard->extent(NR::X) / current->extent(NR::X); - double scale_y = size_clipboard->extent(NR::Y) / current->extent(NR::Y); + sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_REMOVE_FILTER, + _("Remove filter")); +} - sp_selection_scale_relative (selection, current->midpoint(), - NR::scale( - apply_x? scale_x : (desktop->isToolboxButtonActive ("lock")? scale_y : 1.0), - apply_y? scale_y : (desktop->isToolboxButtonActive ("lock")? scale_x : 1.0))); - sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_PASTE_SIZE, +void sp_selection_paste_size (bool apply_x, bool apply_y) +{ + Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get(); + if(cm->pasteSize(false, apply_x, apply_y)) + sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_EDIT_PASTE_SIZE, _("Paste size")); } void sp_selection_paste_size_separately (bool apply_x, bool apply_y) { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; - if (desktop == NULL) return; - - Inkscape::Selection *selection = sp_desktop_selection(desktop); - - // check if something is in the clipboard - if ( !size_clipboard ) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing on the clipboard.")); - return; - } - - // check if something is selected - if (selection->isEmpty()) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to paste size to.")); - return; - } - - for (GSList const *l = selection->itemList(); l != NULL; l = l->next) { - SPItem *item = SP_ITEM(l->data); - - NR::Maybe current = sp_item_bbox_desktop(item); - if ( !current || current->isEmpty() ) { - continue; - } - - double scale_x = size_clipboard->extent(NR::X) / current->extent(NR::X); - double scale_y = size_clipboard->extent(NR::Y) / current->extent(NR::Y); - - sp_item_scale_rel (item, - NR::scale( - apply_x? scale_x : (desktop->isToolboxButtonActive ("lock")? scale_y : 1.0), - apply_y? scale_y : (desktop->isToolboxButtonActive ("lock")? scale_x : 1.0))); - - } - - sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_PASTE_SIZE_SEPARATELY, + Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get(); + if(cm->pasteSize(true, apply_x, apply_y)) + sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_EDIT_PASTE_SIZE_SEPARATELY, _("Paste size separately")); } -void sp_selection_to_next_layer () +void sp_selection_to_next_layer(bool suppressDone) { SPDesktop *dt = SP_ACTIVE_DESKTOP; @@ -1401,22 +1034,24 @@ void sp_selection_to_next_layer () SPObject *next=Inkscape::next_layer(dt->currentRoot(), dt->currentLayer()); if (next) { GSList *temp_clip = NULL; - sp_selection_copy_impl (items, &temp_clip, NULL, NULL, sp_document_repr_doc(dt->doc())); // we're in the same doc, so no need to copy defs + sp_selection_copy_impl (items, &temp_clip, sp_document_repr_doc(dt->doc())); sp_selection_delete_impl (items, false, false); next=Inkscape::next_layer(dt->currentRoot(), dt->currentLayer()); // Fixes bug 1482973: crash while moving layers GSList *copied; if(next) { - copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip, NULL); + copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip); } else { - copied = sp_selection_paste_impl (sp_desktop_document (dt), dt->currentLayer(), &temp_clip, NULL); + copied = sp_selection_paste_impl (sp_desktop_document (dt), dt->currentLayer(), &temp_clip); no_more = true; } selection->setReprList((GSList const *) copied); g_slist_free (copied); if (temp_clip) g_slist_free (temp_clip); if (next) dt->setCurrentLayer(next); - sp_document_done(sp_desktop_document (dt), SP_VERB_LAYER_MOVE_TO_NEXT, - _("Raise to next layer")); + if ( !suppressDone ) { + sp_document_done(sp_desktop_document (dt), SP_VERB_LAYER_MOVE_TO_NEXT, + _("Raise to next layer")); + } } else { no_more = true; } @@ -1428,7 +1063,7 @@ void sp_selection_to_next_layer () g_slist_free ((GSList *) items); } -void sp_selection_to_prev_layer () +void sp_selection_to_prev_layer(bool suppressDone) { SPDesktop *dt = SP_ACTIVE_DESKTOP; @@ -1446,22 +1081,24 @@ void sp_selection_to_prev_layer () SPObject *next=Inkscape::previous_layer(dt->currentRoot(), dt->currentLayer()); if (next) { GSList *temp_clip = NULL; - sp_selection_copy_impl (items, &temp_clip, NULL, NULL, sp_document_repr_doc(dt->doc())); // we're in the same doc, so no need to copy defs + sp_selection_copy_impl (items, &temp_clip, sp_document_repr_doc(dt->doc())); // we're in the same doc, so no need to copy defs sp_selection_delete_impl (items, false, false); next=Inkscape::previous_layer(dt->currentRoot(), dt->currentLayer()); // Fixes bug 1482973: crash while moving layers GSList *copied; if(next) { - copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip, NULL); + copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip); } else { - copied = sp_selection_paste_impl (sp_desktop_document (dt), dt->currentLayer(), &temp_clip, NULL); + copied = sp_selection_paste_impl (sp_desktop_document (dt), dt->currentLayer(), &temp_clip); no_more = true; } selection->setReprList((GSList const *) copied); g_slist_free (copied); if (temp_clip) g_slist_free (temp_clip); if (next) dt->setCurrentLayer(next); - sp_document_done(sp_desktop_document (dt), SP_VERB_LAYER_MOVE_TO_PREV, - _("Lower to previous layer")); + if ( !suppressDone ) { + sp_document_done(sp_desktop_document (dt), SP_VERB_LAYER_MOVE_TO_PREV, + _("Lower to previous layer")); + } } else { no_more = true; } @@ -1596,8 +1233,8 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, NR::Matrix const // calculate the matrix we need to apply to the clone to cancel its induced transform from its original NR::Matrix parent_transform = sp_item_i2root_affine(SP_ITEM(SP_OBJECT_PARENT (item))); - NR::Matrix t = parent_transform * matrix_to_desktop (matrix_from_desktop (affine, item), item) * parent_transform.inverse(); - NR::Matrix t_inv =parent_transform * matrix_to_desktop (matrix_from_desktop (affine.inverse(), item), item) * parent_transform.inverse(); + NR::Matrix t = parent_transform * from_2geom(matrix_to_desktop (matrix_from_desktop (affine, item), item)) * parent_transform.inverse(); + NR::Matrix t_inv =parent_transform * from_2geom(matrix_to_desktop (matrix_from_desktop (affine.inverse(), item), item)) * parent_transform.inverse(); NR::Matrix result = t_inv * item->transform * t; if ((prefs_parallel || prefs_unmoved) && affine.is_translation()) { @@ -1625,7 +1262,7 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, NR::Matrix const } else { if (set_i2d) { - sp_item_set_i2d_affine(item, sp_item_i2d_affine(item) * affine); + sp_item_set_i2d_affine(item, sp_item_i2d_affine(item) * (Geom::Matrix)affine); } sp_item_write_transform(item, SP_OBJECT_REPR(item), item->transform, NULL); } @@ -1649,7 +1286,7 @@ void sp_selection_remove_transform() GSList const *l = (GSList *) selection->reprList(); while (l != NULL) { - sp_repr_set_attr((Inkscape::XML::Node*)l->data, "transform", NULL); + ((Inkscape::XML::Node*)l->data)->setAttribute("transform", NULL, false); l = l->next; } @@ -1665,7 +1302,7 @@ sp_selection_scale_absolute(Inkscape::Selection *selection, if (selection->isEmpty()) return; - NR::Maybe const bbox(selection->bounds()); + boost::optional const bbox(selection->bounds()); if ( !bbox || bbox->isEmpty() ) { return; } @@ -1687,7 +1324,7 @@ void sp_selection_scale_relative(Inkscape::Selection *selection, NR::Point const if (selection->isEmpty()) return; - NR::Maybe const bbox(selection->bounds()); + boost::optional const bbox(selection->bounds()); if ( !bbox || bbox->isEmpty() ) { return; @@ -1768,12 +1405,8 @@ void sp_selection_rotate_90_cw() /** - * \brief sp_selection_rotate_90_ccw - * - * This function rotates selected objects 90 degrees counter-clockwise. - * + * @brief Rotates selected objects 90 degrees counter-clockwise. */ - void sp_selection_rotate_90_ccw() { SPDesktop *desktop = SP_ACTIVE_DESKTOP; @@ -1800,7 +1433,7 @@ sp_selection_rotate(Inkscape::Selection *selection, gdouble const angle_degrees) if (selection->isEmpty()) return; - NR::Maybe center = selection->center(); + boost::optional center = selection->center(); if (!center) { return; } @@ -1824,8 +1457,8 @@ sp_selection_rotate_screen(Inkscape::Selection *selection, gdouble angle) if (selection->isEmpty()) return; - NR::Maybe const bbox(selection->bounds()); - NR::Maybe center = selection->center(); + boost::optional const bbox(selection->bounds()); + boost::optional center = selection->center(); if ( !bbox || !center ) { return; @@ -1853,7 +1486,7 @@ sp_selection_scale(Inkscape::Selection *selection, gdouble grow) if (selection->isEmpty()) return; - NR::Maybe const bbox(selection->bounds()); + boost::optional const bbox(selection->bounds()); if (!bbox) { return; } @@ -1890,7 +1523,7 @@ sp_selection_scale_times(Inkscape::Selection *selection, gdouble times) if (selection->isEmpty()) return; - NR::Maybe sel_bbox = selection->bounds(); + boost::optional sel_bbox = selection->bounds(); if (!sel_bbox) { return; @@ -2071,9 +1704,8 @@ void sp_selection_next_patheffect_param(SPDesktop * dt) if ( selection && !selection->isEmpty() ) { SPItem *item = selection->singleItem(); if ( item && SP_IS_SHAPE(item)) { - SPShape *shape = SP_SHAPE(item); - if (sp_shape_has_path_effect(shape)) { - sp_shape_edit_next_param_oncanvas(shape, dt); + if (sp_lpe_item_has_path_effect(SP_LPE_ITEM(item))) { + sp_lpe_item_edit_next_param_oncanvas(SP_LPE_ITEM(item), dt); } else { dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("The selection has no applied path effect.")); } @@ -2081,6 +1713,55 @@ void sp_selection_next_patheffect_param(SPDesktop * dt) } } +void sp_selection_edit_clip_or_mask(SPDesktop * dt, bool clip) +{ + if (!dt) return; + + Inkscape::Selection *selection = sp_desktop_selection(dt); + if ( selection && !selection->isEmpty() ) { + SPItem *item = selection->singleItem(); + if ( item ) { + SPObject *obj = NULL; + if (clip) + obj = item->clip_ref ? SP_OBJECT(item->clip_ref->getObject()) : NULL; + else + obj = item->mask_ref ? SP_OBJECT(item->mask_ref->getObject()) : NULL; + + if (obj) { + // obj is a group object, the children are the actual clippers + for ( SPObject *child = obj->children ; child ; child = child->next ) { + if ( SP_IS_ITEM(child) ) { + // If not already in nodecontext, goto it! + if (!tools_isactive(dt, TOOLS_NODES)) { + tools_switch_current(TOOLS_NODES); + } + + ShapeEditor * shape_editor = SP_NODE_CONTEXT( dt->event_context )->shape_editor; + // TODO: should we set the item for nodepath or knotholder or both? seems to work with both. + shape_editor->set_item(SP_ITEM(child), SH_NODEPATH); + shape_editor->set_item(SP_ITEM(child), SH_KNOTHOLDER); + Inkscape::NodePath::Path *np = shape_editor->get_nodepath(); + if (np) { + // take colors from prefs (same as used in outline mode) + np->helperpath_rgba = clip ? + prefs_get_int_attribute("options.wireframecolors", "clips", 0x00ff00ff) : + prefs_get_int_attribute("options.wireframecolors", "masks", 0x0000ffff); + np->helperpath_width = 1.0; + sp_nodepath_show_helperpath(np, true); + } + break; // break out of for loop after 1st encountered item + } + } + } else if (clip) { + dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("The selection has no applied clip path.")); + } else { + dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("The selection has no applied mask.")); + } + } + } +} + + namespace { template @@ -2168,7 +1849,7 @@ SPItem *next_item(SPDesktop *desktop, GSList *path, SPObject *root, void scroll_to_show_item(SPDesktop *desktop, SPItem *item) { NR::Rect dbox = desktop->get_display_area(); - NR::Maybe sbox = sp_item_bbox_desktop(item); + boost::optional sbox = sp_item_bbox_desktop(item); if ( sbox && dbox.contains(*sbox) == false ) { NR::Point const s_dt = sbox->midpoint(); @@ -2214,12 +1895,12 @@ sp_selection_clone() Inkscape::XML::Node *parent = sp_repr_parent(sel_repr); Inkscape::XML::Node *clone = xml_doc->createElement("svg:use"); - sp_repr_set_attr(clone, "x", "0"); - sp_repr_set_attr(clone, "y", "0"); - sp_repr_set_attr(clone, "xlink:href", g_strdup_printf("#%s", sel_repr->attribute("id"))); - - sp_repr_set_attr(clone, "inkscape:transform-center-x", sel_repr->attribute("inkscape:transform-center-x")); - sp_repr_set_attr(clone, "inkscape:transform-center-y", sel_repr->attribute("inkscape:transform-center-y")); + clone->setAttribute("x", "0", false); + clone->setAttribute("y", "0", false); + clone->setAttribute("xlink:href", g_strdup_printf("#%s", sel_repr->attribute("id")), false); + + clone->setAttribute("inkscape:transform-center-x", sel_repr->attribute("inkscape:transform-center-x"), false); + clone->setAttribute("inkscape:transform-center-y", sel_repr->attribute("inkscape:transform-center-y"), false); // add the new clone to the top of the original's parent parent->appendChild(clone); @@ -2239,6 +1920,55 @@ sp_selection_clone() g_slist_free(newsel); } +void +sp_selection_relink() +{ + SPDesktop *desktop = SP_ACTIVE_DESKTOP; + if (!desktop) + return; + + Inkscape::Selection *selection = sp_desktop_selection(desktop); + + if (selection->isEmpty()) { + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select clones to relink.")); + return; + } + + Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get(); + const gchar *newid = cm->getFirstObjectID(); + if (!newid) { + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Copy an object to clipboard to relink clones to.")); + return; + } + gchar *newref = g_strdup_printf ("#%s", newid); + + // Get a copy of current selection. + bool relinked = false; + for (GSList *items = (GSList *) selection->itemList(); + items != NULL; + items = items->next) + { + SPItem *item = (SPItem *) items->data; + + if (!SP_IS_USE(item)) + continue; + + SP_OBJECT_REPR(item)->setAttribute("xlink:href", newref); + SP_OBJECT(item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + relinked = true; + } + + g_free(newref); + + if (!relinked) { + desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No clones to relink in the selection.")); + } else { + sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_UNLINK_CLONE, + _("Relink clone")); + } +} + + void sp_selection_unlink() { @@ -2249,7 +1979,7 @@ sp_selection_unlink() Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select a clone to unlink.")); + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select clones to unlink.")); return; } @@ -2351,6 +2081,25 @@ sp_select_clone_original() } if (original) { + + bool highlight = prefs_get_int_attribute ("options.highlightoriginal", "value", 0); + if (highlight) { + boost::optional a = item->getBounds(sp_item_i2d_affine(item)); + boost::optional b = original->getBounds(sp_item_i2d_affine(original)); + if ( a && b ) { + // draw a flashing line between the objects + SPCurve *curve = new SPCurve(); + curve->moveto(a->midpoint()); + curve->lineto(b->midpoint()); + + SPCanvasItem * canvasitem = sp_canvas_bpath_new(sp_desktop_tempgroup(desktop), curve); + sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(canvasitem), 0x0000ddff, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT, 5, 3); + sp_canvas_item_show(canvasitem); + curve->unref(); + desktop->add_temporary_canvasitem (canvasitem, 1000); + } + } + selection->clear(); selection->set(original); if (SP_CYCLING == SP_CYCLE_FOCUS) { @@ -2378,13 +2127,14 @@ void sp_selection_to_marker(bool apply) } sp_document_ensure_up_to_date(doc); - NR::Maybe r = selection->bounds(); - if ( !r || r->isEmpty() ) { + boost::optional r = selection->bounds(); + boost::optional c = selection->center(); + if ( !r || !c || r->isEmpty() ) { return; } // calculate the transform to be applied to objects to move them to 0,0 - NR::Point move_p = NR::Point(0, sp_document_height(doc)) - (r->min() + NR::Point ((r->extent(NR::X))/2, (r->extent(NR::Y))/2)); + NR::Point move_p = NR::Point(0, sp_document_height(doc)) - *c; move_p[NR::Y] = -move_p[NR::Y]; NR::Matrix move = NR::Matrix (NR::translate (move_p)); @@ -2395,7 +2145,7 @@ void sp_selection_to_marker(bool apply) // bottommost object, after sorting SPObject *parent = SP_OBJECT_PARENT (items->data); - NR::Matrix parent_transform = sp_item_i2root_affine(SP_ITEM(parent)); + NR::Matrix parent_transform (sp_item_i2root_affine(SP_ITEM(parent))); // remember the position of the first item gint pos = SP_OBJECT_REPR (items->data)->position(); @@ -2441,13 +2191,17 @@ void sp_selection_to_marker(bool apply) _("Objects to marker")); } -static void sp_selection_to_guides_recursive(SPItem *item) { - if (SP_IS_GROUP(item) && !SP_IS_BOX3D(item)) { +static void sp_selection_to_guides_recursive(SPItem *item, bool deleteitem, bool wholegroups) { + if (SP_IS_GROUP(item) && !SP_IS_BOX3D(item) && !wholegroups) { for (GSList *i = sp_item_group_item_list (SP_GROUP(item)); i != NULL; i = i->next) { - sp_selection_to_guides_recursive(SP_ITEM(i->data)); + sp_selection_to_guides_recursive(SP_ITEM(i->data), deleteitem, wholegroups); } } else { sp_item_convert_item_to_guides(item); + + if (deleteitem) { + SP_OBJECT(item)->deleteObject(true); + } } } @@ -2467,8 +2221,11 @@ void sp_selection_to_guides() return; } + bool deleteitem = (prefs_get_int_attribute("tools", "cvg_keep_objects", 0) == 0); + bool wholegroups = (prefs_get_int_attribute("tools", "cvg_convert_whole_groups", 0) != 0); + for (GSList const *i = items; i != NULL; i = i->next) { - sp_selection_to_guides_recursive(SP_ITEM(i->data)); + sp_selection_to_guides_recursive(SP_ITEM(i->data), deleteitem, wholegroups); } sp_document_done (doc, SP_VERB_EDIT_SELECTION_2_GUIDES, _("Objects to guides")); @@ -2493,7 +2250,7 @@ sp_selection_tile(bool apply) } sp_document_ensure_up_to_date(doc); - NR::Maybe r = selection->bounds(); + boost::optional r = selection->bounds(); if ( !r || r->isEmpty() ) { return; } @@ -2510,7 +2267,7 @@ sp_selection_tile(bool apply) // bottommost object, after sorting SPObject *parent = SP_OBJECT_PARENT (items->data); - NR::Matrix parent_transform = sp_item_i2root_affine(SP_ITEM(parent)); + NR::Matrix parent_transform (sp_item_i2root_affine(SP_ITEM(parent))); // remember the position of the first item gint pos = SP_OBJECT_REPR (items->data)->position(); @@ -2521,6 +2278,8 @@ sp_selection_tile(bool apply) Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate(xml_doc); repr_copies = g_slist_prepend (repr_copies, dup); } + // restore the z-order after prepends + repr_copies = g_slist_reverse (repr_copies); NR::Rect bounds(desktop->dt2doc(r->min()), desktop->dt2doc(r->max())); @@ -2736,11 +2495,16 @@ sp_selection_create_bitmap_copy () return; } + desktop->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Rendering bitmap...")); + // set "busy" cursor + desktop->setWaitingCursor(); + // Get the bounding box of the selection NRRect bbox; sp_document_ensure_up_to_date (document); selection->bounds(&bbox); if (NR_RECT_DFLS_TEST_EMPTY(&bbox)) { + desktop->clearWaitingCursor(); return; // exceptional situation, so not bother with a translatable error message, just quit quietly } @@ -2804,7 +2568,7 @@ sp_selection_create_bitmap_copy () unsigned width = (unsigned) floor ((bbox.x1 - bbox.x0) * res / PX_PER_IN); unsigned height =(unsigned) floor ((bbox.y1 - bbox.y0) * res / PX_PER_IN); - // Find out if we have to run a filter + // Find out if we have to run an external filter gchar const *run = NULL; gchar const *filter = prefs_get_string_attribute ("options.createbitmap", "filter"); if (filter) { @@ -2829,7 +2593,7 @@ sp_selection_create_bitmap_copy () } // Calculate the matrix that will be applied to the image so that it exactly overlaps the source objects - NR::Matrix eek = sp_item_i2d_affine (SP_ITEM(parent_object)); + NR::Matrix eek (sp_item_i2d_affine (SP_ITEM(parent_object))); NR::Matrix t; double shift_x = bbox.x0; @@ -2854,7 +2618,8 @@ sp_selection_create_bitmap_copy () // Run filter, if any if (run) { g_print ("Running external filter: %s\n", run); - system (run); + int retval; + retval = system (run); } // Import the image back @@ -2896,14 +2661,14 @@ sp_selection_create_bitmap_copy () _("Create bitmap")); } + desktop->clearWaitingCursor(); + g_free (filename); g_free (filepath); } /** - * \brief sp_selection_set_mask - * - * This function creates a mask or clipPath from selection + * \brief Creates a mask or clipPath from selection * Two different modes: * if applyToLayer, all selection is moved to DEFS as mask/clippath * and is applied to current layer @@ -3059,7 +2824,9 @@ void sp_selection_unset_mask(bool apply_clip_path) { sp_document_ensure_up_to_date(doc); gchar const *attributeName = apply_clip_path ? "clip-path" : "mask"; - std::map referenced_objects; + std::map referenced_objects; + // SPObject* refers to a group containing the clipped path or mask itself, + // whereas SPItem* refers to the item being clipped or masked for (GSList const *i = selection->itemList(); NULL != i; i = i->next) { if (remove_original) { // remember referenced mask/clippath, so orphaned masks can be moved back to document @@ -3083,9 +2850,10 @@ void sp_selection_unset_mask(bool apply_clip_path) { // restore mask objects into a document for ( std::map::iterator it = referenced_objects.begin() ; it != referenced_objects.end() ; ++it) { - SPObject *obj = (*it).first; + SPObject *obj = (*it).first; // Group containing the clipped paths or masks GSList *items_to_move = NULL; for (SPObject *child = sp_object_first_child(obj) ; child != NULL; child = SP_OBJECT_NEXT(child) ) { + // Collect all clipped paths and masks within a single group Inkscape::XML::Node *copy = SP_OBJECT_REPR(child)->duplicate(xml_doc); items_to_move = g_slist_prepend (items_to_move, copy); } @@ -3099,6 +2867,7 @@ void sp_selection_unset_mask(bool apply_clip_path) { Inkscape::XML::Node *parent = SP_OBJECT_REPR((*it).second)->parent(); gint pos = SP_OBJECT_REPR((*it).second)->position(); + // Iterate through all clipped paths / masks for (GSList *i = items_to_move; NULL != i; i = i->next) { Inkscape::XML::Node *repr = (Inkscape::XML::Node *)i->data; @@ -3124,33 +2893,67 @@ void sp_selection_unset_mask(bool apply_clip_path) { sp_document_done (doc, SP_VERB_OBJECT_UNSET_MASK, _("Release mask")); } -void fit_canvas_to_selection(SPDesktop *desktop) { - g_return_if_fail(desktop != NULL); +/** + * Returns true if an undoable change should be recorded. + */ +bool +fit_canvas_to_selection(SPDesktop *desktop) +{ + g_return_val_if_fail(desktop != NULL, false); SPDocument *doc = sp_desktop_document(desktop); - g_return_if_fail(doc != NULL); - g_return_if_fail(desktop->selection != NULL); + g_return_val_if_fail(doc != NULL, false); + g_return_val_if_fail(desktop->selection != NULL, false); if (desktop->selection->isEmpty()) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to fit canvas to.")); - return; + return false; } - NR::Maybe const bbox(desktop->selection->bounds()); + boost::optional const bbox(desktop->selection->bounds()); if (bbox && !bbox->isEmpty()) { doc->fitToRect(*bbox); + return true; + } else { + return false; } -}; +} -void fit_canvas_to_drawing(SPDocument *doc) { - g_return_if_fail(doc != NULL); +/** + * Fit canvas to the bounding box of the selection, as an undoable action. + */ +void +verb_fit_canvas_to_selection(SPDesktop *const desktop) +{ + if (fit_canvas_to_selection(desktop)) { + sp_document_done(sp_desktop_document(desktop), SP_VERB_FIT_CANVAS_TO_SELECTION, + _("Fit Page to Selection")); + } +} + +bool +fit_canvas_to_drawing(SPDocument *doc) +{ + g_return_val_if_fail(doc != NULL, false); sp_document_ensure_up_to_date(doc); SPItem const *const root = SP_ITEM(doc->root); - NR::Maybe const bbox(root->getBounds(sp_item_i2r_affine(root))); + boost::optional const bbox(root->getBounds(sp_item_i2r_affine(root))); if (bbox && !bbox->isEmpty()) { doc->fitToRect(*bbox); + return true; + } else { + return false; } -}; +} + +void +verb_fit_canvas_to_drawing(SPDesktop *desktop) +{ + if (fit_canvas_to_drawing(sp_desktop_document(desktop))) { + sp_document_done(sp_desktop_document(desktop), SP_VERB_FIT_CANVAS_TO_DRAWING, + _("Fit Page to Drawing")); + } +} void fit_canvas_to_selection_or_drawing(SPDesktop *desktop) { g_return_if_fail(desktop != NULL); @@ -3159,14 +2962,13 @@ void fit_canvas_to_selection_or_drawing(SPDesktop *desktop) { g_return_if_fail(doc != NULL); g_return_if_fail(desktop->selection != NULL); - if (desktop->selection->isEmpty()) { - fit_canvas_to_drawing(doc); - } else { - fit_canvas_to_selection(desktop); + bool const changed = ( desktop->selection->isEmpty() + ? fit_canvas_to_drawing(doc) + : fit_canvas_to_selection(desktop) ); + if (changed) { + sp_document_done(sp_desktop_document(desktop), SP_VERB_FIT_CANVAS_TO_SELECTION_OR_DRAWING, + _("Fit Page to Selection or Drawing")); } - - sp_document_done(doc, SP_VERB_FIT_CANVAS_TO_DRAWING, - _("Fit page to selection")); }; static void itemtree_map(void (*f)(SPItem *, SPDesktop *), SPObject *root, SPDesktop *desktop) { @@ -3224,11 +3026,6 @@ void unhide_all_in_all_layers(SPDesktop *dt) { } -GSList * sp_selection_get_clipboard() { - return clipboard; -} - - /* Local Variables: mode:c++