[glom] Moved many developer-mode files into glom/mode_design/ now that our

From: Murray Cumming <murrayc src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [glom] Moved many developer-mode files into glom/mode_design/ now that our
Date: Thu, 3 Sep 2009 19:26:13 +0000 (UTC)
commit 34e6b88af65923149eacc440c63f90e439ab8eb4
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Sep 3 18:41:45 2009 +0200

    Moved many developer-mode files into glom/mode_design/ now that our
    	non-recursive build allows that without linker errors.
    
    	* glom/combobox_fields.[h|cc]:
    	* glom/combobox_relationship.[h|cc]:
    	* glom/layout_item_dialogs/:
    	* glom/mode_data/dialog_choose_field.[h|cc]:
    	* glom/mode_data/dialog_choose_relationship.[h|cc]:
    	* glom/mode_data/dialog_layout*.[h|cc]:
    	* glom/mode_data/treestore_layout.[h|cc]:
    	* glom/layout_item_dialogs/:
    	Moved to glom/mode_design/layout/
    	* glom/reports/report_builder.[h|cc]: Moved to glom/
    	* glom/reports/dialog_layout_report.[h|cc]"
    	* glom/reports/treestore_report_layout.[h|cc]:
    	Moved to glom/mode_design/report_layout/
    	* glom/database_preferences.[h|cc]:
    	* glom/relationships_overview/: Moved to
    	glom/mode_design/
    	* glom/glom_developer.glade:
    	* glom/dialog_new_self_hosted_connection.[h|cc]:Rename to
    	glom/mode_design/dialog_initial_password.[h|cc], renaming the class too,
    	because that's what this is now.
    	* glom/utility_widgets/dialog_layoutitem_properties.[h|cc]: Removed
    	this unused class.
    	* glom/Makefile_glom.am, *.[h|cc]: Adapted.

 ChangeLog                                          |   29 +++++
 Makefile_glom.am                                   |  130 ++++++++++----------
 glom/application.cc                                |    2 +-
 glom/application.h                                 |    2 +-
 glom/bakery/app_withdoc_gtk.cc                     |    2 +-
 glom/base_db.cc                                    |   15 +--
 glom/base_db_table.cc                              |    2 +-
 glom/base_db_table.h                               |    2 +-
 glom/base_db_table_data.cc                         |    2 +-
 glom/box_db_table.cc                               |    2 +-
 glom/box_withbuttons.cc                            |    2 +-
 glom/dialog_connection.cc                          |    1 -
 glom/dialog_connection.h                           |    2 +-
 glom/dialog_glom.h                                 |    2 +-
 glom/dialog_import_csv.h                           |    2 +-
 glom/filechooser_export.cc                         |    2 +-
 glom/frame_glom.cc                                 |   20 ++--
 glom/glom_developer.glade                          |    2 +-
 glom/libglom/test_connectionpool.cc                |    2 +-
 glom/mode_data/box_data.cc                         |    2 +-
 glom/mode_data/box_data.h                          |    2 +-
 glom/mode_data/box_data_calendar_related.cc        |    2 +-
 glom/mode_data/box_data_calendar_related.h         |    2 +-
 glom/mode_data/box_data_details.cc                 |    2 +-
 glom/mode_data/box_data_list.cc                    |    6 +-
 glom/mode_data/box_data_list.h                     |    2 +-
 glom/mode_data/box_data_list_related.cc            |    2 +-
 glom/mode_data/box_data_manyrecords.cc             |    4 +-
 glom/mode_data/box_data_manyrecords.h              |    2 +-
 glom/mode_data/box_data_portal.h                   |    2 +-
 glom/mode_data/flowtablewithfields.cc              |    2 +-
 glom/mode_data/flowtablewithfields.h               |    2 +-
 .../dialog_database_preferences.cc                 |    1 -
 .../dialog_database_preferences.h                  |    2 +-
 .../dialog_initial_password.cc}                    |   17 ++--
 .../dialog_initial_password.h}                     |    8 +-
 glom/mode_design/fields/dialog_fieldcalculation.cc |    4 +-
 glom/mode_design/fields/dialog_fieldcalculation.h  |    2 +-
 glom/mode_design/fields/dialog_fielddefinition.h   |    6 +-
 glom/{ => mode_design/layout}/combobox_fields.cc   |    2 +-
 glom/{ => mode_design/layout}/combobox_fields.h    |    0
 .../layout}/combobox_relationship.cc               |    2 +-
 .../layout}/combobox_relationship.h                |    0
 .../layout}/dialog_choose_field.cc                 |    0
 .../layout}/dialog_choose_field.h                  |   10 +-
 .../layout}/dialog_choose_relationship.cc          |    0
 .../layout}/dialog_choose_relationship.h           |    4 +-
 .../layout}/dialog_layout.cc                       |    2 +-
 .../layout}/dialog_layout.h                        |    4 +-
 .../layout}/dialog_layout_calendar_related.cc      |    6 +-
 .../layout}/dialog_layout_calendar_related.h       |    6 +-
 .../layout}/dialog_layout_details.cc               |    8 +-
 .../layout}/dialog_layout_details.h                |    4 +-
 .../layout}/dialog_layout_export.cc                |    6 +-
 .../layout}/dialog_layout_export.h                 |    2 +-
 .../layout}/dialog_layout_list.cc                  |    8 +-
 .../layout}/dialog_layout_list.h                   |    2 +-
 .../layout}/dialog_layout_list_related.cc          |    6 +-
 .../layout}/dialog_layout_list_related.h           |    6 +-
 .../layout}/layout_item_dialogs/box_formatting.cc  |    0
 .../layout}/layout_item_dialogs/box_formatting.h   |   10 +-
 .../layout_item_dialogs/combo_summarytype.cc       |    0
 .../layout_item_dialogs/combo_summarytype.h        |    0
 .../layout_item_dialogs/comboentry_borderwidth.cc  |    0
 .../layout_item_dialogs/comboentry_borderwidth.h   |    0
 .../layout_item_dialogs/dialog_buttonscript.cc     |    2 +-
 .../layout_item_dialogs/dialog_buttonscript.h      |    2 +-
 .../layout_item_dialogs/dialog_field_layout.cc     |    0
 .../layout_item_dialogs/dialog_field_layout.h      |    8 +-
 .../layout_item_dialogs/dialog_field_summary.cc    |    0
 .../layout_item_dialogs/dialog_field_summary.h     |    6 +-
 .../layout}/layout_item_dialogs/dialog_group_by.cc |    2 +-
 .../layout}/layout_item_dialogs/dialog_group_by.h  |    8 +-
 .../dialog_groupby_secondaryfields.cc              |    0
 .../dialog_groupby_secondaryfields.h               |    4 +-
 .../dialog_groupby_sortfields.cc                   |    0
 .../dialog_groupby_sortfields.h                    |    4 +-
 .../layout_item_dialogs/dialog_imageobject.cc      |    2 +-
 .../layout_item_dialogs/dialog_imageobject.h       |    4 +-
 .../layout}/layout_item_dialogs/dialog_notebook.cc |    2 +-
 .../layout}/layout_item_dialogs/dialog_notebook.h  |    4 +-
 .../layout_item_dialogs/dialog_textobject.cc       |    2 +-
 .../layout_item_dialogs/dialog_textobject.h        |    2 +-
 .../layout}/treestore_layout.cc                    |    2 +-
 .../layout}/treestore_layout.h                     |    0
 .../print_layouts/canvas_print_layout.cc           |    2 +-
 .../print_layouts/dialog_text_formatting.h         |    2 +-
 .../relationships_overview/canvas_group_dbtable.cc |    0
 .../relationships_overview/canvas_group_dbtable.h  |    0
 .../dialog_relationships_overview.cc               |    2 +-
 .../dialog_relationships_overview.h                |    0
 .../printoperation_relationshipsoverview.cc        |    0
 .../printoperation_relationshipsoverview.h         |    0
 .../report_layout}/dialog_layout_report.cc         |   12 +-
 .../report_layout}/dialog_layout_report.h          |    2 +-
 .../report_layout}/treestore_report_layout.cc      |    0
 .../report_layout}/treestore_report_layout.h       |    0
 .../script_library/dialog_script_library.cc        |    2 +-
 glom/mode_design/users/dialog_groups_list.h        |    2 +-
 glom/mode_design/users/dialog_users_list.h         |    2 +-
 glom/notebook_glom.h                               |    2 +-
 glom/{reports => }/report_builder.cc               |    0
 glom/{reports => }/report_builder.h                |    0
 glom/utility_widgets/buttonglom.cc                 |    3 +-
 glom/utility_widgets/datawidget.cc                 |    4 +-
 glom/utility_widgets/datawidget.h                  |    2 +-
 glom/utility_widgets/db_adddel/glom_db_treemodel.h |    2 +-
 glom/utility_widgets/dialog_choose_date.h          |    2 +-
 glom/utility_widgets/dialog_choose_id.h            |    2 +-
 glom/utility_widgets/dialog_flowtable.h            |    2 +-
 .../dialog_layoutitem_properties.cc                |   50 --------
 .../utility_widgets/dialog_layoutitem_properties.h |   45 -------
 glom/utility_widgets/labelglom.cc                  |    2 +-
 glom/utility_widgets/layoutwidgetbase.h            |    2 +-
 glom/xsl_utils.cc                                  |    2 +-
 115 files changed, 255 insertions(+), 328 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ba7b2e0..45fbc5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,34 @@
 2009-09-03  Murray Cumming  <murrayc murrayc com>
 
+	Moved many developer-mode files into glom/mode_design/ now that our 
+	non-recursive build allows that without linker errors.
+
+	* glom/combobox_fields.[h|cc]:
+	* glom/combobox_relationship.[h|cc]:
+	* glom/layout_item_dialogs/:
+	* glom/mode_data/dialog_choose_field.[h|cc]:
+	* glom/mode_data/dialog_choose_relationship.[h|cc]:
+	* glom/mode_data/dialog_layout*.[h|cc]:
+	* glom/mode_data/treestore_layout.[h|cc]:
+	* glom/layout_item_dialogs/:
+	Moved to glom/mode_design/layout/
+	* glom/reports/report_builder.[h|cc]: Moved to glom/
+	* glom/reports/dialog_layout_report.[h|cc]"
+	* glom/reports/treestore_report_layout.[h|cc]:
+	Moved to glom/mode_design/report_layout/
+	* glom/database_preferences.[h|cc]:
+	* glom/relationships_overview/: Moved to 
+	glom/mode_design/
+	* glom/glom_developer.glade:
+	* glom/dialog_new_self_hosted_connection.[h|cc]:Rename to 
+	glom/mode_design/dialog_initial_password.[h|cc], renaming the class too, 
+	because that's what this is now.
+	* glom/utility_widgets/dialog_layoutitem_properties.[h|cc]: Removed 
+	this unused class.
+	* glom/Makefile_glom.am, *.[h|cc]: Adapted.
+
+2009-09-03  Murray Cumming  <murrayc murrayc com>
+
 	libglom: Avoid client-only build changes: partial recommit of revert.
 
 	* glom/libglom/appstate.cc:
diff --git a/Makefile_glom.am b/Makefile_glom.am
index e29c5bb..3730aa4 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -30,10 +30,6 @@ glom_glom_SOURCES =							\
 	glom/box_reports.h						\
 	glom/box_withbuttons.cc						\
 	glom/box_withbuttons.h						\
-	glom/combobox_fields.cc						\
-	glom/combobox_fields.h						\
-	glom/combobox_relationship.cc					\
-	glom/combobox_relationship.h					\
 	glom/dialog_connection.cc					\
 	glom/dialog_connection.h					\
 	glom/dialog_existing_or_new.cc					\
@@ -68,6 +64,8 @@ glom_glom_SOURCES =							\
 	glom/variablesmap.h						\
 	glom/xsl_utils.cc						\
 	glom/xsl_utils.h						\
