diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index 6f79f33e31a9618ab90cc0460206dd03fb3222e0..6af5a6210ce7c0cbdaa68b15afb5627264be4a2d 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -51,7 +51,7 @@ #include "helper/action.h" -#include "pixmaps/cursor-select.xpm" +#include "ui/pixmaps/cursor-select.xpm" #include "object/sp-guide.h" #include "object/sp-namedview.h" diff --git a/src/pixmaps/README b/src/ui/pixmaps/README similarity index 76% rename from src/pixmaps/README rename to src/ui/pixmaps/README index 5495fa268784cbebf97319c88f93fccd52222e46..0b78941bd3930e6159ca9dc35605223348126a6c 100644 --- a/src/pixmaps/README +++ b/src/ui/pixmaps/README @@ -1,6 +1,2 @@ This directory contains cursor xpm's and handles for resizing/skewing/rotating. - -To do: - -* Move to 'ui'. diff --git a/src/pixmaps/cursor-3dbox.xpm b/src/ui/pixmaps/cursor-3dbox.xpm similarity index 100% rename from src/pixmaps/cursor-3dbox.xpm rename to src/ui/pixmaps/cursor-3dbox.xpm diff --git a/src/pixmaps/cursor-adj-a.xpm b/src/ui/pixmaps/cursor-adj-a.xpm similarity index 100% rename from src/pixmaps/cursor-adj-a.xpm rename to src/ui/pixmaps/cursor-adj-a.xpm diff --git a/src/pixmaps/cursor-adj-h.xpm b/src/ui/pixmaps/cursor-adj-h.xpm similarity index 100% rename from src/pixmaps/cursor-adj-h.xpm rename to src/ui/pixmaps/cursor-adj-h.xpm diff --git a/src/pixmaps/cursor-adj-l.xpm b/src/ui/pixmaps/cursor-adj-l.xpm similarity index 100% rename from src/pixmaps/cursor-adj-l.xpm rename to src/ui/pixmaps/cursor-adj-l.xpm diff --git a/src/pixmaps/cursor-adj-s.xpm b/src/ui/pixmaps/cursor-adj-s.xpm similarity index 100% rename from src/pixmaps/cursor-adj-s.xpm rename to src/ui/pixmaps/cursor-adj-s.xpm diff --git a/src/pixmaps/cursor-calligraphy.xpm b/src/ui/pixmaps/cursor-calligraphy.xpm similarity index 100% rename from src/pixmaps/cursor-calligraphy.xpm rename to src/ui/pixmaps/cursor-calligraphy.xpm diff --git a/src/pixmaps/cursor-connector.xpm b/src/ui/pixmaps/cursor-connector.xpm similarity index 100% rename from src/pixmaps/cursor-connector.xpm rename to src/ui/pixmaps/cursor-connector.xpm diff --git a/src/pixmaps/cursor-crosshairs.xpm b/src/ui/pixmaps/cursor-crosshairs.xpm similarity index 100% rename from src/pixmaps/cursor-crosshairs.xpm rename to src/ui/pixmaps/cursor-crosshairs.xpm diff --git a/src/pixmaps/cursor-dropper-f.xpm b/src/ui/pixmaps/cursor-dropper-f.xpm similarity index 100% rename from src/pixmaps/cursor-dropper-f.xpm rename to src/ui/pixmaps/cursor-dropper-f.xpm diff --git a/src/pixmaps/cursor-dropper-s.xpm b/src/ui/pixmaps/cursor-dropper-s.xpm similarity index 100% rename from src/pixmaps/cursor-dropper-s.xpm rename to src/ui/pixmaps/cursor-dropper-s.xpm diff --git a/src/pixmaps/cursor-dropping-f.xpm b/src/ui/pixmaps/cursor-dropping-f.xpm similarity index 100% rename from src/pixmaps/cursor-dropping-f.xpm rename to src/ui/pixmaps/cursor-dropping-f.xpm diff --git a/src/pixmaps/cursor-dropping-s.xpm b/src/ui/pixmaps/cursor-dropping-s.xpm similarity index 100% rename from src/pixmaps/cursor-dropping-s.xpm rename to src/ui/pixmaps/cursor-dropping-s.xpm diff --git a/src/pixmaps/cursor-ellipse.xpm b/src/ui/pixmaps/cursor-ellipse.xpm similarity index 100% rename from src/pixmaps/cursor-ellipse.xpm rename to src/ui/pixmaps/cursor-ellipse.xpm diff --git a/src/pixmaps/cursor-eraser.xpm b/src/ui/pixmaps/cursor-eraser.xpm similarity index 100% rename from src/pixmaps/cursor-eraser.xpm rename to src/ui/pixmaps/cursor-eraser.xpm diff --git a/src/pixmaps/cursor-gradient-add.xpm b/src/ui/pixmaps/cursor-gradient-add.xpm similarity index 100% rename from src/pixmaps/cursor-gradient-add.xpm rename to src/ui/pixmaps/cursor-gradient-add.xpm diff --git a/src/pixmaps/cursor-gradient.xpm b/src/ui/pixmaps/cursor-gradient.xpm similarity index 100% rename from src/pixmaps/cursor-gradient.xpm rename to src/ui/pixmaps/cursor-gradient.xpm diff --git a/src/pixmaps/cursor-measure.xpm b/src/ui/pixmaps/cursor-measure.xpm similarity index 100% rename from src/pixmaps/cursor-measure.xpm rename to src/ui/pixmaps/cursor-measure.xpm diff --git a/src/pixmaps/cursor-node-d.xpm b/src/ui/pixmaps/cursor-node-d.xpm similarity index 100% rename from src/pixmaps/cursor-node-d.xpm rename to src/ui/pixmaps/cursor-node-d.xpm diff --git a/src/pixmaps/cursor-node.xpm b/src/ui/pixmaps/cursor-node.xpm similarity index 100% rename from src/pixmaps/cursor-node.xpm rename to src/ui/pixmaps/cursor-node.xpm diff --git a/src/pixmaps/cursor-paintbucket.xpm b/src/ui/pixmaps/cursor-paintbucket.xpm similarity index 100% rename from src/pixmaps/cursor-paintbucket.xpm rename to src/ui/pixmaps/cursor-paintbucket.xpm diff --git a/src/pixmaps/cursor-pen.xpm b/src/ui/pixmaps/cursor-pen.xpm similarity index 100% rename from src/pixmaps/cursor-pen.xpm rename to src/ui/pixmaps/cursor-pen.xpm diff --git a/src/pixmaps/cursor-pencil.xpm b/src/ui/pixmaps/cursor-pencil.xpm similarity index 100% rename from src/pixmaps/cursor-pencil.xpm rename to src/ui/pixmaps/cursor-pencil.xpm diff --git a/src/pixmaps/cursor-rect.xpm b/src/ui/pixmaps/cursor-rect.xpm similarity index 100% rename from src/pixmaps/cursor-rect.xpm rename to src/ui/pixmaps/cursor-rect.xpm diff --git a/src/pixmaps/cursor-select-d.xpm b/src/ui/pixmaps/cursor-select-d.xpm similarity index 100% rename from src/pixmaps/cursor-select-d.xpm rename to src/ui/pixmaps/cursor-select-d.xpm diff --git a/src/pixmaps/cursor-select-m.xpm b/src/ui/pixmaps/cursor-select-m.xpm similarity index 100% rename from src/pixmaps/cursor-select-m.xpm rename to src/ui/pixmaps/cursor-select-m.xpm diff --git a/src/pixmaps/cursor-select.xpm b/src/ui/pixmaps/cursor-select.xpm similarity index 100% rename from src/pixmaps/cursor-select.xpm rename to src/ui/pixmaps/cursor-select.xpm diff --git a/src/pixmaps/cursor-spiral.xpm b/src/ui/pixmaps/cursor-spiral.xpm similarity index 100% rename from src/pixmaps/cursor-spiral.xpm rename to src/ui/pixmaps/cursor-spiral.xpm diff --git a/src/pixmaps/cursor-spray-move.xpm b/src/ui/pixmaps/cursor-spray-move.xpm similarity index 100% rename from src/pixmaps/cursor-spray-move.xpm rename to src/ui/pixmaps/cursor-spray-move.xpm diff --git a/src/pixmaps/cursor-spray.xpm b/src/ui/pixmaps/cursor-spray.xpm similarity index 100% rename from src/pixmaps/cursor-spray.xpm rename to src/ui/pixmaps/cursor-spray.xpm diff --git a/src/pixmaps/cursor-star.xpm b/src/ui/pixmaps/cursor-star.xpm similarity index 100% rename from src/pixmaps/cursor-star.xpm rename to src/ui/pixmaps/cursor-star.xpm diff --git a/src/pixmaps/cursor-text-insert.xpm b/src/ui/pixmaps/cursor-text-insert.xpm similarity index 100% rename from src/pixmaps/cursor-text-insert.xpm rename to src/ui/pixmaps/cursor-text-insert.xpm diff --git a/src/pixmaps/cursor-text.xpm b/src/ui/pixmaps/cursor-text.xpm similarity index 100% rename from src/pixmaps/cursor-text.xpm rename to src/ui/pixmaps/cursor-text.xpm diff --git a/src/pixmaps/cursor-tweak-attract.xpm b/src/ui/pixmaps/cursor-tweak-attract.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-attract.xpm rename to src/ui/pixmaps/cursor-tweak-attract.xpm diff --git a/src/pixmaps/cursor-tweak-color.xpm b/src/ui/pixmaps/cursor-tweak-color.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-color.xpm rename to src/ui/pixmaps/cursor-tweak-color.xpm diff --git a/src/pixmaps/cursor-tweak-less.xpm b/src/ui/pixmaps/cursor-tweak-less.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-less.xpm rename to src/ui/pixmaps/cursor-tweak-less.xpm diff --git a/src/pixmaps/cursor-tweak-more.xpm b/src/ui/pixmaps/cursor-tweak-more.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-more.xpm rename to src/ui/pixmaps/cursor-tweak-more.xpm diff --git a/src/pixmaps/cursor-tweak-move-in.xpm b/src/ui/pixmaps/cursor-tweak-move-in.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-move-in.xpm rename to src/ui/pixmaps/cursor-tweak-move-in.xpm diff --git a/src/pixmaps/cursor-tweak-move-jitter.xpm b/src/ui/pixmaps/cursor-tweak-move-jitter.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-move-jitter.xpm rename to src/ui/pixmaps/cursor-tweak-move-jitter.xpm diff --git a/src/pixmaps/cursor-tweak-move-out.xpm b/src/ui/pixmaps/cursor-tweak-move-out.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-move-out.xpm rename to src/ui/pixmaps/cursor-tweak-move-out.xpm diff --git a/src/pixmaps/cursor-tweak-move.xpm b/src/ui/pixmaps/cursor-tweak-move.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-move.xpm rename to src/ui/pixmaps/cursor-tweak-move.xpm diff --git a/src/pixmaps/cursor-tweak-push.xpm b/src/ui/pixmaps/cursor-tweak-push.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-push.xpm rename to src/ui/pixmaps/cursor-tweak-push.xpm diff --git a/src/pixmaps/cursor-tweak-repel.xpm b/src/ui/pixmaps/cursor-tweak-repel.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-repel.xpm rename to src/ui/pixmaps/cursor-tweak-repel.xpm diff --git a/src/pixmaps/cursor-tweak-rotate-clockwise.xpm b/src/ui/pixmaps/cursor-tweak-rotate-clockwise.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-rotate-clockwise.xpm rename to src/ui/pixmaps/cursor-tweak-rotate-clockwise.xpm diff --git a/src/pixmaps/cursor-tweak-rotate-counterclockwise.xpm b/src/ui/pixmaps/cursor-tweak-rotate-counterclockwise.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-rotate-counterclockwise.xpm rename to src/ui/pixmaps/cursor-tweak-rotate-counterclockwise.xpm diff --git a/src/pixmaps/cursor-tweak-roughen.xpm b/src/ui/pixmaps/cursor-tweak-roughen.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-roughen.xpm rename to src/ui/pixmaps/cursor-tweak-roughen.xpm diff --git a/src/pixmaps/cursor-tweak-scale-down.xpm b/src/ui/pixmaps/cursor-tweak-scale-down.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-scale-down.xpm rename to src/ui/pixmaps/cursor-tweak-scale-down.xpm diff --git a/src/pixmaps/cursor-tweak-scale-up.xpm b/src/ui/pixmaps/cursor-tweak-scale-up.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-scale-up.xpm rename to src/ui/pixmaps/cursor-tweak-scale-up.xpm diff --git a/src/pixmaps/cursor-tweak-thicken.xpm b/src/ui/pixmaps/cursor-tweak-thicken.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-thicken.xpm rename to src/ui/pixmaps/cursor-tweak-thicken.xpm diff --git a/src/pixmaps/cursor-tweak-thin.xpm b/src/ui/pixmaps/cursor-tweak-thin.xpm similarity index 100% rename from src/pixmaps/cursor-tweak-thin.xpm rename to src/ui/pixmaps/cursor-tweak-thin.xpm diff --git a/src/pixmaps/cursor-zoom-out.xpm b/src/ui/pixmaps/cursor-zoom-out.xpm similarity index 100% rename from src/pixmaps/cursor-zoom-out.xpm rename to src/ui/pixmaps/cursor-zoom-out.xpm diff --git a/src/pixmaps/cursor-zoom.xpm b/src/ui/pixmaps/cursor-zoom.xpm similarity index 100% rename from src/pixmaps/cursor-zoom.xpm rename to src/ui/pixmaps/cursor-zoom.xpm diff --git a/src/pixmaps/handles.xpm b/src/ui/pixmaps/handles.xpm similarity index 100% rename from src/pixmaps/handles.xpm rename to src/ui/pixmaps/handles.xpm diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp index e0378ff032a9a19e517c340930d843ef49ac885a..dc3f0db0f90d76316652a4a6f20e98eec4a85469 100644 --- a/src/ui/tools/arc-tool.cpp +++ b/src/ui/tools/arc-tool.cpp @@ -40,7 +40,7 @@ #include "object/sp-ellipse.h" #include "object/sp-namedview.h" -#include "pixmaps/cursor-ellipse.xpm" +#include "ui/pixmaps/cursor-ellipse.xpm" #include "ui/tools/arc-tool.h" #include "ui/shape-editor.h" diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp index f643fc356c426627d54e6f50fd538291ffc69e90..d7ec5036057baae34634b06b55ac7bffcb3edbc5 100644 --- a/src/ui/tools/box3d-tool.cpp +++ b/src/ui/tools/box3d-tool.cpp @@ -35,7 +35,7 @@ #include "display/sp-canvas-item.h" #include "display/sp-canvas.h" -#include "pixmaps/cursor-3dbox.xpm" +#include "ui/pixmaps/cursor-3dbox.xpm" #include "object/box3d-side.h" #include "object/box3d.h" diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp index 5cd2514ba3e81435f50095e4985b3b1ddc834ca8..50c5f413ac1d5839c7cd81947327842b80a9bae4 100644 --- a/src/ui/tools/calligraphic-tool.cpp +++ b/src/ui/tools/calligraphic-tool.cpp @@ -58,7 +58,7 @@ #include "object/sp-shape.h" #include "object/sp-text.h" -#include "pixmaps/cursor-calligraphy.xpm" +#include "ui/pixmaps/cursor-calligraphy.xpm" #include "svg/svg.h" diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp index 09f18e630dadb6ca7313d9dc2e2c20867a92d793..d41e1b3eb74487171a25bf83cb40f655ada378b8 100644 --- a/src/ui/tools/connector-tool.cpp +++ b/src/ui/tools/connector-tool.cpp @@ -97,7 +97,7 @@ #include "object/sp-path.h" #include "object/sp-text.h" -#include "pixmaps/cursor-connector.xpm" +#include "ui/pixmaps/cursor-connector.xpm" #include "svg/svg.h" diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp index d11ed1d83c14000c69808f9689dc39154c1ede38..c0be19479bee5a7bfa9d1169ddef4c16d7605ed9 100644 --- a/src/ui/tools/dropper-tool.cpp +++ b/src/ui/tools/dropper-tool.cpp @@ -40,10 +40,10 @@ #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 "ui/pixmaps/cursor-dropper-f.xpm" +#include "ui/pixmaps/cursor-dropper-s.xpm" +#include "ui/pixmaps/cursor-dropping-f.xpm" +#include "ui/pixmaps/cursor-dropping-s.xpm" #include "svg/svg-color.h" diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp index 60d572e1645573fe37ca97a5bf481c77182bb160..c0742f9df2c1ff7889af5d6ccd6a9f168d6bfc9c 100644 --- a/src/ui/tools/eraser-tool.cpp +++ b/src/ui/tools/eraser-tool.cpp @@ -67,7 +67,7 @@ #include "object/sp-use.h" #include "style.h" -#include "pixmaps/cursor-eraser.xpm" +#include "ui/pixmaps/cursor-eraser.xpm" #include "svg/svg.h" diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp index bfd7f60dd7b1aa9a280b82208b2bbc43f4d6d3c2..1d1930a4e2a549e229be4537a60eefbf67cab331 100644 --- a/src/ui/tools/flood-tool.cpp +++ b/src/ui/tools/flood-tool.cpp @@ -58,7 +58,7 @@ #include "object/sp-path.h" #include "object/sp-root.h" -#include "pixmaps/cursor-paintbucket.xpm" +#include "ui/pixmaps/cursor-paintbucket.xpm" #include "svg/svg.h" diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp index a443716d7430094727a07d52bcf0173c24b37c79..c00d0324e8cd23e93c3253a11c52506c2de50f31 100644 --- a/src/ui/tools/gradient-tool.cpp +++ b/src/ui/tools/gradient-tool.cpp @@ -38,8 +38,8 @@ #include "display/sp-ctrlline.h" -#include "pixmaps/cursor-gradient-add.xpm" -#include "pixmaps/cursor-gradient.xpm" +#include "ui/pixmaps/cursor-gradient-add.xpm" +#include "ui/pixmaps/cursor-gradient.xpm" #include "svg/css-ostringstream.h" diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp index c523b7bdec52998b1d5773d68c8e6c6f20167171..dae62d4f94d42a4bd154b6601531fcf18cfd92c2 100644 --- a/src/ui/tools/lpe-tool.cpp +++ b/src/ui/tools/lpe-tool.cpp @@ -35,7 +35,7 @@ #include "object/sp-path.h" -#include "pixmaps/cursor-crosshairs.xpm" +#include "ui/pixmaps/cursor-crosshairs.xpm" #include "util/units.h" diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index 2048dce232346c715e7289b263004c957848ea6e..a305fa350178816f92df5dc0cf377f6f12ea5307 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -45,7 +45,7 @@ #include "object/sp-shape.h" #include "object/sp-text.h" -#include "pixmaps/cursor-measure.xpm" +#include "ui/pixmaps/cursor-measure.xpm" #include "svg/stringstream.h" #include "svg/svg-color.h" diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp index 93b94d7507e82ffc4fbee644a27a68f845a5e0ff..251de33b33968da6a2cd74714b834876bc762a35 100644 --- a/src/ui/tools/mesh-tool.cpp +++ b/src/ui/tools/mesh-tool.cpp @@ -48,8 +48,8 @@ #include "object/sp-text.h" #include "style.h" -#include "pixmaps/cursor-gradient.xpm" -#include "pixmaps/cursor-gradient-add.xpm" +#include "ui/pixmaps/cursor-gradient.xpm" +#include "ui/pixmaps/cursor-gradient-add.xpm" #include "ui/control-manager.h" #include "ui/tools/mesh-tool.h" diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp index 3ec40d08667fb6c5f49fca6ab9318f839d554ed3..5168393156d0ca0019c16c135020fe7b08d8ca5d 100644 --- a/src/ui/tools/node-tool.cpp +++ b/src/ui/tools/node-tool.cpp @@ -38,8 +38,8 @@ #include "object/sp-shape.h" #include "object/sp-text.h" -#include "pixmaps/cursor-node-d.xpm" -#include "pixmaps/cursor-node.xpm" +#include "ui/pixmaps/cursor-node-d.xpm" +#include "ui/pixmaps/cursor-node.xpm" #include "ui/control-manager.h" #include "ui/shape-editor.h" // temporary! diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp index e7301152ffbdeb8cf47f036557f4b093ea43da34..9ea403b092eb2e66ea314c9e98e985f39fe84234 100644 --- a/src/ui/tools/pen-tool.cpp +++ b/src/ui/tools/pen-tool.cpp @@ -42,7 +42,7 @@ #include "object/sp-path.h" -#include "pixmaps/cursor-pen.xpm" +#include "ui/pixmaps/cursor-pen.xpm" #include "ui/control-manager.h" #include "ui/draw-anchor.h" diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp index f0d6639ab6c05cacf2b07f853911b318306a38c6..b5257cecbfc44fbbc4315b9359fc82882ffa38fb 100644 --- a/src/ui/tools/pencil-tool.cpp +++ b/src/ui/tools/pencil-tool.cpp @@ -46,7 +46,7 @@ #include "object/sp-path.h" #include "style.h" -#include "pixmaps/cursor-pencil.xpm" +#include "ui/pixmaps/cursor-pencil.xpm" #include "svg/svg.h" diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp index cedf43962cf0136fc60771826ef2078866878799..7d2f784015b9993cf650f781af7a3fab60a5c954 100644 --- a/src/ui/tools/rect-tool.cpp +++ b/src/ui/tools/rect-tool.cpp @@ -37,7 +37,7 @@ #include "object/sp-rect.h" #include "object/sp-namedview.h" -#include "pixmaps/cursor-rect.xpm" +#include "ui/pixmaps/cursor-rect.xpm" #include "ui/shape-editor.h" #include "ui/tools/rect-tool.h" diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp index 90451e662c15ac7251d1f1a2816f2e9d98969c33..835bb6f942138b631c7b40dc7bf9313e04205d7d 100644 --- a/src/ui/tools/select-tool.cpp +++ b/src/ui/tools/select-tool.cpp @@ -44,9 +44,9 @@ #include "object/box3d.h" #include "style.h" -#include "pixmaps/cursor-select-d.xpm" -#include "pixmaps/cursor-select-m.xpm" -#include "pixmaps/handles.xpm" +#include "ui/pixmaps/cursor-select-d.xpm" +#include "ui/pixmaps/cursor-select-m.xpm" +#include "ui/pixmaps/handles.xpm" #include "ui/tools-switch.h" #include "ui/tools/select-tool.h" diff --git a/src/ui/tools/spiral-tool.cpp b/src/ui/tools/spiral-tool.cpp index 4b7743678615c4c2e23e400c631b45f4ef04888a..6add0944231a10a1d128ecfa33952fa0d1e6fccf 100644 --- a/src/ui/tools/spiral-tool.cpp +++ b/src/ui/tools/spiral-tool.cpp @@ -27,7 +27,7 @@ #include "document.h" #include "macros.h" #include "message-context.h" -#include "pixmaps/cursor-spiral.xpm" +#include "ui/pixmaps/cursor-spiral.xpm" #include "selection.h" #include "verbs.h" diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp index f8a70a7d0bef538a91747733a52bb3a99941a5ea..cf677ff0c3463915b712337c6e9e092a696fd834 100644 --- a/src/ui/tools/spray-tool.cpp +++ b/src/ui/tools/spray-tool.cpp @@ -55,7 +55,7 @@ #include "object/box3d.h" #include "object/sp-item-transform.h" -#include "pixmaps/cursor-spray.xpm" +#include "ui/pixmaps/cursor-spray.xpm" #include "svg/svg.h" #include "svg/svg-color.h" diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp index 5c011101214c37a102d7b8698885098260b63d86..aa8fe48cdf8be23fca2c07e0b4357503c6e58941 100644 --- a/src/ui/tools/star-tool.cpp +++ b/src/ui/tools/star-tool.cpp @@ -40,7 +40,7 @@ #include "object/sp-namedview.h" #include "object/sp-star.h" -#include "pixmaps/cursor-star.xpm" +#include "ui/pixmaps/cursor-star.xpm" #include "ui/shape-editor.h" #include "ui/tools/star-tool.h" diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp index 8ed03ece1e3fc0550f7198066178e5cc1833fcee..713d72a40a10ae2cbbcc28ab4a6d6e53fcdf980c 100644 --- a/src/ui/tools/text-tool.cpp +++ b/src/ui/tools/text-tool.cpp @@ -44,8 +44,8 @@ #include "object/sp-text.h" #include "style.h" -#include "pixmaps/cursor-text-insert.xpm" -#include "pixmaps/cursor-text.xpm" +#include "ui/pixmaps/cursor-text-insert.xpm" +#include "ui/pixmaps/cursor-text.xpm" #include "ui/control-manager.h" #include "ui/shape-editor.h" diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp index 1e9307a40873940102f4819a46f9bda48e26cade..060131b497a6cd8e672010b89a2171c3b76b33c9 100644 --- a/src/ui/tools/tweak-tool.cpp +++ b/src/ui/tools/tweak-tool.cpp @@ -53,23 +53,23 @@ #include "object/sp-text.h" #include "style.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 "ui/pixmaps/cursor-tweak-attract.xpm" +#include "ui/pixmaps/cursor-tweak-color.xpm" +#include "ui/pixmaps/cursor-tweak-less.xpm" +#include "ui/pixmaps/cursor-tweak-more.xpm" +#include "ui/pixmaps/cursor-tweak-move-in.xpm" +#include "ui/pixmaps/cursor-tweak-move-jitter.xpm" +#include "ui/pixmaps/cursor-tweak-move-out.xpm" +#include "ui/pixmaps/cursor-tweak-move.xpm" +#include "ui/pixmaps/cursor-tweak-push.xpm" +#include "ui/pixmaps/cursor-tweak-repel.xpm" +#include "ui/pixmaps/cursor-tweak-rotate-clockwise.xpm" +#include "ui/pixmaps/cursor-tweak-rotate-counterclockwise.xpm" +#include "ui/pixmaps/cursor-tweak-roughen.xpm" +#include "ui/pixmaps/cursor-tweak-scale-down.xpm" +#include "ui/pixmaps/cursor-tweak-scale-up.xpm" +#include "ui/pixmaps/cursor-tweak-thicken.xpm" +#include "ui/pixmaps/cursor-tweak-thin.xpm" #include "svg/svg.h" diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp index 5310e0f1714cf24ee72afad0bf8b00fd4cb07167..907f66678872ac72d0d91ca6f49ac88161a2d235 100644 --- a/src/ui/tools/zoom-tool.cpp +++ b/src/ui/tools/zoom-tool.cpp @@ -19,8 +19,8 @@ #include "display/sp-canvas-item.h" #include "display/sp-canvas-util.h" #include "desktop.h" -#include "pixmaps/cursor-zoom.xpm" -#include "pixmaps/cursor-zoom-out.xpm" +#include "ui/pixmaps/cursor-zoom.xpm" +#include "ui/pixmaps/cursor-zoom-out.xpm" #include "selection-chemistry.h" #include "ui/tools/zoom-tool.h" diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index 9a5d35f3b3d828187fca54aa1003a347eb75cb00..2f0a9a9ea8221b2e3df058ffb17854faef9841c9 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -34,10 +34,10 @@ #include "object/sp-radial-gradient.h" #include "style.h" -#include "pixmaps/cursor-adj-a.xpm" -#include "pixmaps/cursor-adj-h.xpm" -#include "pixmaps/cursor-adj-l.xpm" -#include "pixmaps/cursor-adj-s.xpm" +#include "ui/pixmaps/cursor-adj-a.xpm" +#include "ui/pixmaps/cursor-adj-h.xpm" +#include "ui/pixmaps/cursor-adj-l.xpm" +#include "ui/pixmaps/cursor-adj-s.xpm" #include "svg/css-ostringstream.h" #include "svg/svg-color.h"