[glom] Cleaned glom/utility_widgets/ a little.

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [glom] Cleaned glom/utility_widgets/ a little.
Date: Thu, 8 Apr 2010 17:22:37 +0000 (UTC)
commit a2bc68654373f3a10c21d91d57a3a2444a4c6ba3
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 8 12:14:15 2010 +0200

    Cleaned glom/utility_widgets/ a little.
    
      * glom/utility_widgets/datawidget.[h|cc]: Moved to glom/mode_data/datawidget/
      because it is only used by the data-mode flowtable.
    	* glom/utility_widgets/buttonglom.[h|cc]
    	* glom/utility_widgets/checkglom.[h|cc]
    	* glom/utility_widgets/combo_as_radio_buttons.[h|cc]
    	* glom/utility_widgets/combochoices.[h|cc]
    	* glom/utility_widgets/combochoiceswithtreemodel.[h|cc]
    	* glom/utility_widgets/comboentryglom.c[h|cc]
    	* glom/utility_widgets/comboglom.[h|cc]
    	* glom/utility_widgets/dialog_choose_date.[h|cc]
    	* glom/utility_widgets/dialog_choose_id.[h|cc]
    	* glom/utility_widgets/entryglom.[h|cc]
    	* glom/utility_widgets/labelglom.[h|cc]
    	* glom/utility_widgets/textviewglom.[h|cc]
    	* glom/utility_widgets/placeholder-glom.[h|cc]: Also move these to
      glom/mode_data/datawidget because they are only used by DataWidget.
    	* glom/utility_widgets/alignment_justified.[h|cc]:
    	* glom/utility_widgets/table_columns.[h|cc]: Deleted these unused classes.
      * Makefile_glom.am: Adapted.

 ChangeLog                                          |   24 ++++++
 Makefile_glom.am                                   |   60 +++++++--------
 glom/{utility_widgets => mode_data}/buttonglom.cc  |    2 +-
 glom/{utility_widgets => mode_data}/buttonglom.h   |    2 +-
 .../datawidget}/checkglom.cc                       |    2 +-
 .../datawidget}/checkglom.h                        |    2 +-
 .../datawidget}/combo_as_radio_buttons.cc          |    2 +-
 .../datawidget}/combo_as_radio_buttons.h           |    2 +-
 .../datawidget}/combochoices.cc                    |    0
 .../datawidget}/combochoices.h                     |    2 +-
 .../datawidget}/combochoiceswithtreemodel.cc       |    0
 .../datawidget}/combochoiceswithtreemodel.h        |    2 +-
 .../datawidget}/comboentryglom.cc                  |    2 +-
 .../datawidget}/comboentryglom.h                   |    2 +-
 .../datawidget}/comboglom.cc                       |    2 +-
 .../datawidget}/comboglom.h                        |    2 +-
 .../datawidget}/datawidget.cc                      |   14 ++--
 .../datawidget}/datawidget.h                       |    4 +-
 .../datawidget}/dialog_choose_date.cc              |    0
 .../datawidget}/dialog_choose_date.h               |    4 +-
 .../datawidget}/dialog_choose_id.cc                |    0
 .../datawidget}/dialog_choose_id.h                 |    4 +-
 .../datawidget}/entryglom.cc                       |    2 +-
 .../datawidget}/entryglom.h                        |    2 +-
 .../datawidget}/labelglom.cc                       |    2 +-
 .../datawidget}/labelglom.h                        |    4 +-
 .../datawidget}/textviewglom.cc                    |    2 +-
 .../datawidget}/textviewglom.h                     |    2 +-
 glom/mode_data/flowtablewithfields.cc              |    8 +-
 .../placeholder-glom.cc                            |    2 +-
 .../placeholder-glom.h                             |    2 +-
 glom/mode_design/fields/dialog_fielddefinition.h   |    3 +-
 glom/utility_widgets/alignment_justified.cc        |   61 --------------
 glom/utility_widgets/alignment_justified.h         |   42 ----------
 glom/utility_widgets/flowtable_dnd.cc              |    8 +-
 glom/utility_widgets/layoutwidgetbase.cc           |    4 +-
 glom/utility_widgets/table_columns.cc              |   83 --------------------
 glom/utility_widgets/table_columns.h               |   53 -------------
 38 files changed, 97 insertions(+), 317 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e075637..c5c8134 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2010-04-08  Murray Cumming  <murrayc murrayc com>
