moved ColorNotebook to ui/widget

(bzr r13341.6.51)

12 files changed, 20 insertions, 21 deletions

diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp
index 5b2a4ad0c..6748c8f5f 100644
--- a/src/extension/param/color.cpp
+++ b/src/extension/param/color.cpp
@@ -29,7 +29,7 @@
 
 #include <color.h>
 #include "widgets/sp-color-selector.h"
-#include "widgets/sp-color-notebook.h"
+#include "ui/widget/color-notebook.h"
 #include "preferences.h"
 
 
diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp
index b18525215..8c99ee55d 100644
--- a/src/extension/param/parameter.cpp
+++ b/src/extension/param/parameter.cpp
@@ -30,8 +30,7 @@
 #include "document-private.h"
 #include "sp-object.h"
 #include <color.h>
-#include "widgets/sp-color-selector.h"
-#include "widgets/sp-color-notebook.h"
+#include "ui/widget/color-notebook.h"
 
 #include "parameter.h"
 #include "bool.h"
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index dbfba0508..45b4c7960 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -110,6 +110,7 @@ set(ui_SRC
 	widget/button.cpp
 	widget/color-entry.cpp
 	widget/color-icc-selector.cpp
+	widget/color-notebook.cpp
 	widget/color-picker.cpp
 	widget/color-preview.cpp
 	widget/color-scales.cpp
@@ -277,6 +278,7 @@ set(ui_SRC
 	widget/button.h
 	widget/color-entry.h
 	widget/color-icc-selector.h
+	widget/color-notebook.h
 	widget/color-picker.h
 	widget/color-preview.h
 	widget/color-scales.h
diff --git a/src/ui/widget/Makefile_insert b/src/ui/widget/Makefile_insert
index f39236da7..ddb641069 100644
--- a/src/ui/widget/Makefile_insert
+++ b/src/ui/widget/Makefile_insert
@@ -10,6 +10,8 @@ ink_common_sources +=	\
 	ui/widget/color-entry.h     \
 	ui/widget/color-icc-selector.cpp	\
 	ui/widget/color-icc-selector.h	\
+	ui/widget/color-notebook.cpp   \
+	ui/widget/color-notebook.h  \
 	ui/widget/color-wheel-selector.cpp    \
 	ui/widget/color-wheel-selector.h    \
 	ui/widget/color-picker.cpp     \
diff --git a/src/widgets/sp-color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index 38ea04372..2b592e620 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -26,20 +26,20 @@
 #include <glibmm/i18n.h>
 #include <gtkmm/label.h>
 
-#include "../dialogs/dialog-events.h"
-#include "../preferences.h"
-#include "sp-color-notebook.h"
-#include "spw-utilities.h"
+#include "dialogs/dialog-events.h"
+#include "preferences.h"
+#include "widgets/spw-utilities.h"
 #include "svg/svg-icc-color.h"
-#include "../inkscape.h"
-#include "../document.h"
-#include "../profile-manager.h"
+#include "inkscape.h"
+#include "document.h"
+#include "profile-manager.h"
 #include "color-profile.h"
 #include "cms-system.h"
 #include "tools-switch.h"
 #include "ui/tools/tool-base.h"
 #include "ui/widget/color-entry.h"
 #include "ui/widget/color-icc-selector.h"
+#include "ui/widget/color-notebook.h"
 #include "ui/widget/color-scales.h"
 #include "ui/widget/color-wheel-selector.h"
 
diff --git a/src/widgets/sp-color-notebook.h b/src/ui/widget/color-notebook.h
index 42fb0ed97..177519e25 100644
--- a/src/widgets/sp-color-notebook.h
+++ b/src/ui/widget/color-notebook.h
@@ -25,8 +25,8 @@
 #include <glib.h>
 #include <gtkmm/table.h>
 
-#include "../color.h"
-#include "sp-color-selector.h"
+#include "color.h"
+#include "widgets/sp-color-selector.h"
 #include "ui/selected-color.h"
 
 
diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index f909535b1..dc827f377 100644
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -17,7 +17,7 @@
 #include "document-undo.h"
 #include "dialogs/dialog-events.h"
 
-#include "widgets/sp-color-notebook.h"
+#include "ui/widget/color-notebook.h"
 #include "verbs.h"
 
 
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index f546c516f..d5910e8af 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -36,7 +36,6 @@ set(widgets_SRC
 	select-toolbar.cpp
 	shrink-wrap-button.cpp
 	sp-attribute-widget.cpp
-	sp-color-notebook.cpp
 	sp-color-selector.cpp
 	sp-widget.cpp
 	sp-xmlview-attr-list.cpp
@@ -89,7 +88,6 @@ set(widgets_SRC
 	select-toolbar.h
 	shrink-wrap-button.h
 	sp-attribute-widget.h
-	sp-color-notebook.h
 	sp-color-selector.h
 	sp-widget.h
 	sp-xmlview-attr-list.h
diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert
index 88e79f118..5e38b5df7 100644
--- a/src/widgets/Makefile_insert
+++ b/src/widgets/Makefile_insert
@@ -66,8 +66,6 @@ ink_common_sources +=	\
 	widgets/spiral-toolbar.h		\
 	widgets/sp-attribute-widget.cpp	\
 	widgets/sp-attribute-widget.h	\
-	widgets/sp-color-notebook.cpp	\
-	widgets/sp-color-notebook.h	\
 	widgets/sp-color-selector.cpp	\
 	widgets/sp-color-selector.h	\
 	widgets/spinbutton-events.cpp	\
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 0ea5f5506..2d654ac43 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -55,6 +55,7 @@
 #include "document-undo.h"
 
 #include "ui/selected-color.h"
+#include "ui/widget/color-notebook.h"
 
 using Inkscape::DocumentUndo;
 using Inkscape::UI::SelectedColor;
@@ -491,11 +492,10 @@ void SPGradientVectorSelector::setSwatched()
   ###                 Vector Editing Widget
   ##################################################################*/
 
-#include "../widgets/sp-color-notebook.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
 #include "../svg/svg-color.h"
-
+#include "ui/widget/color-notebook.h"
 
 #define PAD 4
 
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 274ad7bdf..3f2edb4f2 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -35,7 +35,6 @@
 #include "widgets/widget-sizes.h"
 #include "xml/repr.h"
 
-#include "sp-color-notebook.h"
 #include "sp-linear-gradient.h"
 #include "sp-radial-gradient.h"
 /* fixme: Move it from dialogs to here */
@@ -50,6 +49,7 @@
 #include "io/sys.h"
 #include "helper/stock-items.h"
 #include "ui/icon-names.h"
+#include "ui/widget/color-notebook.h"
 
 #include "paint-selector.h"
 
diff --git a/src/widgets/swatch-selector.cpp b/src/widgets/swatch-selector.cpp
index b7de6657c..eb8bf7a4f 100644
--- a/src/widgets/swatch-selector.cpp
+++ b/src/widgets/swatch-selector.cpp
@@ -5,11 +5,11 @@
 #include "document-undo.h"
 #include "gradient-chemistry.h"
 #include "gradient-selector.h"
-#include "sp-color-notebook.h"
 #include "sp-stop.h"
 #include "svg/css-ostringstream.h"
 #include "svg/svg-color.h"
 #include "verbs.h"
+#include "ui/widget/color-notebook.h"
 #include "xml/node.h"
 
 namespace Inkscape