Move obvious ui component to ui/

(bzr r13341.1.247)

28 files changed, 27 insertions, 26 deletions

diff --git a/src/Makefile_insert b/src/Makefile_insert
index 86ae970d1..47ea28ebc 100644
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -72,7 +72,6 @@ ink_common_sources +=	\
 	ink-comboboxentry-action.cpp					\
 	ink-comboboxentry-action.h					\
 	inkscape.cpp inkscape.h inkscape-private.h			\
-	interface.cpp interface.h					\
 	isinf.h								\
 	knot.cpp knot.h							\
 	knot-enums.h							\
diff --git a/src/desktop.cpp b/src/desktop.cpp
index f14a314b9..b72e9c776 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -55,7 +55,7 @@
 #include "document-undo.h"
 #include "event-log.h"
 #include "helper/action-context.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "inkscape-private.h"
 #include "layer-fns.h"
 #include "layer-manager.h"
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index c244d9c16..d02d801dc 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -20,7 +20,7 @@
 # include <config.h>
 #endif
 
-#include <interface.h>
+#include "ui/interface.h"
 #include <unistd.h>
 #include <glibmm/miscutils.h>
 
diff --git a/src/file.cpp b/src/file.cpp
index 7181f4f98..307944001 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -46,7 +46,7 @@
 #include "id-clash.h"
 #include "inkscape.h"
 #include "inkscape.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "io/sys.h"
 #include "message.h"
 #include "message-stack.h"
diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
index d44b2207b..acb2be4da 100644
--- a/src/helper/pixbuf-ops.cpp
+++ b/src/helper/pixbuf-ops.cpp
@@ -19,7 +19,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <2geom/transforms.h>
 
-#include "interface.h"
+#include "ui/interface.h"
 #include "helper/png-write.h"
 #include "display/cairo-utils.h"
 #include "display/drawing.h"
diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp
index a7ebe7423..32e50b537 100644
--- a/src/helper/png-write.cpp
+++ b/src/helper/png-write.cpp
@@ -18,7 +18,7 @@
 #endif
 
 #include <png.h>
-#include "interface.h"
+#include "ui/interface.h"
 #include <2geom/rect.h>
 #include <2geom/transforms.h>
 #include <glib.h>
diff --git a/src/main.cpp b/src/main.cpp
index 517ba0506..caec66b05 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -64,7 +64,7 @@
 #include "layer-model.h"
 #include "selection.h"
 #include "sp-object.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "print.h"
 #include "color.h"
 #include "sp-item.h"
diff --git a/src/ui/Makefile_insert b/src/ui/Makefile_insert
index 94064d0cf..4c6b49ed6 100644
--- a/src/ui/Makefile_insert
+++ b/src/ui/Makefile_insert
@@ -9,6 +9,8 @@ ink_common_sources +=		\
 	ui/dialog-events.cpp    \
 	ui/dialog-events.h      \
 	ui/icon-names.h		\
+	ui/interface.cpp	\
+	ui/interface.h		\
 	ui/previewable.h	\
 	ui/previewfillable.h	\
 	ui/previewholder.cpp	\
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index d9e2c03ba..1d6d0403e 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -38,7 +38,7 @@
 #include "util/units.h"
 #include "helper/window.h"
 #include "inkscape.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "macros.h"
 #include "message-stack.h"
 #include "preferences.h"
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index 4f0d9fbe1..213965a18 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -28,7 +28,7 @@
 #include "desktop-handles.h"
 #include "shortcuts.h"
 #include "preferences.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "verbs.h"
 #include "ui/tool/event-utils.h"
 
diff --git a/src/ui/dialog/dock-behavior.cpp b/src/ui/dialog/dock-behavior.cpp
index f65b298c9..50a6db208 100644
--- a/src/ui/dialog/dock-behavior.cpp
+++ b/src/ui/dialog/dock-behavior.cpp
@@ -18,7 +18,7 @@
 #include "dock-behavior.h"
 #include "inkscape.h"
 #include "desktop.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "widgets/icon.h"
 #include "ui/widget/dock.h"
 #include "verbs.h"
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index cd8fdbd92..a4d8801f7 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -65,7 +65,7 @@
 #include "ui/dialog-events.h"
 #include "preferences.h"
 #include "verbs.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "sp-root.h"
 
 #include "extension/output.h"
diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp
index cd5491c24..9bdddc0e0 100644
--- a/src/ui/dialog/extension-editor.cpp
+++ b/src/ui/dialog/extension-editor.cpp
@@ -25,7 +25,7 @@
 
 #include "verbs.h"
 #include "preferences.h"
