Move files from the src/dialogs/ directory to the places where they

should be. Build libinkscape.a - should reduce link time.

(bzr r7337)

17 files changed, 45 insertions, 42 deletions

diff --git a/src/widgets/calligraphic-profile-rename.cpp b/src/ui/dialog/calligraphic-profile-rename.cpp
index 888b327f4..888b327f4 100644
--- a/src/widgets/calligraphic-profile-rename.cpp
+++ b/src/ui/dialog/calligraphic-profile-rename.cpp
diff --git a/src/widgets/calligraphic-profile-rename.h b/src/ui/dialog/calligraphic-profile-rename.h
index 53ce907ed..53ce907ed 100644
--- a/src/widgets/calligraphic-profile-rename.h
+++ b/src/ui/dialog/calligraphic-profile-rename.h
diff --git a/src/widgets/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index d51b31e67..51084b127 100644
--- a/src/widgets/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -17,22 +17,19 @@
 #include <string>
 #include <glibmm/i18n.h>
 
-#include "desktop-handles.h"
-
-#include "widgets/layer-selector.h"
-#include "widgets/shrink-wrap-button.h"
-#include "widgets/icon.h"
-
-#include "util/reverse-list.h"
-#include "util/filter-list.h"
-
-#include "sp-item.h"
 #include "desktop.h"
+#include "desktop-handles.h"
 #include "document.h"
-#include "dialogs/layer-properties.h"
 #include "layer-manager.h"
-#include "xml/node-event-vector.h"
+#include "sp-item.h"
+#include "ui/dialog/layer-properties.h"
+#include "ui/widget/layer-selector.h"
+#include "util/filter-list.h"
+#include "util/reverse-list.h"
 #include "verbs.h"