+
+  Cleaned glom/utility_widgets/ a little.
+  
+  * glom/utility_widgets/datawidget.[h|cc]: Moved to glom/mode_data/datawidget/
+  because it is only used by the data-mode flowtable.
+	* glom/utility_widgets/buttonglom.[h|cc]
+	* glom/utility_widgets/checkglom.[h|cc] 
+	* glom/utility_widgets/combo_as_radio_buttons.[h|cc] 
+	* glom/utility_widgets/combochoices.[h|cc] 
+	* glom/utility_widgets/combochoiceswithtreemodel.[h|cc] 
+	* glom/utility_widgets/comboentryglom.c[h|cc] 
+	* glom/utility_widgets/comboglom.[h|cc] 
+	* glom/utility_widgets/dialog_choose_date.[h|cc] 
+	* glom/utility_widgets/dialog_choose_id.[h|cc] 
+	* glom/utility_widgets/entryglom.[h|cc] 
+	* glom/utility_widgets/labelglom.[h|cc] 
+	* glom/utility_widgets/textviewglom.[h|cc] 
+	* glom/utility_widgets/placeholder-glom.[h|cc]: Also move these to 
+  glom/mode_data/datawidget because they are only used by DataWidget. 
+	* glom/utility_widgets/alignment_justified.[h|cc]:
+	* glom/utility_widgets/table_columns.[h|cc]: Deleted these unused classes.
+  * Makefile_glom.am: Adapted.
+
 2010-04-08  Daniel Borgmann  <danielb openismus com>
 
 	Text and Image object Dialog adjustments.
diff --git a/Makefile_glom.am b/Makefile_glom.am
index a00eef6..e0bd170 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -96,10 +96,38 @@ 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/buttonglom.cc				\
+	glom/mode_data/buttonglom.h				\
 	glom/mode_data/flowtablewithfields.cc				\
 	glom/mode_data/flowtablewithfields.h				\
 	glom/mode_data/notebook_data.cc					\
 	glom/mode_data/notebook_data.h					\
+	glom/mode_data/placeholder-glom.cc			\
+	glom/mode_data/placeholder-glom.h				\
+	glom/mode_data/datawidget/datawidget.cc				\
+	glom/mode_data/datawidget/datawidget.h				\
+	glom/mode_data/datawidget/checkglom.cc				\
+	glom/mode_data/datawidget/checkglom.h				\
+	glom/mode_data/datawidget/entryglom.cc				\
+	glom/mode_data/datawidget/entryglom.h				\
+	glom/mode_data/datawidget/labelglom.cc				\
+	glom/mode_data/datawidget/labelglom.h				\
+	glom/mode_data/datawidget/textviewglom.cc				\
+	glom/mode_data/datawidget/textviewglom.h				\
+	glom/mode_data/datawidget/dialog_choose_date.cc			\
+	glom/mode_data/datawidget/dialog_choose_date.h			\
+	glom/mode_data/datawidget/dialog_choose_id.cc			\
+	glom/mode_data/datawidget/dialog_choose_id.h				\
+	glom/mode_data/datawidget/comboentryglom.cc				\
+	glom/mode_data/datawidget/comboentryglom.h				\
+	glom/mode_data/datawidget/comboglom.cc				\
+	glom/mode_data/datawidget/comboglom.h				\
+	glom/mode_data/datawidget/combochoices.cc			\
+	glom/mode_data/datawidget/combochoices.h			\
+	glom/mode_data/datawidget/combochoiceswithtreemodel.cc			\
+	glom/mode_data/datawidget/combochoiceswithtreemodel.h			\
+	glom/mode_data/datawidget/combo_as_radio_buttons.cc			\
+	glom/mode_data/datawidget/combo_as_radio_buttons.h			\
 	glom/mode_find/box_data_details_find.cc				\
 	glom/mode_find/box_data_details_find.h				\
 	glom/mode_find/box_data_list_find.cc				\
@@ -114,44 +142,18 @@ glom_glom_SOURCES =							\
 	glom/python_embed/glom_python.h					\
 	glom/python_embed/python_ui_callbacks.cc				\
 	glom/python_embed/python_ui_callbacks.h					\
