From aaf63b4ad640441b73bcc82bc4a8e9ee05ebf1fd Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Thu, 21 Jun 2018 14:44:01 +0200 Subject: [PATCH] Move pixmaps to ui/pixmaps, and update the README accordingly. --- src/desktop-events.cpp | 2 +- src/{ => ui}/pixmaps/README | 4 --- src/{ => ui}/pixmaps/cursor-3dbox.xpm | 0 src/{ => ui}/pixmaps/cursor-adj-a.xpm | 0 src/{ => ui}/pixmaps/cursor-adj-h.xpm | 0 src/{ => ui}/pixmaps/cursor-adj-l.xpm | 0 src/{ => ui}/pixmaps/cursor-adj-s.xpm | 0 src/{ => ui}/pixmaps/cursor-calligraphy.xpm | 0 src/{ => ui}/pixmaps/cursor-connector.xpm | 0 src/{ => ui}/pixmaps/cursor-crosshairs.xpm | 0 src/{ => ui}/pixmaps/cursor-dropper-f.xpm | 0 src/{ => ui}/pixmaps/cursor-dropper-s.xpm | 0 src/{ => ui}/pixmaps/cursor-dropping-f.xpm | 0 src/{ => ui}/pixmaps/cursor-dropping-s.xpm | 0 src/{ => ui}/pixmaps/cursor-ellipse.xpm | 0 src/{ => ui}/pixmaps/cursor-eraser.xpm | 0 src/{ => ui}/pixmaps/cursor-gradient-add.xpm | 0 src/{ => ui}/pixmaps/cursor-gradient.xpm | 0 src/{ => ui}/pixmaps/cursor-measure.xpm | 0 src/{ => ui}/pixmaps/cursor-node-d.xpm | 0 src/{ => ui}/pixmaps/cursor-node.xpm | 0 src/{ => ui}/pixmaps/cursor-paintbucket.xpm | 0 src/{ => ui}/pixmaps/cursor-pen.xpm | 0 src/{ => ui}/pixmaps/cursor-pencil.xpm | 0 src/{ => ui}/pixmaps/cursor-rect.xpm | 0 src/{ => ui}/pixmaps/cursor-select-d.xpm | 0 src/{ => ui}/pixmaps/cursor-select-m.xpm | 0 src/{ => ui}/pixmaps/cursor-select.xpm | 0 src/{ => ui}/pixmaps/cursor-spiral.xpm | 0 src/{ => ui}/pixmaps/cursor-spray-move.xpm | 0 src/{ => ui}/pixmaps/cursor-spray.xpm | 0 src/{ => ui}/pixmaps/cursor-star.xpm | 0 src/{ => ui}/pixmaps/cursor-text-insert.xpm | 0 src/{ => ui}/pixmaps/cursor-text.xpm | 0 src/{ => ui}/pixmaps/cursor-tweak-attract.xpm | 0 src/{ => ui}/pixmaps/cursor-tweak-color.xpm | 0 src/{ => ui}/pixmaps/cursor-tweak-less.xpm | 0 src/{ => ui}/pixmaps/cursor-tweak-more.xpm | 0 src/{ => ui}/pixmaps/cursor-tweak-move-in.xpm | 0 .../pixmaps/cursor-tweak-move-jitter.xpm | 0 .../pixmaps/cursor-tweak-move-out.xpm | 0 src/{ => ui}/pixmaps/cursor-tweak-move.xpm | 0 src/{ => ui}/pixmaps/cursor-tweak-push.xpm | 0 src/{ => ui}/pixmaps/cursor-tweak-repel.xpm | 0 .../pixmaps/cursor-tweak-rotate-clockwise.xpm | 0 .../cursor-tweak-rotate-counterclockwise.xpm | 0 src/{ => ui}/pixmaps/cursor-tweak-roughen.xpm | 0 .../pixmaps/cursor-tweak-scale-down.xpm | 0 .../pixmaps/cursor-tweak-scale-up.xpm | 0 src/{ => ui}/pixmaps/cursor-tweak-thicken.xpm | 0 src/{ => ui}/pixmaps/cursor-tweak-thin.xpm | 0 src/{ => ui}/pixmaps/cursor-zoom-out.xpm | 0 src/{ => ui}/pixmaps/cursor-zoom.xpm | 0 src/{ => ui}/pixmaps/handles.xpm | 0 src/ui/tools/arc-tool.cpp | 2 +- src/ui/tools/box3d-tool.cpp | 2 +- src/ui/tools/calligraphic-tool.cpp | 2 +- src/ui/tools/connector-tool.cpp | 2 +- src/ui/tools/dropper-tool.cpp | 8 ++--- src/ui/tools/eraser-tool.cpp | 2 +- src/ui/tools/flood-tool.cpp | 2 +- src/ui/tools/gradient-tool.cpp | 4 +-- src/ui/tools/lpe-tool.cpp | 2 +- src/ui/tools/measure-tool.cpp | 2 +- src/ui/tools/mesh-tool.cpp | 4 +-- src/ui/tools/node-tool.cpp | 4 +-- src/ui/tools/pen-tool.cpp | 2 +- src/ui/tools/pencil-tool.cpp | 2 +- src/ui/tools/rect-tool.cpp | 2 +- src/ui/tools/select-tool.cpp | 6 ++-- src/ui/tools/spiral-tool.cpp | 2 +- src/ui/tools/spray-tool.cpp | 2 +- src/ui/tools/star-tool.cpp | 2 +- src/ui/tools/text-tool.cpp | 4 +-- src/ui/tools/tweak-tool.cpp | 34 +++++++++---------- src/ui/tools/zoom-tool.cpp | 4 +-- src/ui/widget/selected-style.cpp | 8 ++--- 77 files changed, 53 insertions(+), 57 deletions(-) rename src/{ => ui}/pixmaps/README (76%) rename src/{ => ui}/pixmaps/cursor-3dbox.xpm (100%) rename src/{ => ui}/pixmaps/cursor-adj-a.xpm (100%) rename src/{ => ui}/pixmaps/cursor-adj-h.xpm (100%) rename src/{ => ui}/pixmaps/cursor-adj-l.xpm (100%) rename src/{ => ui}/pixmaps/cursor-adj-s.xpm (100%) rename src/{ => ui}/pixmaps/cursor-calligraphy.xpm (100%) rename src/{ => ui}/pixmaps/cursor-connector.xpm (100%) rename src/{ => ui}/pixmaps/cursor-crosshairs.xpm (100%) rename src/{ => ui}/pixmaps/cursor-dropper-f.xpm (100%) rename src/{ => ui}/pixmaps/cursor-dropper-s.xpm (100%) rename src/{ => ui}/pixmaps/cursor-dropping-f.xpm (100%) rename src/{ => ui}/pixmaps/cursor-dropping-s.xpm (100%) rename src/{ => ui}/pixmaps/cursor-ellipse.xpm (100%) rename src/{ => ui}/pixmaps/cursor-eraser.xpm (100%) rename src/{ => ui}/pixmaps/cursor-gradient-add.xpm (100%) rename src/{ => ui}/pixmaps/cursor-gradient.xpm (100%) rename src/{ => ui}/pixmaps/cursor-measure.xpm (100%) rename src/{ => ui}/pixmaps/cursor-node-d.xpm (100%) rename src/{ => ui}/pixmaps/cursor-node.xpm (100%) rename src/{ => ui}/pixmaps/cursor-paintbucket.xpm (100%) rename src/{ => ui}/pixmaps/cursor-pen.xpm (100%) rename src/{ => ui}/pixmaps/cursor-pencil.xpm (100%) rename src/{ => ui}/pixmaps/cursor-rect.xpm (100%) rename src/{ => ui}/pixmaps/cursor-select-d.xpm (100%) rename src/{ => ui}/pixmaps/cursor-select-m.xpm (100%) rename src/{ => ui}/pixmaps/cursor-select.xpm (100%) rename src/{ => ui}/pixmaps/cursor-spiral.xpm (100%) rename src/{ => ui}/pixmaps/cursor-spray-move.xpm (100%) rename src/{ => ui}/pixmaps/cursor-spray.xpm (100%) rename src/{ => ui}/pixmaps/cursor-star.xpm (100%) rename src/{ => ui}/pixmaps/cursor-text-insert.xpm (100%) rename src/{ => ui}/pixmaps/cursor-text.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-attract.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-color.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-less.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-more.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-move-in.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-move-jitter.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-move-out.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-move.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-push.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-repel.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-rotate-clockwise.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-rotate-counterclockwise.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-roughen.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-scale-down.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-scale-up.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-thicken.xpm (100%) rename src/{ => ui}/pixmaps/cursor-tweak-thin.xpm (100%) rename src/{ => ui}/pixmaps/cursor-zoom-out.xpm (100%) rename src/{ => ui}/pixmaps/cursor-zoom.xpm (100%) rename src/{ => ui}/pixmaps/handles.xpm (100%) diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index 6f79f33e31..6af5a6210c 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 5495fa2687..0b78941bd3 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 e0378ff032..dc3f0db0f9 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 f643fc356c..d7ec503605 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 5cd2514ba3..50c5f413ac 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 09f18e630d..d41e1b3eb7 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 d11ed1d83c..c0be19479b 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 60d572e164..c0742f9df2 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 bfd7f60dd7..1d1930a4e2 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 a443716d74..c00d0324e8 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 c523b7bdec..dae62d4f94 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 2048dce232..a305fa3501 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 93b94d7507..251de33b33 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 3ec40d0866..5168393156 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 e7301152ff..9ea403b092 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 f0d6639ab6..b5257cecbf 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 cedf43962c..7d2f784015 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 90451e662c..835bb6f942 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 4b77436786..6add094423 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 f8a70a7d0b..cf677ff0c3 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 5c01110121..aa8fe48cdf 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 8ed03ece1e..713d72a40a 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 1e9307a408..060131b497 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 5310e0f171..907f666788 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 9a5d35f3b3..2f0a9a9ea8 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" -- GitLab