+#include "widgets/icon.h"
+#include "widgets/shrink-wrap-button.h"
+#include "xml/node-event-vector.h"
 
 namespace Inkscape {
 namespace Widgets {
diff --git a/src/widgets/layer-selector.h b/src/ui/widget/layer-selector.h
index 0b5300272..0b5300272 100644
--- a/src/widgets/layer-selector.h
+++ b/src/ui/widget/layer-selector.h
diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert
index 32a8a71e5..13f2b33eb 100644
--- a/src/widgets/Makefile_insert
+++ b/src/widgets/Makefile_insert
@@ -3,12 +3,16 @@
 ink_common_sources +=	\
 	widgets/button.cpp		\
 	widgets/button.h		\
-	widgets/calligraphic-profile-rename.cpp	\
-	widgets/calligraphic-profile-rename.h	\
 	widgets/dash-selector.cpp	\
 	widgets/dash-selector.h		\
 	widgets/desktop-widget.cpp	\
 	widgets/desktop-widget.h	\
+	widgets/eek-color-def.cpp	\
+	widgets/eek-color-def.h		\
+	widgets/eek-preview.cpp		\
+	widgets/eek-preview.h		\
+	widgets/fill-style.cpp		\
+	widgets/fill-style.h		\
 	widgets/font-selector.cpp	\
 	widgets/font-selector.h		\
 	widgets/gradient-image.cpp	\
@@ -21,8 +25,6 @@ ink_common_sources +=	\
 	widgets/gradient-vector.h	\
 	widgets/icon.cpp		\
 	widgets/icon.h			\
-	widgets/layer-selector.cpp	\
-	widgets/layer-selector.h	\
 	widgets/paint-selector.cpp	\
 	widgets/paint-selector.h	\
 	widgets/ruler.cpp		\
@@ -31,6 +33,8 @@ ink_common_sources +=	\
 	widgets/select-toolbar.h	\
 	widgets/shrink-wrap-button.cpp	\
 	widgets/shrink-wrap-button.h	\
+	widgets/sp-attribute-widget.cpp	\
+	widgets/sp-attribute-widget.h	\
 	widgets/sp-color-gtkselector.cpp	\
 	widgets/sp-color-gtkselector.h	\
 	widgets/sp-color-icc-selector.cpp	\
@@ -61,6 +65,8 @@ ink_common_sources +=	\
 	widgets/sp-xmlview-content.h	\
 	widgets/sp-xmlview-tree.cpp	\
 	widgets/sp-xmlview-tree.h	\
+	widgets/stroke-style.cpp	\
+	widgets/stroke-style.h		\
 	widgets/toolbox.cpp		\
 	widgets/toolbox.h		\
 	widgets/widget-sizes.h
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 324e5b008..356a09418 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -27,39 +27,39 @@
 #include <gtkmm/paned.h>
 #include <gtk/gtk.h>
 
-#include "macros.h"
-#include "inkscape-private.h"
-#include "desktop-handles.h"
+#include "box3d-context.h"
+#include "color-profile-fns.h"
+#include "conn-avoid-ref.h"
 #include "desktop-events.h"
-#include "document.h"
+#include "desktop-handles.h"
 #include "desktop-widget.h"
-#include "sp-namedview.h"
-#include "interface.h"
-#include "toolbox.h"
-#include "preferences.h"
-#include "file.h"
 #include "display/canvas-arena.h"
 #include "display/nr-arena.h"
+#include "document.h"
+#include "ege-color-prof-tracker.h"
+#include "ege-select-one-action.h"
 #include <extension/db.h>
+#include "file.h"
 #include "helper/units.h"
+#include "inkscape-private.h"
+#include "interface.h"
+#include "macros.h"
+#include "preferences.h"
+#include "sp-image.h"
+#include "sp-item.h"
+#include "sp-namedview.h"
+#include "toolbox.h"
+#include "ui/dialog/dialog-manager.h"
+#include "ui/dialog/swatches.h"
+#include "ui/widget/dock.h"
+#include "ui/widget/layer-selector.h"
+#include "ui/widget/selected-style.h"
 #include "widgets/button.h"
 #include "widgets/ruler.h"
-#include "widgets/widget-sizes.h"
-#include "widgets/spw-utilities.h"
 #include "widgets/spinbutton-events.h"
-#include "widgets/layer-selector.h"
+#include "widgets/spw-utilities.h"
 #include "widgets/toolbox.h"
-#include "ui/dialog/dialog-manager.h"
-#include "ui/widget/dock.h"
-#include "ui/widget/selected-style.h"
-#include "sp-item.h"
-#include "dialogs/swatches.h"
-#include "conn-avoid-ref.h"
-#include "ege-select-one-action.h"
-#include "ege-color-prof-tracker.h"
-#include "color-profile-fns.h"
-#include "box3d-context.h"
-#include "sp-image.h"
+#include "widgets/widget-sizes.h"
 
 #if defined (SOLARIS) && (SOLARIS == 8)
 #include "round.h"
diff --git a/src/dialogs/eek-color-def.cpp b/src/widgets/eek-color-def.cpp
index 85b00b251..85b00b251 100644
--- a/src/dialogs/eek-color-def.cpp
+++ b/src/widgets/eek-color-def.cpp
diff --git a/src/dialogs/eek-color-def.h b/src/widgets/eek-color-def.h
index 63cd096be..63cd096be 100644
--- a/src/dialogs/eek-color-def.h
+++ b/src/widgets/eek-color-def.h
diff --git a/src/dialogs/eek-preview.cpp b/src/widgets/eek-preview.cpp
index 1c1adf543..1c1adf543 100644
--- a/src/dialogs/eek-preview.cpp
+++ b/src/widgets/eek-preview.cpp
diff --git a/src/dialogs/eek-preview.h b/src/widgets/eek-preview.h
index 6eb5c8930..6eb5c8930 100644
--- a/src/dialogs/eek-preview.h
+++ b/src/widgets/eek-preview.h
diff --git a/src/dialogs/fill-style.cpp b/src/widgets/fill-style.cpp
index 24e46f056..5e9d30bcd 100644
--- a/src/dialogs/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -35,7 +35,7 @@
 #include "widgets/sp-widget.h"
 #include "xml/repr.h"
 
-#include "dialogs/fill-style.h"
+#include "widgets/fill-style.h"
 
 
 // These can be deleted once we sort out the libart dependence.
diff --git a/src/dialogs/fill-style.h b/src/widgets/fill-style.h
index 3924412ec..3924412ec 100644
--- a/src/dialogs/fill-style.h
+++ b/src/widgets/fill-style.h
diff --git a/src/dialogs/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index de14fc173..de14fc173 100644
--- a/src/dialogs/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
diff --git a/src/dialogs/sp-attribute-widget.h b/src/widgets/sp-attribute-widget.h
index 01da29bed..01da29bed 100644
--- a/src/dialogs/sp-attribute-widget.h
+++ b/src/widgets/sp-attribute-widget.h
diff --git a/src/dialogs/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 566ee5117..b1678f266 100644
--- a/src/dialogs/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -54,7 +54,7 @@
 #include "widgets/spw-utilities.h"
 #include "xml/repr.h"
 
-#include "dialogs/stroke-style.h"
+#include "widgets/stroke-style.h"
 
 
 /* Paint */
diff --git a/src/dialogs/stroke-style.h b/src/widgets/stroke-style.h
index b947209e3..b947209e3 100644
--- a/src/dialogs/stroke-style.h
+++ b/src/widgets/stroke-style.h
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 14acb188a..e3dcbcc14 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -36,7 +36,6 @@
 
 #include "../box3d-context.h"
 #include "../box3d.h"
-#include "calligraphic-profile-rename.h"
 #include "../conn-avoid-ref.h"
 #include "../connection-pool.h"
 #include "../connector-context.h"
@@ -87,6 +86,7 @@
 #include "../svg/css-ostringstream.h"
 #include "../tools-switch.h"
 #include "../tweak-context.h"
+#include "../ui/dialog/calligraphic-profile-rename.h"
 #include "../ui/icon-names.h"
 #include "../ui/widget/style-swatch.h"
 #include "../verbs.h"