-	glom/utility_widgets/alignment_justified.cc			\
-	glom/utility_widgets/alignment_justified.h			\
-	glom/utility_widgets/buttonglom.cc				\
-	glom/utility_widgets/buttonglom.h				\
-	glom/utility_widgets/checkglom.cc				\
-	glom/utility_widgets/checkglom.h				\
 	glom/utility_widgets/combo_textglade.cc				\
 	glom/utility_widgets/combo_textglade.h				\
-	glom/utility_widgets/comboentryglom.cc				\
-	glom/utility_widgets/comboentryglom.h				\
-	glom/utility_widgets/comboglom.cc				\
-	glom/utility_widgets/comboglom.h				\
-	glom/utility_widgets/combochoices.cc			\
-	glom/utility_widgets/combochoices.h			\
-	glom/utility_widgets/combochoiceswithtreemodel.cc			\
-	glom/utility_widgets/combochoiceswithtreemodel.h			\
-	glom/utility_widgets/combo_as_radio_buttons.cc			\
-	glom/utility_widgets/combo_as_radio_buttons.h			\
-	glom/utility_widgets/datawidget.cc				\
-	glom/utility_widgets/datawidget.h				\
-	glom/utility_widgets/dialog_choose_date.cc			\
-	glom/utility_widgets/dialog_choose_date.h			\
-	glom/utility_widgets/dialog_choose_id.cc			\
-	glom/utility_widgets/dialog_choose_id.h				\
 	glom/utility_widgets/dialog_flowtable.cc			\
 	glom/utility_widgets/dialog_flowtable.h				\
 	glom/utility_widgets/dialog_image_progress.cc			\
 	glom/utility_widgets/dialog_image_progress.h			\
 	glom/utility_widgets/dialog_properties.cc			\
 	glom/utility_widgets/dialog_properties.h			\
-	glom/utility_widgets/entryglom.cc				\
-	glom/utility_widgets/entryglom.h				\
 	glom/utility_widgets/flowtable.cc				\
 	glom/utility_widgets/flowtable.h				\
 	glom/utility_widgets/imageglom.cc				\
 	glom/utility_widgets/imageglom.h				\
-	glom/utility_widgets/labelglom.cc				\
-	glom/utility_widgets/labelglom.h				\
 	glom/utility_widgets/layoutwidgetbase.cc			\
 	glom/utility_widgets/layoutwidgetbase.h				\
 	glom/utility_widgets/layoutwidgetfield.cc			\
@@ -162,14 +164,8 @@ glom_glom_SOURCES =							\
 	glom/utility_widgets/layoutwidgetutils.h			\
 	glom/utility_widgets/notebookglom.cc				\
 	glom/utility_widgets/notebookglom.h				\
-	glom/utility_widgets/placeholder-glom.cc			\
-	glom/utility_widgets/placeholder-glom.h				\
 	glom/utility_widgets/placeholder.cc				\
 	glom/utility_widgets/placeholder.h				\
-	glom/utility_widgets/table_columns.cc				\
-	glom/utility_widgets/table_columns.h				\
-	glom/utility_widgets/textviewglom.cc				\
-	glom/utility_widgets/textviewglom.h				\
 	glom/utility_widgets/adddel/adddel.cc				\
 	glom/utility_widgets/adddel/adddel.h				\
 	glom/utility_widgets/adddel/adddel_withbuttons.cc		\
diff --git a/glom/utility_widgets/buttonglom.cc b/glom/mode_data/buttonglom.cc
similarity index 98%
rename from glom/utility_widgets/buttonglom.cc
rename to glom/mode_data/buttonglom.cc
index b6f08c7..5ef5bd6 100644
--- a/glom/utility_widgets/buttonglom.cc
+++ b/glom/mode_data/buttonglom.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <glom/utility_widgets/buttonglom.h>
+#include "buttonglom.h"
 #include <gtkmm/messagedialog.h>
 #include <glom/application.h>
 #include <glom/glade_utils.h>
diff --git a/glom/utility_widgets/buttonglom.h b/glom/mode_data/buttonglom.h
similarity index 96%
rename from glom/utility_widgets/buttonglom.h
rename to glom/mode_data/buttonglom.h
index 31df593..f37a3c8 100644
--- a/glom/utility_widgets/buttonglom.h
+++ b/glom/mode_data/buttonglom.h
@@ -22,7 +22,7 @@
 #define GLOM_UTILITY_WIDGETS_BUTTON_GLOM_H
 
 #include <gtkmm.h>
