Move GIMP widgets to their own folder

(bzr r15043.1.2)

17 files changed, 55 insertions, 49 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 587974b90..edcc41cd2 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -130,8 +130,6 @@ set(ui_SRC
 	widget/filter-effect-chooser.cpp
 	widget/font-variants.cpp
 	widget/frame.cpp
-	widget/gimpcolorwheel.c
-	widget/gimpspinscale.c
 	widget/highlight-picker.cpp
 	widget/imageicon.cpp
 	widget/imagetoggler.cpp
@@ -314,8 +312,6 @@ set(ui_SRC
 	widget/filter-effect-chooser.h
 	widget/font-variants.h
 	widget/frame.h
-	widget/gimpspinscale.h
-	widget/gimpcolorwheel.h
 	widget/highlight-picker.h
 	widget/insertordericon.h
 	widget/imageicon.h
diff --git a/src/ui/dialog-events.h b/src/ui/dialog-events.h
index b4a5d7c35..547cfb95d 100644
--- a/src/ui/dialog-events.h
+++ b/src/ui/dialog-events.h
@@ -12,6 +12,7 @@
 #ifndef SEEN_DIALOG_EVENTS_H
 #define SEEN_DIALOG_EVENTS_H
 
+#include <gtk/gtk.h>
  
 /*
  * event callback can only accept one argument, but we need two,
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index fea6543ea..616e9afa8 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -5,7 +5,6 @@
 #include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
 
-#include <gtk/gtk.h>
 #include <set>
 
 #include "ui/dialog-events.h"
diff --git a/src/ui/widget/color-notebook.h b/src/ui/widget/color-notebook.h
index 35e46ef14..0948e3d46 100644
--- a/src/ui/widget/color-notebook.h
+++ b/src/ui/widget/color-notebook.h
@@ -20,7 +20,6 @@
 
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <gtkmm/grid.h>
-#include <gtk/gtk.h>
 #include <glib.h>
 
 #include "color.h"
diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp
index 7fcca215f..89913b01b 100644
--- a/src/ui/widget/color-scales.cpp
+++ b/src/ui/widget/color-scales.cpp
@@ -8,7 +8,6 @@
 
 #include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
-#include <gtk/gtk.h>
 
 #include "ui/dialog-events.h"
 #include "ui/widget/color-scales.h"
diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp
index 18f932f10..4f011c6c3 100644
--- a/src/ui/widget/color-wheel-selector.cpp
+++ b/src/ui/widget/color-wheel-selector.cpp
@@ -11,7 +11,7 @@
 #include "ui/dialog-events.h"
 #include "ui/widget/color-scales.h"
 #include "ui/widget/color-slider.h"
-#include "ui/widget/gimpcolorwheel.h"
+#include "widgets/gimp/gimpcolorwheel.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/spin-scale.cpp b/src/ui/widget/spin-scale.cpp
index eb91aaf39..f74626d9b 100644
--- a/src/ui/widget/spin-scale.cpp
+++ b/src/ui/widget/spin-scale.cpp
@@ -11,7 +11,7 @@
 #include <glibmm/i18n.h>
 #include <glibmm/stringutils.h>
 
-#include "ui/widget/gimpspinscale.h"
+#include "widgets/gimp/gimpspinscale.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 47ffe82ac..b2071af4e 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -1,24 +1,25 @@
+add_subdirectory(gimp)
 
 set(widgets_SRC
 	button.cpp
-	  arc-toolbar.cpp
-	  box3d-toolbar.cpp
-	  calligraphy-toolbar.cpp
-	  connector-toolbar.cpp
-	  dropper-toolbar.cpp
-	  eraser-toolbar.cpp
-	  lpe-toolbar.cpp
-	  measure-toolbar.cpp
-	  mesh-toolbar.cpp
-	  node-toolbar.cpp
-	  pencil-toolbar.cpp
-	  rect-toolbar.cpp
-	  spiral-toolbar.cpp
-	  spray-toolbar.cpp
-	  star-toolbar.cpp
-	  text-toolbar.cpp
-	  tweak-toolbar.cpp
-	  zoom-toolbar.cpp		
+	arc-toolbar.cpp
+	box3d-toolbar.cpp
+	calligraphy-toolbar.cpp
+	connector-toolbar.cpp
+	dropper-toolbar.cpp
+	eraser-toolbar.cpp
+	lpe-toolbar.cpp
+	measure-toolbar.cpp
+	mesh-toolbar.cpp
+	node-toolbar.cpp
+	pencil-toolbar.cpp
+	rect-toolbar.cpp
+	spiral-toolbar.cpp
+	spray-toolbar.cpp
+	star-toolbar.cpp
+	text-toolbar.cpp
+	tweak-toolbar.cpp
+	zoom-toolbar.cpp		
 	dash-selector.cpp
 	desktop-widget.cpp
 	eek-preview.cpp
@@ -40,7 +41,6 @@ set(widgets_SRC
 	ink-toggle-action.cpp
 	ink-tool-menu-action.cpp
 	paint-selector.cpp
-	ruler.cpp
 	select-toolbar.cpp
 	sp-attribute-widget.cpp
 	sp-color-selector.cpp
@@ -59,24 +59,24 @@ set(widgets_SRC
 	# -------
 	# Headers
 	button.h
-	  arc-toolbar.h
-	  box3d-toolbar.h
-	  calligraphy-toolbar.h
-	  connector-toolbar.h
-	  dropper-toolbar.h
-	  eraser-toolbar.h
-	  lpe-toolbar.h
-	  measure-toolbar.h
-	  mesh-toolbar.h
-	  node-toolbar.h
-	  pencil-toolbar.h
-	  rect-toolbar.h
-	  spiral-toolbar.h
-	  spray-toolbar.h
-	  star-toolbar.h
-	  text-toolbar.h
-	  tweak-toolbar.h
-	  zoom-toolbar.h	
+	arc-toolbar.h
+	box3d-toolbar.h
+	calligraphy-toolbar.h
+	connector-toolbar.h
+	dropper-toolbar.h
+	eraser-toolbar.h
+	lpe-toolbar.h
+	measure-toolbar.h
+	mesh-toolbar.h
+	node-toolbar.h
+	pencil-toolbar.h
+	rect-toolbar.h
+	spiral-toolbar.h
+	spray-toolbar.h
+	star-toolbar.h
+	text-toolbar.h
+	tweak-toolbar.h
+	zoom-toolbar.h	
 	dash-selector.h
 	desktop-widget.h
 	eek-preview.h
@@ -99,7 +99,6 @@ set(widgets_SRC
         ink-toggle-action.h
         ink-tool-menu-action.h
 	paint-selector.h
-	ruler.h
 	select-toolbar.h
 	sp-attribute-widget.h
 	sp-color-selector.h
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index aa485498e..bd72560c6 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -57,7 +57,7 @@
 
 // We're in the "widgets" directory, so no need to explicitly prefix these:
 #include "button.h"
-#include "ruler.h"
+#include "gimp/ruler.h"
 #include "spinbutton-events.h"
 #include "spw-utilities.h"
 #include "toolbox.h"
diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp
index 8fef21741..6678d1e5a 100644
--- a/src/widgets/ege-adjustment-action.cpp
+++ b/src/widgets/ege-adjustment-action.cpp
@@ -47,7 +47,7 @@
 
 #include "icon-size.h"
 #include "widgets/ege-adjustment-action.h"
-#include "ui/widget/gimpspinscale.h"
+#include "gimp/gimpspinscale.h"
 #include "ui/icon-names.h"
 
 
diff --git a/src/widgets/gimp/CMakeLists.txt b/src/widgets/gimp/CMakeLists.txt
new file mode 100644
index 000000000..7b3e834e3
--- /dev/null
+++ b/src/widgets/gimp/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(gimpwidgets_SRC
+	gimpcolorwheel.c
+	gimpspinscale.c
+	ruler.cpp
+
+	# -------
+	# Headers
+	gimpcolorwheel.h
+	gimpspinscale.h
+	ruler.h
+)
+
+add_inkscape_source("${gimpwidgets_SRC}")
diff --git a/src/ui/widget/gimpcolorwheel.c b/src/widgets/gimp/gimpcolorwheel.c
index 212391497..212391497 100644
--- a/src/ui/widget/gimpcolorwheel.c
+++ b/src/widgets/gimp/gimpcolorwheel.c
diff --git a/src/ui/widget/gimpcolorwheel.h b/src/widgets/gimp/gimpcolorwheel.h
index 016fb593f..016fb593f 100644
--- a/src/ui/widget/gimpcolorwheel.h
+++ b/src/widgets/gimp/gimpcolorwheel.h
diff --git a/src/ui/widget/gimpspinscale.c b/src/widgets/gimp/gimpspinscale.c
index 8d8c6c935..8d8c6c935 100644
--- a/src/ui/widget/gimpspinscale.c
+++ b/src/widgets/gimp/gimpspinscale.c
diff --git a/src/ui/widget/gimpspinscale.h b/src/widgets/gimp/gimpspinscale.h
index b42a0faf8..b42a0faf8 100644
--- a/src/ui/widget/gimpspinscale.h
+++ b/src/widgets/gimp/gimpspinscale.h
diff --git a/src/widgets/ruler.cpp b/src/widgets/gimp/ruler.cpp
index bfb9c9071..bfb9c9071 100644
--- a/src/widgets/ruler.cpp
+++ b/src/widgets/gimp/ruler.cpp
diff --git a/src/widgets/ruler.h b/src/widgets/gimp/ruler.h
index ed529d082..ed529d082 100644
--- a/src/widgets/ruler.h
+++ b/src/widgets/gimp/ruler.h