Move GtkAction subclasses to widgets/

(bzr r13341.1.249)

35 files changed, 80 insertions, 77 deletions

diff --git a/src/Makefile_insert b/src/Makefile_insert
index f8f0ac122..762535cb5 100644
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -38,10 +38,7 @@ ink_common_sources +=	\
 	document-undo.cpp document-undo.h \
 	doxygen-main.cpp						\
 	draw-anchor.cpp	draw-anchor.h					\
-	ege-adjustment-action.cpp ege-adjustment-action.h		\
 	ege-color-prof-tracker.cpp ege-color-prof-tracker.h		\
-	ege-output-action.cpp ege-output-action.h			\
-	ege-select-one-action.cpp ege-select-one-action.h		\
 	enums.h								\
 	event-log.cpp event-log.h event.h				\
 	extract-uri.cpp extract-uri.h					\
@@ -67,10 +64,6 @@ ink_common_sources +=	\
 	helper/pixbuf-ops.h						\
 	icon-size.h							\
 	id-clash.cpp id-clash.h						\
-	ink-action.cpp							\
-	ink-action.h							\
-	ink-comboboxentry-action.cpp					\
-	ink-comboboxentry-action.h					\
 	inkscape.cpp inkscape.h inkscape-private.h			\
 	isinf.h								\
 	knot.cpp knot.h							\
diff --git a/src/ui/widget/unit-tracker.cpp b/src/ui/widget/unit-tracker.cpp
index 67eb1f48d..c6318db25 100644
--- a/src/ui/widget/unit-tracker.cpp
+++ b/src/ui/widget/unit-tracker.cpp
@@ -13,7 +13,7 @@
  */
 
 #include "unit-tracker.h"
-#include "ege-select-one-action.h"
+#include "widgets/ege-select-one-action.h"
 
 #define COLUMN_STRING 0
 
diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert
index 97713cbee..dc4c12967 100644
--- a/src/widgets/Makefile_insert
+++ b/src/widgets/Makefile_insert
@@ -19,8 +19,14 @@ ink_common_sources +=	\
 	widgets/dropper-toolbar.h		\
 	widgets/eek-preview.cpp		\
 	widgets/eek-preview.h		\
+	widgets/ege-adjustment-action.cpp	\
+	widgets/ege-adjustment-action.h		\
 	widgets/ege-paint-def.cpp	\
 	widgets/ege-paint-def.h		\
+	widgets/ege-output-action.cpp	\
+	widgets/ege-output-action.h	\
+	widgets/ege-select-one-action.cpp	\
+	widgets/ege-select-one-action.h		\
 	widgets/eraser-toolbar.cpp		\
 	widgets/eraser-toolbar.h		\
 	widgets/fill-style.cpp		\
@@ -38,6 +44,10 @@ ink_common_sources +=	\
 	widgets/gradient-vector.h	\
 	widgets/icon.cpp		\
 	widgets/icon.h			\
+	widgets/ink-action.cpp		\
+	widgets/ink-action.h		\
+	widgets/ink-comboboxentry-action.cpp	\
+	widgets/ink-comboboxentry-action.h	\
 	widgets/lpe-toolbar.cpp	\
 	widgets/lpe-toolbar.h	   \
 	widgets/measure-toolbar.cpp	\
diff --git a/src/widgets/arc-toolbar.cpp b/src/widgets/arc-toolbar.cpp
index 1005de70d..ca582924b 100644
--- a/src/widgets/arc-toolbar.cpp
+++ b/src/widgets/arc-toolbar.cpp
@@ -34,10 +34,10 @@
 #include "desktop-handles.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "ege-adjustment-action.h"
-#include "ege-output-action.h"
-#include "ege-select-one-action.h"
-#include "ink-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-output-action.h"
+#include "widgets/ege-select-one-action.h"
+#include "widgets/ink-action.h"
 #include "mod360.h"
 #include "preferences.h"
 #include "selection.h"
diff --git a/src/widgets/box3d-toolbar.cpp b/src/widgets/box3d-toolbar.cpp
index 7629e8c24..41f440ccc 100644
--- a/src/widgets/box3d-toolbar.cpp
+++ b/src/widgets/box3d-toolbar.cpp
@@ -36,8 +36,8 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "ege-adjustment-action.h"
-#include "ink-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ink-action.h"
 #include "inkscape.h"
 #include "persp3d.h"
 #include "selection.h"
diff --git a/src/widgets/calligraphy-toolbar.cpp b/src/widgets/calligraphy-toolbar.cpp
index 9c0393cd9..4ae6427ad 100644
--- a/src/widgets/calligraphy-toolbar.cpp
+++ b/src/widgets/calligraphy-toolbar.cpp
@@ -34,9 +34,9 @@
 
 #include "desktop.h"
 #include "document-undo.h"