-#include "layoutwidgetutils.h"
+#include <glom/utility_widgets/layoutwidgetutils.h>
 #include <libglom/data_structure/layout/layoutitem_button.h>
 #include <gtkmm/builder.h>
 
diff --git a/glom/utility_widgets/checkglom.cc b/glom/mode_data/datawidget/checkglom.cc
similarity index 98%
rename from glom/utility_widgets/checkglom.cc
rename to glom/mode_data/datawidget/checkglom.cc
index 0975b8a..14436b1 100644
--- a/glom/utility_widgets/checkglom.cc
+++ b/glom/mode_data/datawidget/checkglom.cc
@@ -20,7 +20,7 @@
 
 #include "checkglom.h"
 #include <gtkmm/messagedialog.h>
-#include "../dialog_invalid_data.h"
+#include <glom/dialog_invalid_data.h>
 #include <glom/application.h>
 #include <glibmm/i18n.h>
 
diff --git a/glom/utility_widgets/checkglom.h b/glom/mode_data/datawidget/checkglom.h
similarity index 96%
rename from glom/utility_widgets/checkglom.h
rename to glom/mode_data/datawidget/checkglom.h
index 558a764..0ebe9bf 100644
--- a/glom/utility_widgets/checkglom.h
+++ b/glom/mode_data/datawidget/checkglom.h
@@ -25,7 +25,7 @@
 
 #include <gtkmm.h>
 #include <libglom/data_structure/field.h>
-#include "layoutwidgetfield.h"
+#include <glom/utility_widgets/layoutwidgetfield.h>
 #include <gtkmm/builder.h>
 
 namespace Glom
diff --git a/glom/utility_widgets/combo_as_radio_buttons.cc b/glom/mode_data/datawidget/combo_as_radio_buttons.cc
similarity index 99%
rename from glom/utility_widgets/combo_as_radio_buttons.cc
rename to glom/mode_data/datawidget/combo_as_radio_buttons.cc
index 39def7d..c77a6db 100644
--- a/glom/utility_widgets/combo_as_radio_buttons.cc
+++ b/glom/mode_data/datawidget/combo_as_radio_buttons.cc
@@ -21,7 +21,7 @@
 #include "combo_as_radio_buttons.h"
 #include <libglom/data_structure/glomconversions.h>
 #include <gtkmm/messagedialog.h>
-#include "../dialog_invalid_data.h"
+#include <glom/dialog_invalid_data.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/application.h>
 #include <glibmm/i18n.h>
diff --git a/glom/utility_widgets/combo_as_radio_buttons.h b/glom/mode_data/datawidget/combo_as_radio_buttons.h
similarity index 98%
rename from glom/utility_widgets/combo_as_radio_buttons.h
rename to glom/mode_data/datawidget/combo_as_radio_buttons.h
index 6958ee8..cdf3dca 100644
--- a/glom/utility_widgets/combo_as_radio_buttons.h
+++ b/glom/mode_data/datawidget/combo_as_radio_buttons.h
@@ -23,7 +23,7 @@
 
 #include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
-#include <glom/utility_widgets/combochoices.h>
+#include <glom/mode_data/datawidget/combochoices.h>
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/combochoices.cc b/glom/mode_data/datawidget/combochoices.cc
similarity index 100%
rename from glom/utility_widgets/combochoices.cc
rename to glom/mode_data/datawidget/combochoices.cc
diff --git a/glom/utility_widgets/combochoices.h b/glom/mode_data/datawidget/combochoices.h
similarity index 97%
rename from glom/utility_widgets/combochoices.h
rename to glom/mode_data/datawidget/combochoices.h
index 93002b6..06a8f61 100644
--- a/glom/utility_widgets/combochoices.h
+++ b/glom/mode_data/datawidget/combochoices.h
@@ -23,7 +23,7 @@
 
 #include <gtkmm.h>
 #include <libglom/data_structure/field.h>
-#include "layoutwidgetfield.h"
+#include <glom/utility_widgets/layoutwidgetfield.h>
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/combochoiceswithtreemodel.cc b/glom/mode_data/datawidget/combochoiceswithtreemodel.cc
similarity index 100%
rename from glom/utility_widgets/combochoiceswithtreemodel.cc
rename to glom/mode_data/datawidget/combochoiceswithtreemodel.cc
diff --git a/glom/utility_widgets/combochoiceswithtreemodel.h b/glom/mode_data/datawidget/combochoiceswithtreemodel.h
similarity index 97%
rename from glom/utility_widgets/combochoiceswithtreemodel.h
rename to glom/mode_data/datawidget/combochoiceswithtreemodel.h
index ce886bd..776e583 100644
--- a/glom/utility_widgets/combochoiceswithtreemodel.h
+++ b/glom/mode_data/datawidget/combochoiceswithtreemodel.h
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITY_WIDGETS_COMBO_CHOICES_WITH_TREE_MODEL_H
 #define GLOM_UTILITY_WIDGETS_COMBO_CHOICES_WITH_TREE_MODEL_H
 
