diff options
Diffstat (limited to 'src/ui/tools')
28 files changed, 551 insertions, 441 deletions
diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp index 33f323eb3..e620b7cb1 100644 --- a/src/ui/tools/arc-tool.cpp +++ b/src/ui/tools/arc-tool.cpp @@ -19,31 +19,35 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include <glibmm/i18n.h> #include <gdk/gdkkeysyms.h> -#include "macros.h" -#include <glibmm/i18n.h> -#include "display/sp-canvas.h" -#include "sp-ellipse.h" -#include "document.h" +#include "context-fns.h" +#include "desktop-style.h" +#include "desktop.h" #include "document-undo.h" -#include "sp-namedview.h" +#include "document.h" +#include "macros.h" +#include "message-context.h" +#include "preferences.h" #include "selection.h" +#include "snap.h" +#include "verbs.h" + +#include "display/sp-canvas.h" +#include "display/sp-canvas-item.h" + +#include "object/sp-ellipse.h" +#include "object/sp-namedview.h" #include "pixmaps/cursor-ellipse.xpm" -#include "xml/repr.h" -#include "xml/node-event-vector.h" -#include "preferences.h" -#include "message-context.h" -#include "desktop.h" -#include "desktop-style.h" -#include "context-fns.h" -#include "verbs.h" + +#include "ui/tools/arc-tool.h" #include "ui/shape-editor.h" #include "ui/tools/tool-base.h" -#include "ui/tools/arc-tool.h" -#include "display/sp-canvas-item.h" +#include "xml/repr.h" +#include "xml/node-event-vector.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp index 09ee2cda9..52c66fb2b 100644 --- a/src/ui/tools/box3d-tool.cpp +++ b/src/ui/tools/box3d-tool.cpp @@ -16,30 +16,36 @@ */ #include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> -#include "macros.h" -#include "display/sp-canvas.h" -#include "document.h" + +#include "context-fns.h" +#include "desktop-style.h" +#include "desktop.h" +#include "document-private.h" #include "document-undo.h" -#include "sp-namedview.h" -#include "selection.h" +#include "document.h" +#include "macros.h" +#include "message-context.h" +#include "perspective-line.h" #include "selection-chemistry.h" +#include "selection.h" +#include "verbs.h" #include "display/sp-canvas-item.h" -#include "desktop.h" -#include "message-context.h" +#include "display/sp-canvas.h" + #include "pixmaps/cursor-3dbox.xpm" -#include "box3d.h" + +#include "object/box3d-side.h" +#include "object/box3d.h" +#include "object/sp-defs.h" +#include "object/sp-namedview.h" + +#include "ui/shape-editor.h" #include "ui/tools/box3d-tool.h" -#include <glibmm/i18n.h> + #include "xml/node-event-vector.h" -#include "context-fns.h" -#include "desktop-style.h" -#include "perspective-line.h" -#include "box3d-side.h" -#include "document-private.h" -#include "ui/shape-editor.h" -#include "verbs.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp index 2a29b25b0..ccf5e3be5 100644 --- a/src/ui/tools/calligraphic-tool.cpp +++ b/src/ui/tools/calligraphic-tool.cpp @@ -30,34 +30,38 @@ #include <cstring> #include <numeric> -#include "svg/svg.h" -#include "display/canvas-bpath.h" -#include "display/cairo-utils.h" #include <2geom/pathvector.h> #include <2geom/bezier-utils.h> #include <2geom/circle.h> -#include "display/curve.h" -#include "macros.h" -#include "document.h" -#include "document-undo.h" -#include "selection.h" -#include "desktop.h" -#include "desktop-events.h" -#include "desktop-style.h" -#include "message-context.h" -#include "pixmaps/cursor-calligraphy.xpm" #include "context-fns.h" +#include "desktop-events.h" +#include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" #include "inkscape.h" +#include "macros.h" +#include "message-context.h" +#include "selection.h" #include "splivarot.h" -#include "sp-item-group.h" -#include "sp-shape.h" -#include "sp-path.h" -#include "sp-text.h" -#include "display/sp-canvas.h" +#include "verbs.h" + +#include "display/cairo-utils.h" #include "display/canvas-arena.h" +#include "display/canvas-bpath.h" +#include "display/curve.h" +#include "display/sp-canvas.h" + #include "livarot/Shape.h" -#include "verbs.h" + +#include "object/sp-shape.h" +#include "object/sp-text.h" + +#include "pixmaps/cursor-calligraphy.xpm" + +#include "svg/svg.h" + #include "ui/tools/calligraphic-tool.h" #include "ui/tools/freehand-base.h" diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp index bb2e724ae..ec55ab80b 100644 --- a/src/ui/tools/connector-tool.cpp +++ b/src/ui/tools/connector-tool.cpp @@ -66,40 +66,45 @@ * */ - - -#include <gdk/gdkkeysyms.h> #include <string> #include <cstring> -#include "ui/tools/connector-tool.h" -#include "pixmaps/cursor-connector.xpm" -#include "xml/node-event-vector.h" -#include "svg/svg.h" -#include "desktop.h" -#include "desktop-style.h" +#include <glibmm/i18n.h> +#include <glibmm/stringutils.h> +#include <gdk/gdkkeysyms.h> -#include "document.h" +#include "context-fns.h" +#include "desktop-style.h" +#include "desktop.h" #include "document-undo.h" +#include "document.h" +#include "inkscape.h" #include "message-context.h" #include "message-stack.h" #include "selection.h" -#include "inkscape.h" -#include "sp-path.h" -#include "display/sp-canvas.h" -#include "display/canvas-bpath.h" -#include <glibmm/i18n.h> -#include <glibmm/stringutils.h> #include "snap.h" -#include "sp-conn-end.h" -#include "libavoid/router.h" -#include "context-fns.h" -#include "sp-namedview.h" -#include "sp-text.h" -#include "sp-flowtext.h" -#include "display/curve.h" #include "verbs.h" +#include "display/canvas-bpath.h" +#include "display/curve.h" +#include "display/sp-canvas.h" + +#include "libavoid/router.h" + +#include "object/sp-conn-end.h" +#include "object/sp-flowtext.h" +#include "object/sp-namedview.h" +#include "object/sp-path.h" +#include "object/sp-text.h" + +#include "pixmaps/cursor-connector.xpm" + +#include "svg/svg.h" + +#include "ui/tools/connector-tool.h" + +#include "xml/node-event-vector.h" + using Inkscape::DocumentUndo; namespace Inkscape { diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp index 7bde1b698..07fc4b719 100644 --- a/src/ui/tools/dropper-tool.cpp +++ b/src/ui/tools/dropper-tool.cpp @@ -18,33 +18,36 @@ #include <glibmm/i18n.h> #include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> + #include <2geom/transforms.h> #include <2geom/circle.h> +#include "color-rgba.h" +#include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" #include "macros.h" +#include "message-context.h" +#include "preferences.h" +#include "selection.h" +#include "sp-cursor.h" +#include "verbs.h" + #include "display/canvas-bpath.h" #include "display/canvas-arena.h" #include "display/curve.h" #include "display/cairo-utils.h" -#include "svg/svg-color.h" -#include "color-rgba.h" -#include "desktop-style.h" -#include "preferences.h" -#include "sp-namedview.h" -#include "sp-cursor.h" -#include "desktop.h" -#include "selection.h" -#include "document-undo.h" +#include "object/sp-namedview.h" #include "pixmaps/cursor-dropper-f.xpm" #include "pixmaps/cursor-dropper-s.xpm" #include "pixmaps/cursor-dropping-f.xpm" #include "pixmaps/cursor-dropping-s.xpm" +#include "svg/svg-color.h" + #include "ui/tools/dropper-tool.h" -#include "message-context.h" -#include "verbs.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp index 7892e865b..01ae71413 100644 --- a/src/ui/tools/eraser-tool.cpp +++ b/src/ui/tools/eraser-tool.cpp @@ -24,48 +24,53 @@ #define noERASER_VERBOSE -#include <gtk/gtk.h> -#include <gdk/gdkkeysyms.h> -#include <glibmm/i18n.h> #include <string> #include <cstring> #include <numeric> -#include "svg/svg.h" -#include "display/sp-canvas.h" -#include "display/canvas-bpath.h" +#include <gtk/gtk.h> +#include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> + #include <2geom/bezier-utils.h> +#include <2geom/pathvector.h> -#include "macros.h" -#include "document.h" -#include "selection.h" -#include "desktop.h" +#include "context-fns.h" #include "desktop-events.h" - #include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "layer-manager.h" +#include "layer-model.h" +#include "macros.h" #include "message-context.h" -#include "pixmaps/cursor-eraser.xpm" -#include "context-fns.h" +#include "path-chemistry.h" #include "rubberband.h" +#include "selection-chemistry.h" +#include "selection.h" #include "splivarot.h" -#include "sp-item-group.h" -#include "sp-shape.h" -#include "sp-path.h" -#include "sp-clippath.h" -#include "sp-rect.h" -#include "sp-text.h" -#include "sp-root.h" -#include "display/canvas-bpath.h" -#include "display/canvas-arena.h" -#include "document-undo.h" #include "verbs.h" -#include "style.h" -#include <2geom/pathvector.h> -#include "path-chemistry.h" -#include "selection-chemistry.h" + +#include "display/sp-canvas.h" +#include "display/canvas-arena.h" +#include "display/canvas-bpath.h" #include "display/curve.h" -#include "layer-model.h" -#include "layer-manager.h" + +#include "object/sp-clippath.h" +#include "object/sp-item-group.h" +#include "object/sp-path.h" +#include "object/sp-rect.h" +#include "object/sp-root.h" +#include "object/sp-shape.h" +#include "object/sp-text.h" +#include "object/sp-use.h" +#include "style.h" + +#include "pixmaps/cursor-eraser.xpm" + +#include "svg/svg.h" + #include "ui/tools/eraser-tool.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp index 401b50c1c..487f3f7d8 100644 --- a/src/ui/tools/flood-tool.cpp +++ b/src/ui/tools/flood-tool.cpp @@ -21,43 +21,53 @@ #include <config.h> #endif +#include "flood-tool.h" + #include <cmath> -#include "trace/potrace/inkscape-potrace.h" -#include <2geom/pathvector.h> -#include <gdk/gdkkeysyms.h> #include <queue> + +#include <gdk/gdkkeysyms.h> #include <glibmm/i18n.h> +#include <2geom/pathvector.h> + #include "color.h" #include "context-fns.h" +#include "desktop-style.h" #include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "macros.h" +#include "message-context.h" +#include "message-stack.h" +#include "rubberband.h" +#include "selection.h" +#include "splivarot.h" +#include "verbs.h" -#include "desktop-style.h" #include "display/cairo-utils.h" #include "display/drawing-context.h" #include "display/drawing-image.h" #include "display/drawing.h" #include "display/sp-canvas.h" -#include "document.h" -#include "document-undo.h" -#include "ui/tools/flood-tool.h" + #include "livarot/Path.h" #include "livarot/Shape.h" -#include "macros.h" -#include "message-context.h" -#include "message-stack.h" -#include "rubberband.h" -#include "selection.h" -#include "ui/shape-editor.h" -#include "splivarot.h" -#include "sp-namedview.h" -#include "sp-root.h" + +#include "object/sp-namedview.h" +#include "object/sp-path.h" +#include "object/sp-root.h" + +#include "pixmaps/cursor-paintbucket.xpm" + #include "svg/svg.h" + #include "trace/imagemap.h" -#include "xml/node-event-vector.h" -#include "verbs.h" +#include "trace/potrace/inkscape-potrace.h" -#include "pixmaps/cursor-paintbucket.xpm" +#include "ui/shape-editor.h" + +#include "xml/node-event-vector.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/flood-tool.h b/src/ui/tools/flood-tool.h index 100875f22..7eadeea34 100644 --- a/src/ui/tools/flood-tool.h +++ b/src/ui/tools/flood-tool.h @@ -11,14 +11,19 @@ * Released under GNU GPL */ +#include <vector> + #include <sigc++/connection.h> + #include "ui/tools/tool-base.h" -#include <vector> #define SP_FLOOD_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::FloodTool*>((Inkscape::UI::Tools::ToolBase*)obj)) #define SP_IS_FLOOD_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::FloodTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL) namespace Inkscape { + +class Selection; + namespace UI { namespace Tools { diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp index 8a078d510..26d812394 100644 --- a/src/ui/tools/freehand-base.cpp +++ b/src/ui/tools/freehand-base.cpp @@ -20,28 +20,33 @@ #include <config.h> #endif +#include "desktop-style.h" +#include "macros.h" +#include "message-stack.h" +#include "selection-chemistry.h" + +#include "display/canvas-bpath.h" +#include "display/curve.h" + #include "live_effects/lpe-bendpath.h" #include "live_effects/lpe-patternalongpath.h" #include "live_effects/lpe-simplify.h" #include "live_effects/lpe-powerstroke.h" -#include "display/canvas-bpath.h" + #include "svg/svg.h" -#include "display/curve.h" -#include "desktop-style.h" +#include "object/sp-item-group.h" +#include "object/sp-path.h" +#include "object/sp-rect.h" +#include "object/sp-use.h" +#include "style.h" + +#include "ui/clipboard.h" +#include "ui/control-manager.h" #include "ui/draw-anchor.h" -#include "macros.h" -#include "message-stack.h" +#include "ui/tools/lpe-tool.h" #include "ui/tools/pen-tool.h" #include "ui/tools/pencil-tool.h" -#include "ui/tools/lpe-tool.h" -#include "selection-chemistry.h" -#include "sp-item-group.h" -#include "sp-rect.h" -#include "style.h" -#include "ui/control-manager.h" -// clipboard support -#include "ui/clipboard.h" #define MIN_PRESSURE 0.0 #define MAX_PRESSURE 1.0 diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp index 81d2f6a5b..b0c2a0185 100644 --- a/src/ui/tools/gradient-tool.cpp +++ b/src/ui/tools/gradient-tool.cpp @@ -16,31 +16,34 @@ #include <config.h> #endif - +#include <glibmm/i18n.h> #include <gdk/gdkkeysyms.h> -#include "macros.h" -#include "document.h" -#include "selection.h" #include "desktop.h" - -#include "message-context.h" -#include "message-stack.h" -#include "pixmaps/cursor-gradient.xpm" -#include "pixmaps/cursor-gradient-add.xpm" -#include "ui/tools/gradient-tool.h" +#include "document-undo.h" +#include "document.h" #include "gradient-chemistry.h" -#include <glibmm/i18n.h> #include "gradient-drag.h" -#include "display/sp-ctrlline.h" -#include "sp-stop.h" -#include "svg/css-ostringstream.h" -#include "snap.h" -#include "sp-namedview.h" +#include "macros.h" +#include "message-context.h" +#include "message-stack.h" #include "rubberband.h" -#include "document-undo.h" -#include "verbs.h" #include "selection-chemistry.h" +#include "selection.h" +#include "snap.h" +#include "verbs.h" + +#include "object/sp-namedview.h" +#include "object/sp-stop.h" + +#include "display/sp-ctrlline.h" + +#include "pixmaps/cursor-gradient-add.xpm" +#include "pixmaps/cursor-gradient.xpm" + +#include "svg/css-ostringstream.h" + +#include "ui/tools/gradient-tool.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp index ad3964f4a..f62a70c34 100644 --- a/src/ui/tools/lpe-tool.cpp +++ b/src/ui/tools/lpe-tool.cpp @@ -18,25 +18,29 @@ #include <config.h> #endif -#include <2geom/sbasis-geometric.h> - #include <glibmm/i18n.h> -#include "pixmaps/cursor-crosshairs.xpm" #include <gtk/gtk.h> + +#include <2geom/sbasis-geometric.h> + #include "desktop.h" +#include "document.h" #include "message-context.h" -#include "ui/shape-editor.h" +#include "message-stack.h" #include "selection.h" -#include "document.h" #include "display/curve.h" #include "display/canvas-bpath.h" #include "display/canvas-text.h" -#include "message-stack.h" -#include "sp-path.h" + +#include "object/sp-path.h" + +#include "pixmaps/cursor-crosshairs.xpm" + #include "util/units.h" #include "ui/tools/lpe-tool.h" +#include "ui/shape-editor.h" using Inkscape::Util::unit_table; using Inkscape::UI::Tools::PenTool; diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index 8037a02a9..724e121d9 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -15,37 +15,47 @@ #endif #include <gtkmm.h> +#include <glibmm/i18n.h> + #include <boost/none_t.hpp> -#include "util/units.h" -#include "display/curve.h" -#include "display/sodipodi-ctrl.h" -#include "display/sp-ctrlline.h" -#include "display/sp-ctrlcurve.h" -#include "display/sp-canvas.h" -#include "display/sp-canvas-util.h" -#include "svg/svg.h" -#include "svg/svg-color.h" -#include "ui/tools/measure-tool.h" -#include "ui/tools/freehand-base.h" + #include <2geom/line.h> #include <2geom/path-intersection.h> -#include "ui/dialog/knot-properties.h" -#include "sp-namedview.h" -#include "sp-text.h" -#include "sp-flowtext.h" -#include "sp-defs.h" -#include "sp-root.h" -#include "svg/stringstream.h" -#include "rubberband.h" -#include "path-chemistry.h" + +#include "desktop-style.h" #include "desktop.h" #include "document-undo.h" -#include "text-editing.h" -#include "pixmaps/cursor-measure.xpm" #include "inkscape.h" -#include "desktop-style.h" +#include "path-chemistry.h" +#include "rubberband.h" +#include "text-editing.h" #include "verbs.h" -#include <glibmm/i18n.h> + +#include "display/curve.h" +#include "display/sodipodi-ctrl.h" +#include "display/sp-canvas-util.h" +#include "display/sp-canvas.h" +#include "display/sp-ctrlcurve.h" +#include "display/sp-ctrlline.h" + +#include "object/sp-defs.h" +#include "object/sp-flowtext.h" +#include "object/sp-namedview.h" +#include "object/sp-root.h" +#include "object/sp-shape.h" +#include "object/sp-text.h" + +#include "pixmaps/cursor-measure.xpm" + +#include "svg/stringstream.h" +#include "svg/svg-color.h" +#include "svg/svg.h" + +#include "ui/dialog/knot-properties.h" +#include "ui/tools/freehand-base.h" +#include "ui/tools/measure-tool.h" + +#include "util/units.h" using Inkscape::ControlManager; using Inkscape::CTLINE_SECONDARY; diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp index 94d7eedfc..703e57ac8 100644 --- a/src/ui/tools/mesh-tool.cpp +++ b/src/ui/tools/mesh-tool.cpp @@ -27,33 +27,33 @@ // General #include "desktop.h" - -#include "document.h" #include "document-undo.h" +#include "document.h" +#include "gradient-drag.h" +#include "gradient-chemistry.h" #include "macros.h" #include "message-context.h" #include "message-stack.h" #include "rubberband.h" #include "selection.h" #include "snap.h" -#include "sp-namedview.h" #include "verbs.h" -#include "sp-text.h" -#include "sp-defs.h" + +#include "display/sp-ctrlcurve.h" +#include "display/curve.h" + +#include "object/sp-defs.h" +#include "object/sp-mesh-gradient.h" +#include "object/sp-namedview.h" +#include "object/sp-text.h" #include "style.h" -#include "ui/control-manager.h" -// Gradient specific -#include "gradient-drag.h" -#include "gradient-chemistry.h" #include "pixmaps/cursor-gradient.xpm" #include "pixmaps/cursor-gradient-add.xpm" -// Mesh specific +#include "ui/control-manager.h" #include "ui/tools/mesh-tool.h" -#include "sp-mesh-gradient.h" -#include "display/sp-ctrlcurve.h" -#include "display/curve.h" + using Inkscape::DocumentUndo; diff --git a/src/ui/tools/mesh-tool.h b/src/ui/tools/mesh-tool.h index 1f012dc53..9c13ec30e 100644 --- a/src/ui/tools/mesh-tool.h +++ b/src/ui/tools/mesh-tool.h @@ -20,7 +20,8 @@ #include <stddef.h> #include <sigc++/sigc++.h> #include "ui/tools/tool-base.h" -#include "sp-mesh-array.h" + +#include "object/sp-mesh-array.h" #define SP_MESH_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::MeshTool*>((Inkscape::UI::Tools::ToolBase*)obj)) #define SP_IS_MESH_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::MeshTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL) diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp index 2b3de5203..6e586b0e9 100644 --- a/src/ui/tools/node-tool.cpp +++ b/src/ui/tools/node-tool.cpp @@ -10,41 +10,49 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "ui/tool/curve-drag-point.h" #include <glib/gi18n.h> +#include <gdk/gdkkeysyms.h> + + + #include "desktop.h" +#include "document.h" +#include "message-context.h" +#include "selection-chemistry.h" +#include "selection.h" +#include "snap.h" -#include "display/sp-canvas-group.h" #include "display/canvas-bpath.h" #include "display/curve.h" +#include "display/sp-canvas-group.h" #include "display/sp-canvas.h" -#include "document.h" + #include "live_effects/effect.h" #include "live_effects/lpeobject.h" -#include "message-context.h" -#include "selection.h" -#include "ui/shape-editor.h" // temporary! -#include "snap.h" -#include "sp-namedview.h" -#include "sp-clippath.h" -#include "sp-item-group.h" -#include "sp-mask.h" -#include "sp-text.h" + +#include "object/sp-clippath.h" +#include "object/sp-item-group.h" +#include "object/sp-mask.h" +#include "object/sp-namedview.h" +#include "object/sp-path.h" +#include "object/sp-shape.h" +#include "object/sp-text.h" + +#include "pixmaps/cursor-node-d.xpm" +#include "pixmaps/cursor-node.xpm" + #include "ui/control-manager.h" -#include "ui/tools/node-tool.h" -#include "ui/tools-switch.h" -#include "ui/tools/tool-base.h" +#include "ui/shape-editor.h" // temporary! #include "ui/tool/control-point-selection.h" +#include "ui/tool/curve-drag-point.h" #include "ui/tool/event-utils.h" #include "ui/tool/multi-path-manipulator.h" #include "ui/tool/path-manipulator.h" #include "ui/tool/selector.h" +#include "ui/tools-switch.h" +#include "ui/tools/node-tool.h" +#include "ui/tools/tool-base.h" -#include "pixmaps/cursor-node.xpm" -#include "pixmaps/cursor-node-d.xpm" -#include "selection-chemistry.h" - -#include <gdk/gdkkeysyms.h> /** @struct NodeTool * diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp index 0616ba013..7dd120077 100644 --- a/src/ui/tools/pen-tool.cpp +++ b/src/ui/tools/pen-tool.cpp @@ -16,42 +16,47 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gdk/gdkkeysyms.h> #include <cstring> #include <string> -#include "shortcuts.h" -#include "verbs.h" +#include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> -#include "ui/tools/pen-tool.h" -#include "sp-namedview.h" -#include "desktop.h" +#include <2geom/curves.h> -#include "selection.h" -#include "selection-chemistry.h" -#include "ui/draw-anchor.h" -#include "message-stack.h" +#include "context-fns.h" +#include "desktop.h" +#include "macros.h" #include "message-context.h" -#include "display/sp-canvas.h" -#include "display/curve.h" -#include "pixmaps/cursor-pen.xpm" +#include "message-stack.h" +#include "selection-chemistry.h" +#include "selection.h" +#include "shortcuts.h" +#include "verbs.h" + #include "display/canvas-bpath.h" -#include "display/sp-ctrlline.h" +#include "display/curve.h" #include "display/sodipodi-ctrl.h" -#include <glibmm/i18n.h> -#include "macros.h" -#include "context-fns.h" -#include "ui/tools-switch.h" +#include "display/sp-canvas.h" +#include "display/sp-ctrlline.h" + +#include "object/sp-path.h" + +#include "pixmaps/cursor-pen.xpm" + #include "ui/control-manager.h" +#include "ui/draw-anchor.h" +#include "ui/tools-switch.h" +#include "ui/tools/pen-tool.h" + // we include the necessary files for BSpline & Spiro #include "live_effects/lpeobject.h" #include "live_effects/lpeobject-reference.h" #include "live_effects/parameter/path.h" + #define INKSCAPE_LPE_SPIRO_C #include "live_effects/lpe-spiro.h" - -#include <2geom/curves.h> #include "helper/geom-nodetype.h" // For handling un-continuous paths: diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp index 2f68688a1..590ef3634 100644 --- a/src/ui/tools/pencil-tool.cpp +++ b/src/ui/tools/pencil-tool.cpp @@ -17,37 +17,45 @@ */ #include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> + +#include <2geom/sbasis-to-bezier.h> +#include <2geom/bezier-utils.h> #include "ui/tools/pencil-tool.h" + + #include "desktop.h" #include "inkscape.h" -#include "selection.h" -#include "selection-chemistry.h" -#include "ui/draw-anchor.h" -#include "message-stack.h" +#include "context-fns.h" +#include "desktop-style.h" #include "message-context.h" -#include "sp-path.h" +#include "message-stack.h" +#include "selection-chemistry.h" +#include "selection.h" #include "snap.h" -#include "pixmaps/cursor-pencil.xpm" -#include <2geom/sbasis-to-bezier.h> -#include <2geom/bezier-utils.h> + #include "display/canvas-bpath.h" -#include <glibmm/i18n.h> -#include "context-fns.h" -#include "sp-namedview.h" -#include "xml/node.h" -#include "xml/sp-css-attr.h" -#include "svg/svg.h" #include "display/curve.h" -#include "desktop-style.h" -#include "style.h" #include "display/sp-canvas.h" -#include "display/curve.h" + #include "live_effects/lpe-powerstroke.h" #include "live_effects/lpe-powerstroke-interpolators.h" + +#include "object/sp-path.h" +#include "style.h" + +#include "pixmaps/cursor-pencil.xpm" + +#include "svg/svg.h" + +#include "ui/draw-anchor.h" #include "ui/tool/event-utils.h" +#include "xml/node.h" +#include "xml/sp-css-attr.h" + namespace Inkscape { namespace UI { namespace Tools { diff --git a/src/ui/tools/pencil-tool.h b/src/ui/tools/pencil-tool.h index c361978cb..24f2c8bfc 100644 --- a/src/ui/tools/pencil-tool.h +++ b/src/ui/tools/pencil-tool.h @@ -6,12 +6,13 @@ */ #include "ui/tools/freehand-base.h" -#include "sp-shape.h" + #include <2geom/piecewise.h> #include <2geom/d2.h> #include <2geom/sbasis.h> #include <2geom/pathvector.h> +class SPShape; #define DDC_MIN_PRESSURE 0.0 #define DDC_MAX_PRESSURE 1.0 diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp index 655650ef4..60524b275 100644 --- a/src/ui/tools/rect-tool.cpp +++ b/src/ui/tools/rect-tool.cpp @@ -14,30 +14,35 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gdk/gdkkeysyms.h> #include <cstring> #include <string> -#include "macros.h" -#include "display/sp-canvas.h" -#include "sp-rect.h" -#include "document.h" -#include "document-undo.h" -#include "sp-namedview.h" -#include "selection.h" -#include "selection-chemistry.h" +#include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> -#include "desktop.h" +#include "context-fns.h" #include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "macros.h" #include "message-context.h" +#include "selection-chemistry.h" +#include "selection.h" +#include "verbs.h" + +#include "display/sp-canvas-item.h" +#include "display/sp-canvas.h" + +#include "object/sp-rect.h" +#include "object/sp-namedview.h" + #include "pixmaps/cursor-rect.xpm" + +#include "ui/shape-editor.h" #include "ui/tools/rect-tool.h" -#include <glibmm/i18n.h> + #include "xml/node-event-vector.h" -#include "context-fns.h" -#include "ui/shape-editor.h" -#include "verbs.h" -#include "display/sp-canvas-item.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/rect-tool.h b/src/ui/tools/rect-tool.h index a22f1caa8..ac056668f 100644 --- a/src/ui/tools/rect-tool.h +++ b/src/ui/tools/rect-tool.h @@ -20,7 +20,7 @@ #include <2geom/point.h> #include "ui/tools/tool-base.h" -#include "sp-rect.h" +class SPRect; namespace Inkscape { namespace UI { diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp index 2468575c6..ddc6e2881 100644 --- a/src/ui/tools/select-tool.cpp +++ b/src/ui/tools/select-tool.cpp @@ -17,36 +17,43 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif + #include <cstring> #include <string> + #include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> + +#include "desktop.h" +#include "document-undo.h" +#include "document.h" #include "macros.h" +#include "message-stack.h" #include "rubberband.h" -#include "document.h" -#include "document-undo.h" +#include "selection-chemistry.h" +#include "selection-describer.h" #include "selection.h" +#include "seltrans.h" #include "sp-cursor.h" + +#include "display/drawing-item.h" +#include "display/sp-canvas.h" +#include "display/sp-canvas-item.h" + +#include "object/box3d.h" #include "style.h" -#include "pixmaps/cursor-select-m.xpm" + #include "pixmaps/cursor-select-d.xpm" +#include "pixmaps/cursor-select-m.xpm" #include "pixmaps/handles.xpm" -#include <glibmm/i18n.h> +#include "ui/tools-switch.h" #include "ui/tools/select-tool.h" -#include "selection-chemistry.h" + #ifdef WITH_DBUS #include "extension/dbus/document-interface.h" #endif -#include "desktop.h" -#include "sp-root.h" -#include "ui/tools-switch.h" -#include "message-stack.h" -#include "selection-describer.h" -#include "seltrans.h" -#include "box3d.h" -#include "display/sp-canvas.h" -#include "display/drawing-item.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/spiral-tool.cpp b/src/ui/tools/spiral-tool.cpp index bb8ce6356..7a1881295 100644 --- a/src/ui/tools/spiral-tool.cpp +++ b/src/ui/tools/spiral-tool.cpp @@ -14,29 +14,33 @@ * Released under GNU GPL */ -#include <gdk/gdkkeysyms.h> #include <cstring> #include <string> -#include "macros.h" -#include "display/sp-canvas.h" -#include "sp-spiral.h" -#include "document.h" -#include "document-undo.h" -#include "sp-namedview.h" -#include "selection.h" +#include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> -#include "desktop.h" +#include "context-fns.h" #include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "macros.h" #include "message-context.h" #include "pixmaps/cursor-spiral.xpm" -#include "ui/tools/spiral-tool.h" -#include <glibmm/i18n.h> -#include "xml/node-event-vector.h" -#include "context-fns.h" -#include "ui/shape-editor.h" +#include "selection.h" #include "verbs.h" + #include "display/sp-canvas-item.h" +#include "display/sp-canvas.h" + +#include "object/sp-namedview.h" +#include "object/sp-spiral.h" + +#include "ui/shape-editor.h" +#include "ui/tools/spiral-tool.h" + +#include "xml/node-event-vector.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp index 5a68fa969..beb556dff 100644 --- a/src/ui/tools/spray-tool.cpp +++ b/src/ui/tools/spray-tool.cpp @@ -22,52 +22,49 @@ #include <numeric> -#include "ui/dialog/dialog-manager.h" +#include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> -#include "svg/svg.h" +#include <2geom/circle.h> -#include "macros.h" -#include "document.h" -#include "document-undo.h" -#include "selection.h" -#include "desktop.h" -#include "desktop-events.h" -#include "message-context.h" -#include "pixmaps/cursor-spray.xpm" #include "context-fns.h" +#include "desktop-events.h" +#include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "filter-chemistry.h" #include "inkscape.h" - -#include "splivarot.h" -#include "sp-item-group.h" -#include "sp-shape.h" -#include "sp-path.h" +#include "macros.h" +#include "message-context.h" #include "path-chemistry.h" +#include "selection.h" +#include "splivarot.h" +#include "verbs.h" -// For color picking -#include "display/drawing.h" -#include "display/drawing-context.h" #include "display/cairo-utils.h" -#include "desktop-style.h" -#include "svg/svg-color.h" - -#include "sp-text.h" -#include "sp-flowtext.h" -#include "display/sp-canvas.h" #include "display/canvas-arena.h" #include "display/curve.h" +#include "display/drawing-context.h" +#include "display/drawing.h" +#include "display/sp-canvas.h" + +#include "helper/action.h" + #include "livarot/Shape.h" -#include <2geom/circle.h> -#include "box3d.h" -#include "sp-item-transform.h" -#include "filter-chemistry.h" + +#include "object/box3d.h" +#include "object/sp-item-transform.h" + +#include "pixmaps/cursor-spray.xpm" + +#include "svg/svg.h" +#include "svg/svg-color.h" #include "ui/tools/spray-tool.h" -#include "helper/action.h" -#include "verbs.h" +#include "ui/dialog/dialog-manager.h" -#include <gdk/gdkkeysyms.h> -#include <glibmm/i18n.h> using Inkscape::DocumentUndo; using namespace std; diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp index ed25503c4..d6fcf0409 100644 --- a/src/ui/tools/star-tool.cpp +++ b/src/ui/tools/star-tool.cpp @@ -22,28 +22,31 @@ #include <string> #include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> -#include "macros.h" -#include "display/sp-canvas.h" -#include "sp-star.h" -#include "document.h" -#include "document-undo.h" -#include "sp-namedview.h" -#include "selection.h" - -#include "desktop.h" +#include "context-fns.h" #include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "macros.h" #include "message-context.h" -#include "pixmaps/cursor-star.xpm" -#include <glibmm/i18n.h> -#include "xml/node-event-vector.h" -#include "context-fns.h" -#include "ui/shape-editor.h" +#include "selection.h" #include "verbs.h" + +#include "display/sp-canvas.h" #include "display/sp-canvas-item.h" +#include "object/sp-namedview.h" +#include "object/sp-star.h" + +#include "pixmaps/cursor-star.xpm" + +#include "ui/shape-editor.h" #include "ui/tools/star-tool.h" +#include "xml/node-event-vector.h" + using Inkscape::DocumentUndo; namespace Inkscape { diff --git a/src/ui/tools/star-tool.h b/src/ui/tools/star-tool.h index da3774e68..a697582d3 100644 --- a/src/ui/tools/star-tool.h +++ b/src/ui/tools/star-tool.h @@ -19,7 +19,7 @@ #include <2geom/point.h> #include "ui/tools/tool-base.h" -#include "sp-star.h" +class SPStar; namespace Inkscape { namespace UI { diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp index 692b65c44..8db6c323c 100644 --- a/src/ui/tools/text-tool.cpp +++ b/src/ui/tools/text-tool.cpp @@ -17,38 +17,42 @@ #include <config.h> #endif +#include <gdk/gdkkeysyms.h> #include <gtkmm/clipboard.h> +#include <glibmm/i18n.h> + #include <display/sp-ctrlline.h> #include <display/sodipodi-ctrlrect.h> #include <display/sp-ctrlquadr.h> -#include <gdk/gdkkeysyms.h> -#include <glibmm/i18n.h> #include "context-fns.h" - #include "desktop-style.h" #include "desktop.h" -#include "document.h" #include "document-undo.h" +#include "document.h" #include "macros.h" #include "message-context.h" #include "message-stack.h" -#include "pixmaps/cursor-text-insert.xpm" -#include "pixmaps/cursor-text.xpm" #include "rubberband.h" #include "selection-chemistry.h" #include "selection.h" -#include "ui/shape-editor.h" -#include "sp-flowtext.h" -#include "sp-namedview.h" -#include "sp-text.h" -#include "style.h" -#include "ui/tools/text-tool.h" #include "text-editing.h" -#include "ui/control-manager.h" #include "verbs.h" -#include "xml/node-event-vector.h" + +#include "object/sp-flowtext.h" +#include "object/sp-namedview.h" +#include "object/sp-text.h" +#include "style.h" + +#include "pixmaps/cursor-text-insert.xpm" +#include "pixmaps/cursor-text.xpm" + +#include "ui/control-manager.h" +#include "ui/shape-editor.h" +#include "ui/tools/text-tool.h" + #include "xml/attribute-record.h" +#include "xml/node-event-vector.h" #include "xml/sp-css-attr.h" using Inkscape::ControlManager; diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index 83a084a60..9f9a155c2 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -18,11 +18,32 @@ #include <config.h> #endif -#include "widgets/desktop-widget.h" +#include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> #include "shortcuts.h" #include "file.h" + + +#include "desktop-events.h" +#include "desktop-style.h" +#include "desktop.h" +#include "gradient-drag.h" +#include "knot-ptr.h" +#include "macros.h" +#include "message-context.h" +#include "rubberband.h" +#include "selcue.h" +#include "selection.h" +#include "sp-cursor.h" + +#include "display/sp-canvas.h" +#include "display/sp-canvas-group.h" +#include "display/canvas-rotate.h" + +#include "object/sp-guide.h" + #include "ui/contextmenu.h" #include "ui/interface.h" #include "ui/event-debug.h" @@ -36,27 +57,9 @@ #include "ui/tools/node-tool.h" #include "ui/tool/shape-record.h" -#include <gdk/gdkkeysyms.h> -#include <glibmm/i18n.h> +#include "widgets/desktop-widget.h" -#include "display/sp-canvas.h" -#include "display/sp-canvas-group.h" -#include "display/canvas-rotate.h" #include "xml/node-event-vector.h" -#include "sp-cursor.h" -#include "desktop.h" - -#include "desktop-events.h" -#include "desktop-style.h" -#include "sp-namedview.h" -#include "selection.h" -#include "macros.h" -#include "message-context.h" -#include "gradient-drag.h" -#include "rubberband.h" -#include "selcue.h" -#include "sp-guide.h" -#include "knot-ptr.h" // globals for temporary switching to selector by space static bool selector_toggled = FALSE; diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp index 9348ef842..bcc30a74f 100644 --- a/src/ui/tools/tweak-tool.cpp +++ b/src/ui/tools/tweak-tool.cpp @@ -11,67 +11,67 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include <numeric> + #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <glibmm/i18n.h> -#include <numeric> - -#include "svg/svg.h" +#include <2geom/circle.h> -#include "macros.h" -#include "document.h" -#include "document-undo.h" -#include "selection.h" -#include "desktop.h" +#include "context-fns.h" #include "desktop-events.h" - #include "desktop-style.h" -#include "message-context.h" -#include "pixmaps/cursor-tweak-move.xpm" -#include "pixmaps/cursor-tweak-move-in.xpm" -#include "pixmaps/cursor-tweak-move-out.xpm" -#include "pixmaps/cursor-tweak-move-jitter.xpm" -#include "pixmaps/cursor-tweak-scale-up.xpm" -#include "pixmaps/cursor-tweak-scale-down.xpm" -#include "pixmaps/cursor-tweak-rotate-clockwise.xpm" -#include "pixmaps/cursor-tweak-rotate-counterclockwise.xpm" -#include "pixmaps/cursor-tweak-more.xpm" -#include "pixmaps/cursor-tweak-less.xpm" -#include "pixmaps/cursor-tweak-thin.xpm" -#include "pixmaps/cursor-tweak-thicken.xpm" -#include "pixmaps/cursor-tweak-attract.xpm" -#include "pixmaps/cursor-tweak-repel.xpm" -#include "pixmaps/cursor-tweak-push.xpm" -#include "pixmaps/cursor-tweak-roughen.xpm" -#include "pixmaps/cursor-tweak-color.xpm" -#include "context-fns.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "filter-chemistry.h" +#include "gradient-chemistry.h" #include "inkscape.h" -#include "splivarot.h" -#include "sp-item-group.h" -#include "sp-shape.h" -#include "sp-path.h" +#include "macros.h" +#include "message-context.h" #include "path-chemistry.h" -#include "sp-stop.h" -#include "sp-gradient-reference.h" -#include "sp-linear-gradient.h" -#include "sp-radial-gradient.h" -#include "sp-mesh-gradient.h" -#include "sp-mesh-array.h" -#include "gradient-chemistry.h" -#include "sp-text.h" -#include "sp-flowtext.h" -#include "display/sp-canvas.h" +#include "selection.h" +#include "splivarot.h" +#include "verbs.h" + #include "display/canvas-arena.h" #include "display/curve.h" +#include "display/sp-canvas.h" + #include "livarot/Shape.h" -#include <2geom/circle.h> + +#include "object/box3d.h" +#include "object/filters/gaussian-blur.h" +#include "object/sp-flowtext.h" +#include "object/sp-item-transform.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-mesh-gradient.h" +#include "object/sp-path.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-stop.h" +#include "object/sp-text.h" #include "style.h" -#include "box3d.h" -#include "sp-item-transform.h" -#include "filter-chemistry.h" -#include "filters/gaussian-blur.h" -#include "verbs.h" + +#include "pixmaps/cursor-tweak-attract.xpm" +#include "pixmaps/cursor-tweak-color.xpm" +#include "pixmaps/cursor-tweak-less.xpm" +#include "pixmaps/cursor-tweak-more.xpm" +#include "pixmaps/cursor-tweak-move-in.xpm" +#include "pixmaps/cursor-tweak-move-jitter.xpm" +#include "pixmaps/cursor-tweak-move-out.xpm" +#include "pixmaps/cursor-tweak-move.xpm" +#include "pixmaps/cursor-tweak-push.xpm" +#include "pixmaps/cursor-tweak-repel.xpm" +#include "pixmaps/cursor-tweak-rotate-clockwise.xpm" +#include "pixmaps/cursor-tweak-rotate-counterclockwise.xpm" +#include "pixmaps/cursor-tweak-roughen.xpm" +#include "pixmaps/cursor-tweak-scale-down.xpm" +#include "pixmaps/cursor-tweak-scale-up.xpm" +#include "pixmaps/cursor-tweak-thicken.xpm" +#include "pixmaps/cursor-tweak-thin.xpm" + +#include "svg/svg.h" #include "ui/tools/tweak-tool.h" |