-#include "ege-adjustment-action.h"
-#include "ege-select-one-action.h"
-#include "ink-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-select-one-action.h"
+#include "widgets/ink-action.h"
 #include "preferences.h"
 #include "toolbox.h"
 #include "ui/icon-names.h"
diff --git a/src/widgets/connector-toolbar.cpp b/src/widgets/connector-toolbar.cpp
index 9bbc1bbb4..6ce926dc1 100644
--- a/src/widgets/connector-toolbar.cpp
+++ b/src/widgets/connector-toolbar.cpp
@@ -35,10 +35,10 @@
 #include "desktop-handles.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "ege-adjustment-action.h"
+#include "widgets/ege-adjustment-action.h"
 #include "enums.h"
 #include "graphlayout.h"
-#include "ink-action.h"
+#include "widgets/ink-action.h"
 #include "inkscape.h"
 #include "preferences.h"
 #include "selection.h"
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 388d22e29..9c8dac7dc 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -38,7 +38,7 @@
 #include "display/canvas-arena.h"
 #include "document.h"
 #include "ege-color-prof-tracker.h"
-#include "ege-select-one-action.h"
+#include "widgets/ege-select-one-action.h"
 #include <extension/db.h>
 #include "file.h"
 #include "helper/action.h"
diff --git a/src/widgets/dropper-toolbar.cpp b/src/widgets/dropper-toolbar.cpp
index 478d0c1a4..45ed9ead4 100644
--- a/src/widgets/dropper-toolbar.cpp
+++ b/src/widgets/dropper-toolbar.cpp
@@ -32,8 +32,8 @@
 
 #include "dropper-toolbar.h"
 #include "document-undo.h"
-#include "ege-output-action.h"
-#include "ink-action.h"
+#include "widgets/ege-output-action.h"
+#include "widgets/ink-action.h"
 #include "preferences.h"
 #include "widgets/spinbutton-events.h"
 
diff --git a/src/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp
index 9491468dc..d89a6e3f1 100644
--- a/src/ege-adjustment-action.cpp
+++ b/src/widgets/ege-adjustment-action.cpp
@@ -46,7 +46,7 @@
 #include <gdk/gdkkeysyms.h>
 
 #include "icon-size.h"
-#include "ege-adjustment-action.h"
+#include "widgets/ege-adjustment-action.h"
 #include "ui/widget/gimpspinscale.h"
 #include "ui/icon-names.h"
 
diff --git a/src/ege-adjustment-action.h b/src/widgets/ege-adjustment-action.h
index 8cfaa3e52..8cfaa3e52 100644
--- a/src/ege-adjustment-action.h
+++ b/src/widgets/ege-adjustment-action.h
diff --git a/src/ege-output-action.cpp b/src/widgets/ege-output-action.cpp
index 9a7d7e318..5dece8e91 100644
--- a/src/ege-output-action.cpp
+++ b/src/widgets/ege-output-action.cpp
@@ -43,7 +43,7 @@
 
 #include <gtk/gtk.h>
 
-#include "ege-output-action.h"
+#include "widgets/ege-output-action.h"
 
 
 static void ege_output_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec );
diff --git a/src/ege-output-action.h b/src/widgets/ege-output-action.h
index 0f4e21805..0f4e21805 100644
--- a/src/ege-output-action.h
+++ b/src/widgets/ege-output-action.h
diff --git a/src/ege-select-one-action.cpp b/src/widgets/ege-select-one-action.cpp
index 3facf7242..ab86c49f8 100644
--- a/src/ege-select-one-action.cpp
+++ b/src/widgets/ege-select-one-action.cpp
@@ -43,7 +43,7 @@
 
 #include <gtk/gtk.h>
 