-#include "interface.h"
+#include "ui/interface.h"
 
 #include "extension/extension.h"
 #include "extension/db.h"
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 5778b44db..511237f4d 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -23,7 +23,7 @@
 
 #include "filedialogimpl-gtkmm.h"
 #include "ui/dialog-events.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "io/sys.h"
 #include "path-prefix.h"
 #include "preferences.h"
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index 9b814bb9f..1a4823e4a 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -33,7 +33,7 @@
 
 #include "ui/dialog-events.h"
 #include "verbs.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "preferences.h"
 #include "sp-text.h"
 #include "sp-flowtext.h"
diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp
index f286588b2..11db14801 100644
--- a/src/ui/dialog/floating-behavior.cpp
+++ b/src/ui/dialog/floating-behavior.cpp
@@ -29,7 +29,7 @@
 #include "inkscape.h"
 #include "desktop.h"
 #include "ui/dialog-events.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "preferences.h"
 #include "verbs.h"
 
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index 607087f6d..c4dd9df98 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -25,7 +25,7 @@
 
 #include "path-prefix.h"
 #include "filedialogimpl-gtkmm.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "gc-core.h"
 #include "ui/dialog-events.h"
 #include "io/sys.h"
diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp
index a887a7355..b8436ebf1 100644
--- a/src/ui/dialog/spellcheck.cpp
+++ b/src/ui/dialog/spellcheck.cpp
@@ -25,7 +25,7 @@
 #include "desktop-handles.h"
 #include "tools-switch.h"
 #include "ui/tools/text-tool.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "preferences.h"
 #include "sp-text.h"
 #include "sp-flowtext.h"
diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp
index d75f81456..13cb01eef 100644
--- a/src/ui/dialog/template-load-tab.cpp
+++ b/src/ui/dialog/template-load-tab.cpp
@@ -24,7 +24,7 @@
 #include "extension/db.h"
 #include "extension/effect.h"
 #include "inkscape.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "file.h"
 #include "path-prefix.h"
 #include "preferences.h"
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index 9996fc0f9..0f4a6f7f1 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -51,7 +51,7 @@ extern "C" {
 #include "ui/icon-names.h"
 #include "preferences.h"
 #include "verbs.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "svg/css-ostringstream.h"
 #include "widgets/icon.h"
 #include "widgets/font-selector.h"
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index 9a8c188b2..7ab6c78ba 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -30,7 +30,7 @@
 #include "ui/tools/tool-base.h"
 #include "helper/window.h"
 #include "inkscape.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "macros.h"
 #include "message-context.h"
 #include "message-stack.h"
diff --git a/src/interface.cpp b/src/ui/interface.cpp
index 591887c3d..7830a8de1 100644
--- a/src/interface.cpp
+++ b/src/ui/interface.cpp
@@ -39,7 +39,7 @@
 #include "shortcuts.h"
 #include "document.h"
 #include "desktop-handles.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "desktop.h"
 #include "selection.h"
 #include "selection-chemistry.h"
diff --git a/src/interface.h b/src/ui/interface.h
index 6fb74046f..6fb74046f 100644
--- a/src/interface.h
+++ b/src/ui/interface.h
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index c28b86416..150e899ce 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -44,7 +44,7 @@
 #include "desktop-style.h"
 #include "sp-namedview.h"
 #include "selection.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "macros.h"
 #include "tools-switch.h"
 #include "preferences.h"
diff --git a/src/verbs.cpp b/src/verbs.cpp
index f0a49a81a..ea4c336d7 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -53,7 +53,7 @@
 #include "helper/action-context.h"
 #include "help.h"
 #include "inkscape-private.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "layer-fns.h"
 #include "layer-manager.h"
 #include "message-stack.h"
diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index cda97654e..1776e28c4 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -16,7 +16,7 @@
 
 #include "button.h"
 #include "helper/action-context.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "shortcuts.h"
 #include "helper/action.h"
 
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index fec46b188..388d22e29 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -46,7 +46,7 @@
 #include "util/units.h"
 #include "ui/widget/unit-tracker.h"
 #include "inkscape-private.h"
-#include "interface.h"
+#include "ui/interface.h"
 #include "macros.h"
 #include "preferences.h"
 #include "sp-image.h"
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 939546f78..ba70c081e 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -53,7 +53,7 @@
 #include "../ink-action.h"
 #include "../ink-comboboxentry-action.h"
 #include "../inkscape.h"
-#include "../interface.h"
+#include "ui/interface.h"
 #include "../shortcuts.h"
 #include "../sp-namedview.h"
 #include "../tools-switch.h"