-#include <glom/utility_widgets/combochoices.h>
+#include <glom/mode_data/datawidget/combochoices.h>
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/comboentryglom.cc b/glom/mode_data/datawidget/comboentryglom.cc
similarity index 99%
rename from glom/utility_widgets/comboentryglom.cc
rename to glom/mode_data/datawidget/comboentryglom.cc
index abee0cb..43e6217 100644
--- a/glom/utility_widgets/comboentryglom.cc
+++ b/glom/mode_data/datawidget/comboentryglom.cc
@@ -21,7 +21,7 @@
 #include "comboentryglom.h"
 #include <libglom/data_structure/glomconversions.h>
 #include <gtkmm/messagedialog.h>
-#include "../dialog_invalid_data.h"
+#include <glom/dialog_invalid_data.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/application.h>
 #include <glibmm/i18n.h>
diff --git a/glom/utility_widgets/comboentryglom.h b/glom/mode_data/datawidget/comboentryglom.h
similarity index 98%
rename from glom/utility_widgets/comboentryglom.h
rename to glom/mode_data/datawidget/comboentryglom.h
index 7b687cc..308644e 100644
--- a/glom/utility_widgets/comboentryglom.h
+++ b/glom/mode_data/datawidget/comboentryglom.h
@@ -23,7 +23,7 @@
 
 #include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
-#include <glom/utility_widgets/combochoiceswithtreemodel.h>
+#include <glom/mode_data/datawidget/combochoiceswithtreemodel.h>
 
 #ifdef GLOM_ENABLE_MAEMO
 #include <hildonmm/picker-button.h>
diff --git a/glom/utility_widgets/comboglom.cc b/glom/mode_data/datawidget/comboglom.cc
similarity index 99%
rename from glom/utility_widgets/comboglom.cc
rename to glom/mode_data/datawidget/comboglom.cc
index 711f29c..6589f71 100644
--- a/glom/utility_widgets/comboglom.cc
+++ b/glom/mode_data/datawidget/comboglom.cc
@@ -21,7 +21,7 @@
 #include "comboglom.h"
 #include <libglom/data_structure/glomconversions.h>
 #include <gtkmm/messagedialog.h>
-#include "../dialog_invalid_data.h"
+#include <glom/dialog_invalid_data.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/application.h>
 #include <glibmm/i18n.h>
diff --git a/glom/utility_widgets/comboglom.h b/glom/mode_data/datawidget/comboglom.h
similarity index 97%
rename from glom/utility_widgets/comboglom.h
rename to glom/mode_data/datawidget/comboglom.h
index 8e81eb2..79331e2 100644
--- a/glom/utility_widgets/comboglom.h
+++ b/glom/mode_data/datawidget/comboglom.h
@@ -23,7 +23,7 @@
 
 #include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
-#include <glom/utility_widgets/combochoiceswithtreemodel.h>
+#include <glom/mode_data/datawidget/combochoiceswithtreemodel.h>
 
 #ifdef GLOM_ENABLE_MAEMO
 #include <hildonmm/picker-button.h>
diff --git a/glom/utility_widgets/datawidget.cc b/glom/mode_data/datawidget/datawidget.cc
similarity index 98%
rename from glom/utility_widgets/datawidget.cc
rename to glom/mode_data/datawidget/datawidget.cc
index b649a16..3db282f 100644
--- a/glom/utility_widgets/datawidget.cc
+++ b/glom/mode_data/datawidget/datawidget.cc
@@ -23,16 +23,16 @@
 #include "entryglom.h"
 #include "checkglom.h"
 #include "labelglom.h"
