X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fselection-chemistry.cpp;h=62f5c57e2e80c1be0677597912b01ec41609a871;hb=b752616506705efd28f22c4d852d198ff40c7026;hp=dd6ab6eb80a689d40350e9de84490c09a7ae51e6;hpb=29ad4e90d149629a444e2b7aab6b48ca5a709d3e;p=inkscape.git diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index dd6ab6eb8..62f5c57e2 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -20,6 +20,8 @@ # include "config.h" #endif +#include "selection-chemistry.h" + #include #include "svg/svg.h" @@ -70,17 +72,29 @@ #include "layer-fns.h" #include "context-fns.h" #include +#include +#include #include "helper/units.h" #include "sp-item.h" +#include "box3d.h" #include "unit-constants.h" #include "xml/simple-document.h" #include "sp-filter-reference.h" +#include "gradient-drag.h" +#include "uri-references.h" +#include "live_effects/lpeobject.h" +#include "live_effects/parameter/path.h" +#include "libnr/nr-convert2geom.h" + +// For clippath editing +#include "tools-switch.h" +#include "shape-editor.h" +#include "node-context.h" +#include "nodepath.h" using NR::X; using NR::Y; -#include "selection-chemistry.h" - /* fixme: find a better place */ Inkscape::XML::Document *clipboard_document = NULL; GSList *clipboard = NULL; @@ -88,7 +102,7 @@ GSList *defs_clipboard = NULL; SPCSSAttr *style_clipboard = NULL; NR::Maybe size_clipboard; -static void sp_copy_stuff_used_by_item(GSList **defs_clip, SPItem *item, const GSList *items, Inkscape::XML::Document* xml_doc); +static void sp_copy_stuff_used_by_item(GSList **defs_clip, SPItem *item, GSList const *items, Inkscape::XML::Document* xml_doc); /** * Copies repr and its inherited css style elements, along with the accumulated transform 'full_t', @@ -104,7 +118,7 @@ void sp_selection_copy_one (Inkscape::XML::Node *repr, NR::Matrix full_t, GSList sp_repr_css_attr_unref(css); // write the complete accumulated transform passed to us - // (we're dealing with unattached repr, so we write to its attr + // (we're dealing with unattached repr, so we write to its attr // instead of using sp_item_set_transform) gchar *affinestr=sp_svg_transform_write(full_t); copy->setAttribute("transform", affinestr); @@ -113,7 +127,7 @@ 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 (const GSList *items, GSList **clip, GSList **defs_clip, SPCSSAttr **style_clip, Inkscape::XML::Document* xml_doc) +void sp_selection_copy_impl (GSList const *items, GSList **clip, GSList **defs_clip, SPCSSAttr **style_clip, Inkscape::XML::Document* xml_doc) { // Copy stuff referenced by all items to defs_clip: @@ -201,14 +215,14 @@ GSList *sp_selection_paste_impl (SPDocument *doc, SPObject *parent, GSList **cli return copied; } -void sp_selection_delete_impl(const GSList *items) +void sp_selection_delete_impl(GSList const *items, bool propagate = true, bool propagate_descendants = true) { - for (const GSList *i = items ; i ; i = i->next ) { + for (GSList const *i = items ; i ; i = i->next ) { sp_object_ref((SPObject *)i->data, NULL); } - for (const GSList *i = items; i != NULL; i = i->next) { + for (GSList const *i = items; i != NULL; i = i->next) { SPItem *item = (SPItem *) i->data; - SP_OBJECT(item)->deleteObject(); + SP_OBJECT(item)->deleteObject(propagate, propagate_descendants); sp_object_unref((SPObject *)item, NULL); } } @@ -236,7 +250,7 @@ void sp_selection_delete() return; } - const GSList *selected = g_slist_copy(const_cast(selection->itemList())); + GSList const *selected = g_slist_copy(const_cast(selection->itemList())); selection->clear(); sp_selection_delete_impl (selected); g_slist_free ((GSList *) selected); @@ -249,7 +263,7 @@ void sp_selection_delete() */ tools_switch ( desktop, tools_active ( desktop ) ); - sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DELETE, + sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DELETE, _("Delete")); } @@ -289,7 +303,7 @@ void sp_selection_duplicate() Inkscape::GC::release(copy); } - sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DUPLICATE, + sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DUPLICATE, _("Duplicate")); selection->setReprList(newsel); @@ -319,7 +333,7 @@ void sp_edit_clear_all() } GSList * -get_all_items (GSList *list, SPObject *from, SPDesktop *desktop, bool onlyvisible, bool onlysensitive, const GSList *exclude) +get_all_items (GSList *list, SPObject *from, SPDesktop *desktop, bool onlyvisible, bool onlysensitive, GSList const *exclude) { for (SPObject *child = sp_object_first_child(SP_OBJECT(from)) ; child != NULL; child = SP_OBJECT_NEXT(child) ) { if (SP_IS_ITEM(child) && @@ -356,7 +370,7 @@ void sp_edit_select_all_full (bool force_all_layers, bool invert) GSList *items = NULL; - const GSList *exclude = NULL; + GSList const *exclude = NULL; if (invert) { exclude = selection->itemList(); } @@ -511,7 +525,7 @@ void sp_selection_group() // Move to the position of the topmost, reduced by the number of items deleted from topmost_parent group->setPosition(topmost + 1); - sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_GROUP, + sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_GROUP, _("Group")); selection->set(group); @@ -573,12 +587,12 @@ void sp_selection_ungroup() g_slist_free(items); - sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_UNGROUP, + sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_UNGROUP, _("Ungroup")); } static SPGroup * -sp_item_list_common_parent_group(const GSList *items) +sp_item_list_common_parent_group(GSList const *items) { if (!items) { return NULL; @@ -597,10 +611,9 @@ sp_item_list_common_parent_group(const GSList *items) return SP_GROUP(parent); } -/** Finds out the minimum common bbox of the selected items - */ +/** Finds out the minimum common bbox of the selected items. */ static NR::Maybe -enclose_items(const GSList *items) +enclose_items(GSList const *items) { g_assert(items != NULL); @@ -648,14 +661,14 @@ sp_selection_raise() Inkscape::XML::Node *grepr = SP_OBJECT_REPR(group); - /* construct reverse-ordered list of selected children */ + /* Construct reverse-ordered list of selected children. */ GSList *rev = g_slist_copy((GSList *) items); rev = g_slist_sort(rev, (GCompareFunc) sp_item_repr_compare_position); - // find out the common bbox of the selected items + // Determine the common bbox of the selected items. NR::Maybe selected = enclose_items(items); - // for all objects in the selection (starting from top) + // Iterate over all objects in the selection (starting from top). if (selected) { while (rev) { SPObject *child = SP_OBJECT(rev->data); @@ -716,7 +729,7 @@ void sp_selection_raise_to_top() g_slist_free(rl); - sp_document_done(document, SP_VERB_SELECTION_TO_FRONT, + sp_document_done(document, SP_VERB_SELECTION_TO_FRONT, _("Raise to top")); } @@ -743,15 +756,15 @@ sp_selection_lower() Inkscape::XML::Node *grepr = SP_OBJECT_REPR(group); - // find out the common bbox of the selected items + // Determine the common bbox of the selected items. NR::Maybe selected = enclose_items(items); - /* construct direct-ordered list of selected children */ + /* Construct direct-ordered list of selected children. */ GSList *rev = g_slist_copy((GSList *) items); rev = g_slist_sort(rev, (GCompareFunc) sp_item_repr_compare_position); rev = g_slist_reverse(rev); - // for all objects in the selection (starting from top) + // Iterate over all objects in the selection (starting from top). if (selected) { while (rev) { SPObject *child = SP_OBJECT(rev->data); @@ -780,7 +793,7 @@ sp_selection_lower() g_slist_free(rev); } - sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_LOWER, + sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_LOWER, _("Lower")); } @@ -828,7 +841,7 @@ void sp_selection_lower_to_bottom() g_slist_free(rl); - sp_document_done(document, SP_VERB_SELECTION_TO_BACK, + sp_document_done(document, SP_VERB_SELECTION_TO_BACK, _("Lower to bottom")); } @@ -892,7 +905,7 @@ void sp_copy_single (GSList **defs_clip, SPObject *thing, Inkscape::XML::Documen } -void sp_copy_textpath_path (GSList **defs_clip, SPTextPath *tp, const GSList *items, Inkscape::XML::Document* xml_doc) +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) @@ -906,11 +919,11 @@ void sp_copy_textpath_path (GSList **defs_clip, SPTextPath *tp, const GSList *it /** * Copies things like patterns, markers, gradients, etc. */ -void sp_copy_stuff_used_by_item (GSList **defs_clip, SPItem *item, const GSList *items, Inkscape::XML::Document* xml_doc) +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.type == SP_PAINT_TYPE_PAINTSERVER)) { + 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); @@ -918,7 +931,7 @@ void sp_copy_stuff_used_by_item (GSList **defs_clip, SPItem *item, const GSList sp_copy_pattern (defs_clip, SP_PATTERN(server), xml_doc); } - if (style && (style->stroke.type == SP_PAINT_TYPE_PAINTSERVER)) { + 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); @@ -934,6 +947,16 @@ void sp_copy_stuff_used_by_item (GSList **defs_clip, SPItem *item, const GSList 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); + } + } + + // For 3D boxes copy perspectives + if (SP_IS_BOX3D(item)) { + sp_copy_single (defs_clip, SP_OBJECT(box3d_get_perspective(SP_BOX3D(item))), xml_doc); } if (SP_IS_TEXT_TEXTPATH (item)) { @@ -968,6 +991,20 @@ void sp_copy_stuff_used_by_item (GSList **defs_clip, SPItem *item, const GSList } } +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 */ @@ -1026,13 +1063,17 @@ void sp_selection_copy() 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; } - const GSList *items = g_slist_copy ((GSList *) selection->itemList()); + 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; @@ -1087,15 +1128,7 @@ void sp_selection_copy() 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); - 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; - } + sp_set_style_clipboard (css); } sp_style_unref(query); } @@ -1105,6 +1138,100 @@ void sp_selection_copy() g_slist_free ((GSList *) items); } + +void sp_selection_copy_lpe_pathparam(Inkscape::LivePathEffect::PathParam * pathparam) +{ + if (pathparam == NULL) + return; + + SPDesktop *desktop = SP_ACTIVE_DESKTOP; + if (desktop == NULL) + return; + + if (!clipboard_document) { + clipboard_document = new Inkscape::XML::SimpleDocument(); + } + + // 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); + } + + // make new path node and put svgd as 'd' attribute + Inkscape::XML::Node *newnode = clipboard_document->createElement("svg:path"); + gchar * svgd = pathparam->param_writeSVGValue(); + newnode->setAttribute("d", svgd); + g_free(svgd); + + clipboard = g_slist_prepend(clipboard, newnode); + + Geom::Rect bnds = Geom::bounds_exact(*pathparam); + size_clipboard = from_2geom(bnds); +} + + +//____________________________________________________________________________ + +/** 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; @@ -1127,8 +1254,14 @@ void sp_selection_paste(bool in_place) } // 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 on the clipboard.")); + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing in the clipboard.")); return; } @@ -1146,15 +1279,10 @@ void sp_selection_paste(bool in_place) m -= sel_bbox->midpoint(); } - /* Snap the offset of the new item(s) to the grid */ - SnapManager &sm = desktop->namedview->snap_manager; - SnapManager::SnapperList gs = sm.getGridSnappers(); - m = sm.freeSnapAlways(Inkscape::Snapper::SNAP_POINT, m, NULL, gs).getPoint(); sp_selection_move_relative(selection, m); } - sp_document_done(document, SP_VERB_EDIT_PASTE, - _("Paste")); + sp_document_done(document, SP_VERB_EDIT_PASTE, _("Paste")); } void sp_selection_paste_style() @@ -1165,8 +1293,8 @@ void sp_selection_paste_style() 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.")); + if (style_clipboard == NULL) { + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing on the style clipboard.")); return; } @@ -1184,6 +1312,60 @@ void sp_selection_paste_style() _("Paste style")); } +void sp_selection_paste_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.")); + 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_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_PASTE_LIVEPATHEFFECT, + _("Paste live path effect")); +} + void sp_selection_paste_size (bool apply_x, bool apply_y) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; @@ -1273,14 +1455,14 @@ void sp_selection_to_next_layer () return; } - const GSList *items = g_slist_copy ((GSList *) selection->itemList()); + GSList const *items = g_slist_copy ((GSList *) selection->itemList()); bool no_more = false; // Set to true, if no more layers above 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_delete_impl (items); + 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) { @@ -1293,7 +1475,7 @@ void sp_selection_to_next_layer () 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, + sp_document_done(sp_desktop_document (dt), SP_VERB_LAYER_MOVE_TO_NEXT, _("Raise to next layer")); } else { no_more = true; @@ -1318,14 +1500,14 @@ void sp_selection_to_prev_layer () return; } - const GSList *items = g_slist_copy ((GSList *) selection->itemList()); + GSList const *items = g_slist_copy ((GSList *) selection->itemList()); bool no_more = false; // Set to true, if no more layers below 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_delete_impl (items); + 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) { @@ -1355,7 +1537,7 @@ bool selection_contains_original (SPItem *item, Inkscape::Selection *selection) { bool contains_original = false; - + bool is_use = SP_IS_USE(item); SPItem *item_use = item; SPItem *item_use_first = item; @@ -1367,13 +1549,13 @@ selection_contains_original (SPItem *item, Inkscape::Selection *selection) break; is_use = SP_IS_USE(item_use); } - + // If it's a tref, check whether the object containing the character // data is part of the selection if (!contains_original && SP_IS_TREF(item)) { contains_original = selection->includes(SP_TREF(item)->getObjectReferredTo()); } - + return contains_original; } @@ -1385,7 +1567,7 @@ selection_contains_both_clone_and_original (Inkscape::Selection *selection) for (GSList const *l = selection->itemList(); l != NULL; l = l->next) { SPItem *item = SP_ITEM(l->data); clone_with_original |= selection_contains_original(item, selection); - if (clone_with_original) + if (clone_with_original) break; } return clone_with_original; @@ -1423,21 +1605,21 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, NR::Matrix const bool transform_flowtext_with_frame = (SP_IS_FLOWTEXT(item) && selection->includes( SP_FLOWTEXT(item)->get_frame (NULL))); // (only the first frame is checked so far) // ...both an offset and its source? bool transform_offset_with_source = (SP_IS_OFFSET(item) && SP_OFFSET (item)->sourceHref) && selection->includes( sp_offset_get_source (SP_OFFSET(item)) ); - + // If we're moving a connector, we want to detach it // from shapes that aren't part of the selection, but // leave it attached if they are if (cc_item_is_connector(item)) { SPItem *attItem[2]; SP_PATH(item)->connEndPair.getAttachedItems(attItem); - + for (int n = 0; n < 2; ++n) { if (!selection->includes(attItem[n])) { sp_conn_end_detach(item, n); } } } - + // "clones are unmoved when original is moved" preference int compensation = prefs_get_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED); bool prefs_unmoved = (compensation == SP_CLONE_COMPENSATION_UNMOVED); @@ -1531,7 +1713,7 @@ void sp_selection_remove_transform() l = l->next; } - sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_FLATTEN, + sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_FLATTEN, _("Remove transform")); } @@ -1640,7 +1822,7 @@ void sp_selection_rotate_90_cw() sp_item_rotate_rel(item, rot_neg_90); } - sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_ROTATE_90_CCW, + sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_ROTATE_90_CCW, _("Rotate 90° CW")); } @@ -1688,8 +1870,8 @@ sp_selection_rotate(Inkscape::Selection *selection, gdouble const angle_degrees) sp_document_maybe_done(sp_desktop_document(selection->desktop()), ( ( angle_degrees > 0 ) ? "selector:rotate:ccw" - : "selector:rotate:cw" ), - SP_VERB_CONTEXT_SELECT, + : "selector:rotate:cw" ), + SP_VERB_CONTEXT_SELECT, _("Rotate")); } @@ -1711,7 +1893,7 @@ sp_selection_rotate_screen(Inkscape::Selection *selection, gdouble angle) gdouble const zoom = selection->desktop()->current_zoom(); gdouble const zmove = angle / zoom; - gdouble const r = NR::L2(bbox->max() - *center); + gdouble const r = NR::L2(bbox->cornerFarthestFrom(*center) - *center); gdouble const zangle = 180 * atan2(zmove, r) / M_PI; @@ -1721,7 +1903,7 @@ sp_selection_rotate_screen(Inkscape::Selection *selection, gdouble angle) ( (angle > 0) ? "selector:rotate:ccw" : "selector:rotate:cw" ), - SP_VERB_CONTEXT_SELECT, + SP_VERB_CONTEXT_SELECT, _("Rotate by pixels")); } @@ -1776,7 +1958,7 @@ sp_selection_scale_times(Inkscape::Selection *selection, gdouble times) NR::Point const center(sel_bbox->midpoint()); sp_selection_scale_relative(selection, center, NR::scale(times, times)); - sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_CONTEXT_SELECT, + sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_CONTEXT_SELECT, _("Scale by whole factor")); } @@ -1792,13 +1974,13 @@ sp_selection_move(gdouble dx, gdouble dy) sp_selection_move_relative(selection, dx, dy); if (dx == 0) { - sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical", SP_VERB_CONTEXT_SELECT, + sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical", SP_VERB_CONTEXT_SELECT, _("Move vertically")); } else if (dy == 0) { - sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal", SP_VERB_CONTEXT_SELECT, + sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal", SP_VERB_CONTEXT_SELECT, _("Move horizontally")); } else { - sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SELECT, + sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SELECT, _("Move")); } } @@ -1820,13 +2002,13 @@ sp_selection_move_screen(gdouble dx, gdouble dy) sp_selection_move_relative(selection, zdx, zdy); if (dx == 0) { - sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical", SP_VERB_CONTEXT_SELECT, + sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical", SP_VERB_CONTEXT_SELECT, _("Move vertically by pixels")); } else if (dy == 0) { - sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal", SP_VERB_CONTEXT_SELECT, + sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal", SP_VERB_CONTEXT_SELECT, _("Move horizontally by pixels")); } else { - sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SELECT, + sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SELECT, _("Move")); } } @@ -1846,7 +2028,7 @@ struct Forward { static Iterator children(SPObject *o) { return sp_object_first_child(o); } static Iterator siblings_after(SPObject *o) { return SP_OBJECT_NEXT(o); } - static void dispose(Iterator i) {} + static void dispose(Iterator /*i*/) {} static SPObject *object(Iterator i) { return i; } static Iterator next(Iterator i) { return SP_OBJECT_NEXT(i); } @@ -1941,6 +2123,68 @@ sp_selection_item_prev(void) } } +void sp_selection_next_patheffect_param(SPDesktop * dt) +{ + if (!dt) return; + + Inkscape::Selection *selection = sp_desktop_selection(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); + } else { + dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("The selection has no applied path effect.")); + } + } + } +} + +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; + shape_editor->set_item(SP_ITEM(child)); + Inkscape::NodePath::Path *np = shape_editor->get_nodepath(); + if (np) { + np->helperpath_rgba = clip ? 0x0000ffff : 0x800080ff; + 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 @@ -2061,14 +2305,14 @@ sp_selection_clone() } GSList *reprs = g_slist_copy((GSList *) selection->reprList()); - + selection->clear(); - + // 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; - + while (reprs) { Inkscape::XML::Node *sel_repr = (Inkscape::XML::Node *) reprs->data; Inkscape::XML::Node *parent = sp_repr_parent(sel_repr); @@ -2080,7 +2324,7 @@ sp_selection_clone() 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")); - + // add the new clone to the top of the original's parent parent->appendChild(clone); @@ -2088,14 +2332,14 @@ sp_selection_clone() reprs = g_slist_remove(reprs, sel_repr); Inkscape::GC::release(clone); } - + // TRANSLATORS: only translate "string" in "context|string". // For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS - sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_CLONE, + sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_CLONE, Q_("action|Clone")); selection->setReprList(newsel); - + g_slist_free(newsel); } @@ -2122,6 +2366,18 @@ sp_selection_unlink() { SPItem *item = (SPItem *) items->data; + if (SP_IS_TEXT(item)) { + SPObject *tspan = sp_tref_convert_to_tspan(SP_OBJECT(item)); + + if (tspan) { + SP_OBJECT(item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + } + + // Set unlink to true, and fall into the next if which + // will include this text item in the new selection + unlinked = true; + } + if (!(SP_IS_USE(item) || SP_IS_TREF(item))) { // keep the non-use item in the new selection new_select = g_slist_prepend(new_select, item); @@ -2129,12 +2385,12 @@ sp_selection_unlink() } SPItem *unlink; - if (SP_IS_USE(item)) { + if (SP_IS_USE(item)) { unlink = sp_use_unlink(SP_USE(item)); } else /*if (SP_IS_TREF(use))*/ { - unlink = SP_ITEM(sp_tref_convert_to_tspan(SP_TREF(item))); + unlink = SP_ITEM(sp_tref_convert_to_tspan(SP_OBJECT(item))); } - + unlinked = true; // Add ungrouped items to the new selection. new_select = g_slist_prepend(new_select, unlink); @@ -2164,7 +2420,7 @@ sp_select_clone_original() SPItem *item = selection->singleItem(); - const gchar *error = _("Select a clone to go to its original. Select a linked offset to go to its source. Select a text on path to go to the path. Select a flowed text to go to its frame."); + gchar const *error = _("Select a clone to go to its original. Select a linked offset to go to its source. Select a text on path to go to the path. Select a flowed text to go to its frame."); // Check if other than two objects are selected if (g_slist_length((GSList *) selection->itemList()) != 1 || !item) { @@ -2207,6 +2463,128 @@ sp_select_clone_original() } } + +void sp_selection_to_marker(bool apply) +{ + SPDesktop *desktop = SP_ACTIVE_DESKTOP; + if (desktop == NULL) + return; + + SPDocument *doc = sp_desktop_document(desktop); + Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc); + + Inkscape::Selection *selection = sp_desktop_selection(desktop); + + // check if something is selected + if (selection->isEmpty()) { + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to convert to marker.")); + return; + } + + sp_document_ensure_up_to_date(doc); + NR::Maybe r = selection->bounds(); + NR::Maybe 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)) - *c; + move_p[NR::Y] = -move_p[NR::Y]; + NR::Matrix move = NR::Matrix (NR::translate (move_p)); + + GSList *items = g_slist_copy((GSList *) selection->itemList()); + + items = g_slist_sort (items, (GCompareFunc) sp_object_compare_position); + + // bottommost object, after sorting + SPObject *parent = SP_OBJECT_PARENT (items->data); + + 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(); + (void)pos; // TODO check why this was remembered + + // create a list of duplicates + GSList *repr_copies = NULL; + for (GSList *i = items; i != NULL; i = i->next) { + Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate(xml_doc); + repr_copies = g_slist_prepend (repr_copies, dup); + } + + NR::Rect bounds(desktop->dt2doc(r->min()), desktop->dt2doc(r->max())); + + if (apply) { + // delete objects so that their clones don't get alerted; this object will be restored shortly + for (GSList *i = items; i != NULL; i = i->next) { + SPObject *item = SP_OBJECT (i->data); + item->deleteObject (false); + } + } + + // Hack: Temporarily set clone compensation to unmoved, so that we can move clone-originals + // without disturbing clones. + // See ActorAlign::on_button_click() in src/ui/dialog/align-and-distribute.cpp + int saved_compensation = prefs_get_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED); + prefs_set_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED); + + gchar const *mark_id = generate_marker(repr_copies, bounds, doc, + ( NR::Matrix(NR::translate(desktop->dt2doc(NR::Point(r->min()[NR::X], + r->max()[NR::Y])))) + * parent_transform.inverse() ), + parent_transform * move); + (void)mark_id; + + // restore compensation setting + prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation); + + + g_slist_free (items); + + sp_document_done (doc, SP_VERB_EDIT_SELECTION_2_MARKER, + _("Objects to marker")); +} + +static void sp_selection_to_guides_recursive(SPItem *item, bool deleteitem) { + if (SP_IS_GROUP(item) && !SP_IS_BOX3D(item)) { + 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), deleteitem); + } + } else { + sp_item_convert_item_to_guides(item); + + if (deleteitem) { + SP_OBJECT(item)->deleteObject(true); + } + } +} + +void sp_selection_to_guides() +{ + SPDesktop *desktop = SP_ACTIVE_DESKTOP; + if (desktop == NULL) + return; + + SPDocument *doc = sp_desktop_document(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); + // we need to copy the list because it gets reset when objects are deleted + GSList *items = g_slist_copy((GSList *) selection->itemList()); + + if (!items) { + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to convert to guides.")); + return; + } + + bool deleteitem = (prefs_get_int_attribute("tools", "cvg_keep_objects", 0) == 0); + + for (GSList const *i = items; i != NULL; i = i->next) { + sp_selection_to_guides_recursive(SP_ITEM(i->data), deleteitem); + } + + sp_document_done (doc, SP_VERB_EDIT_SELECTION_2_GUIDES, _("Objects to guides")); +} + void sp_selection_tile(bool apply) { @@ -2271,8 +2649,11 @@ sp_selection_tile(bool apply) int saved_compensation = prefs_get_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED); prefs_set_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED); - const gchar *pat_id = pattern_tile (repr_copies, bounds, doc, - NR::Matrix(NR::translate(desktop->dt2doc(NR::Point(r->min()[NR::X], r->max()[NR::Y])))) * parent_transform.inverse(), parent_transform * move); + gchar const *pat_id = pattern_tile(repr_copies, bounds, doc, + ( NR::Matrix(NR::translate(desktop->dt2doc(NR::Point(r->min()[NR::X], + r->max()[NR::Y])))) + * parent_transform.inverse() ), + parent_transform * move); // restore compensation setting prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation); @@ -2302,7 +2683,7 @@ sp_selection_tile(bool apply) g_slist_free (items); - sp_document_done (doc, SP_VERB_EDIT_TILE, + sp_document_done (doc, SP_VERB_EDIT_TILE, _("Objects to pattern")); } @@ -2336,7 +2717,7 @@ sp_selection_untile() SPStyle *style = SP_OBJECT_STYLE (item); - if (!style || style->fill.type != SP_PAINT_TYPE_PAINTSERVER) + if (!style || !style->fill.isPaintserver()) continue; SPObject *server = SP_OBJECT_STYLE_FILL_SERVER(item); @@ -2375,20 +2756,20 @@ sp_selection_untile() if (!did) { desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No pattern fills in the selection.")); } else { - sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_UNTILE, + sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_UNTILE, _("Pattern to objects")); selection->setList(new_select); } } void -sp_selection_get_export_hints (Inkscape::Selection *selection, const char **filename, float *xdpi, float *ydpi) +sp_selection_get_export_hints (Inkscape::Selection *selection, char const **filename, float *xdpi, float *ydpi) { if (selection->isEmpty()) { return; } - const GSList * reprlst = selection->reprList(); + GSList const *reprlst = selection->reprList(); bool filename_search = TRUE; bool xdpi_search = TRUE; bool ydpi_search = TRUE; @@ -2398,7 +2779,7 @@ sp_selection_get_export_hints (Inkscape::Selection *selection, const char **file xdpi_search && ydpi_search; reprlst = reprlst->next) { - const gchar * dpi_string; + gchar const *dpi_string; Inkscape::XML::Node * repr = (Inkscape::XML::Node *)reprlst->data; if (filename_search) { @@ -2428,10 +2809,10 @@ sp_selection_get_export_hints (Inkscape::Selection *selection, const char **file } void -sp_document_get_export_hints (SPDocument * doc, const char **filename, float *xdpi, float *ydpi) +sp_document_get_export_hints (SPDocument *doc, char const **filename, float *xdpi, float *ydpi) { Inkscape::XML::Node * repr = sp_document_repr_root(doc); - const gchar * dpi_string; + gchar const *dpi_string; *filename = repr->attribute("inkscape:export-filename"); @@ -2513,7 +2894,7 @@ sp_selection_create_bitmap_copy () res = PX_PER_IN * prefs_min / MIN ((bbox.x1 - bbox.x0), (bbox.y1 - bbox.y0)); } else { float hint_xdpi = 0, hint_ydpi = 0; - const char *hint_filename; + char const *hint_filename; // take resolution hint from the selected objects sp_selection_get_export_hints (selection, &hint_filename, &hint_xdpi, &hint_ydpi); if (hint_xdpi != 0) { @@ -2535,12 +2916,12 @@ sp_selection_create_bitmap_copy () unsigned height =(unsigned) floor ((bbox.y1 - bbox.y0) * res / PX_PER_IN); // Find out if we have to run a filter - const gchar *run = NULL; - const gchar *filter = prefs_get_string_attribute ("options.createbitmap", "filter"); + gchar const *run = NULL; + gchar const *filter = prefs_get_string_attribute ("options.createbitmap", "filter"); if (filter) { // filter command is given; // see if we have a parameter to pass to it - const gchar *param1 = prefs_get_string_attribute ("options.createbitmap", "filter_param1"); + gchar const *param1 = prefs_get_string_attribute ("options.createbitmap", "filter_param1"); if (param1) { if (param1[strlen(param1) - 1] == '%') { // if the param string ends with %, interpret it as a percentage of the image's max dimension @@ -2563,7 +2944,7 @@ sp_selection_create_bitmap_copy () NR::Matrix t; double shift_x = bbox.x0; - double shift_y = bbox.y1; + double shift_y = bbox.y1; if (res == PX_PER_IN) { // for default 90 dpi, snap it to pixel grid shift_x = round (shift_x); shift_y = -round (-shift_y); // this gets correct rounding despite coordinate inversion, remove the negations when the inversion is gone @@ -2639,7 +3020,7 @@ sp_selection_create_bitmap_copy () * and is applied to current layer * otherwise, topmost object is used as mask for other objects * If \a apply_clip_path parameter is true, clipPath is created, otherwise mask - * + * */ void sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer) @@ -2650,7 +3031,7 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer) SPDocument *doc = sp_desktop_document(desktop); Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc); - + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected @@ -2663,18 +3044,18 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer) return; } - // FIXME: temporary patch to prevent crash! + // FIXME: temporary patch to prevent crash! // Remove this when bboxes are fixed to not blow up on an item clipped/masked with its own clone bool clone_with_original = selection_contains_both_clone_and_original (selection); if (clone_with_original) { return; // in this version, you cannot clip/mask an object with its own clone } // /END FIXME - + sp_document_ensure_up_to_date(doc); GSList *items = g_slist_copy((GSList *) selection->itemList()); - + items = g_slist_sort (items, (GCompareFunc) sp_object_compare_position); // create a list of duplicates @@ -2683,7 +3064,7 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer) GSList *items_to_delete = NULL; bool topmost = prefs_get_int_attribute ("options.maskobject", "topmost", 1); bool remove_original = prefs_get_int_attribute ("options.maskobject", "remove", 1); - + if (apply_to_layer) { // all selected items are used for mask, which is applied to a layer apply_to_items = g_slist_prepend (apply_to_items, desktop->currentLayer()); @@ -2707,7 +3088,7 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer) SPObject *item = SP_OBJECT (i->data); items_to_delete = g_slist_prepend (items_to_delete, item); } - + for (i = i->next; i != NULL; i = i->next) { apply_to_items = g_slist_prepend (apply_to_items, i->data); } @@ -2725,11 +3106,11 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer) items_to_delete = g_slist_prepend (items_to_delete, item); } } - + g_slist_free (items); items = NULL; - - gchar const* attributeName = apply_clip_path ? "clip-path" : "mask"; + + gchar const *attributeName = apply_clip_path ? "clip-path" : "mask"; for (GSList *i = apply_to_items; NULL != i; i = i->next) { SPItem *item = reinterpret_cast(i->data); // inverted object transform should be applied to a mask object, @@ -2742,7 +3123,7 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer) mask_items_dup = g_slist_prepend (mask_items_dup, dup); } - const gchar *mask_id = NULL; + gchar const *mask_id = NULL; if (apply_clip_path) { mask_id = sp_clippath_create(mask_items_dup, doc, &maskTransform); } else { @@ -2764,9 +3145,9 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer) } g_slist_free (items_to_delete); - if (apply_clip_path) + if (apply_clip_path) sp_document_done (doc, SP_VERB_OBJECT_SET_CLIPPATH, _("Set clipping path")); - else + else sp_document_done (doc, SP_VERB_OBJECT_SET_MASK, _("Set mask")); } @@ -2774,8 +3155,8 @@ void sp_selection_unset_mask(bool apply_clip_path) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop == NULL) return; - - SPDocument *doc = sp_desktop_document(desktop); + + SPDocument *doc = sp_desktop_document(desktop); Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc); Inkscape::Selection *selection = sp_desktop_selection(desktop); @@ -2784,18 +3165,18 @@ void sp_selection_unset_mask(bool apply_clip_path) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to remove clippath or mask from.")); return; } - + bool remove_original = prefs_get_int_attribute ("options.maskobject", "remove", 1); sp_document_ensure_up_to_date(doc); - gchar const* attributeName = apply_clip_path ? "clip-path" : "mask"; + gchar const *attributeName = apply_clip_path ? "clip-path" : "mask"; std::map referenced_objects; - for (GSList const*i = selection->itemList(); NULL != i; i = i->next) { + 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 SPItem *item = reinterpret_cast(i->data); Inkscape::URIReference *uri_ref = NULL; - + if (apply_clip_path) { uri_ref = item->clip_ref; } else { @@ -2848,9 +3229,9 @@ void sp_selection_unset_mask(bool apply_clip_path) { g_slist_free (items_to_move); } - if (apply_clip_path) + if (apply_clip_path) sp_document_done (doc, SP_VERB_OBJECT_UNSET_CLIPPATH, _("Release clipping path")); - else + else sp_document_done (doc, SP_VERB_OBJECT_UNSET_MASK, _("Release mask")); } @@ -2860,8 +3241,11 @@ void fit_canvas_to_selection(SPDesktop *desktop) { g_return_if_fail(doc != NULL); g_return_if_fail(desktop->selection != NULL); - g_return_if_fail(!desktop->selection->isEmpty()); + if (desktop->selection->isEmpty()) { + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to fit canvas to.")); + return; + } NR::Maybe const bbox(desktop->selection->bounds()); if (bbox && !bbox->isEmpty()) { doc->fitToRect(*bbox); @@ -2892,7 +3276,7 @@ void fit_canvas_to_selection_or_drawing(SPDesktop *desktop) { fit_canvas_to_selection(desktop); } - sp_document_done(doc, SP_VERB_FIT_CANVAS_TO_DRAWING, + sp_document_done(doc, SP_VERB_FIT_CANVAS_TO_DRAWING, _("Fit page to selection")); }; @@ -2909,7 +3293,7 @@ static void itemtree_map(void (*f)(SPItem *, SPDesktop *), SPObject *root, SPDes } } -static void unlock(SPItem *item, SPDesktop *desktop) { +static void unlock(SPItem *item, SPDesktop */*desktop*/) { if (item->isLocked()) { item->setLocked(FALSE); } @@ -2923,14 +3307,14 @@ static void unhide(SPItem *item, SPDesktop *desktop) { static void process_all(void (*f)(SPItem *, SPDesktop *), SPDesktop *dt, bool layer_only) { if (!dt) return; - + SPObject *root; if (layer_only) { root = dt->currentLayer(); } else { root = dt->currentRoot(); } - + itemtree_map(f, root, dt); } @@ -2950,6 +3334,12 @@ void unhide_all_in_all_layers(SPDesktop *dt) { process_all(&unhide, dt, false); } + +GSList * sp_selection_get_clipboard() { + return clipboard; +} + + /* Local Variables: mode:c++ @@ -2959,4 +3349,4 @@ void unhide_all_in_all_layers(SPDesktop *dt) { fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :