X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fdialog%2Falign-and-distribute.cpp;h=b509d041ff745f0bb757e2d6b6395a4f1c39bd8f;hb=9acbda558d50be3b21e4b384be758bc12a461072;hp=924a987907a6591dd8d664e291845dcc3c134ae8;hpb=a0df1b8dd5b14367c583ce2f72a2ca6bf1cde799;p=inkscape.git diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 924a98790..b509d041f 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -1,7 +1,7 @@ -/** - * \brief Align and Distribute dialog - * - * Authors: +/** @file + * @brief Align and Distribute dialog - implementation + */ +/* Authors: * Bryce W. Harrington * Aubanel MONNIER * Frank Felfe @@ -39,7 +39,7 @@ #include "desktop-handles.h" #include "macros.h" #include "sp-item-transform.h" -#include "prefs-utils.h" +#include "preferences.h" #include "enums.h" #include "sp-text.h" @@ -99,7 +99,7 @@ class ActionAlign : public Action { public : struct Coeffs { double mx0, mx1, my0, my1; - double sx0, sx1, sy0, sy1; + double sx0, sx1, sy0, sy1; }; ActionAlign(const Glib::ustring &id, const Glib::ustring &tiptext, @@ -116,18 +116,21 @@ private : virtual void on_button_click() { //Retreive selected objects - SPDesktop *desktop = SP_ACTIVE_DESKTOP; + SPDesktop *desktop = _dialog.getDesktop(); if (!desktop) return; Inkscape::Selection *selection = sp_desktop_selection(desktop); if (!selection) return; + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + bool sel_as_group = prefs->getBool("/dialogs/align/sel-as-groups"); + using Inkscape::Util::GSListConstIterator; std::list selected; selected.insert >(selected.end(), selection->itemList(), NULL); if (selected.empty()) return; - NR::Point mp; //Anchor point + Geom::Point mp; //Anchor point AlignAndDistribute::AlignTarget target = _dialog.getAlignTarget(); const Coeffs &a= _allCoeffs[_index]; switch (target) @@ -151,12 +154,17 @@ private : ); //remove the master from the selection SPItem * thing = *master; - selected.erase(master); + // TODO: either uncomment or remove the following commented lines, depending on which + // behaviour of moving objects makes most sense; also cf. discussion at + // https://bugs.launchpad.net/inkscape/+bug/255933 + /*if (!sel_as_group) { */ + selected.erase(master); + /*}*/ //Compute the anchor point - NR::Maybe b = sp_item_bbox_desktop (thing); + Geom::OptRect b = sp_item_bbox_desktop (thing); if (b) { - mp = NR::Point(a.mx0 * b->min()[NR::X] + a.mx1 * b->max()[NR::X], - a.my0 * b->min()[NR::Y] + a.my1 * b->max()[NR::Y]); + mp = Geom::Point(a.mx0 * b->min()[Geom::X] + a.mx1 * b->max()[Geom::X], + a.my0 * b->min()[Geom::Y] + a.my1 * b->max()[Geom::Y]); } else { return; } @@ -164,17 +172,17 @@ private : } case AlignAndDistribute::PAGE: - mp = NR::Point(a.mx1 * sp_document_width(sp_desktop_document(desktop)), + mp = Geom::Point(a.mx1 * sp_document_width(sp_desktop_document(desktop)), a.my1 * sp_document_height(sp_desktop_document(desktop))); break; case AlignAndDistribute::DRAWING: { - NR::Maybe b = sp_item_bbox_desktop + Geom::OptRect b = sp_item_bbox_desktop ( (SPItem *) sp_document_root (sp_desktop_document (desktop)) ); if (b) { - mp = NR::Point(a.mx0 * b->min()[NR::X] + a.mx1 * b->max()[NR::X], - a.my0 * b->min()[NR::Y] + a.my1 * b->max()[NR::Y]); + mp = Geom::Point(a.mx0 * b->min()[Geom::X] + a.mx1 * b->max()[Geom::X], + a.my0 * b->min()[Geom::Y] + a.my1 * b->max()[Geom::Y]); } else { return; } @@ -183,10 +191,10 @@ private : case AlignAndDistribute::SELECTION: { - NR::Maybe b = selection->bounds(); + Geom::OptRect b = selection->bounds(); if (b) { - mp = NR::Point(a.mx0 * b->min()[NR::X] + a.mx1 * b->max()[NR::X], - a.my0 * b->min()[NR::Y] + a.my1 * b->max()[NR::Y]); + mp = Geom::Point(a.mx0 * b->min()[Geom::X] + a.mx1 * b->max()[Geom::X], + a.my0 * b->min()[Geom::Y] + a.my1 * b->max()[Geom::Y]); } else { return; } @@ -204,30 +212,35 @@ private : // a selected original, they will be unmoved too, possibly contrary to user's // expecation. However this is a minor point compared to making align/distribute always // work as expected, and "unmoved" is the default option anyway. - 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); + int saved_compensation = prefs->getInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED); + prefs->setInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED); bool changed = false; - //Move each item in the selected list + Geom::OptRect b; + if (sel_as_group) + b = selection->bounds(); + + //Move each item in the selected list separately for (std::list::iterator it(selected.begin()); it != selected.end(); it++) { sp_document_ensure_up_to_date(sp_desktop_document (desktop)); - NR::Maybe b = sp_item_bbox_desktop (*it); + if (!sel_as_group) + b = sp_item_bbox_desktop (*it); if (b) { - NR::Point const sp(a.sx0 * b->min()[NR::X] + a.sx1 * b->max()[NR::X], - a.sy0 * b->min()[NR::Y] + a.sy1 * b->max()[NR::Y]); - NR::Point const mp_rel( mp - sp ); + Geom::Point const sp(a.sx0 * b->min()[Geom::X] + a.sx1 * b->max()[Geom::X], + a.sy0 * b->min()[Geom::Y] + a.sy1 * b->max()[Geom::Y]); + Geom::Point const mp_rel( mp - sp ); if (LInfty(mp_rel) > 1e-9) { - sp_item_move_rel(*it, NR::translate(mp_rel)); + sp_item_move_rel(*it, Geom::Translate(mp_rel)); changed = true; } } } // restore compensation setting - prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation); + prefs->setInt("/options/clonecompensation/value", saved_compensation); if (changed) { sp_document_done ( sp_desktop_document (desktop) , SP_VERB_DIALOG_ALIGN_DISTRIBUTE, @@ -255,24 +268,20 @@ ActionAlign::Coeffs const ActionAlign::_allCoeffs[10] = { {0., 0., 1., 0., 0., 0., 0., 1.} }; -struct BBoxSort -{ - SPItem *item; - float anchor; - NR::Rect bbox; - BBoxSort(SPItem *pItem, NR::Rect bounds, NR::Dim2 orientation, double kBegin, double kEnd) : +BBoxSort::BBoxSort(SPItem *pItem, Geom::Rect bounds, Geom::Dim2 orientation, double kBegin, double kEnd) : item(pItem), bbox (bounds) - { +{ anchor = kBegin * bbox.min()[orientation] + kEnd * bbox.max()[orientation]; - } - BBoxSort(const BBoxSort &rhs): +} +BBoxSort::BBoxSort(const BBoxSort &rhs) : //NOTE : this copy ctor is called O(sort) when sorting the vector //this is bad. The vector should be a vector of pointers. //But I'll wait the bohem GC before doing that - item(rhs.item), anchor(rhs.anchor), bbox(rhs.bbox) { - } -}; + item(rhs.item), anchor(rhs.anchor), bbox(rhs.bbox) +{ +} + bool operator< (const BBoxSort &a, const BBoxSort &b) { return (a.anchor < b.anchor); @@ -285,7 +294,7 @@ public : guint row, guint column, AlignAndDistribute &dialog, bool onInterSpace, - NR::Dim2 orientation, + Geom::Dim2 orientation, double kBegin, double kEnd ): Action(id, tiptext, row, column, @@ -300,7 +309,7 @@ public : private : virtual void on_button_click() { //Retreive selected objects - SPDesktop *desktop = SP_ACTIVE_DESKTOP; + SPDesktop *desktop = _dialog.getDesktop(); if (!desktop) return; Inkscape::Selection *selection = sp_desktop_selection(desktop); @@ -322,7 +331,7 @@ private : it != selected.end(); ++it) { - NR::Maybe bbox = sp_item_bbox_desktop(*it); + Geom::OptRect bbox = sp_item_bbox_desktop(*it); if (bbox) { sorted.push_back(BBoxSort(*it, *bbox, _orientation, _kBegin, _kEnd)); } @@ -331,8 +340,9 @@ private : std::sort(sorted.begin(), sorted.end()); // see comment in ActionAlign above - 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); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + int saved_compensation = prefs->getInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED); + prefs->setInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED); unsigned int len = sorted.size(); bool changed = false; @@ -345,7 +355,7 @@ private : float span = 0; for (unsigned int i = 0; i < len; i++) { - span += sorted[i].bbox.extent(_orientation); + span += sorted[i].bbox[_orientation].extent(); } //new distance between each bbox float step = (dist - span) / (len - 1); @@ -355,12 +365,12 @@ private : it ++ ) { if (!NR_DF_TEST_CLOSE (pos, it->bbox.min()[_orientation], 1e-6)) { - NR::Point t(0.0, 0.0); + Geom::Point t(0.0, 0.0); t[_orientation] = pos - it->bbox.min()[_orientation]; - sp_item_move_rel(it->item, NR::translate(t)); + sp_item_move_rel(it->item, Geom::Translate(t)); changed = true; } - pos += it->bbox.extent(_orientation); + pos += it->bbox[_orientation].extent(); pos += step; } } @@ -379,27 +389,27 @@ private : //Don't move if we are really close if (!NR_DF_TEST_CLOSE (pos, it.anchor, 1e-6)) { //Compute translation - NR::Point t(0.0, 0.0); + Geom::Point t(0.0, 0.0); t[_orientation] = pos - it.anchor; //translate - sp_item_move_rel(it.item, NR::translate(t)); + sp_item_move_rel(it.item, Geom::Translate(t)); changed = true; } } } // restore compensation setting - prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation); + prefs->setInt("/options/clonecompensation/value", saved_compensation); if (changed) { - sp_document_done ( sp_desktop_document (desktop), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, + sp_document_done ( sp_desktop_document (desktop), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, _("Distribute")); } } guint _index; AlignAndDistribute &_dialog; bool _onInterSpace; - NR::Dim2 _orientation; + Geom::Dim2 _orientation; double _kBegin; double _kEnd; @@ -413,7 +423,7 @@ public : const Glib::ustring &tiptext, guint column, AlignAndDistribute &dialog, - NR::Dim2 orientation, bool distribute): + Geom::Dim2 orientation, bool distribute): Action(id, tiptext, 0, column, dialog.nodes_table(), dialog.tooltips(), dialog), _orientation(orientation), @@ -421,19 +431,19 @@ public : {} private : - NR::Dim2 _orientation; + Geom::Dim2 _orientation; bool _distribute; virtual void on_button_click() { - if (!SP_ACTIVE_DESKTOP) return; - SPEventContext *event_context = sp_desktop_event_context(SP_ACTIVE_DESKTOP); - if (!SP_IS_NODE_CONTEXT (event_context)) return ; + if (!_dialog.getDesktop()) return; + SPEventContext *event_context = sp_desktop_event_context(_dialog.getDesktop()); + if (!SP_IS_NODE_CONTEXT (event_context)) return ; if (_distribute) - SP_NODE_CONTEXT (event_context)->shape_editor->distribute(_orientation); + SP_NODE_CONTEXT (event_context)->shape_editor->distribute((Geom::Dim2)_orientation); else - SP_NODE_CONTEXT (event_context)->shape_editor->align(_orientation); + SP_NODE_CONTEXT (event_context)->shape_editor->align((Geom::Dim2)_orientation); } }; @@ -455,7 +465,7 @@ public: dialog.removeOverlap_table(), dialog.tooltips(), dialog) { dialog.removeOverlap_table().set_col_spacings(3); - + removeOverlapXGap.set_digits(1); removeOverlapXGap.set_size_request(60, -1); removeOverlapXGap.set_increments(1.0, 5.0); @@ -463,8 +473,8 @@ public: removeOverlapXGap.set_value(0); dialog.tooltips().set_tip(removeOverlapXGap, _("Minimum horizontal gap (in px units) between bounding boxes")); - /* TRANSLATORS: Horizontal gap */ - removeOverlapXGapLabel.set_label(_("H:")); + /* TRANSLATORS: Horizontal gap. Only put "H:" equivalent in the translation */ + removeOverlapXGapLabel.set_label(Q_("gap|H:")); removeOverlapYGap.set_digits(1); removeOverlapYGap.set_size_request(60, -1); @@ -486,22 +496,23 @@ public: private : virtual void on_button_click() { - if (!SP_ACTIVE_DESKTOP) return; + if (!_dialog.getDesktop()) return; // see comment in ActionAlign above - 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); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + int saved_compensation = prefs->getInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED); + prefs->setInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED); // xGap and yGap are the minimum space required between bounding rectangles. double const xGap = removeOverlapXGap.get_value(); double const yGap = removeOverlapYGap.get_value(); - removeoverlap(sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList(), + removeoverlap(sp_desktop_selection(_dialog.getDesktop())->itemList(), xGap, yGap); // restore compensation setting - prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation); + prefs->setInt("/options/clonecompensation/value", saved_compensation); - sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, + sp_document_done(sp_desktop_document(_dialog.getDesktop()), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, _("Remove overlaps")); } }; @@ -520,18 +531,19 @@ public: private : virtual void on_button_click() { - if (!SP_ACTIVE_DESKTOP) return; + if (!_dialog.getDesktop()) return; // see comment in ActionAlign above - 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); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + int saved_compensation = prefs->getInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED); + prefs->setInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED); - graphlayout(sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList()); + graphlayout(sp_desktop_selection(_dialog.getDesktop())->itemList()); // restore compensation setting - prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation); + prefs->setInt("/options/clonecompensation/value", saved_compensation); - sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, + sp_document_done(sp_desktop_document(_dialog.getDesktop()), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, _("Arrange connector network")); } }; @@ -550,18 +562,19 @@ public : private : virtual void on_button_click() { - if (!SP_ACTIVE_DESKTOP) return; + if (!_dialog.getDesktop()) return; // see comment in ActionAlign above - 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); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + int saved_compensation = prefs->getInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED); + prefs->setInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED); - unclump ((GSList *) sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList()); + unclump ((GSList *) sp_desktop_selection(_dialog.getDesktop())->itemList()); // restore compensation setting - prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation); + prefs->setInt("/options/clonecompensation/value", saved_compensation); - sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, + sp_document_done (sp_desktop_document (_dialog.getDesktop()), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, _("Unclump")); } }; @@ -580,7 +593,7 @@ public : private : virtual void on_button_click() { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; + SPDesktop *desktop = _dialog.getDesktop(); if (!desktop) return; Inkscape::Selection *selection = sp_desktop_selection(desktop); @@ -594,7 +607,7 @@ private : //Check 2 or more selected objects if (selected.size() < 2) return; - NR::Maybe sel_bbox = selection->bounds(); + Geom::OptRect sel_bbox = selection->bounds(); if (!sel_bbox) { return; } @@ -607,31 +620,32 @@ private : } // see comment in ActionAlign above - 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); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + int saved_compensation = prefs->getInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED); + prefs->setInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED); for (std::list::iterator it(selected.begin()); it != selected.end(); ++it) { sp_document_ensure_up_to_date(sp_desktop_document (desktop)); - NR::Maybe item_box = sp_item_bbox_desktop (*it); + Geom::OptRect item_box = sp_item_bbox_desktop (*it); if (item_box) { - // find new center, staying within bbox - double x = _dialog.randomize_bbox->min()[NR::X] + item_box->extent(NR::X)/2 + - g_random_double_range (0, _dialog.randomize_bbox->extent(NR::X) - item_box->extent(NR::X)); - double y = _dialog.randomize_bbox->min()[NR::Y] + item_box->extent(NR::Y)/2 + - g_random_double_range (0, _dialog.randomize_bbox->extent(NR::Y) - item_box->extent(NR::Y)); + // find new center, staying within bbox + double x = _dialog.randomize_bbox->min()[Geom::X] + (*item_box)[Geom::X].extent() /2 + + g_random_double_range (0, (*_dialog.randomize_bbox)[Geom::X].extent() - (*item_box)[Geom::X].extent()); + double y = _dialog.randomize_bbox->min()[Geom::Y] + (*item_box)[Geom::Y].extent()/2 + + g_random_double_range (0, (*_dialog.randomize_bbox)[Geom::Y].extent() - (*item_box)[Geom::Y].extent()); // displacement is the new center minus old: - NR::Point t = NR::Point (x, y) - 0.5*(item_box->max() + item_box->min()); - sp_item_move_rel(*it, NR::translate(t)); + Geom::Point t = Geom::Point (x, y) - 0.5*(item_box->max() + item_box->min()); + sp_item_move_rel(*it, Geom::Translate(t)); } } // restore compensation setting - prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation); + prefs->setInt("/options/clonecompensation/value", saved_compensation); - sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, + sp_document_done (sp_desktop_document (desktop), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, _("Randomize positions")); } }; @@ -639,9 +653,9 @@ private : struct Baselines { SPItem *_item; - NR::Point _base; - NR::Dim2 _orientation; - Baselines(SPItem *item, NR::Point base, NR::Dim2 orientation) : + Geom::Point _base; + Geom::Dim2 _orientation; + Baselines(SPItem *item, Geom::Point base, Geom::Dim2 orientation) : _item (item), _base (base), _orientation (orientation) @@ -661,7 +675,7 @@ public : guint column, AlignAndDistribute &dialog, Gtk::Table &table, - NR::Dim2 orientation, bool distribute): + Geom::Dim2 orientation, bool distribute): Action(id, tiptext, row, column, table, dialog.tooltips(), dialog), _orientation(orientation), @@ -669,11 +683,11 @@ public : {} private : - NR::Dim2 _orientation; + Geom::Dim2 _orientation; bool _distribute; virtual void on_button_click() { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; + SPDesktop *desktop = _dialog.getDesktop(); if (!desktop) return; Inkscape::Selection *selection = sp_desktop_selection(desktop); @@ -687,8 +701,8 @@ private : //Check 2 or more selected objects if (selected.size() < 2) return; - NR::Point b_min = NR::Point (HUGE_VAL, HUGE_VAL); - NR::Point b_max = NR::Point (-HUGE_VAL, -HUGE_VAL); + Geom::Point b_min = Geom::Point (HUGE_VAL, HUGE_VAL); + Geom::Point b_max = Geom::Point (-HUGE_VAL, -HUGE_VAL); std::vector sorted; @@ -698,11 +712,11 @@ private : { if (SP_IS_TEXT (*it) || SP_IS_FLOWTEXT (*it)) { Inkscape::Text::Layout const *layout = te_get_layout(*it); - NR::Point base = layout->characterAnchorPoint(layout->begin()) * sp_item_i2d_affine(*it); - if (base[NR::X] < b_min[NR::X]) b_min[NR::X] = base[NR::X]; - if (base[NR::Y] < b_min[NR::Y]) b_min[NR::Y] = base[NR::Y]; - if (base[NR::X] > b_max[NR::X]) b_max[NR::X] = base[NR::X]; - if (base[NR::Y] > b_max[NR::Y]) b_max[NR::Y] = base[NR::Y]; + Geom::Point base = layout->characterAnchorPoint(layout->begin()) * sp_item_i2d_affine(*it); + if (base[Geom::X] < b_min[Geom::X]) b_min[Geom::X] = base[Geom::X]; + if (base[Geom::Y] < b_min[Geom::Y]) b_min[Geom::Y] = base[Geom::Y]; + if (base[Geom::X] > b_max[Geom::X]) b_max[Geom::X] = base[Geom::X]; + if (base[Geom::Y] > b_max[Geom::Y]) b_max[Geom::Y] = base[Geom::Y]; Baselines b (*it, base, _orientation); sorted.push_back(b); @@ -720,15 +734,15 @@ private : double step = (b_max[_orientation] - b_min[_orientation])/(sorted.size() - 1); for (unsigned int i = 0; i < sorted.size(); i++) { SPItem *item = sorted[i]._item; - NR::Point base = sorted[i]._base; - NR::Point t(0.0, 0.0); + Geom::Point base = sorted[i]._base; + Geom::Point t(0.0, 0.0); t[_orientation] = b_min[_orientation] + step * i - base[_orientation]; - sp_item_move_rel(item, NR::translate(t)); + sp_item_move_rel(item, Geom::Translate(t)); changed = true; } if (changed) { - sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, + sp_document_done (sp_desktop_document (desktop), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, _("Distribute text baselines")); } @@ -739,16 +753,16 @@ private : { if (SP_IS_TEXT (*it) || SP_IS_FLOWTEXT (*it)) { Inkscape::Text::Layout const *layout = te_get_layout(*it); - NR::Point base = layout->characterAnchorPoint(layout->begin()) * sp_item_i2d_affine(*it); - NR::Point t(0.0, 0.0); + Geom::Point base = layout->characterAnchorPoint(layout->begin()) * sp_item_i2d_affine(*it); + Geom::Point t(0.0, 0.0); t[_orientation] = b_min[_orientation] - base[_orientation]; - sp_item_move_rel(*it, NR::translate(t)); + sp_item_move_rel(*it, Geom::Translate(t)); changed = true; } } if (changed) { - sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, + sp_document_done (sp_desktop_document (desktop), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, _("Align text baselines")); } } @@ -757,16 +771,16 @@ private : -void on_tool_changed(Inkscape::Application *inkscape, SPEventContext *context, AlignAndDistribute *daad) +void on_tool_changed(Inkscape::Application */*inkscape*/, SPEventContext */*context*/, AlignAndDistribute *daad) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop && sp_desktop_event_context(desktop)) daad->setMode(tools_active(desktop) == TOOLS_NODES); } -void on_selection_changed(Inkscape::Application *inkscape, Inkscape::Selection *selection, AlignAndDistribute *daad) +void on_selection_changed(Inkscape::Application */*inkscape*/, Inkscape::Selection */*selection*/, AlignAndDistribute *daad) { - daad->randomize_bbox = NR::Nothing(); + daad->randomize_bbox = Geom::OptRect(); } ///////////////////////////////////////////////////////// @@ -774,9 +788,9 @@ void on_selection_changed(Inkscape::Application *inkscape, Inkscape::Selection * -AlignAndDistribute::AlignAndDistribute(Behavior::BehaviorFactory behavior_factory) - : Dialog (behavior_factory, "dialogs.align", SP_VERB_DIALOG_ALIGN_DISTRIBUTE), - randomize_bbox(NR::Nothing()), +AlignAndDistribute::AlignAndDistribute() + : UI::Widget::Panel ("", "/dialogs/align", SP_VERB_DIALOG_ALIGN_DISTRIBUTE), + randomize_bbox(), _alignFrame(_("Align")), _distributeFrame(_("Distribute")), _removeOverlapFrame(_("Remove overlaps")), @@ -787,8 +801,10 @@ AlignAndDistribute::AlignAndDistribute(Behavior::BehaviorFactory behavior_factor _removeOverlapTable(1, 5, false), _graphLayoutTable(1, 5, false), _nodesTable(1, 4, true), - _anchorLabel(_("Relative to: ")) + _anchorLabel(_("Relative to: ")), + _selgrpLabel(_("Treat selection as group: ")) { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); //Instanciate the align buttons addAlignButton("al_left_out", @@ -825,47 +841,47 @@ AlignAndDistribute::AlignAndDistribute(Behavior::BehaviorFactory behavior_factor //Baseline aligns addBaselineButton("al_baselines_vert", _("Align baseline anchors of texts vertically"), - 0, 5, this->align_table(), NR::X, false); + 0, 5, this->align_table(), Geom::X, false); addBaselineButton("al_baselines_hor", _("Align baseline anchors of texts horizontally"), - 1, 5, this->align_table(), NR::Y, false); + 1, 5, this->align_table(), Geom::Y, false); //The distribute buttons addDistributeButton("distribute_hdist", _("Make horizontal gaps between objects equal"), - 0, 4, true, NR::X, .5, .5); + 0, 4, true, Geom::X, .5, .5); addDistributeButton("distribute_left", _("Distribute left sides equidistantly"), - 0, 1, false, NR::X, 1., 0.); + 0, 1, false, Geom::X, 1., 0.); addDistributeButton("distribute_hcentre", _("Distribute centers equidistantly horizontally"), - 0, 2, false, NR::X, .5, .5); + 0, 2, false, Geom::X, .5, .5); addDistributeButton("distribute_right", _("Distribute right sides equidistantly"), - 0, 3, false, NR::X, 0., 1.); + 0, 3, false, Geom::X, 0., 1.); addDistributeButton("distribute_vdist", _("Make vertical gaps between objects equal"), - 1, 4, true, NR::Y, .5, .5); + 1, 4, true, Geom::Y, .5, .5); addDistributeButton("distribute_top", _("Distribute tops equidistantly"), - 1, 1, false, NR::Y, 0, 1); + 1, 1, false, Geom::Y, 0, 1); addDistributeButton("distribute_vcentre", _("Distribute centers equidistantly vertically"), - 1, 2, false, NR::Y, .5, .5); + 1, 2, false, Geom::Y, .5, .5); addDistributeButton("distribute_bottom", _("Distribute bottoms equidistantly"), - 1, 3, false, NR::Y, 1., 0.); + 1, 3, false, Geom::Y, 1., 0.); //Baseline distribs addBaselineButton("distribute_baselines_hor", _("Distribute baseline anchors of texts horizontally"), - 0, 5, this->distribute_table(), NR::X, true); + 0, 5, this->distribute_table(), Geom::X, true); addBaselineButton("distribute_baselines_vert", _("Distribute baseline anchors of texts vertically"), - 1, 5, this->distribute_table(), NR::Y, true); + 1, 5, this->distribute_table(), Geom::Y, true); //Randomize & Unclump addRandomizeButton("distribute_randomize", @@ -887,16 +903,16 @@ AlignAndDistribute::AlignAndDistribute(Behavior::BehaviorFactory behavior_factor //Node Mode buttons addNodeButton("node_halign", _("Align selected nodes horizontally"), - 0, NR::X, false); + 0, Geom::X, false); addNodeButton("node_valign", _("Align selected nodes vertically"), - 1, NR::Y, false); + 1, Geom::Y, false); addNodeButton("node_hdistribute", _("Distribute selected nodes horizontally"), - 2, NR::X, true); + 2, Geom::X, true); addNodeButton("node_vdistribute", _("Distribute selected nodes vertically"), - 3, NR::Y, true); + 3, Geom::Y, true); //Rest of the widgetry @@ -908,13 +924,19 @@ AlignAndDistribute::AlignAndDistribute(Behavior::BehaviorFactory behavior_factor _combo.append_text(_("Drawing")); _combo.append_text(_("Selection")); - _combo.set_active(6); + _combo.set_active(prefs->getInt("/dialogs/align/align-to", 6)); _combo.signal_changed().connect(sigc::mem_fun(*this, &AlignAndDistribute::on_ref_change)); _anchorBox.pack_start(_anchorLabel); _anchorBox.pack_start(_combo); + _selgrpBox.pack_start(_selgrpLabel); + _selgrpBox.pack_start(_selgrp); + _selgrp.set_active(prefs->getBool("/dialogs/align/sel-as-groups")); + _selgrp.signal_toggled().connect(sigc::mem_fun(*this, &AlignAndDistribute::on_selgrp_toggled)); + _alignBox.pack_start(_anchorBox); + _alignBox.pack_start(_selgrpBox); _alignBox.pack_start(_alignTable); _alignFrame.add(_alignBox); @@ -923,31 +945,30 @@ AlignAndDistribute::AlignAndDistribute(Behavior::BehaviorFactory behavior_factor _graphLayoutFrame.add(_graphLayoutTable); _nodesFrame.add(_nodesTable); - // Top level vbox - Gtk::VBox *vbox = get_vbox(); - vbox->set_spacing(4); + Gtk::Box *contents = _getContents(); + contents->set_spacing(4); // Notebook for individual transformations - vbox->pack_start(_alignFrame, true, true); - vbox->pack_start(_distributeFrame, true, true); - vbox->pack_start(_removeOverlapFrame, true, true); - vbox->pack_start(_graphLayoutFrame, true, true); - vbox->pack_start(_nodesFrame, true, true); + contents->pack_start(_alignFrame, true, true); + contents->pack_start(_distributeFrame, true, true); + contents->pack_start(_removeOverlapFrame, true, true); + contents->pack_start(_graphLayoutFrame, true, true); + contents->pack_start(_nodesFrame, true, true); //Connect to the global tool change signal g_signal_connect (G_OBJECT (INKSCAPE), "set_eventcontext", G_CALLBACK (on_tool_changed), this); // Connect to the global selection change, to invalidate cached randomize_bbox g_signal_connect (G_OBJECT (INKSCAPE), "change_selection", G_CALLBACK (on_selection_changed), this); - randomize_bbox = NR::Nothing(); + randomize_bbox = Geom::OptRect(); show_all_children(); on_tool_changed (NULL, NULL, this); // set current mode } -AlignAndDistribute::~AlignAndDistribute() +AlignAndDistribute::~AlignAndDistribute() { sp_signal_disconnect_by_data (G_OBJECT (INKSCAPE), this); @@ -958,7 +979,17 @@ AlignAndDistribute::~AlignAndDistribute() } void AlignAndDistribute::on_ref_change(){ -//Make blink the master + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + prefs->setInt("/dialogs/align/align-to", _combo.get_active_row_number()); + + //Make blink the master +} + +void AlignAndDistribute::on_selgrp_toggled(){ + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + prefs->setInt("/dialogs/align/sel-as-groups", _selgrp.get_active()); + + //Make blink the master } @@ -992,7 +1023,7 @@ void AlignAndDistribute::addAlignButton(const Glib::ustring &id, const Glib::ust } void AlignAndDistribute::addDistributeButton(const Glib::ustring &id, const Glib::ustring tiptext, guint row, guint col, bool onInterSpace, - NR::Dim2 orientation, float kBegin, float kEnd) + Geom::Dim2 orientation, float kBegin, float kEnd) { _actionList.push_back( new ActionDistribute( @@ -1004,7 +1035,7 @@ void AlignAndDistribute::addDistributeButton(const Glib::ustring &id, const Glib } void AlignAndDistribute::addNodeButton(const Glib::ustring &id, const Glib::ustring tiptext, - guint col, NR::Dim2 orientation, bool distribute) + guint col, Geom::Dim2 orientation, bool distribute) { _actionList.push_back( new ActionNode( @@ -1049,11 +1080,11 @@ void AlignAndDistribute::addRandomizeButton(const Glib::ustring &id, const Glib: } void AlignAndDistribute::addBaselineButton(const Glib::ustring &id, const Glib::ustring tiptext, - guint row, guint col, Gtk::Table &table, NR::Dim2 orientation, bool distribute) + guint row, guint col, Gtk::Table &table, Geom::Dim2 orientation, bool distribute) { _actionList.push_back( new ActionBaseline( - id, tiptext, row, col, + id, tiptext, row, col, *this, table, orientation, distribute)); } @@ -1075,9 +1106,9 @@ std::list::iterator AlignAndDistribute::find_master( std::list::iterator it = list.begin(); it != list.end(); it++) { - NR::Maybe b = sp_item_bbox_desktop (*it); + Geom::OptRect b = sp_item_bbox_desktop (*it); if (b) { - gdouble dim = b->extent(horizontal ? NR::X : NR::Y); + gdouble dim = (*b)[horizontal ? Geom::X : Geom::Y].extent(); if (dim > max) { max = dim; master = it; @@ -1092,9 +1123,9 @@ std::list::iterator AlignAndDistribute::find_master( std::list::iterator it = list.begin(); it != list.end(); it++) { - NR::Maybe b = sp_item_bbox_desktop (*it); + Geom::OptRect b = sp_item_bbox_desktop (*it); if (b) { - gdouble dim = b->extent(horizontal ? NR::X : NR::Y); + gdouble dim = (*b)[horizontal ? Geom::X : Geom::Y].extent(); if (dim < max) { max = dim; master = it;