-#include "comboentryglom.h"
-#include "comboglom.h"
-#include "combo_as_radio_buttons.h"
-#include "textviewglom.h"
-#include "imageglom.h"
+#include <glom/mode_data/datawidget/comboentryglom.h>
+#include <glom/mode_data/datawidget/comboglom.h>
+#include <glom/mode_data/datawidget/combo_as_radio_buttons.h>
+#include <glom/mode_data/datawidget/textviewglom.h>
+#include <glom/utility_widgets/imageglom.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/application.h>
 #include <glom/mode_design/layout/dialog_choose_field.h>
-#include "dialog_choose_id.h"
-#include "dialog_choose_date.h"
+#include <glom/mode_data/datawidget/dialog_choose_id.h>
+#include <glom/mode_data/datawidget/dialog_choose_date.h>
 #include <glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h>
 #include <glom/utils_ui.h>
 #include <glom/glade_utils.h>
diff --git a/glom/utility_widgets/datawidget.h b/glom/mode_data/datawidget/datawidget.h
similarity index 98%
rename from glom/utility_widgets/datawidget.h
rename to glom/mode_data/datawidget/datawidget.h
index cb21962..44f85bf 100644
--- a/glom/utility_widgets/datawidget.h
+++ b/glom/mode_data/datawidget/datawidget.h
@@ -23,8 +23,8 @@
 
 #include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
-#include "placeholder.h"
-#include "layoutwidgetmenu.h"
+#include <glom/utility_widgets/placeholder.h>
+#include <glom/utility_widgets/layoutwidgetmenu.h>
 #include <gtkmm/label.h>
 #include <libglom/data_structure/field.h>
 #include <libglom/document/view.h>
diff --git a/glom/utility_widgets/dialog_choose_date.cc b/glom/mode_data/datawidget/dialog_choose_date.cc
similarity index 100%
rename from glom/utility_widgets/dialog_choose_date.cc
rename to glom/mode_data/datawidget/dialog_choose_date.cc
diff --git a/glom/utility_widgets/dialog_choose_date.h b/glom/mode_data/datawidget/dialog_choose_date.h
similarity index 93%
rename from glom/utility_widgets/dialog_choose_date.h
rename to glom/mode_data/datawidget/dialog_choose_date.h
index bbb5d69..f2e41ae 100644
--- a/glom/utility_widgets/dialog_choose_date.h
+++ b/glom/mode_data/datawidget/dialog_choose_date.h
@@ -24,8 +24,8 @@
 #include <gtkmm/dialog.h>
 #include <libglom/document/document.h>
 #include <glom/base_db.h>
-#include "../mode_find/box_data_details_find.h"
-#include "../mode_data/box_data_list.h"
+//#include <glom/mode_find/box_data_details_find.h>
+#include <glom/mode_data/box_data_list.h>
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/dialog_choose_id.cc b/glom/mode_data/datawidget/dialog_choose_id.cc
similarity index 100%
rename from glom/utility_widgets/dialog_choose_id.cc
rename to glom/mode_data/datawidget/dialog_choose_id.cc
diff --git a/glom/utility_widgets/dialog_choose_id.h b/glom/mode_data/datawidget/dialog_choose_id.h
similarity index 95%
rename from glom/utility_widgets/dialog_choose_id.h
rename to glom/mode_data/datawidget/dialog_choose_id.h
index 0835496..faeb04f 100644
--- a/glom/utility_widgets/dialog_choose_id.h
+++ b/glom/mode_data/datawidget/dialog_choose_id.h
@@ -24,8 +24,8 @@
 #include <gtkmm/dialog.h>
 #include <libglom/document/document.h>
 #include <glom/base_db.h>
-#include "../mode_find/box_data_details_find.h"
-#include "../mode_data/box_data_list.h"
+#include <glom/mode_find/box_data_details_find.h>
+#include <glom/mode_data/box_data_list.h>
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/entryglom.cc b/glom/mode_data/datawidget/entryglom.cc
similarity index 99%
rename from glom/utility_widgets/entryglom.cc
rename to glom/mode_data/datawidget/entryglom.cc
index c95f8bd..99dd267 100644
--- a/glom/utility_widgets/entryglom.cc
+++ b/glom/mode_data/datawidget/entryglom.cc
@@ -21,7 +21,7 @@
 #include "entryglom.h"
 #include <libglom/data_structure/glomconversions.h>
 #include <gtkmm/messagedialog.h>
-#include "../dialog_invalid_data.h"
+#include <glom/dialog_invalid_data.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/application.h>
 #include <glibmm/i18n.h>
