Remove misleading dialogs directory

(bzr r13341.1.192)

37 files changed, 36 insertions, 66 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 282797a50..8fb7e23ef 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -105,7 +105,6 @@ endif
 
 # Include all partial makefiles from subdirectories
 include Makefile_insert
-include dialogs/Makefile_insert
 include display/Makefile_insert
 include extension/Makefile_insert
 include extension/dbus/Makefile_insert
@@ -144,7 +143,6 @@ include libdepixelize/Makefile_insert
 EXTRA_DIST +=	\
 	2geom/makefile.in	\
 	debug/makefile.in	\
-	dialogs/makefile.in	\
 	display/makefile.in	\
 	extension/implementation/makefile.in	\
 	extension/internal/makefile.in	\
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index 8be5e001b..332de3630 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -25,7 +25,7 @@
 #include "desktop.h"
 #include "desktop-events.h"
 #include "desktop-handles.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "display/canvas-axonomgrid.h"
 #include "display/canvas-grid.h"
 #include "display/guideline.h"
diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt
deleted file mode 100644
index ca19c0b72..000000000
--- a/src/dialogs/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-set(dialogs_SRC
-	dialog-events.cpp
-
-	# -------
-	# Headers
-	dialog-events.h
-)
-
-# add_inkscape_lib(dialogs_LIB "${dialogs_SRC}")
-add_inkscape_source("${dialogs_SRC}")
diff --git a/src/dialogs/Makefile_insert b/src/dialogs/Makefile_insert
deleted file mode 100644
index f1ed89314..000000000
--- a/src/dialogs/Makefile_insert
+++ /dev/null
@@ -1,5 +0,0 @@
-## Makefile.am fragment sourced by src/Makefile.am.
-
-ink_common_sources +=	\
-	dialogs/dialog-events.cpp	\
-	dialogs/dialog-events.h	
diff --git a/src/dialogs/makefile.in b/src/dialogs/makefile.in
deleted file mode 100644
index 9acaf79a0..000000000
--- a/src/dialogs/makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# Convenience stub makefile to call the real Makefile.
-
-@SET_MAKE@
-
-OBJEXT = @OBJEXT@
-
-# Explicit so that it's the default rule.
-all:
-	cd .. && $(MAKE) dialogs/all
-
-clean %.a %.$(OBJEXT):
-	cd .. && $(MAKE) dialogs/$@
-
-.PHONY: all clean
-
-.SUFFIXES:
-.SUFFIXES: .a .$(OBJEXT)
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 70a2ca672..cac11031f 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -26,7 +26,7 @@
 
 #include "desktop-handles.h"
 #include "desktop.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "extension/effect.h"
 #include "extension/output.h"
 #include "extension/input.h"
diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp
index b8f429a87..239c99688 100644
--- a/src/extension/internal/cdr-input.cpp
+++ b/src/extension/internal/cdr-input.cpp
@@ -40,7 +40,7 @@
 #include "document-undo.h"
 #include "inkscape.h"
 
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include <gtk/gtk.h>
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/frame.h"
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index 63581bd8a..b2bf61321 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -48,7 +48,7 @@
 #include "inkscape.h"
 #include "util/units.h"
 
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include <gtk/gtk.h>
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/frame.h"
diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp
index 83bfb5a92..302a3a6f9 100644
--- a/src/extension/internal/vsd-input.cpp
+++ b/src/extension/internal/vsd-input.cpp
@@ -41,7 +41,7 @@
 #include "inkscape.h"
 #include "util/units.h"
 
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include <gtk/gtk.h>
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/frame.h"
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index d1f83701f..af31f32b6 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -13,7 +13,7 @@
 #include <gtkmm/separator.h>
 #include <glibmm/i18n.h>
 
-#include "../dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "xml/repr.h"
 
 // Used to get SP_ACTIVE_DESKTOP