-#include "ege-select-one-action.h"
+#include "widgets/ege-select-one-action.h"
 
 enum {
     CHANGED = 0,
diff --git a/src/ege-select-one-action.h b/src/widgets/ege-select-one-action.h
index 0c5cecaa3..0c5cecaa3 100644
--- a/src/ege-select-one-action.h
+++ b/src/widgets/ege-select-one-action.h
diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp
index 14e7cbf4e..f547cbd8b 100644
--- a/src/widgets/eraser-toolbar.cpp
+++ b/src/widgets/eraser-toolbar.cpp
@@ -35,9 +35,9 @@
 #include "desktop-handles.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "ege-adjustment-action.h"
-#include "ege-select-one-action.h"
-#include "ink-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-select-one-action.h"
+#include "widgets/ink-action.h"
 #include "preferences.h"
 #include "toolbox.h"
 #include "ui/icon-names.h"
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index f5a99f3e7..3e358e522 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -22,12 +22,12 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "ege-adjustment-action.h"
-#include "ege-select-one-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-select-one-action.h"
 #include "gradient-chemistry.h"
 #include "gradient-drag.h"
 #include "gradient-toolbar.h"
-#include "ink-action.h"
+#include "widgets/ink-action.h"
 #include "macros.h"
 #include "preferences.h"
 #include "selection.h"
diff --git a/src/ink-action.cpp b/src/widgets/ink-action.cpp
index dd1fe5484..5941c31e4 100644
--- a/src/ink-action.cpp
+++ b/src/widgets/ink-action.cpp
@@ -3,7 +3,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "ink-action.h"
+#include "widgets/ink-action.h"
 
 #include "widgets/button.h"
 
diff --git a/src/ink-action.h b/src/widgets/ink-action.h
index ac5cb9873..ac5cb9873 100644
--- a/src/ink-action.h
+++ b/src/widgets/ink-action.h
diff --git a/src/ink-comboboxentry-action.cpp b/src/widgets/ink-comboboxentry-action.cpp
index 6ae2a8485..5c59f6961 100644
--- a/src/ink-comboboxentry-action.cpp
+++ b/src/widgets/ink-comboboxentry-action.cpp
@@ -30,7 +30,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "ink-comboboxentry-action.h"
+#include "widgets/ink-comboboxentry-action.h"
 #include "ui/icon-names.h"
 
 // Must handle both tool and menu items!
diff --git a/src/ink-comboboxentry-action.h b/src/widgets/ink-comboboxentry-action.h
index 04b66e8fe..04b66e8fe 100644
--- a/src/ink-comboboxentry-action.h
+++ b/src/widgets/ink-comboboxentry-action.h
diff --git a/src/widgets/lpe-toolbar.cpp b/src/widgets/lpe-toolbar.cpp
index 7ad88b856..485a4289d 100644
--- a/src/widgets/lpe-toolbar.cpp
+++ b/src/widgets/lpe-toolbar.cpp
@@ -33,10 +33,10 @@
 #include "desktop-handles.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "ege-select-one-action.h"
+#include "widgets/ege-select-one-action.h"
 #include "helper/action-context.h"
 #include "helper/action.h"
-#include "ink-action.h"
+#include "widgets/ink-action.h"
 #include "live_effects/effect.h"
 #include "preferences.h"
 #include "selection.h"
diff --git a/src/widgets/measure-toolbar.cpp b/src/widgets/measure-toolbar.cpp
index 46d3bd4e0..1a4678332 100644
--- a/src/widgets/measure-toolbar.cpp
+++ b/src/widgets/measure-toolbar.cpp
@@ -34,8 +34,8 @@
 #include "desktop-handles.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "ege-adjustment-action.h"
-#include "ege-output-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-output-action.h"
 #include "preferences.h"
 #include "toolbox.h"
 #include "ui/widget/unit-tracker.h"
diff --git a/src/widgets/mesh-toolbar.cpp b/src/widgets/mesh-toolbar.cpp
index 73e450926..897d84278 100644
--- a/src/widgets/mesh-toolbar.cpp
+++ b/src/widgets/mesh-toolbar.cpp
@@ -50,11 +50,11 @@
 #include "selection.h"
 #include "ui/icon-names.h"
 
-#include "ege-adjustment-action.h"
-#include "ege-output-action.h"
-#include "ege-select-one-action.h"
-#include "ink-action.h"
-#include "ink-comboboxentry-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-output-action.h"
+#include "widgets/ege-select-one-action.h"
+#include "widgets/ink-action.h"
+#include "widgets/ink-comboboxentry-action.h"
 
 #include "sp-stop.h"
 #include "svg/css-ostringstream.h"
diff --git a/src/widgets/node-toolbar.cpp b/src/widgets/node-toolbar.cpp
index ace78f8f5..49f9732e5 100644
--- a/src/widgets/node-toolbar.cpp
+++ b/src/widgets/node-toolbar.cpp
@@ -34,8 +34,8 @@
 #include "desktop-handles.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "ege-adjustment-action.h"
-#include "ink-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ink-action.h"
 #include "inkscape.h"
 #include "preferences.h"
 #include "selection-chemistry.h"
diff --git a/src/widgets/paintbucket-toolbar.cpp b/src/widgets/paintbucket-toolbar.cpp
index 8ddaccf64..d8edeb9f6 100644
--- a/src/widgets/paintbucket-toolbar.cpp
+++ b/src/widgets/paintbucket-toolbar.cpp
@@ -33,8 +33,8 @@
 #include "paintbucket-toolbar.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "ege-adjustment-action.h"
-#include "ege-select-one-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-select-one-action.h"
 #include "preferences.h"
 #include "toolbox.h"
 #include "ui/icon-names.h"
diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp
index cf09a4d34..c387d9f78 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/widgets/pencil-toolbar.cpp
@@ -33,9 +33,9 @@
 #include "pencil-toolbar.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "ege-adjustment-action.h"
-#include "ege-select-one-action.h"
-#include "ink-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-select-one-action.h"
+#include "widgets/ink-action.h"
 #include "preferences.h"
 #include "toolbox.h"
 #include "tools-switch.h"
diff --git a/src/widgets/rect-toolbar.cpp b/src/widgets/rect-toolbar.cpp
index 48808fe70..64090b7cf 100644
--- a/src/widgets/rect-toolbar.cpp
+++ b/src/widgets/rect-toolbar.cpp
@@ -34,9 +34,9 @@
 #include "desktop-handles.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "ege-adjustment-action.h"
-#include "ege-output-action.h"
-#include "ink-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-output-action.h"
+#include "widgets/ink-action.h"
 #include "inkscape.h"
 #include "preferences.h"
 #include "selection.h"
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index d45fb7e4d..08a46354e 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -26,10 +26,10 @@
 #include "display/sp-canvas.h"
 #include "document-undo.h"
 #include "document.h"
-#include "ege-adjustment-action.h"
+#include "widgets/ege-adjustment-action.h"
 #include "helper/action-context.h"
 #include "helper/action.h"
-#include "ink-action.h"
+#include "widgets/ink-action.h"
 #include "inkscape.h"
 #include "message-stack.h"
 #include "preferences.h"
diff --git a/src/widgets/spiral-toolbar.cpp b/src/widgets/spiral-toolbar.cpp
index 710be9440..e85b024ed 100644
--- a/src/widgets/spiral-toolbar.cpp
+++ b/src/widgets/spiral-toolbar.cpp
@@ -34,9 +34,9 @@
 #include "desktop-handles.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "ege-adjustment-action.h"
-#include "ege-output-action.h"
-#include "ink-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-output-action.h"
+#include "widgets/ink-action.h"
 #include "preferences.h"
 #include "selection.h"
 #include "sp-spiral.h"
diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp
index 788ce6475..183814b7e 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/widgets/spray-toolbar.cpp
@@ -33,9 +33,9 @@
 #include "spray-toolbar.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "ege-adjustment-action.h"
-#include "ege-select-one-action.h"
-#include "ink-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-select-one-action.h"
+#include "widgets/ink-action.h"
 #include "preferences.h"
 #include "toolbox.h"
 #include "ui/icon-names.h"
diff --git a/src/widgets/star-toolbar.cpp b/src/widgets/star-toolbar.cpp
index 0f8c31be8..6213263fc 100644
--- a/src/widgets/star-toolbar.cpp
+++ b/src/widgets/star-toolbar.cpp
@@ -34,10 +34,10 @@
 #include "desktop-handles.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "ege-adjustment-action.h"
-#include "ege-output-action.h"
-#include "ege-select-one-action.h"
-#include "ink-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-output-action.h"
+#include "widgets/ege-select-one-action.h"
+#include "widgets/ink-action.h"
 #include "selection.h"
 #include "sp-star.h"
 #include "toolbox.h"
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp
index 88f698bc4..d62bb8027 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/widgets/text-toolbar.cpp
@@ -36,10 +36,10 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "ege-adjustment-action.h"
-#include "ege-select-one-action.h"
-#include "ink-action.h"
-#include "ink-comboboxentry-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-select-one-action.h"
+#include "widgets/ink-action.h"
+#include "widgets/ink-comboboxentry-action.h"
 #include "inkscape.h"
 #include "preferences.h"
 #include "selection-chemistry.h"
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index ba70c081e..45aa01dd1 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -43,15 +43,15 @@
 #include "../desktop-handles.h"
 #include "../desktop-style.h"
 #include "document-undo.h"
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-output-action.h"
+#include "widgets/ege-select-one-action.h"
 #include "../graphlayout.h"
 #include "../helper/action.h"
 #include "../helper/action-context.h"
 #include "icon.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
+#include "ink-action.h"
+#include "ink-comboboxentry-action.h"
 #include "../inkscape.h"
 #include "ui/interface.h"
 #include "../shortcuts.h"
diff --git a/src/widgets/tweak-toolbar.cpp b/src/widgets/tweak-toolbar.cpp
index 050d7fb5e..a5d90fc3d 100644
--- a/src/widgets/tweak-toolbar.cpp
+++ b/src/widgets/tweak-toolbar.cpp
@@ -33,10 +33,10 @@
 #include "tweak-toolbar.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "ege-adjustment-action.h"
-#include "ege-output-action.h"
-#include "ege-select-one-action.h"
-#include "ink-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-output-action.h"
+#include "widgets/ege-select-one-action.h"
+#include "widgets/ink-action.h"
 #include "preferences.h"
 #include "toolbox.h"
 #include "ui/icon-names.h"