diff --git a/glom/utility_widgets/entryglom.h b/glom/mode_data/datawidget/entryglom.h
similarity index 98%
rename from glom/utility_widgets/entryglom.h
rename to glom/mode_data/datawidget/entryglom.h
index 92f8154..570b0ca 100644
--- a/glom/utility_widgets/entryglom.h
+++ b/glom/mode_data/datawidget/entryglom.h
@@ -25,7 +25,7 @@
 
 #include <gtkmm.h>
 #include <libglom/data_structure/field.h>
-#include "layoutwidgetfield.h"
+#include <glom/utility_widgets/layoutwidgetfield.h>
 #include <gtkmm/builder.h>
 
 #ifdef GLOM_ENABLE_MAEMO
diff --git a/glom/utility_widgets/labelglom.cc b/glom/mode_data/datawidget/labelglom.cc
similarity index 98%
rename from glom/utility_widgets/labelglom.cc
rename to glom/mode_data/datawidget/labelglom.cc
index 63a6e51..8912f2c 100644
--- a/glom/utility_widgets/labelglom.cc
+++ b/glom/mode_data/datawidget/labelglom.cc
@@ -24,7 +24,7 @@
 #include <glibmm/i18n.h>
 #include <glom/mode_design/layout/layout_item_dialogs/dialog_textobject.h>
 #include <glom/glade_utils.h>
-#include "../mode_data/flowtablewithfields.h"
+#include <glom/mode_data/flowtablewithfields.h>
 //#include <sstream> //For stringstream
 
 namespace Glom
diff --git a/glom/utility_widgets/labelglom.h b/glom/mode_data/datawidget/labelglom.h
similarity index 94%
rename from glom/utility_widgets/labelglom.h
rename to glom/mode_data/datawidget/labelglom.h
index 5d389d7..80a4f88 100644
--- a/glom/utility_widgets/labelglom.h
+++ b/glom/mode_data/datawidget/labelglom.h
@@ -22,8 +22,8 @@
 #define GLOM_UTILITY_WIDGETS_LABEL_GLOM_H
 
 #include <gtkmm.h>
-#include "layoutwidgetbase.h"
-#include "layoutwidgetutils.h"
+#include <glom/utility_widgets/layoutwidgetbase.h>
+#include <glom/utility_widgets/layoutwidgetutils.h>
 #include <libglom/data_structure/layout/layoutitem_button.h>
 #include <gtkmm/builder.h>
 
diff --git a/glom/utility_widgets/textviewglom.cc b/glom/mode_data/datawidget/textviewglom.cc
similarity index 99%
rename from glom/utility_widgets/textviewglom.cc
rename to glom/mode_data/datawidget/textviewglom.cc
index f832ecd..887d1c0 100644
--- a/glom/utility_widgets/textviewglom.cc
+++ b/glom/mode_data/datawidget/textviewglom.cc
@@ -21,7 +21,7 @@
 #include "textviewglom.h"
 #include <libglom/data_structure/glomconversions.h>
 #include <gtkmm/messagedialog.h>
-#include "../dialog_invalid_data.h"
+#include <glom/dialog_invalid_data.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <glom/application.h>
 #include <glibmm/i18n.h>
diff --git a/glom/utility_widgets/textviewglom.h b/glom/mode_data/datawidget/textviewglom.h
similarity index 98%
rename from glom/utility_widgets/textviewglom.h
rename to glom/mode_data/datawidget/textviewglom.h
index b449b06..6b95bbd 100644
--- a/glom/utility_widgets/textviewglom.h
+++ b/glom/mode_data/datawidget/textviewglom.h
@@ -25,7 +25,7 @@
 
 #include <gtkmm.h>
 #include <libglom/data_structure/field.h>
-#include "layoutwidgetfield.h"
+#include <glom/utility_widgets/layoutwidgetfield.h>
 #include <gtkmm/builder.h>
 
 #ifdef GLOM_ENABLE_MAEMO
diff --git a/glom/mode_data/flowtablewithfields.cc b/glom/mode_data/flowtablewithfields.cc
index 95fbed7..8ee3478 100644
--- a/glom/mode_data/flowtablewithfields.cc
+++ b/glom/mode_data/flowtablewithfields.cc
@@ -19,14 +19,14 @@
  */
 
 #include "flowtablewithfields.h"
