← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/inkscape/oneiric-updates

« back to all changes in this revision

Viewing changes to src/selection.h

  • Committer: Bazaar Package Importer
  • Author(s): Alex Valavanis
  • Date: 2010-09-12 19:44:58 UTC
  • mfrom: (1.1.12 upstream) (45.1.3 maverick)
  • Revision ID: james.westby@ubuntu.com-20100912194458-4sjwmbl7dlsrk5dc
Tags: 0.48.0-1ubuntu1
https://launchpad.net/bugs/628048
https://launchpad.net/bugs/401567
https://launchpad.net/bugs/456248
https://launchpad.net/bugs/463602
https://launchpad.net/bugs/591986
https://launchpad.net/bugs/513319
* Merge with Debian unstable (LP: #628048, LP: #401567, LP: #456248, 
  LP: #463602, LP: #591986)
* debian/control: 
  - Ubuntu maintainers
  - Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Demote pstoedit to Suggests (universe package).
  - Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319)
* debian/rules:
  - Run intltool-update on build (Ubuntu-specific).
  - Add translation domain to .desktop files (Ubuntu-specific).
* debian/dirs:
  - Add usr/share/pixmaps.  Allow inkscape.xpm installation
* drop 50-poppler-API.dpatch (now upstream)
* drop 51-paste-in-unwritable-directory.dpatch (now upstream) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/selection.h
229
229
    ///      method for that
230
230
    GSList const *reprList();
231
231
 
232
 
    /* list of all perspectives which have a 3D box in the current selection
 
232
    /** @brief Returns a list of all perspectives which have a 3D box in the current selection
233
233
       (these may also be nested in groups) */
234
234
    std::list<Persp3D *> const perspList();
235
235
 
236
 
    std::list<SPBox3D *> const box3DList();
 
236
    /** @brief Returns a list of all 3D boxes in the current selection which are associated to @c
 
237
       persp. If @c pers is @c NULL, return all selected boxes.
 
238
    */
 
239
    std::list<SPBox3D *> const box3DList(Persp3D *persp = NULL);
237
240
 
238
241
    /** @brief Returns the number of layers in which there are selected objects */
239
242
    guint numberOfLayers();
269
272
     * @brief Gets the selection's snap points.
270
273
     * @return Selection's snap points
271
274
     */
272
 
    std::vector<std::pair<Geom::Point, int> > getSnapPoints(SnapPreferences const *snapprefs) const;
 
275
    std::vector<Inkscape::SnapCandidatePoint> getSnapPoints(SnapPreferences const *snapprefs) const;
273
276
 
274
277
    /**
275
278
     * @brief Gets the snap points of a selection that form a convex hull.
276
279
     * @return Selection's convex hull points
277
280
     */
278
 
    std::vector<std::pair<Geom::Point, int> > getSnapPointsConvexHull(SnapPreferences const *snapprefs) const;
 
281
    std::vector<Inkscape::SnapCandidatePoint> getSnapPointsConvexHull(SnapPreferences const *snapprefs) const;
279
282
 
280
283
    /**
281
284
     * @brief Connects a slot to be notified of selection changes
351
354
    void remove_box_perspective(SPBox3D *box);
352
355
    void remove_3D_boxes_recursively(SPObject *obj);
353
356
 
354
 
    std::map<Persp3D *, unsigned int> _persps;
355
357
    std::list<SPBox3D *> _3dboxes;
356
358
 
357
359
    GC::soft_ptr<SPDesktop> _desktop;