+	glom/printoperation_printlayout.cc				\
+	glom/printoperation_printlayout.h				\
 	glom/bakery/app.cc						\
 	glom/bakery/app.h						\
 	glom/bakery/app_withdoc.cc					\
@@ -92,14 +90,6 @@ glom_glom_SOURCES =							\
 	glom/mode_data/box_data_manyrecords.h				\
 	glom/mode_data/box_data_portal.cc				\
 	glom/mode_data/box_data_portal.h				\
-	glom/mode_data/dialog_choose_field.cc				\
-	glom/mode_data/dialog_choose_field.h				\
-	glom/mode_data/dialog_choose_relationship.cc			\
-	glom/mode_data/dialog_choose_relationship.h			\
-	glom/mode_data/dialog_layout.cc					\
-	glom/mode_data/dialog_layout.h					\
-	glom/mode_data/dialog_layout_export.cc				\
-	glom/mode_data/dialog_layout_export.h				\
 	glom/mode_data/flowtablewithfields.cc				\
 	glom/mode_data/flowtablewithfields.h				\
 	glom/mode_data/notebook_data.cc					\
@@ -114,8 +104,8 @@ glom_glom_SOURCES =							\
 	glom/navigation/box_tables.h					\
 	glom/python_embed/glom_python.cc				\
 	glom/python_embed/glom_python.h					\
-	glom/reports/report_builder.cc					\
-	glom/reports/report_builder.h					\
+	glom/report_builder.cc						\
+	glom/report_builder.h						\
 	glom/utility_widgets/alignment_justified.cc			\
 	glom/utility_widgets/alignment_justified.h			\
 	glom/utility_widgets/buttonglom.cc				\
@@ -142,8 +132,6 @@ glom_glom_SOURCES =							\
 	glom/utility_widgets/dialog_flowtable.h				\
 	glom/utility_widgets/dialog_image_progress.cc			\
 	glom/utility_widgets/dialog_image_progress.h			\
-	glom/utility_widgets/dialog_layoutitem_properties.cc		\
-	glom/utility_widgets/dialog_layoutitem_properties.h		\
 	glom/utility_widgets/dialog_properties.cc			\
 	glom/utility_widgets/dialog_properties.h			\
 	glom/utility_widgets/entryglom.cc				\
@@ -215,46 +203,10 @@ glom_glom_SOURCES =							\
 
 if !GLOM_ENABLE_CLIENT_ONLY
 glom_glom_SOURCES +=							\
-	glom/dialog_database_preferences.cc				\
-	glom/dialog_database_preferences.h				\
-	glom/dialog_new_self_hosted_connection.cc			\
-	glom/dialog_new_self_hosted_connection.h			\
-	glom/printoperation_printlayout.cc				\
-	glom/printoperation_printlayout.h				\
-	glom/layout_item_dialogs/box_formatting.cc			\
-	glom/layout_item_dialogs/box_formatting.h			\
-	glom/layout_item_dialogs/combo_summarytype.cc			\
-	glom/layout_item_dialogs/combo_summarytype.h			\
-	glom/layout_item_dialogs/comboentry_borderwidth.cc		\
-	glom/layout_item_dialogs/comboentry_borderwidth.h		\
-	glom/layout_item_dialogs/dialog_buttonscript.cc			\
-	glom/layout_item_dialogs/dialog_buttonscript.h			\
-	glom/layout_item_dialogs/dialog_field_layout.cc			\
-	glom/layout_item_dialogs/dialog_field_layout.h			\
-	glom/layout_item_dialogs/dialog_field_summary.cc		\
-	glom/layout_item_dialogs/dialog_field_summary.h			\
-	glom/layout_item_dialogs/dialog_group_by.cc			\
-	glom/layout_item_dialogs/dialog_group_by.h			\
-	glom/layout_item_dialogs/dialog_groupby_secondaryfields.cc	\
-	glom/layout_item_dialogs/dialog_groupby_secondaryfields.h	\
-	glom/layout_item_dialogs/dialog_groupby_sortfields.cc		\
-	glom/layout_item_dialogs/dialog_groupby_sortfields.h		\
-	glom/layout_item_dialogs/dialog_imageobject.cc			\
-	glom/layout_item_dialogs/dialog_imageobject.h			\
-	glom/layout_item_dialogs/dialog_notebook.cc			\
-	glom/layout_item_dialogs/dialog_notebook.h			\
-	glom/layout_item_dialogs/dialog_textobject.cc			\
-	glom/layout_item_dialogs/dialog_textobject.h			\
-	glom/mode_data/dialog_layout_calendar_related.cc		\
-	glom/mode_data/dialog_layout_calendar_related.h			\
-	glom/mode_data/dialog_layout_details.cc				\
-	glom/mode_data/dialog_layout_details.h				\
-	glom/mode_data/dialog_layout_list.cc				\
-	glom/mode_data/dialog_layout_list.h				\
-	glom/mode_data/dialog_layout_list_related.cc			\
-	glom/mode_data/dialog_layout_list_related.h			\
-	glom/mode_data/treestore_layout.cc				\
-	glom/mode_data/treestore_layout.h				\
+	glom/mode_design/dialog_database_preferences.cc				\
+	glom/mode_design/dialog_database_preferences.h				\
+	glom/mode_design/dialog_initial_password.cc					\
+	glom/mode_design/dialog_initial_password.h					\
 	glom/mode_design/box_db_table_relationships.cc			\
 	glom/mode_design/box_db_table_relationships.h			\
 	glom/mode_design/dialog_add_related_table.cc			\
@@ -273,6 +225,58 @@ glom_glom_SOURCES +=							\
 	glom/mode_design/fields/dialog_fieldcalculation.h		\
 	glom/mode_design/fields/dialog_fielddefinition.cc		\
 	glom/mode_design/fields/dialog_fielddefinition.h		\
+	glom/mode_design/layout/combobox_fields.cc			\
+	glom/mode_design/layout/combobox_fields.h			\
+	glom/mode_design/layout/combobox_relationship.cc		\
+	glom/mode_design/layout/combobox_relationship.h			\
+	glom/mode_design/layout/dialog_choose_field.cc				\
+	glom/mode_design/layout/dialog_choose_field.h				\
+	glom/mode_design/layout/dialog_choose_relationship.cc			\
+	glom/mode_design/layout/dialog_choose_relationship.h			\
+	glom/mode_design/layout/dialog_layout.cc				\
+	glom/mode_design/layout/dialog_layout.h					\
+	glom/mode_design/layout/dialog_layout_export.cc				\
+	glom/mode_design/layout/dialog_layout_export.h				\
+	glom/mode_design/layout/dialog_layout_calendar_related.cc		\
+	glom/mode_design/layout/dialog_layout_calendar_related.h		\
+	glom/mode_design/layout/dialog_layout_details.cc			\
+	glom/mode_design/layout/dialog_layout_details.h				\
+	glom/mode_design/layout/dialog_layout_list.cc				\
+	glom/mode_design/layout/dialog_layout_list.h				\
+	glom/mode_design/layout/dialog_layout_list_related.cc			\
+	glom/mode_design/layout/dialog_layout_list_related.h			\
+	glom/mode_design/layout/treestore_layout.cc				\
+	glom/mode_design/layout/treestore_layout.h				\
+	glom/mode_design/layout/layout_item_dialogs/box_formatting.cc			\
+	glom/mode_design/layout/layout_item_dialogs/box_formatting.h			\
+	glom/mode_design/layout/layout_item_dialogs/combo_summarytype.cc		\
+	glom/mode_design/layout/layout_item_dialogs/combo_summarytype.h			\
+	glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc		\
+	glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.h		\
+	glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc		\
+	glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h		\
+	glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.cc		\
+	glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h		\
+	glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.cc		\
+	glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.h		\
+	glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc			\
+	glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h			\
+	glom/mode_design/layout/layout_item_dialogs/dialog_groupby_secondaryfields.cc	\
+	glom/mode_design/layout/layout_item_dialogs/dialog_groupby_secondaryfields.h	\
+	glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.cc	\
+	glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.h		\
+	glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.cc		\
+	glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.h		\
+	glom/mode_design/layout/layout_item_dialogs/dialog_notebook.cc			\
+	glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h			\
+	glom/mode_design/layout/layout_item_dialogs/dialog_textobject.cc		\
+	glom/mode_design/layout/layout_item_dialogs/dialog_textobject.h			\
+	glom/mode_design/relationships_overview/canvas_group_dbtable.cc			\
+	glom/mode_design/relationships_overview/canvas_group_dbtable.h			\
+	glom/mode_design/relationships_overview/dialog_relationships_overview.cc	\
+	glom/mode_design/relationships_overview/dialog_relationships_overview.h		\
+	glom/mode_design/relationships_overview/printoperation_relationshipsoverview.cc	\
+	glom/mode_design/relationships_overview/printoperation_relationshipsoverview.h	\
 	glom/mode_design/print_layouts/box_print_layouts.cc		\
 	glom/mode_design/print_layouts/box_print_layouts.h		\
 	glom/mode_design/print_layouts/canvas_layout_item.cc		\
@@ -287,6 +291,10 @@ glom_glom_SOURCES +=							\
 	glom/mode_design/print_layouts/print_layout_toolbar_button.h	\
 	glom/mode_design/print_layouts/window_print_layout_edit.cc	\
 	glom/mode_design/print_layouts/window_print_layout_edit.h	\
+	glom/mode_design/report_layout/dialog_layout_report.cc		\
+	glom/mode_design/report_layout/dialog_layout_report.h		\
+	glom/mode_design/report_layout/treestore_report_layout.cc	\
+	glom/mode_design/report_layout/treestore_report_layout.h	\
 	glom/mode_design/script_library/dialog_new_script.cc		\
 	glom/mode_design/script_library/dialog_new_script.h		\
 	glom/mode_design/script_library/dialog_script_library.cc	\
@@ -301,16 +309,6 @@ glom_glom_SOURCES +=							\
 	glom/mode_design/users/dialog_user.h				\
 	glom/mode_design/users/dialog_users_list.cc			\
 	glom/mode_design/users/dialog_users_list.h			\
-	glom/relationships_overview/canvas_group_dbtable.cc		\
-	glom/relationships_overview/canvas_group_dbtable.h		\
-	glom/relationships_overview/dialog_relationships_overview.cc	\
-	glom/relationships_overview/dialog_relationships_overview.h	\
-	glom/relationships_overview/printoperation_relationshipsoverview.cc	\
-	glom/relationships_overview/printoperation_relationshipsoverview.h	\
-	glom/reports/dialog_layout_report.cc				\
-	glom/reports/dialog_layout_report.h				\
-	glom/reports/treestore_report_layout.cc				\
-	glom/reports/treestore_report_layout.h				\
 	glom/translation/combobox_locale.cc				\
 	glom/translation/combobox_locale.h				\
 	glom/translation/dialog_change_language.cc			\
diff --git a/glom/application.cc b/glom/application.cc
index 3fe6298..a481ac0 100644
--- a/glom/application.cc
+++ b/glom/application.cc
@@ -1041,7 +1041,7 @@ bool App_Glom::on_document_load()
         connection_pool->set_get_document_func( sigc::mem_fun(*this, &App_Glom::on_connection_pool_get_document) );
 #endif
 
-        connection_pool->set_ready_to_connect(true); //Box_WithButtons::connect_to_server() will now attempt the connection-> Shared instances of m_Connection will also be usable.
+        connection_pool->set_ready_to_connect(true); //connect_to_server() will now attempt the connection-> Shared instances of m_Connection will also be usable.
 
         //Attempt to connect to the specified database:
         bool test = false;
diff --git a/glom/application.h b/glom/application.h
index 3721bea..e5b883c 100644
--- a/glom/application.h
+++ b/glom/application.h
@@ -22,7 +22,7 @@
 #define HEADER_APP_GLOM
 
 #include <glom/bakery/app_withdoc_gtk.h>