-#include <glom/utility_widgets/datawidget.h>
-#include <glom/utility_widgets/buttonglom.h>
+#include <glom/mode_data/datawidget/datawidget.h>
+#include <glom/mode_data/buttonglom.h>
 #include <glom/utility_widgets/notebookglom.h>
 #include <glom/utility_widgets/notebooklabelglom.h>
 #include <glom/utility_widgets/imageglom.h>
-#include <glom/utility_widgets/labelglom.h>
+#include <glom/mode_data/datawidget/labelglom.h>
 #include <glom/utility_widgets/dialog_flowtable.h>
-#include <glom/utility_widgets/placeholder-glom.h>
+#include <glom/mode_data/placeholder-glom.h>
 #include <glom/application.h>
 #include <gtkmm/checkbutton.h>
 #include <libglom/data_structure/glomconversions.h>
diff --git a/glom/utility_widgets/placeholder-glom.cc b/glom/mode_data/placeholder-glom.cc
similarity index 99%
rename from glom/utility_widgets/placeholder-glom.cc
rename to glom/mode_data/placeholder-glom.cc
index aeac536..2b3ae22 100644
--- a/glom/utility_widgets/placeholder-glom.cc
+++ b/glom/mode_data/placeholder-glom.cc
@@ -23,7 +23,7 @@
  */
 
 #include "placeholder-glom.h"
-#include "labelglom.h"
+//#include "labelglom.h"
 #include <gtkmm/messagedialog.h>
 #include <glom/application.h>
 #include <glibmm/i18n.h>
diff --git a/glom/utility_widgets/placeholder-glom.h b/glom/mode_data/placeholder-glom.h
similarity index 97%
rename from glom/utility_widgets/placeholder-glom.h
rename to glom/mode_data/placeholder-glom.h
index 42b2c4e..55555b5 100644
--- a/glom/utility_widgets/placeholder-glom.h
+++ b/glom/mode_data/placeholder-glom.h
@@ -23,7 +23,7 @@
  */
 
 #include <gtkmm.h>
-#include "layoutwidgetbase.h"
+#include <glom/utility_widgets/layoutwidgetbase.h>
 //#include <libglom/data_structure/layout/layoutitem_button.h>
 //#include <gtkmm/builder.h>
 
diff --git a/glom/mode_design/fields/dialog_fielddefinition.h b/glom/mode_design/fields/dialog_fielddefinition.h
index 76b1112..add2378 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.h
+++ b/glom/mode_design/fields/dialog_fielddefinition.h
@@ -25,10 +25,9 @@
 #include "../../utility_widgets/combo_textglade.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 <glom/mode_data/datawidget/datawidget.h>
 #include <libglom/data_structure/field.h>
 #include <glom/mode_design/layout/layout_item_dialogs/box_formatting.h>
 #include <glom/base_db.h>
diff --git a/glom/utility_widgets/flowtable_dnd.cc b/glom/utility_widgets/flowtable_dnd.cc
index 325c199..66c86f3 100644
--- a/glom/utility_widgets/flowtable_dnd.cc
+++ b/glom/utility_widgets/flowtable_dnd.cc
@@ -21,11 +21,11 @@
 #include "flowtable_dnd.h"
 #include "../mode_data/flowtablewithfields.h"
 #include <gtkmm/toolpalette.h>
-#include "placeholder-glom.h"
+#include <glom/mode_data/placeholder-glom.h>
 #include "layouttoolbarbutton.h"
-#include "entryglom.h"
-#include "labelglom.h"
-#include "buttonglom.h"
+//#include <glom/mode_data/data_widget/entryglom.h>
+//#include "labelglom.h"
+#include <glom/mode_data/buttonglom.h>
 #include "imageglom.h"
 
 namespace Glom
diff --git a/glom/utility_widgets/layoutwidgetbase.cc b/glom/utility_widgets/layoutwidgetbase.cc
index c85071c..67156ae 100644
--- a/glom/utility_widgets/layoutwidgetbase.cc
+++ b/glom/utility_widgets/layoutwidgetbase.cc
@@ -21,8 +21,8 @@
 #include "layoutwidgetbase.h"
 #include <glibmm/i18n.h>
 #include <glom/application.h>
-#include <glom/utility_widgets/textviewglom.h>
-#include <glom/utility_widgets/labelglom.h>
+#include <glom/mode_data/datawidget/textviewglom.h>
+#include <glom/mode_data/datawidget/labelglom.h>
 
 namespace Glom
 {
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]