diff --git a/src/interface.cpp b/src/interface.cpp
index 3b5958a33..d453d6bc8 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -57,7 +57,7 @@
 #include "helper/gnome-utils.h"
 #include "helper/window.h"
 #include "io/sys.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "message-context.h"
 #include "ui/uxmanager.h"
 #include "ui/clipboard.h"
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 125755c48..56908f58e 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -2,6 +2,7 @@
 set(ui_SRC
 	clipboard.cpp
 	control-manager.cpp
+	dialog-events.cpp
 	previewholder.cpp
 	uxmanager.cpp
 
@@ -156,6 +157,7 @@ set(ui_SRC
 	clipboard.h
 	control-manager.h
 	control-types.h
+	dialog-events.h
 	icon-names.h
 	previewable.h
 	previewfillable.h
diff --git a/src/ui/Makefile_insert b/src/ui/Makefile_insert
index 4081f86f8..94064d0cf 100644
--- a/src/ui/Makefile_insert
+++ b/src/ui/Makefile_insert
@@ -6,6 +6,8 @@ ink_common_sources +=		\
 	ui/control-manager.cpp	\
 	ui/control-manager.h	\
 	ui/control-types.h	\
+	ui/dialog-events.cpp    \
+	ui/dialog-events.h      \
 	ui/icon-names.h		\
 	ui/previewable.h	\
 	ui/previewfillable.h	\
diff --git a/src/dialogs/dialog-events.cpp b/src/ui/dialog-events.cpp
index cf3497c9b..6bd93bbc3 100644
--- a/src/dialogs/dialog-events.cpp
+++ b/src/ui/dialog-events.cpp
@@ -29,7 +29,7 @@
 #include "preferences.h"
 #include "ui/tools/tool-base.h"
 
-#include "dialog-events.h"
+#include "ui/dialog-events.h"
 
 
 /**
diff --git a/src/dialogs/dialog-events.h b/src/ui/dialog-events.h
index b33eb3f38..b33eb3f38 100644
--- a/src/dialogs/dialog-events.h
+++ b/src/ui/dialog-events.h
diff --git a/src/ui/dialog/dock-behavior.cpp b/src/ui/dialog/dock-behavior.cpp
index 9b216e841..f65b298c9 100644
--- a/src/ui/dialog/dock-behavior.cpp
+++ b/src/ui/dialog/dock-behavior.cpp
@@ -24,7 +24,7 @@
 #include "verbs.h"
 #include "dialog.h"
 #include "preferences.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 
 #include <gtkmm/invisible.h>
 #include <gtkmm/label.h>
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 913713e5c..cd8fdbd92 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -62,7 +62,7 @@
 #include "sp-namedview.h"
 #include "selection-chemistry.h"
 
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "preferences.h"
 #include "verbs.h"
 #include "interface.h"
diff --git a/src/ui/dialog/filedialog.cpp b/src/ui/dialog/filedialog.cpp
index e71605739..00ed09551 100644
--- a/src/ui/dialog/filedialog.cpp
+++ b/src/ui/dialog/filedialog.cpp
@@ -20,7 +20,7 @@
 #include "filedialog.h"
 
 #include "gc-core.h"
-#include <dialogs/dialog-events.h>
+#include "ui/dialog-events.h"
 #include "extension/output.h"
 #include "preferences.h"
 
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 575519848..5778b44db 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -22,7 +22,7 @@
 #endif
 
 #include "filedialogimpl-gtkmm.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "interface.h"
 #include "io/sys.h"
 #include "path-prefix.h"
diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp
index 06153a2d8..ee6a0ef3a 100644
--- a/src/ui/dialog/filedialogimpl-win32.cpp
+++ b/src/ui/dialog/filedialogimpl-win32.cpp
@@ -31,7 +31,7 @@
 
 //Inkscape includes
 #include "inkscape.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "extension/input.h"
 #include "extension/output.h"
 #include "extension/db.h"
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index 37f2761df..9b814bb9f 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -31,7 +31,7 @@
 #include "selection.h"
 #include "desktop-handles.h"
 
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "verbs.h"
 #include "interface.h"
 #include "preferences.h"
diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp
index dd07f009a..f286588b2 100644
--- a/src/ui/dialog/floating-behavior.cpp
+++ b/src/ui/dialog/floating-behavior.cpp
@@ -28,7 +28,7 @@
 
 #include "inkscape.h"
 #include "desktop.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "interface.h"
 #include "preferences.h"
 #include "verbs.h"
diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp
index 6e9ecc3c8..db7bdf222 100644
--- a/src/ui/dialog/font-substitution.cpp
+++ b/src/ui/dialog/font-substitution.cpp
@@ -27,7 +27,7 @@
 #include "document.h"
 #include "selection.h"
 
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "desktop-handles.h"
 #include "selection-chemistry.h"
 #include "preferences.h"
diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index 80740113c..76c26a3cb 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -28,7 +28,7 @@
 #include "ui/tools/tool-base.h"
 #include "widgets/desktop-widget.h"
 #include <glibmm/i18n.h>
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "message-context.h"
 #include "xml/repr.h"
 #include "verbs.h"
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index f676e75fd..607087f6d 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -27,7 +27,7 @@
 #include "filedialogimpl-gtkmm.h"
 #include "interface.h"
 #include "gc-core.h"
-#include <dialogs/dialog-events.h>
+#include "ui/dialog-events.h"
 #include "io/sys.h"
 #include "preferences.h"
 
diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h
index e21030bcd..bd028c145 100644
--- a/src/ui/dialog/ocaldialogs.h
+++ b/src/ui/dialog/ocaldialogs.h
@@ -38,8 +38,7 @@
 
 //Inkscape includes
 #include "ui/dialog/filedialog.h"
-
-#include <dialogs/dialog-events.h>
+#include "ui/dialog-events.h"
 
 struct _xmlNode;
 typedef _xmlNode xmlNode;
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index c87e42633..9a8c188b2 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -24,7 +24,7 @@
 
 #include "desktop.h"
 #include "desktop-handles.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "document.h"
 #include "document-undo.h"
 #include "ui/tools/tool-base.h"
diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index 5585f2db4..6b5a351f6 100644
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -15,7 +15,7 @@
 #include "desktop-handles.h"
 #include "document.h"
 #include "document-undo.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 
 #include "widgets/sp-color-notebook.h"
 #include "verbs.h"
diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
index fce7a9d9f..479895022 100644
--- a/src/widgets/dash-selector.cpp
+++ b/src/widgets/dash-selector.cpp
@@ -25,7 +25,7 @@
 #include <2geom/coord.h>
 
 #include "style.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "preferences.h"
 #include "ui/widget/spinbutton.h"
 #include "display/cairo-utils.h"
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 53ce8ceac..6607c90d2 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -40,7 +40,7 @@
 
 #include "xml/repr.h"
 
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "preferences.h"
 #include "svg/css-ostringstream.h"
 #include "sp-stop.h"
diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index d0d302ff4..6e910c582 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -10,7 +10,7 @@
 #include <set>
 #include <vector>
 
-#include "../dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "sp-color-icc-selector.h"
 #include "sp-color-scales.h"
 #include "sp-color-slider.h"
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index 9f927b51f..87cb7cae3 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -25,7 +25,7 @@
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 
-#include "../dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "../preferences.h"
 #include "sp-color-notebook.h"
 #include "spw-utilities.h"
diff --git a/src/widgets/sp-color-scales.cpp b/src/widgets/sp-color-scales.cpp
index 5fddacf59..60ba62ec5 100644
--- a/src/widgets/sp-color-scales.cpp
+++ b/src/widgets/sp-color-scales.cpp
@@ -8,7 +8,7 @@
 #include <math.h>
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
-#include "../dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "sp-color-scales.h"
 #include "sp-color-slider.h"
 #include "svg/svg-icc-color.h"
diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp
index 404874db7..6cfa7c14d 100644
--- a/src/widgets/sp-color-wheel-selector.cpp
+++ b/src/widgets/sp-color-wheel-selector.cpp
@@ -4,7 +4,7 @@
 #include <math.h>
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
-#include "../dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "sp-color-wheel-selector.h"
 #include "sp-color-scales.h"
 #include "sp-color-slider.h"
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index 00b6b5c91..29c342f21 100644
--- a/src/widgets/stroke-marker-selector.cpp
+++ b/src/widgets/stroke-marker-selector.cpp
@@ -25,7 +25,7 @@
 
 
 #include "style.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "desktop-handles.h"
 #include "desktop-style.h"
 #include "preferences.h"
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 0e0a4fd72..3fa39da6f 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -18,7 +18,7 @@
 #define noSP_SS_VERBOSE
 
 #include "stroke-style.h"
-#include "../gradient-chemistry.h"
+#include "gradient-chemistry.h"
 #include "sp-gradient.h"
 #include "sp-stop.h"
 #include "svg/svg-color.h"
diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h
index 6f0fe583b..464e7d2d1 100644
--- a/src/widgets/stroke-style.h
+++ b/src/widgets/stroke-style.h
@@ -12,6 +12,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+// WHOA! talk about header bloat!
+
 #ifndef SEEN_DIALOGS_STROKE_STYLE_H
 #define SEEN_DIALOGS_STROKE_STYLE_H
 
@@ -33,7 +35,7 @@
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "desktop-style.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "display/canvas-bpath.h" // for SP_STROKE_LINEJOIN_*
 #include "display/drawing.h"
 #include "document-private.h"