-#include "frame_glom.h"
+#include <glom/frame_glom.h>
 
 #include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
diff --git a/glom/bakery/app_withdoc_gtk.cc b/glom/bakery/app_withdoc_gtk.cc
index 1c76164..cf2e43d 100644
--- a/glom/bakery/app_withdoc_gtk.cc
+++ b/glom/bakery/app_withdoc_gtk.cc
@@ -119,7 +119,7 @@ void App_WithDoc_Gtk::init_layout()
 
   //Add menu bar at the top:
   //These were defined in init_uimanager().
-#ifdef GLOM_ENABLE_MAEMO
+#ifdef GLOM_ENABLE_MAEMO //TODO: Use Hildon::AppMenu
   Gtk::Menu* pMenu = static_cast<Gtk::Menu*>(m_refUIManager->get_widget("/Bakery_MainMenu"));
   set_menu(*pMenu);
 #else
diff --git a/glom/base_db.cc b/glom/base_db.cc
index 0eafd31..390850b 100644
--- a/glom/base_db.cc
+++ b/glom/base_db.cc
@@ -20,22 +20,21 @@
 
 #include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
-#include "base_db.h"
+#include <glom/base_db.h>
 #include "application.h" //App_Glom.
 #include <libglom/appstate.h>
 #include <libglom/standard_table_prefs_fields.h>
 #include <libglom/document/document.h>
 #include <libglom/data_structure/glomconversions.h>
-#include "mode_data/dialog_choose_field.h"
+#include <glom/mode_design/layout/dialog_choose_field.h>
 
 //#ifndef GLOM_ENABLE_CLIENT_ONLY
-#include "layout_item_dialogs/dialog_field_layout.h"
-#include "layout_item_dialogs/dialog_notebook.h"
-#include "layout_item_dialogs/dialog_textobject.h"
-#include "layout_item_dialogs/dialog_imageobject.h"
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h>
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h>
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_textobject.h>
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.h>
 //#endif // !GLOM_ENABLE_CLIENT_ONLY
 
-//#include "reports/dialog_layout_report.h"
 #include <glom/utils_ui.h>
 #include <glom/glade_utils.h>
 #include <libglom/data_structure/glomconversions.h>
@@ -45,7 +44,7 @@
 #include <libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_header.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_footer.h>
-#include "python_embed/glom_python.h"
+#include <glom/python_embed/glom_python.h>
 #include <glom/glom_postgres.h>
 #include <glom/glom_privs.h>
 #include <glibmm/i18n.h>
diff --git a/glom/base_db_table.cc b/glom/base_db_table.cc
index 6ae64c5..416b6f6 100644
--- a/glom/base_db_table.cc
+++ b/glom/base_db_table.cc
@@ -21,7 +21,7 @@
 #include "base_db_table.h"
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/application.h>
-#include "python_embed/glom_python.h"
+#include <glom/python_embed/glom_python.h>
 #include <sstream>
 
 namespace Glom
diff --git a/glom/base_db_table.h b/glom/base_db_table.h
index 5d2e917..1050c95 100644
--- a/glom/base_db_table.h
+++ b/glom/base_db_table.h
@@ -22,7 +22,7 @@
 #ifndef BASE_DB_TABLE_H
 #define BASE_DB_TABLE_H
 
-#include "base_db.h"
+#include <glom/base_db.h>
 #include <libglom/data_structure/field.h>
 #include <algorithm> //find_if used in various places.
 
diff --git a/glom/base_db_table_data.cc b/glom/base_db_table_data.cc
index de37ab1..c2d61b1 100644
--- a/glom/base_db_table_data.cc
+++ b/glom/base_db_table_data.cc
@@ -22,7 +22,7 @@
 #include "base_db_table_data.h"
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/application.h>
-#include "python_embed/glom_python.h"
+#include <glom/python_embed/glom_python.h>
 #include <glom/utils_ui.h>
 #include <sstream>
 #include <glibmm/i18n.h>
diff --git a/glom/box_db_table.cc b/glom/box_db_table.cc
index a4450b4..fc78503 100644
--- a/glom/box_db_table.cc
+++ b/glom/box_db_table.cc
@@ -20,7 +20,7 @@
 
 #include "box_db_table.h"
 #include <libglom/data_structure/glomconversions.h>
-#include "python_embed/glom_python.h"
+#include <glom/python_embed/glom_python.h>
 #include <sstream>
 
 namespace Glom
diff --git a/glom/box_withbuttons.cc b/glom/box_withbuttons.cc
index 795fc02..cad3ca7 100644
--- a/glom/box_withbuttons.cc
+++ b/glom/box_withbuttons.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "box_withbuttons.h"
+#include <glom/box_withbuttons.h>
 #include <glom/application.h> //App_Glom.
 #include <glom/utils_ui.h>
 #include <libglom/appstate.h>
diff --git a/glom/dialog_connection.cc b/glom/dialog_connection.cc
index 0e26f0a..b0d7bb1 100644
--- a/glom/dialog_connection.cc
+++ b/glom/dialog_connection.cc
@@ -20,7 +20,6 @@
 
 #include "config.h" //For GLOM_ENABLE_POSTGRESQL
 #include "dialog_connection.h"
-#include "box_withbuttons.h" //For Box_WithButtons::connect_to_server().
 #include <glibmm/i18n.h>
 
 #include <libglom/connectionpool.h>
diff --git a/glom/dialog_connection.h b/glom/dialog_connection.h
index 1c07b21..07a6ec7 100644
--- a/glom/dialog_connection.h
+++ b/glom/dialog_connection.h
@@ -25,7 +25,7 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>
 #include <gtkmm/builder.h>
-#include "base_db.h"
+#include <glom/base_db.h>
 #include <libglom/connectionpool.h>
 
 namespace Glom
diff --git a/glom/dialog_glom.h b/glom/dialog_glom.h
index c425727..bdd36de 100644
--- a/glom/dialog_glom.h
+++ b/glom/dialog_glom.h
@@ -21,7 +21,7 @@
 #ifndef DIALOG_GLOM_H
 #define DIALOG_GLOM_H
 
-#include "box_withbuttons.h"
+#include <glom/box_withbuttons.h>
 #include <gtkmm/dialog.h>
 #include <gtkmm/button.h>
 
diff --git a/glom/dialog_import_csv.h b/glom/dialog_import_csv.h
index 90dbcfc..ca06b21 100644
--- a/glom/dialog_import_csv.h
+++ b/glom/dialog_import_csv.h
@@ -21,7 +21,7 @@
 #ifndef GLOM_DIALOG_IMPORT_CSV_H
 #define GLOM_DIALOG_IMPORT_CSV_H
 
-#include "base_db.h"
+#include <glom/base_db.h>
 
 #include <memory>
 #include <giomm/asyncresult.h>
diff --git a/glom/filechooser_export.cc b/glom/filechooser_export.cc
index 500ba0a..53626e7 100644
--- a/glom/filechooser_export.cc
+++ b/glom/filechooser_export.cc
@@ -19,7 +19,7 @@
  */
 
 #include "filechooser_export.h"
-#include "mode_data/dialog_layout_export.h"
+#include <glom/mode_design/layout/dialog_layout_export.h>
 #include <glom/utils_ui.h>
 #include <glom/glade_utils.h>
 #include <gtkmm/stock.h>
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index e064ddb..7cfec54 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -39,14 +39,14 @@
 #endif
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
-#include "mode_design/users/dialog_groups_list.h"
-#include "dialog_database_preferences.h"
-#include "reports/dialog_layout_report.h"
+#include <glom/mode_design/users/dialog_groups_list.h>
+#include <glom/mode_design/dialog_database_preferences.h>
+#include <glom/mode_design/report_layout/dialog_layout_report.h>
 #include <glom/mode_design/print_layouts/window_print_layout_edit.h>
 #include <glom/mode_design/dialog_add_related_table.h>
 #include <glom/mode_design/script_library/dialog_script_library.h>
-#include <glom/dialog_new_self_hosted_connection.h>
-#include "relationships_overview/dialog_relationships_overview.h"
+#include <glom/mode_design/dialog_initial_password.h>
+#include <glom/mode_design/relationships_overview/dialog_relationships_overview.h>
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
 #include <glom/utils_ui.h>
@@ -55,7 +55,7 @@
 #include <libglom/data_structure/layout/report_parts/layoutitem_summary.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
 
-#include <glom/reports/report_builder.h>
+#include <glom/report_builder.h>
 #ifndef GLOM_ENABLE_CLIENT_ONLY
 #include <glom/mode_design/dialog_add_related_table.h>
 #include <glom/mode_design/script_library/dialog_script_library.h>
