Move pixmaps to ui/pixmaps, and update the README accordingly.

22 files changed, 48 insertions, 48 deletions

diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp
index e0378ff03..dc3f0db0f 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 f643fc356..d7ec50360 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 5cd2514ba..50c5f413a 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 09f18e630..d41e1b3eb 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 d11ed1d83..c0be19479 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 60d572e16..c0742f9df 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 bfd7f60dd..1d1930a4e 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 a443716d7..c00d0324e 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 c523b7bde..dae62d4f9 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 2048dce23..a305fa350 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 93b94d750..251de33b3 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 3ec40d086..516839315 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 e7301152f..9ea403b09 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 f0d6639ab..b5257cecb 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 cedf43962..7d2f78401 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 90451e662..835bb6f94 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 4b7743678..6add09442 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 f8a70a7d0..cf677ff0c 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 5c0111012..aa8fe48cd 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 8ed03ece1..713d72a40 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 1e9307a40..060131b49 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 5310e0f17..907f66678 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"