@@ -2008,13 +2008,13 @@ bool Frame_Glom::connection_request_initial_password(Glib::ustring& user, Glib::
     return false;
 
   //Ask for a new username and password to specify when creating a new self-hosted database.
-  Dialog_NewSelfHostedConnection* dialog = 0;
+  Dialog_InitialPassword* dialog = 0;
   Glib::RefPtr<Gtk::Builder> refXml;
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
-    refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_new_self_hosted_connection");
+    refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_initial_password");
   }
   catch(const Gtk::BuilderError& ex)
   {
@@ -2023,7 +2023,7 @@ bool Frame_Glom::connection_request_initial_password(Glib::ustring& user, Glib::
   }
 #else
   std::auto_ptr<Gtk::BuilderError> error;
-  refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_new_self_hosted_connection", error);
+  refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_initial_password", error);
   if(error.get())
   {
     std::cerr << error->what() << std::endl;
@@ -2031,7 +2031,7 @@ bool Frame_Glom::connection_request_initial_password(Glib::ustring& user, Glib::
   }
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 
-  refXml->get_widget_derived("dialog_new_self_hosted_connection", dialog);
+  refXml->get_widget_derived("dialog_initial_password", dialog);
   if(!dialog)
     return false;
 
diff --git a/glom/glom_developer.glade b/glom/glom_developer.glade
index 3042ae9..d13c7ba 100644
--- a/glom/glom_developer.glade
+++ b/glom/glom_developer.glade
@@ -2115,7 +2115,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkDialog" id="dialog_new_self_hosted_connection">
+  <object class="GtkDialog" id="dialog_initial_password">
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="vbox27">
diff --git a/glom/libglom/test_connectionpool.cc b/glom/libglom/test_connectionpool.cc
index 5f3222e..a71af8e 100644
--- a/glom/libglom/test_connectionpool.cc
+++ b/glom/libglom/test_connectionpool.cc
@@ -59,7 +59,7 @@ main()
 #endif //GLOM_ENABLE_POSTGRESQL
 
       connection_pool->set_backend(std::auto_ptr<Glom::ConnectionPool::Backend>(backend));
-      connection_pool->set_ready_to_connect(); //Box_WithButtons::connect_to_server() will now attempt the connection-> Shared instances of m_Connection will also be usable.
+      connection_pool->set_ready_to_connect(); //connect_to_server() will now attempt the connection-> Shared instances of m_Connection will also be usable.
     }
 
     //Connect:
diff --git a/glom/mode_data/box_data.cc b/glom/mode_data/box_data.cc
index 29a7932..b913575 100644
--- a/glom/mode_data/box_data.cc
+++ b/glom/mode_data/box_data.cc
@@ -25,7 +25,7 @@
 #include <glom/utils_ui.h>
 #include <libglom/data_structure/layout/layoutitem_field.h>
 #include <glom/glom_privs.h>
-#include "../python_embed/glom_python.h"
+#include <glom/python_embed/glom_python.h>
 #include <algorithm> //For std::find()
 #include <libglom/libglom_config.h>
 #include <glibmm/i18n.h>
diff --git a/glom/mode_data/box_data.h b/glom/mode_data/box_data.h
index d50b9e4..9555e15 100644
--- a/glom/mode_data/box_data.h
+++ b/glom/mode_data/box_data.h
@@ -25,7 +25,7 @@
 
 #include <glom/box_withbuttons.h>
 #include <glom/base_db_table_data.h>
-#include "dialog_layout.h"
+#include <glom/mode_design/layout/dialog_layout.h>
 
 namespace Glom
 {
diff --git a/glom/mode_data/box_data_calendar_related.cc b/glom/mode_data/box_data_calendar_related.cc
index a71233b..23e7644 100644
--- a/glom/mode_data/box_data_calendar_related.cc
+++ b/glom/mode_data/box_data_calendar_related.cc
@@ -19,7 +19,7 @@
  */
 
 #include <glom/mode_data/box_data_calendar_related.h>
-#include <glom/mode_data/dialog_layout_calendar_related.h>
+#include <glom/mode_design/layout/dialog_layout_calendar_related.h>
 #include <glom/utils_ui.h>
 #include <glom/application.h>
 #include <libglom/data_structure/glomconversions.h>
diff --git a/glom/mode_data/box_data_calendar_related.h b/glom/mode_data/box_data_calendar_related.h
index fcf9091..98f0c15 100644
--- a/glom/mode_data/box_data_calendar_related.h
+++ b/glom/mode_data/box_data_calendar_related.h
@@ -25,7 +25,7 @@
 
 #include "box_data_portal.h"
 #include <libglom/data_structure/layout/layoutitem_calendarportal.h>
-#include "../utility_widgets/layoutwidgetbase.h"
+#include <glom/utility_widgets/layoutwidgetbase.h>
 #include <gtkmm/calendar.h>
 
 namespace Glom
diff --git a/glom/mode_data/box_data_details.cc b/glom/mode_data/box_data_details.cc
index c744c4b..e75e558 100644
--- a/glom/mode_data/box_data_details.cc
+++ b/glom/mode_data/box_data_details.cc
@@ -24,7 +24,7 @@
 #include <libglom/data_structure/field.h>
 #include <libglom/data_structure/relationship.h>
 #include <libglom/data_structure/glomconversions.h>
-#include <glom/mode_data/dialog_layout_details.h>
+#include <glom/mode_design/layout/dialog_layout_details.h>
 #include <glom/glade_utils.h>
 #include <glom/utils_ui.h>
 #include <glom/glom_privs.h>
diff --git a/glom/mode_data/box_data_list.cc b/glom/mode_data/box_data_list.cc
index 5ae0fb0..b59ca02 100644
--- a/glom/mode_data/box_data_list.cc
+++ b/glom/mode_data/box_data_list.cc
@@ -21,8 +21,8 @@
 #include "box_data_list.h"
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/glade_utils.h>
-#include <glom/reports/report_builder.h>
-#include "dialog_layout_list.h"
+#include <glom/report_builder.h>
+#include <glom/mode_design/layout/dialog_layout_list.h>
 #include <glom/glom_privs.h>
 #include <libglom/utils.h> //For bold_message()).
 //#include <../utility_widgets/db_adddel/glom_db_treemodel.h> //For DbTreeModel.
@@ -516,7 +516,7 @@ sharedptr<Field> Box_Data_List::get_field_primary_key() const
   return m_AddDel.get_key_field();
 }
 
-void Box_Data_List::print_layout()
+void Box_Data_List::print_layout() //TODO: Is this a duplicate of the one in box_data_manyrecords.cc?
 {
   const Privileges table_privs = Privs::get_current_privs(m_table_name);
 
diff --git a/glom/mode_data/box_data_list.h b/glom/mode_data/box_data_list.h
index 9aa4d50..ed44cf7 100644
--- a/glom/mode_data/box_data_list.h
+++ b/glom/mode_data/box_data_list.h
@@ -24,7 +24,7 @@
 #include "config.h" // GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data_manyrecords.h"
-#include "../utility_widgets/db_adddel/db_adddel_withbuttons.h"
+#include <glom/utility_widgets/db_adddel/db_adddel_withbuttons.h>
 
 namespace Glom
 {
diff --git a/glom/mode_data/box_data_list_related.cc b/glom/mode_data/box_data_list_related.cc
index e578fb1..7d80ebe 100644
--- a/glom/mode_data/box_data_list_related.cc
+++ b/glom/mode_data/box_data_list_related.cc
@@ -19,7 +19,7 @@
  */
 
 #include <glom/mode_data/box_data_list_related.h>
-#include <glom/mode_data/dialog_layout_list_related.h>
+#include <glom/mode_design/layout/dialog_layout_list_related.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/glade_utils.h>
 #include <glom/frame_glom.h> //For show_ok_dialog()
diff --git a/glom/mode_data/box_data_manyrecords.cc b/glom/mode_data/box_data_manyrecords.cc
index 99edc19..6693a31 100644
--- a/glom/mode_data/box_data_manyrecords.cc
+++ b/glom/mode_data/box_data_manyrecords.cc
@@ -21,8 +21,8 @@
 #include "box_data_manyrecords.h"
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/glade_utils.h>
-#include <glom/reports/report_builder.h>
-#include "dialog_layout_list.h"
+#include <glom/report_builder.h>
+#include <glom/mode_design/layout/dialog_layout_list.h>
 #include <glom/glom_privs.h>
 #include <libglom/utils.h> //For bold_message()).
 #include <sstream> //For stringstream
diff --git a/glom/mode_data/box_data_manyrecords.h b/glom/mode_data/box_data_manyrecords.h
index 2364be3..e5c9b8b 100644
--- a/glom/mode_data/box_data_manyrecords.h
+++ b/glom/mode_data/box_data_manyrecords.h
@@ -24,7 +24,7 @@
 #include "config.h" // GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data.h"
-#include "../utility_widgets/db_adddel/db_adddel_withbuttons.h"
+#include <glom/utility_widgets/db_adddel/db_adddel_withbuttons.h>
 
 namespace Glom
 {
diff --git a/glom/mode_data/box_data_portal.h b/glom/mode_data/box_data_portal.h
index 2612cd9..5684973 100644
--- a/glom/mode_data/box_data_portal.h
+++ b/glom/mode_data/box_data_portal.h
@@ -24,7 +24,7 @@
 #include "config.h" // GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data_manyrecords.h"
-#include "../utility_widgets/layoutwidgetbase.h"
+#include <glom/utility_widgets/layoutwidgetbase.h>
 
 namespace Glom
 {
diff --git a/glom/mode_data/flowtablewithfields.cc b/glom/mode_data/flowtablewithfields.cc
index f598584..a0b901f 100644
--- a/glom/mode_data/flowtablewithfields.cc
+++ b/glom/mode_data/flowtablewithfields.cc
@@ -32,7 +32,7 @@
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/glade_utils.h>
 #include <glom/mode_data/box_data_list_related.h>
-#include <glom/mode_data/dialog_choose_relationship.h>
+#include <glom/mode_design/layout/dialog_choose_relationship.h>
 #include <glom/utils_ui.h> //For bold_message()).
 #include <libglom/data_structure/layout/layoutitem_placeholder.h>
 #include <glom/signal_reemitter.h>
diff --git a/glom/mode_data/flowtablewithfields.h b/glom/mode_data/flowtablewithfields.h
index 0d85a79..8fd16b1 100644
--- a/glom/mode_data/flowtablewithfields.h
+++ b/glom/mode_data/flowtablewithfields.h
@@ -42,7 +42,7 @@
 #include <glom/utility_widgets/layoutwidgetutils.h>
 #include <glom/mode_data/box_data_list_related.h>
 #include "box_data_calendar_related.h"
-#include "treestore_layout.h" //Forthe enum.
+#include <glom/mode_design/layout/treestore_layout.h> //Forthe enum.
 #include <map>
 #include <list>
 
diff --git a/glom/dialog_database_preferences.cc b/glom/mode_design/dialog_database_preferences.cc
similarity index 99%
rename from glom/dialog_database_preferences.cc
rename to glom/mode_design/dialog_database_preferences.cc
index e323781..b515147 100644
--- a/glom/dialog_database_preferences.cc
+++ b/glom/mode_design/dialog_database_preferences.cc
@@ -19,7 +19,6 @@
  */
  
 #include "dialog_database_preferences.h"
-#include "box_withbuttons.h" //For Box_WithButtons::connect_to_server().
 #include <libglom/standard_table_prefs_fields.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/bakery/busy_cursor.h>
diff --git a/glom/dialog_database_preferences.h b/glom/mode_design/dialog_database_preferences.h
similarity index 98%
rename from glom/dialog_database_preferences.h
rename to glom/mode_design/dialog_database_preferences.h
index 7087433..db5f409 100644
--- a/glom/dialog_database_preferences.h
+++ b/glom/mode_design/dialog_database_preferences.h
@@ -26,7 +26,7 @@
 #include <gtkmm/dialog.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>
-#include "base_db.h"
+#include <glom/base_db.h>
 #include <libglom/data_structure/system_prefs.h>
 #include <libglom/connectionpool.h>
 #include "utility_widgets/imageglom.h"
diff --git a/glom/dialog_new_self_hosted_connection.cc b/glom/mode_design/dialog_initial_password.cc
similarity index 79%
rename from glom/dialog_new_self_hosted_connection.cc
rename to glom/mode_design/dialog_initial_password.cc
index e3a1412..569cbde 100644
--- a/glom/dialog_new_self_hosted_connection.cc
+++ b/glom/mode_design/dialog_initial_password.cc
@@ -18,8 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "dialog_new_self_hosted_connection.h"
-#include "box_withbuttons.h" //For Box_WithButtons::connect_to_server().
+#include <glom/mode_design/dialog_initial_password.h>
 #include <glom/frame_glom.h> //For Frame_Glom::show_ok_dialog
 #include <glom/glade_utils.h>
 #include <glibmm/i18n.h>
@@ -27,7 +26,7 @@
 namespace Glom
 {
 
-Dialog_NewSelfHostedConnection::Dialog_NewSelfHostedConnection(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+Dialog_InitialPassword::Dialog_InitialPassword(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
 : Gtk::Dialog(cobject),
   Base_DB(),
   m_entry_user(0),
@@ -38,21 +37,21 @@ Dialog_NewSelfHostedConnection::Dialog_NewSelfHostedConnection(BaseObjectType* c
   builder->get_widget("entry_password_confirm", m_entry_password_confirm);
 }
 
-Dialog_NewSelfHostedConnection::~Dialog_NewSelfHostedConnection()
+Dialog_InitialPassword::~Dialog_InitialPassword()
 {
 }
 
-Glib::ustring Dialog_NewSelfHostedConnection::get_user() const
+Glib::ustring Dialog_InitialPassword::get_user() const
 {
   return m_entry_user->get_text();
 }
 
-Glib::ustring Dialog_NewSelfHostedConnection::get_password() const
+Glib::ustring Dialog_InitialPassword::get_password() const
 {
   return m_entry_password->get_text();
 }
 
-void Dialog_NewSelfHostedConnection::load_from_document()
+void Dialog_InitialPassword::load_from_document()
 {
   Document* document = get_document();
   if(document)
@@ -70,11 +69,11 @@ void Dialog_NewSelfHostedConnection::load_from_document()
     m_entry_user->set_text(user);
   }
   else
-    g_warning("Dialog_NewSelfHostedConnection::load_from_document(): no document");
+    g_warning("Dialog_InitialPassword::load_from_document(): no document");
 
 }
 
-bool Dialog_NewSelfHostedConnection::check_password()
+bool Dialog_InitialPassword::check_password()
 {
   if(m_entry_user->get_text().empty())
   {
diff --git a/glom/dialog_new_self_hosted_connection.h b/glom/mode_design/dialog_initial_password.h
similarity index 87%
rename from glom/dialog_new_self_hosted_connection.h
rename to glom/mode_design/dialog_initial_password.h
index 6a7d642..b3adfa1 100644
--- a/glom/dialog_new_self_hosted_connection.h
+++ b/glom/mode_design/dialog_initial_password.h
@@ -25,19 +25,19 @@
 #include <gtkmm/dialog.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>
-#include "base_db.h"
+#include <glom/base_db.h>
 #include <libglom/connectionpool.h>
 
 namespace Glom
 {
 
-class Dialog_NewSelfHostedConnection
+class Dialog_InitialPassword
   : public Gtk::Dialog,
     public Base_DB
 {
 public:
-  Dialog_NewSelfHostedConnection(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
-  virtual ~Dialog_NewSelfHostedConnection();
+  Dialog_InitialPassword(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
+  virtual ~Dialog_InitialPassword();
 
   bool check_password();
 
diff --git a/glom/mode_design/fields/dialog_fieldcalculation.cc b/glom/mode_design/fields/dialog_fieldcalculation.cc
index b08833a..1f34d3b 100644
--- a/glom/mode_design/fields/dialog_fieldcalculation.cc
+++ b/glom/mode_design/fields/dialog_fieldcalculation.cc
@@ -21,8 +21,8 @@
 
 #include "dialog_fieldcalculation.h"
 #include "../../box_db_table.h"
-#include "../../frame_glom.h"
-#include "../../python_embed/glom_python.h"
+#include <glom/frame_glom.h>
+#include <glom/python_embed/glom_python.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <gtksourceviewmm/sourcelanguagemanager.h>
 
diff --git a/glom/mode_design/fields/dialog_fieldcalculation.h b/glom/mode_design/fields/dialog_fieldcalculation.h
index ddf90d1..88d578e 100644
--- a/glom/mode_design/fields/dialog_fieldcalculation.h
+++ b/glom/mode_design/fields/dialog_fieldcalculation.h
@@ -24,7 +24,7 @@
 #include <gtkmm.h>
 #include <gtkmm/builder.h>
 #include <libglom/data_structure/field.h>
-#include "../../base_db.h"
+#include <glom/base_db.h>
 #include <gtksourceviewmm/sourceview.h>
 
 namespace Glom
diff --git a/glom/mode_design/fields/dialog_fielddefinition.h b/glom/mode_design/fields/dialog_fielddefinition.h
index 556cbbc..76b1112 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.h
+++ b/glom/mode_design/fields/dialog_fielddefinition.h
@@ -23,15 +23,15 @@
 
 #include <gtkmm.h>
 #include "../../utility_widgets/combo_textglade.h"
-#include "../../combobox_relationship.h"
+#include <glom/mode_design/layout/combobox_relationship.h>
 #include "combo_fieldtype.h"
 #include "../../utility_widgets/table_columns.h"
 //#include "../../utility_widgets/entry_numerical.h"
 #include "../../utility_widgets/dialog_properties.h"
 #include "../../utility_widgets/datawidget.h"
 #include <libglom/data_structure/field.h>
-#include "../../layout_item_dialogs/box_formatting.h"
-#include "../../base_db.h"
+#include <glom/mode_design/layout/layout_item_dialogs/box_formatting.h>
+#include <glom/base_db.h>
 #include <gtksourceviewmm/sourceview.h>
 
 namespace Glom
diff --git a/glom/combobox_fields.cc b/glom/mode_design/layout/combobox_fields.cc
similarity index 99%
rename from glom/combobox_fields.cc
rename to glom/mode_design/layout/combobox_fields.cc
index bb9bf5d..017325e 100644
--- a/glom/combobox_fields.cc
+++ b/glom/mode_design/layout/combobox_fields.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "combobox_fields.h"
+#include <glom/mode_design/layout/combobox_fields.h>
 #include <gtk/gtkcomboboxentry.h>
 #include <glibmm/i18n.h>
 
diff --git a/glom/combobox_fields.h b/glom/mode_design/layout/combobox_fields.h
similarity index 100%
rename from glom/combobox_fields.h
rename to glom/mode_design/layout/combobox_fields.h
diff --git a/glom/combobox_relationship.cc b/glom/mode_design/layout/combobox_relationship.cc
similarity index 99%
rename from glom/combobox_relationship.cc
rename to glom/mode_design/layout/combobox_relationship.cc
index afeede4..b155ac7 100644
--- a/glom/combobox_relationship.cc
+++ b/glom/mode_design/layout/combobox_relationship.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "combobox_relationship.h"
+#include <glom/mode_design/layout/combobox_relationship.h>
 #include <gtk/gtkcomboboxentry.h>
 #include <glibmm/i18n.h>
 
diff --git a/glom/combobox_relationship.h b/glom/mode_design/layout/combobox_relationship.h
similarity index 100%
rename from glom/combobox_relationship.h
rename to glom/mode_design/layout/combobox_relationship.h
diff --git a/glom/mode_data/dialog_choose_field.cc b/glom/mode_design/layout/dialog_choose_field.cc
similarity index 100%
rename from glom/mode_data/dialog_choose_field.cc
rename to glom/mode_design/layout/dialog_choose_field.cc
diff --git a/glom/mode_data/dialog_choose_field.h b/glom/mode_design/layout/dialog_choose_field.h
similarity index 92%
rename from glom/mode_data/dialog_choose_field.h
rename to glom/mode_design/layout/dialog_choose_field.h
index 13f29fc..8392303 100644
--- a/glom/mode_data/dialog_choose_field.h
+++ b/glom/mode_design/layout/dialog_choose_field.h
@@ -22,12 +22,12 @@
 #define GLOM_MODE_DATA_DIALOG_CHOOSE_FIELD_H
 
 #include <gtkmm.h>
-#include "../utility_widgets/dialog_properties.h"
+#include <glom/utility_widgets/dialog_properties.h>
 #include <libglom/document/document.h>
-#include "../box_withbuttons.h"
-#include "../utility_widgets/combo_textglade.h"
-#include "../combobox_relationship.h"
-#include "../utility_widgets/comboentry_currency.h"
+#include <glom/box_withbuttons.h>
+#include <glom/utility_widgets/combo_textglade.h>
+#include <glom/mode_design/layout/combobox_relationship.h>
+#include <glom/utility_widgets/comboentry_currency.h>
 
 namespace Glom
 {
diff --git a/glom/mode_data/dialog_choose_relationship.cc b/glom/mode_design/layout/dialog_choose_relationship.cc
similarity index 100%
rename from glom/mode_data/dialog_choose_relationship.cc
rename to glom/mode_design/layout/dialog_choose_relationship.cc
diff --git a/glom/mode_data/dialog_choose_relationship.h b/glom/mode_design/layout/dialog_choose_relationship.h
similarity index 96%
rename from glom/mode_data/dialog_choose_relationship.h
rename to glom/mode_design/layout/dialog_choose_relationship.h
index bc95d99..c941e11 100644
--- a/glom/mode_data/dialog_choose_relationship.h
+++ b/glom/mode_design/layout/dialog_choose_relationship.h
@@ -22,9 +22,9 @@
 #define GLOM_MODE_DATA_DIALOG_CHOOSE_RELATIONSHIP_H
 
 #include <gtkmm/dialog.h>
-#include "../utility_widgets/dialog_properties.h"
+#include <glom/utility_widgets/dialog_properties.h>
 #include <libglom/document/document.h>
-#include "../box_withbuttons.h"
+#include <glom/box_withbuttons.h>
 
 namespace Glom
 {
diff --git a/glom/mode_data/dialog_layout.cc b/glom/mode_design/layout/dialog_layout.cc
similarity index 99%
rename from glom/mode_data/dialog_layout.cc
rename to glom/mode_design/layout/dialog_layout.cc
index 5ccac86..ff9baca 100644
--- a/glom/mode_data/dialog_layout.cc
+++ b/glom/mode_design/layout/dialog_layout.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "dialog_layout.h"
+#include <glom/mode_design/layout/dialog_layout.h>
 //#include <libgnome/gnome-i18n.h>
 #include <glibmm/i18n.h>
 
diff --git a/glom/mode_data/dialog_layout.h b/glom/mode_design/layout/dialog_layout.h
similarity index 97%
rename from glom/mode_data/dialog_layout.h
rename to glom/mode_design/layout/dialog_layout.h
index a73119c..9a13a64 100644
--- a/glom/mode_data/dialog_layout.h
+++ b/glom/mode_design/layout/dialog_layout.h
@@ -22,9 +22,9 @@
 #define GLOM_MODE_DATA_DIALOG_LAYOUT_H
 
 #include <gtkmm/dialog.h>
-#include "../utility_widgets/dialog_properties.h"
+#include <glom/utility_widgets/dialog_properties.h>
 #include <libglom/document/document.h>
-#include "../box_withbuttons.h"
+#include <glom/box_withbuttons.h>
 
 namespace Glom
 {
diff --git a/glom/mode_data/dialog_layout_calendar_related.cc b/glom/mode_design/layout/dialog_layout_calendar_related.cc
similarity index 98%
rename from glom/mode_data/dialog_layout_calendar_related.cc
rename to glom/mode_design/layout/dialog_layout_calendar_related.cc
index a2f5093..36066e9 100644
--- a/glom/mode_data/dialog_layout_calendar_related.cc
+++ b/glom/mode_design/layout/dialog_layout_calendar_related.cc
@@ -18,9 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "dialog_layout_calendar_related.h"
-#include "dialog_choose_field.h"
-#include "../layout_item_dialogs/dialog_field_layout.h"
+#include <glom/mode_design/layout/dialog_layout_calendar_related.h>
+#include <glom/mode_design/layout/dialog_choose_field.h>
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h>
 #include <libglom/utils.h> //For bold_message()).
 
 //#include <libgnome/gnome-i18n.h>
diff --git a/glom/mode_data/dialog_layout_calendar_related.h b/glom/mode_design/layout/dialog_layout_calendar_related.h
similarity index 94%
rename from glom/mode_data/dialog_layout_calendar_related.h
rename to glom/mode_design/layout/dialog_layout_calendar_related.h
index 2e04d45..64ff7d3 100644
--- a/glom/mode_data/dialog_layout_calendar_related.h
+++ b/glom/mode_design/layout/dialog_layout_calendar_related.h
@@ -21,11 +21,11 @@
 #ifndef GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_RELATED_H
 #define GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_RELATED_H
 
-#include "dialog_layout_list.h"
+#include <glom/mode_design/layout/dialog_layout_list.h>
 #include <libglom/data_structure/layout/layoutitem_calendarportal.h>
 #include <glom/utility_widgets/combo_textglade.h>
-#include <glom/combobox_relationship.h>
-#include <glom/combobox_fields.h>
+#include <glom/mode_design/layout/combobox_relationship.h>
+#include <glom/mode_design/layout/combobox_fields.h>
 
 namespace Glom
 {
diff --git a/glom/mode_data/dialog_layout_details.cc b/glom/mode_design/layout/dialog_layout_details.cc
similarity index 99%
rename from glom/mode_data/dialog_layout_details.cc
rename to glom/mode_design/layout/dialog_layout_details.cc
index bbb8478..828494f 100644
--- a/glom/mode_data/dialog_layout_details.cc
+++ b/glom/mode_design/layout/dialog_layout_details.cc
@@ -18,10 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <glom/mode_data/dialog_layout_details.h>
-#include <glom/mode_data/dialog_choose_relationship.h>
-#include <glom/layout_item_dialogs/dialog_buttonscript.h>
-#include <glom/layout_item_dialogs/dialog_notebook.h>
+#include <glom/mode_design/layout/dialog_layout_details.h>
+#include <glom/mode_design/layout/dialog_choose_relationship.h>
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h>
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h>
 #include <glom/glade_utils.h>
 #include <glom/frame_glom.h> //For show_ok_dialog()
 //#include <libgnome/gnome-i18n.h>
diff --git a/glom/mode_data/dialog_layout_details.h b/glom/mode_design/layout/dialog_layout_details.h
similarity index 97%
rename from glom/mode_data/dialog_layout_details.h
rename to glom/mode_design/layout/dialog_layout_details.h
index da9b7e6..5c2f076 100644
--- a/glom/mode_data/dialog_layout_details.h
+++ b/glom/mode_design/layout/dialog_layout_details.h
@@ -21,8 +21,8 @@
 #ifndef GLOM_MODE_DATA_DIALOG_LAYOUT_DETAILS_H
 #define GLOM_MODE_DATA_DIALOG_LAYOUT_DETAILS_H
 
-#include "dialog_layout.h"
-#include "treestore_layout.h"
+#include <glom/mode_design/layout/dialog_layout.h>
+#include <glom/mode_design/layout/treestore_layout.h>
 
 namespace Glom
 {
diff --git a/glom/mode_data/dialog_layout_export.cc b/glom/mode_design/layout/dialog_layout_export.cc
similarity index 98%
rename from glom/mode_data/dialog_layout_export.cc
rename to glom/mode_design/layout/dialog_layout_export.cc
index 6c31f23..8e7f5e8 100644
--- a/glom/mode_data/dialog_layout_export.cc
+++ b/glom/mode_design/layout/dialog_layout_export.cc
@@ -18,9 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "dialog_layout_export.h"
-#include "dialog_choose_field.h"
-#include "../layout_item_dialogs/dialog_field_layout.h"
+#include <glom/mode_design/layout/dialog_layout_export.h>
+#include <glom/mode_design/layout/dialog_choose_field.h>
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h>
 #include <libglom/utils.h> //For bold_message()).
 
 //#include <libgnome/gnome-i18n.h>
diff --git a/glom/mode_data/dialog_layout_export.h b/glom/mode_design/layout/dialog_layout_export.h
similarity index 98%
rename from glom/mode_data/dialog_layout_export.h
rename to glom/mode_design/layout/dialog_layout_export.h
index 8831810..e7fd7ea 100644
--- a/glom/mode_data/dialog_layout_export.h
+++ b/glom/mode_design/layout/dialog_layout_export.h
@@ -21,7 +21,7 @@
 #ifndef GLOM_MODE_DATA_DIALOG_LAYOUT_EXPORT_H
 #define GLOM_MODE_DATA_DIALOG_LAYOUT_EXPORT_H
 
-#include "dialog_layout.h"
+#include <glom/mode_design/layout/dialog_layout.h>
 
 namespace Glom
 {
diff --git a/glom/mode_data/dialog_layout_list.cc b/glom/mode_design/layout/dialog_layout_list.cc
similarity index 88%
rename from glom/mode_data/dialog_layout_list.cc
rename to glom/mode_design/layout/dialog_layout_list.cc
index cb79353..6e8b91d 100644
--- a/glom/mode_data/dialog_layout_list.cc
+++ b/glom/mode_design/layout/dialog_layout_list.cc
@@ -18,10 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "dialog_layout_list.h"
-#include "dialog_choose_field.h"
-#include "../layout_item_dialogs/dialog_field_layout.h"
-#include "../frame_glom.h"
+#include <glom/mode_design/layout/dialog_layout_list.h>
+#include <glom/mode_design/layout/dialog_choose_field.h>
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h>
+#include <glom/frame_glom.h>
 #include <libglom/utils.h> //For bold_message()).
 
 //#include <libgnome/gnome-i18n.h>
diff --git a/glom/mode_data/dialog_layout_list.h b/glom/mode_design/layout/dialog_layout_list.h
similarity index 95%
rename from glom/mode_data/dialog_layout_list.h
rename to glom/mode_design/layout/dialog_layout_list.h
index 2f06ca7..fe13dd3 100644
--- a/glom/mode_data/dialog_layout_list.h
+++ b/glom/mode_design/layout/dialog_layout_list.h
@@ -21,7 +21,7 @@
 #ifndef GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_H
 #define GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_H
 
-#include "dialog_layout_details.h"
+#include <glom/mode_design/layout/dialog_layout_details.h>
 
 namespace Glom
 {
diff --git a/glom/mode_data/dialog_layout_list_related.cc b/glom/mode_design/layout/dialog_layout_list_related.cc
similarity index 98%
rename from glom/mode_data/dialog_layout_list_related.cc
rename to glom/mode_design/layout/dialog_layout_list_related.cc
index cd04d4e..66e3fe5 100644
--- a/glom/mode_data/dialog_layout_list_related.cc
+++ b/glom/mode_design/layout/dialog_layout_list_related.cc
@@ -18,9 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "dialog_layout_list_related.h"
-#include "dialog_choose_field.h"
-#include "../layout_item_dialogs/dialog_field_layout.h"
+#include <glom/mode_design/layout/dialog_layout_list_related.h>
+#include <glom/mode_design/layout/dialog_choose_field.h>
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h>
 #include <libglom/utils.h> //For bold_message()).
 
 //#include <libgnome/gnome-i18n.h>
diff --git a/glom/mode_data/dialog_layout_list_related.h b/glom/mode_design/layout/dialog_layout_list_related.h
similarity index 93%
rename from glom/mode_data/dialog_layout_list_related.h
rename to glom/mode_design/layout/dialog_layout_list_related.h
index 03c3c5c..50ba563 100644
--- a/glom/mode_data/dialog_layout_list_related.h
+++ b/glom/mode_design/layout/dialog_layout_list_related.h
@@ -21,9 +21,9 @@
 #ifndef GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_RELATED_H
 #define GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_RELATED_H
 
-#include "dialog_layout_list.h"
-#include "../utility_widgets/combo_textglade.h"
-#include "../combobox_relationship.h"
+#include <glom/mode_design/layout/dialog_layout_list.h>
+#include <glom/utility_widgets/combo_textglade.h>
+#include <glom/mode_design/layout/combobox_relationship.h>
 
 namespace Glom
 {
diff --git a/glom/layout_item_dialogs/box_formatting.cc b/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
similarity index 100%
rename from glom/layout_item_dialogs/box_formatting.cc
rename to glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
diff --git a/glom/layout_item_dialogs/box_formatting.h b/glom/mode_design/layout/layout_item_dialogs/box_formatting.h
similarity index 92%
rename from glom/layout_item_dialogs/box_formatting.h
rename to glom/mode_design/layout/layout_item_dialogs/box_formatting.h
index 2ac5d65..9901f9f 100644
--- a/glom/layout_item_dialogs/box_formatting.h
+++ b/glom/mode_design/layout/layout_item_dialogs/box_formatting.h
@@ -22,12 +22,12 @@
 #define GLOM_BOX_FORMATTING_H
 
 #include <gtkmm.h>
-#include "../utility_widgets/dialog_properties.h"
+#include <glom/utility_widgets/dialog_properties.h>
 #include <libglom/document/document.h>
-#include "../box_withbuttons.h"
-#include "../utility_widgets/comboentry_currency.h"
-#include "../combobox_relationship.h"
-#include "../combobox_fields.h"
+#include <glom/box_withbuttons.h>
+#include <glom/utility_widgets/comboentry_currency.h>
+#include <glom/mode_design/layout/combobox_relationship.h>
+#include <glom/mode_design/layout/combobox_fields.h>
 
 namespace Glom
 {
diff --git a/glom/layout_item_dialogs/combo_summarytype.cc b/glom/mode_design/layout/layout_item_dialogs/combo_summarytype.cc
similarity index 100%
rename from glom/layout_item_dialogs/combo_summarytype.cc
rename to glom/mode_design/layout/layout_item_dialogs/combo_summarytype.cc
diff --git a/glom/layout_item_dialogs/combo_summarytype.h b/glom/mode_design/layout/layout_item_dialogs/combo_summarytype.h
similarity index 100%
rename from glom/layout_item_dialogs/combo_summarytype.h
rename to glom/mode_design/layout/layout_item_dialogs/combo_summarytype.h
diff --git a/glom/layout_item_dialogs/comboentry_borderwidth.cc b/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc
similarity index 100%
rename from glom/layout_item_dialogs/comboentry_borderwidth.cc
rename to glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc
diff --git a/glom/layout_item_dialogs/comboentry_borderwidth.h b/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.h
similarity index 100%
rename from glom/layout_item_dialogs/comboentry_borderwidth.h
rename to glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.h
diff --git a/glom/layout_item_dialogs/dialog_buttonscript.cc b/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc
similarity index 99%
rename from glom/layout_item_dialogs/dialog_buttonscript.cc
rename to glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc
index 63e0c26..8ecbac7 100644
--- a/glom/layout_item_dialogs/dialog_buttonscript.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc
@@ -20,7 +20,7 @@
 
 
 #include "dialog_buttonscript.h"
-#include "../python_embed/glom_python.h"
+#include <glom/python_embed/glom_python.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <gtksourceviewmm/sourcelanguagemanager.h>
 
diff --git a/glom/layout_item_dialogs/dialog_buttonscript.h b/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h
similarity index 98%
rename from glom/layout_item_dialogs/dialog_buttonscript.h
rename to glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h
index 415623d..722f9e8 100644
--- a/glom/layout_item_dialogs/dialog_buttonscript.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h
@@ -26,7 +26,7 @@
 #include <gtkmm.h>
 #include <gtkmm/builder.h>
 #include <libglom/data_structure/layout/layoutitem_button.h>
-#include "../base_db.h"
+#include <glom/base_db.h>
 
 #include <gtksourceviewmm/sourceview.h>
 
diff --git a/glom/layout_item_dialogs/dialog_field_layout.cc b/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.cc
similarity index 100%
rename from glom/layout_item_dialogs/dialog_field_layout.cc
rename to glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.cc
diff --git a/glom/layout_item_dialogs/dialog_field_layout.h b/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
similarity index 92%
rename from glom/layout_item_dialogs/dialog_field_layout.h
rename to glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
index 128b53c..a51415f 100644
--- a/glom/layout_item_dialogs/dialog_field_layout.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
@@ -22,11 +22,11 @@
 #define GLOM_MODE_DATA_DIALOG_FIELD_LAYOUT_H
 
 #include <gtkmm.h>
-#include "../utility_widgets/dialog_properties.h"
+#include <glom/utility_widgets/dialog_properties.h>
 #include <libglom/document/view.h>
-#include "../box_withbuttons.h"
-#include "../utility_widgets/combo_textglade.h"
-#include "../utility_widgets/comboentry_currency.h"
+#include <glom/box_withbuttons.h>
+#include <glom/utility_widgets/combo_textglade.h>
+#include <glom/utility_widgets/comboentry_currency.h>
 #include "box_formatting.h"
 
 namespace Glom
diff --git a/glom/layout_item_dialogs/dialog_field_summary.cc b/glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.cc
similarity index 100%
rename from glom/layout_item_dialogs/dialog_field_summary.cc
rename to glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.cc
diff --git a/glom/layout_item_dialogs/dialog_field_summary.h b/glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.h
similarity index 93%
rename from glom/layout_item_dialogs/dialog_field_summary.h
rename to glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.h
index c13a97b..cba1d26 100644
--- a/glom/layout_item_dialogs/dialog_field_summary.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.h
@@ -22,11 +22,11 @@
 #define GLOM_LAYOUT_ITEM_DIALOGS_FIELD_SUMMARY_H
 
 #include <gtkmm.h>
-#include "../utility_widgets/dialog_properties.h"
+#include <glom/utility_widgets/dialog_properties.h>
 #include <libglom/document/document.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
-#include "../box_withbuttons.h"
-#include "../utility_widgets/combo_textglade.h"
+#include <glom/box_withbuttons.h>
+#include <glom/utility_widgets/combo_textglade.h>
 #include "combo_summarytype.h"
 
 namespace Glom
diff --git a/glom/layout_item_dialogs/dialog_group_by.cc b/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc
similarity index 99%
rename from glom/layout_item_dialogs/dialog_group_by.cc
rename to glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc
index dbefaf2..770d0be 100644
--- a/glom/layout_item_dialogs/dialog_group_by.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <glom/layout_item_dialogs/dialog_group_by.h>
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/utils_ui.h>
 #include <glom/glade_utils.h>
diff --git a/glom/layout_item_dialogs/dialog_group_by.h b/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h
similarity index 92%
rename from glom/layout_item_dialogs/dialog_group_by.h
rename to glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h
index 23f1d84..12ca60a 100644
--- a/glom/layout_item_dialogs/dialog_group_by.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h
@@ -22,11 +22,11 @@
 #define GLOM_LAYOUT_ITEM_DIALOGS_GROUP_BY_H
 
 #include <gtkmm.h>
-#include "../utility_widgets/dialog_properties.h"
+#include <glom/utility_widgets/dialog_properties.h>
 #include <libglom/document/document.h>
-#include "../box_withbuttons.h"
-#include "../utility_widgets/combo_textglade.h"
-#include "../utility_widgets/comboentry_currency.h"
+#include <glom/box_withbuttons.h>
+#include <glom/utility_widgets/combo_textglade.h>
+#include <glom/utility_widgets/comboentry_currency.h>
 #include "dialog_groupby_secondaryfields.h"
 #include "dialog_groupby_sortfields.h"
 #include "comboentry_borderwidth.h"
diff --git a/glom/layout_item_dialogs/dialog_groupby_secondaryfields.cc b/glom/mode_design/layout/layout_item_dialogs/dialog_groupby_secondaryfields.cc
similarity index 100%
rename from glom/layout_item_dialogs/dialog_groupby_secondaryfields.cc
rename to glom/mode_design/layout/layout_item_dialogs/dialog_groupby_secondaryfields.cc
diff --git a/glom/layout_item_dialogs/dialog_groupby_secondaryfields.h b/glom/mode_design/layout/layout_item_dialogs/dialog_groupby_secondaryfields.h
similarity index 97%
rename from glom/layout_item_dialogs/dialog_groupby_secondaryfields.h
rename to glom/mode_design/layout/layout_item_dialogs/dialog_groupby_secondaryfields.h
index c162d64..aa69835 100644
--- a/glom/layout_item_dialogs/dialog_groupby_secondaryfields.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_groupby_secondaryfields.h
@@ -21,8 +21,8 @@
 #ifndef GLOM_MODE_DATA_DIALOG_GROUPBY_SECONDARYFIELDS_HH
 #define GLOM_MODE_DATA_DIALOG_GROUPBY_SECONDARYFIELDS_HH
 
-#include "../base_db.h"
-#include "../mode_data/dialog_layout.h"
+#include <glom/base_db.h>
+#include <glom/mode_design/layout/dialog_layout.h>
 #include <gtkmm/builder.h>
 
 namespace Glom
diff --git a/glom/layout_item_dialogs/dialog_groupby_sortfields.cc b/glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.cc
similarity index 100%
rename from glom/layout_item_dialogs/dialog_groupby_sortfields.cc
rename to glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.cc
diff --git a/glom/layout_item_dialogs/dialog_groupby_sortfields.h b/glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.h
similarity index 97%
rename from glom/layout_item_dialogs/dialog_groupby_sortfields.h
rename to glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.h
index 1691c07..85d96aa 100644
--- a/glom/layout_item_dialogs/dialog_groupby_sortfields.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.h
@@ -21,8 +21,8 @@
 #ifndef GLOM_MODE_DATA_DIALOG_GROUPBY_SORTFIELDS_HH
 #define GLOM_MODE_DATA_DIALOG_GROUPBY_SORTFIELDS_HH
 
-#include "../base_db.h"
-#include "../mode_data/dialog_layout.h"
+#include <glom/base_db.h>
+#include <glom/mode_design/layout/dialog_layout.h>
 #include <gtkmm/builder.h>
 
 namespace Glom
diff --git a/glom/layout_item_dialogs/dialog_imageobject.cc b/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.cc
similarity index 98%
rename from glom/layout_item_dialogs/dialog_imageobject.cc
rename to glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.cc
index 4b93f21..4d07d5f 100644
--- a/glom/layout_item_dialogs/dialog_imageobject.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.cc
@@ -20,7 +20,7 @@
 
 
 #include "dialog_imageobject.h"
-#include "../python_embed/glom_python.h"
+#include <glom/python_embed/glom_python.h>
 #include <libglom/data_structure/glomconversions.h>
 
 //#include <libgnome/gnome-i18n.h>
diff --git a/glom/layout_item_dialogs/dialog_imageobject.h b/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.h
similarity index 96%
rename from glom/layout_item_dialogs/dialog_imageobject.h
rename to glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.h
index 5a2be5c..f8f4952 100644
--- a/glom/layout_item_dialogs/dialog_imageobject.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.h
@@ -24,8 +24,8 @@
 #include <gtkmm.h>
 #include <gtkmm/builder.h>
 #include <libglom/data_structure/layout/layoutitem_image.h>
-#include "../base_db.h"
-#include "../utility_widgets/imageglom.h"
+#include <glom/base_db.h>
+#include <glom/utility_widgets/imageglom.h>
 
 namespace Glom
 {
diff --git a/glom/layout_item_dialogs/dialog_notebook.cc b/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.cc
similarity index 99%
rename from glom/layout_item_dialogs/dialog_notebook.cc
rename to glom/mode_design/layout/layout_item_dialogs/dialog_notebook.cc
index 9fe43db..7ba3aa8 100644
--- a/glom/layout_item_dialogs/dialog_notebook.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.cc
@@ -19,7 +19,7 @@
  */
 
 #include "dialog_notebook.h"
-#include "../mode_data/dialog_layout.h"
+#include <glom/mode_design/layout/dialog_layout.h>
 
 //#include <libgnome/gnome-i18n.h>
 #include <glibmm/i18n.h>
diff --git a/glom/layout_item_dialogs/dialog_notebook.h b/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h
similarity index 96%
rename from glom/layout_item_dialogs/dialog_notebook.h
rename to glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h
index 8a0c738..2b738b1 100644
--- a/glom/layout_item_dialogs/dialog_notebook.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h
@@ -21,8 +21,8 @@
 #ifndef GLOM_MODE_DATA_DIALOG_NOTEBOOK_HH
 #define GLOM_MODE_DATA_DIALOG_NOTEBOOK_HH
 
-#include "../base_db.h"
-#include "../mode_data/dialog_layout.h"
+#include <glom/base_db.h>
+#include <glom/mode_design/layout/dialog_layout.h>
 #include <libglom/data_structure/layout/layoutitem_notebook.h>
 #include <gtkmm/builder.h>
 
diff --git a/glom/layout_item_dialogs/dialog_textobject.cc b/glom/mode_design/layout/layout_item_dialogs/dialog_textobject.cc
similarity index 98%
rename from glom/layout_item_dialogs/dialog_textobject.cc
rename to glom/mode_design/layout/layout_item_dialogs/dialog_textobject.cc
index 40385d7..fdc186f 100644
--- a/glom/layout_item_dialogs/dialog_textobject.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_textobject.cc
@@ -20,7 +20,7 @@
 
 
 #include "dialog_textobject.h"
-#include "../python_embed/glom_python.h"
+#include <glom/python_embed/glom_python.h>
 #include <libglom/data_structure/glomconversions.h>
 
 //#include <libgnome/gnome-i18n.h>
diff --git a/glom/layout_item_dialogs/dialog_textobject.h b/glom/mode_design/layout/layout_item_dialogs/dialog_textobject.h
similarity index 98%
rename from glom/layout_item_dialogs/dialog_textobject.h
rename to glom/mode_design/layout/layout_item_dialogs/dialog_textobject.h
index 0876d4e..6495b28 100644
--- a/glom/layout_item_dialogs/dialog_textobject.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_textobject.h
@@ -24,7 +24,7 @@
 #include <gtkmm.h>
 #include <gtkmm/builder.h>
 #include <libglom/data_structure/layout/layoutitem_text.h>
-#include "../base_db.h"
+#include <glom/base_db.h>
 
 namespace Glom
 {
diff --git a/glom/mode_data/treestore_layout.cc b/glom/mode_design/layout/treestore_layout.cc
similarity index 99%
rename from glom/mode_data/treestore_layout.cc
rename to glom/mode_design/layout/treestore_layout.cc
index f9ecffc..c7a11a4 100644
--- a/glom/mode_data/treestore_layout.cc
+++ b/glom/mode_design/layout/treestore_layout.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "treestore_layout.h"
+#include <glom/mode_design/layout/treestore_layout.h>
 #include <iostream>
 
 namespace Glom
diff --git a/glom/mode_data/treestore_layout.h b/glom/mode_design/layout/treestore_layout.h
similarity index 100%
rename from glom/mode_data/treestore_layout.h
rename to glom/mode_design/layout/treestore_layout.h
diff --git a/glom/mode_design/print_layouts/canvas_print_layout.cc b/glom/mode_design/print_layouts/canvas_print_layout.cc
index 62f0ce5..64b9979 100644
--- a/glom/mode_design/print_layouts/canvas_print_layout.cc
+++ b/glom/mode_design/print_layouts/canvas_print_layout.cc
@@ -23,7 +23,7 @@
 #include <glom/utils_ui.h> //For bold_message()).
 #include <gtkmm/stock.h>
 #include <glom/mode_design/print_layouts/dialog_text_formatting.h>
-#include <glom/mode_data/dialog_layout_list_related.h>
+#include <glom/mode_design/layout/dialog_layout_list_related.h>
 
 //TODO: Remove these when we can just use a CanvasLayoutItem in a GooCanvasTable:
 #include <glom/utility_widgets/canvas/canvas_table_movable.h>
diff --git a/glom/mode_design/print_layouts/dialog_text_formatting.h b/glom/mode_design/print_layouts/dialog_text_formatting.h
index cb6f2c2..85bef10 100644
--- a/glom/mode_design/print_layouts/dialog_text_formatting.h
+++ b/glom/mode_design/print_layouts/dialog_text_formatting.h
@@ -24,7 +24,7 @@
 #include <gtkmm.h>
 #include <gtkmm/builder.h>
 #include <libglom/document/document.h>
-#include <glom/layout_item_dialogs/box_formatting.h>
+#include <glom/mode_design/layout/layout_item_dialogs/box_formatting.h>
 
 namespace Glom
 {
diff --git a/glom/relationships_overview/canvas_group_dbtable.cc b/glom/mode_design/relationships_overview/canvas_group_dbtable.cc
similarity index 100%
rename from glom/relationships_overview/canvas_group_dbtable.cc
rename to glom/mode_design/relationships_overview/canvas_group_dbtable.cc
diff --git a/glom/relationships_overview/canvas_group_dbtable.h b/glom/mode_design/relationships_overview/canvas_group_dbtable.h
similarity index 100%
rename from glom/relationships_overview/canvas_group_dbtable.h
rename to glom/mode_design/relationships_overview/canvas_group_dbtable.h
diff --git a/glom/relationships_overview/dialog_relationships_overview.cc b/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
similarity index 99%
rename from glom/relationships_overview/dialog_relationships_overview.cc
rename to glom/mode_design/relationships_overview/dialog_relationships_overview.cc
index 597e1fd..778d2a8 100644
--- a/glom/relationships_overview/dialog_relationships_overview.cc
+++ b/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
@@ -22,7 +22,7 @@
 #include "dialog_relationships_overview.h"
 #include "glom/utility_widgets/canvas/canvas_line_movable.h"
 #include "glom/utility_widgets/canvas/canvas_text_movable.h"
-#include "../mode_data/dialog_choose_relationship.h"
+#include <glom/mode_design/layout/dialog_choose_relationship.h>
 #include "printoperation_relationshipsoverview.h"
 #include "glom/application.h"
 #include <goocanvas.h>
diff --git a/glom/relationships_overview/dialog_relationships_overview.h b/glom/mode_design/relationships_overview/dialog_relationships_overview.h
similarity index 100%
rename from glom/relationships_overview/dialog_relationships_overview.h
rename to glom/mode_design/relationships_overview/dialog_relationships_overview.h
diff --git a/glom/relationships_overview/printoperation_relationshipsoverview.cc b/glom/mode_design/relationships_overview/printoperation_relationshipsoverview.cc
similarity index 100%
rename from glom/relationships_overview/printoperation_relationshipsoverview.cc
rename to glom/mode_design/relationships_overview/printoperation_relationshipsoverview.cc
diff --git a/glom/relationships_overview/printoperation_relationshipsoverview.h b/glom/mode_design/relationships_overview/printoperation_relationshipsoverview.h
similarity index 100%
rename from glom/relationships_overview/printoperation_relationshipsoverview.h
rename to glom/mode_design/relationships_overview/printoperation_relationshipsoverview.h
diff --git a/glom/reports/dialog_layout_report.cc b/glom/mode_design/report_layout/dialog_layout_report.cc
similarity index 98%
rename from glom/reports/dialog_layout_report.cc
rename to glom/mode_design/report_layout/dialog_layout_report.cc
index 0cdf213..8c13415 100644
--- a/glom/reports/dialog_layout_report.cc
+++ b/glom/mode_design/report_layout/dialog_layout_report.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "dialog_layout_report.h"
+#include <glom/mode_design/report_layout/dialog_layout_report.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_groupby.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_summary.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
@@ -29,11 +29,11 @@
 #include <libglom/data_structure/layout/layoutitem_text.h>
 #include <libglom/data_structure/layout/layoutitem_image.h>
 #include <glom/glade_utils.h>
-#include "../mode_data/dialog_choose_field.h"
-#include "../layout_item_dialogs/dialog_field_layout.h"
-#include "../layout_item_dialogs/dialog_group_by.h"
-#include "../layout_item_dialogs/dialog_field_summary.h"
-#include "../mode_data/dialog_choose_relationship.h"
+#include <glom/mode_design/layout/dialog_choose_field.h>
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h>
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h>
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.h>
+#include <glom/mode_design/layout/dialog_choose_relationship.h>
 //#include <libgnome/gnome-i18n.h>
 #include <libglom/utils.h> //For bold_message()).
 #include <glibmm/i18n.h>
diff --git a/glom/reports/dialog_layout_report.h b/glom/mode_design/report_layout/dialog_layout_report.h
similarity index 98%
rename from glom/reports/dialog_layout_report.h
rename to glom/mode_design/report_layout/dialog_layout_report.h
index 491c25e..71328ba 100644
--- a/glom/reports/dialog_layout_report.h
+++ b/glom/mode_design/report_layout/dialog_layout_report.h
@@ -21,7 +21,7 @@
 #ifndef GLOM_DIALOG_LAYOUT_REPORT
 #define GLOM_DIALOG_LAYOUT_REPORT
 
-#include "../mode_data/dialog_layout.h"
+#include <glom/mode_design/layout/dialog_layout.h>
 #include <libglom/data_structure/report.h>
 #include "treestore_report_layout.h"
 //#include <libglom/data_structure/layout/layoutitem.h>
diff --git a/glom/reports/treestore_report_layout.cc b/glom/mode_design/report_layout/treestore_report_layout.cc
similarity index 100%
rename from glom/reports/treestore_report_layout.cc
rename to glom/mode_design/report_layout/treestore_report_layout.cc
diff --git a/glom/reports/treestore_report_layout.h b/glom/mode_design/report_layout/treestore_report_layout.h
similarity index 100%
rename from glom/reports/treestore_report_layout.h
rename to glom/mode_design/report_layout/treestore_report_layout.h
diff --git a/glom/mode_design/script_library/dialog_script_library.cc b/glom/mode_design/script_library/dialog_script_library.cc
index 2203c0d..5029d11 100644
--- a/glom/mode_design/script_library/dialog_script_library.cc
+++ b/glom/mode_design/script_library/dialog_script_library.cc
@@ -20,7 +20,7 @@
 
 
 #include "dialog_script_library.h"
-#include "../../python_embed/glom_python.h"
+#include <glom/python_embed/glom_python.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/glade_utils.h>
 #include <glom/utils_ui.h>
diff --git a/glom/mode_design/users/dialog_groups_list.h b/glom/mode_design/users/dialog_groups_list.h
index 3b93dda..17e6ce2 100644
--- a/glom/mode_design/users/dialog_groups_list.h
+++ b/glom/mode_design/users/dialog_groups_list.h
@@ -23,7 +23,7 @@
 
 #include <gtkmm.h>
 #include <gtkmm/builder.h>
-#include "../../base_db.h"
+#include <glom/base_db.h>
 
 namespace Glom
 {
diff --git a/glom/mode_design/users/dialog_users_list.h b/glom/mode_design/users/dialog_users_list.h
index 64b75eb..0719ba9 100644
--- a/glom/mode_design/users/dialog_users_list.h
+++ b/glom/mode_design/users/dialog_users_list.h
@@ -23,7 +23,7 @@
 
 #include <gtkmm.h>
 #include <gtkmm/builder.h>
-#include "../../base_db.h"
+#include <glom/base_db.h>
 #include "../../utility_widgets/combo_textglade.h"
 
 namespace Glom
diff --git a/glom/notebook_glom.h b/glom/notebook_glom.h
index c30b45c..a4edab5 100644
--- a/glom/notebook_glom.h
+++ b/glom/notebook_glom.h
@@ -21,7 +21,7 @@
 #ifndef NOTEBOOK_GLOM_H
 #define NOTEBOOK_GLOM_H
 
-#include "box_withbuttons.h"
+#include <glom/box_withbuttons.h>
 #include <libglom/document/document.h>
 
 namespace Glom
diff --git a/glom/reports/report_builder.cc b/glom/report_builder.cc
similarity index 100%
rename from glom/reports/report_builder.cc
rename to glom/report_builder.cc
diff --git a/glom/reports/report_builder.h b/glom/report_builder.h
similarity index 100%
rename from glom/reports/report_builder.h
rename to glom/report_builder.h
diff --git a/glom/utility_widgets/buttonglom.cc b/glom/utility_widgets/buttonglom.cc
index e3085d4..647afcb 100644
--- a/glom/utility_widgets/buttonglom.cc
+++ b/glom/utility_widgets/buttonglom.cc
@@ -22,10 +22,9 @@
 #include <gtkmm/messagedialog.h>
 #include <glom/application.h>
 #include <glom/glade_utils.h>
-#include <glom/utility_widgets/dialog_layoutitem_properties.h>
 #include <glom/utils_ui.h>
 #ifndef GLOM_ENABLE_CLIENT_ONLY
-#include <glom/layout_item_dialogs/dialog_buttonscript.h>
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h>
 #endif
 #include <glibmm/i18n.h>
 //#include <sstream> //For stringstream
diff --git a/glom/utility_widgets/datawidget.cc b/glom/utility_widgets/datawidget.cc
index 4af416f..e27ff57 100644
--- a/glom/utility_widgets/datawidget.cc
+++ b/glom/utility_widgets/datawidget.cc
@@ -29,10 +29,10 @@
 #include "imageglom.h"
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/application.h>
-#include "../mode_data/dialog_choose_field.h"
+#include <glom/mode_design/layout/dialog_choose_field.h>
 #include "dialog_choose_id.h"
 #include "dialog_choose_date.h"
-#include "../layout_item_dialogs/dialog_field_layout.h"
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h>
 #include <glom/utils_ui.h>
 #include <glom/glade_utils.h>
 #include <glibmm/i18n.h>
diff --git a/glom/utility_widgets/datawidget.h b/glom/utility_widgets/datawidget.h
index 2d8fecc..11acaad 100644
--- a/glom/utility_widgets/datawidget.h
+++ b/glom/utility_widgets/datawidget.h
@@ -29,7 +29,7 @@
 #include <libglom/data_structure/field.h>
 #include <libglom/document/view.h>
 #include <libglom/data_structure/layout/layoutitem_field.h>
-#include "../mode_data/treestore_layout.h" //Forthe enum.
+#include <glom/mode_design/layout/treestore_layout.h> //Forthe enum.
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/db_adddel/glom_db_treemodel.h b/glom/utility_widgets/db_adddel/glom_db_treemodel.h
index 286282c..f98e7d4 100644
--- a/glom/utility_widgets/db_adddel/glom_db_treemodel.h
+++ b/glom/utility_widgets/db_adddel/glom_db_treemodel.h
@@ -25,7 +25,7 @@
 #include <gtkmm/treepath.h>
 #include <libglom/data_structure/layout/layoutitem_field.h>
 #include <libglom/connectionpool.h>
-#include "../../base_db.h"
+#include <glom/base_db.h>
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/dialog_choose_date.h b/glom/utility_widgets/dialog_choose_date.h
index bfef73d..bbb5d69 100644
--- a/glom/utility_widgets/dialog_choose_date.h
+++ b/glom/utility_widgets/dialog_choose_date.h
@@ -23,7 +23,7 @@
 
 #include <gtkmm/dialog.h>
 #include <libglom/document/document.h>
-#include "../base_db.h"
+#include <glom/base_db.h>
 #include "../mode_find/box_data_details_find.h"
 #include "../mode_data/box_data_list.h"
 
diff --git a/glom/utility_widgets/dialog_choose_id.h b/glom/utility_widgets/dialog_choose_id.h
index 783fb62..0835496 100644
--- a/glom/utility_widgets/dialog_choose_id.h
+++ b/glom/utility_widgets/dialog_choose_id.h
@@ -23,7 +23,7 @@
 
 #include <gtkmm/dialog.h>
 #include <libglom/document/document.h>
-#include "../base_db.h"
+#include <glom/base_db.h>
 #include "../mode_find/box_data_details_find.h"
 #include "../mode_data/box_data_list.h"
 
diff --git a/glom/utility_widgets/dialog_flowtable.h b/glom/utility_widgets/dialog_flowtable.h
index cb57732..c993d53 100644
--- a/glom/utility_widgets/dialog_flowtable.h
+++ b/glom/utility_widgets/dialog_flowtable.h
@@ -24,7 +24,7 @@
 #include <gtkmm.h>
 #include <gtkmm/builder.h>
 #include "../mode_data/flowtablewithfields.h"
-#include "../base_db.h"
+#include <glom/base_db.h>
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/labelglom.cc b/glom/utility_widgets/labelglom.cc
index d958ba9..8c072ed 100644
--- a/glom/utility_widgets/labelglom.cc
+++ b/glom/utility_widgets/labelglom.cc
@@ -22,7 +22,7 @@
 #include <gtkmm/messagedialog.h>
 #include <glom/application.h>
 #include <glibmm/i18n.h>
-#include "../layout_item_dialogs/dialog_textobject.h"
+#include <glom/mode_design/layout/layout_item_dialogs/dialog_textobject.h>
 #include <glom/glade_utils.h>
 #include "../mode_data/flowtablewithfields.h"
 //#include <sstream> //For stringstream
diff --git a/glom/utility_widgets/layoutwidgetbase.h b/glom/utility_widgets/layoutwidgetbase.h
index 651ce7f..8ade99a 100644
--- a/glom/utility_widgets/layoutwidgetbase.h
+++ b/glom/utility_widgets/layoutwidgetbase.h
@@ -23,7 +23,7 @@
 
 #include <libglom/data_structure/layout/layoutitem.h>
 #include <gtkmm.h>
-#include "../mode_data/treestore_layout.h" //Forthe enum.
+#include <glom/mode_design/layout/treestore_layout.h> //Forthe enum.
 
 #include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
diff --git a/glom/xsl_utils.cc b/glom/xsl_utils.cc
index dca6fec..ae231e9 100644
--- a/glom/xsl_utils.cc
+++ b/glom/xsl_utils.cc
@@ -24,7 +24,7 @@
 #include <libglom/connectionpool.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
 #include <libglom/data_structure/glomconversions.h>
-#include "frame_glom.h"
+#include <glom/frame_glom.h>
 #include <libxml++/libxml++.h>
 #include <libxslt/transform.h>
 //#include <libexslt/exslt.h> //For exsltRegisterAll().
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]