glom r1950 - in trunk: . glom glom/layout_item_dialogs glom/libglom glom/libglom/connectionpool_backends glom/libglom/data_structure glom/libglom/data_structure/layout glom/libglom/data_structure/layout/report_parts glom/libglom/document glom/libglom/python_embed glom/mode_data glom/mode_design glom/mode_design/fields glom/mode_design/print_layouts glom/mode_design/script_library glom/mode_design/users glom/mode_find glom/navigation glom/python_embed glom/python_embed/python_module glom/relationships_overview glom/reports glom/translation glom/utility_widgets glom/utility_widgets/adddel glom/utility_widgets/canvas glom/utility_widgets/cellrendererlist glom/utility_widgets/db_adddel regression_tests
- From: murrayc svn gnome org
- To: svn-commits-list gnome org
- Subject: glom r1950 - in trunk: . glom glom/layout_item_dialogs glom/libglom glom/libglom/connectionpool_backends glom/libglom/data_structure glom/libglom/data_structure/layout glom/libglom/data_structure/layout/report_parts glom/libglom/document glom/libglom/python_embed glom/mode_data glom/mode_design glom/mode_design/fields glom/mode_design/print_layouts glom/mode_design/script_library glom/mode_design/users glom/mode_find glom/navigation glom/python_embed glom/python_embed/python_module glom/relationships_overview glom/reports glom/translation glom/utility_widgets glom/utility_widgets/adddel glom/utility_widgets/canvas glom/utility_widgets/cellrendererlist glom/utility_widgets/db_adddel regression_tests
- Date: Tue, 3 Mar 2009 22:21:36 +0000 (UTC)
Author: murrayc
Date: Tue Mar 3 22:21:36 2009
New Revision: 1950
URL: http://svn.gnome.org/viewvc/glom?rev=1950&view=rev
Log:
2009-03-03 Murray Cumming <murrayc murrayc com>
* *.[h|cc]: Include all libglom headers via libglom/ instead of
glom/libglom so it works from outside, with the path to the installed
headers, from pkg-config.
* All Makefile.am files: Add -I top_srcdir@/glom to AM_CPPFLAGS.
The repetition is awful. We should avoid that somehow.
Modified:
trunk/ChangeLog
trunk/glom/Makefile.am
trunk/glom/application.cc
trunk/glom/base_db.cc
trunk/glom/base_db.h
trunk/glom/base_db_table.cc
trunk/glom/base_db_table.h
trunk/glom/base_db_table_data.cc
trunk/glom/base_db_table_data.h
trunk/glom/box_db_table.cc
trunk/glom/box_db_table.h
trunk/glom/box_reports.h
trunk/glom/box_withbuttons.cc
trunk/glom/box_withbuttons.h
trunk/glom/combobox_fields.h
trunk/glom/combobox_relationship.h
trunk/glom/dialog_connection.cc
trunk/glom/dialog_connection.h
trunk/glom/dialog_database_preferences.cc
trunk/glom/dialog_database_preferences.h
trunk/glom/dialog_import_csv.cc
trunk/glom/dialog_import_csv_progress.cc
trunk/glom/dialog_invalid_data.cc
trunk/glom/dialog_invalid_data.h
trunk/glom/dialog_new_self_hosted_connection.h
trunk/glom/filechooser_export.cc
trunk/glom/filechooser_export.h
trunk/glom/frame_glom.cc
trunk/glom/frame_glom.h
trunk/glom/glom_postgres.h
trunk/glom/glom_privs.cc
trunk/glom/layout_item_dialogs/Makefile.am
trunk/glom/layout_item_dialogs/box_formatting.cc
trunk/glom/layout_item_dialogs/box_formatting.h
trunk/glom/layout_item_dialogs/combo_summarytype.h
trunk/glom/layout_item_dialogs/dialog_buttonscript.cc
trunk/glom/layout_item_dialogs/dialog_buttonscript.h
trunk/glom/layout_item_dialogs/dialog_field_layout.cc
trunk/glom/layout_item_dialogs/dialog_field_layout.h
trunk/glom/layout_item_dialogs/dialog_field_summary.cc
trunk/glom/layout_item_dialogs/dialog_field_summary.h
trunk/glom/layout_item_dialogs/dialog_group_by.cc
trunk/glom/layout_item_dialogs/dialog_group_by.h
trunk/glom/layout_item_dialogs/dialog_imageobject.cc
trunk/glom/layout_item_dialogs/dialog_imageobject.h
trunk/glom/layout_item_dialogs/dialog_notebook.h
trunk/glom/layout_item_dialogs/dialog_textobject.cc
trunk/glom/layout_item_dialogs/dialog_textobject.h
trunk/glom/libglom/Makefile.am
trunk/glom/libglom/calcinprogress.h
trunk/glom/libglom/connectionpool.cc
trunk/glom/libglom/connectionpool.h
trunk/glom/libglom/connectionpool_backends/Makefile.am
trunk/glom/libglom/connectionpool_backends/backend.cc
trunk/glom/libglom/connectionpool_backends/backend.h
trunk/glom/libglom/connectionpool_backends/postgres.cc
trunk/glom/libglom/connectionpool_backends/postgres.h
trunk/glom/libglom/connectionpool_backends/postgres_central.cc
trunk/glom/libglom/connectionpool_backends/postgres_central.h
trunk/glom/libglom/connectionpool_backends/postgres_self.cc
trunk/glom/libglom/connectionpool_backends/postgres_self.h
trunk/glom/libglom/connectionpool_backends/sqlite.cc
trunk/glom/libglom/connectionpool_backends/sqlite.h
trunk/glom/libglom/data_structure/Makefile.am
trunk/glom/libglom/data_structure/field.cc
trunk/glom/libglom/data_structure/field.h
trunk/glom/libglom/data_structure/fieldtypes.cc
trunk/glom/libglom/data_structure/foundset.cc
trunk/glom/libglom/data_structure/foundset.h
trunk/glom/libglom/data_structure/glomconversions.cc
trunk/glom/libglom/data_structure/glomconversions.h
trunk/glom/libglom/data_structure/iso_codes.cc
trunk/glom/libglom/data_structure/iso_codes.h
trunk/glom/libglom/data_structure/layout/Makefile.am
trunk/glom/libglom/data_structure/layout/fieldformatting.h
trunk/glom/libglom/data_structure/layout/layoutitem_image.cc
trunk/glom/libglom/data_structure/layout/layoutitem_line.cc
trunk/glom/libglom/data_structure/layout/report_parts/Makefile.am
trunk/glom/libglom/data_structure/layout/usesrelationship.h
trunk/glom/libglom/data_structure/translatable_item.cc
trunk/glom/libglom/data_structure/translatable_item.h
trunk/glom/libglom/document/Makefile.am
trunk/glom/libglom/document/document_glom.cc
trunk/glom/libglom/document/document_glom.h
trunk/glom/libglom/document/view.h
trunk/glom/libglom/glom-1.0.pc.in
trunk/glom/libglom/python_embed/Makefile.am
trunk/glom/libglom/python_embed/py_glom_record.cc
trunk/glom/libglom/python_embed/py_glom_record.h
trunk/glom/libglom/python_embed/py_glom_related.cc
trunk/glom/libglom/python_embed/py_glom_related.h
trunk/glom/libglom/python_embed/py_glom_relatedrecord.cc
trunk/glom/libglom/python_embed/py_glom_relatedrecord.h
trunk/glom/libglom/spawn_with_feedback.cc
trunk/glom/libglom/test_avahi_publisher.cc
trunk/glom/libglom/test_connectionpool.cc
trunk/glom/libglom/test_sharedptr_layoutitem.cc
trunk/glom/libglom/test_sync.cc
trunk/glom/libglom/utils.cc
trunk/glom/libglom/utils.h
trunk/glom/main.cc
trunk/glom/mode_data/Makefile.am
trunk/glom/mode_data/box_data.cc
trunk/glom/mode_data/box_data_calendar_related.cc
trunk/glom/mode_data/box_data_calendar_related.h
trunk/glom/mode_data/box_data_details.cc
trunk/glom/mode_data/box_data_list.cc
trunk/glom/mode_data/box_data_list_related.cc
trunk/glom/mode_data/box_data_manyrecords.cc
trunk/glom/mode_data/box_data_portal.cc
trunk/glom/mode_data/dialog_choose_field.h
trunk/glom/mode_data/dialog_choose_relationship.h
trunk/glom/mode_data/dialog_layout.h
trunk/glom/mode_data/dialog_layout_calendar_related.h
trunk/glom/mode_data/dialog_layout_details.cc
trunk/glom/mode_data/flowtablewithfields.cc
trunk/glom/mode_data/flowtablewithfields.h
trunk/glom/mode_data/notebook_data.cc
trunk/glom/mode_data/treestore_layout.h
trunk/glom/mode_design/Makefile.am
trunk/glom/mode_design/dialog_design.h
trunk/glom/mode_design/fields/Makefile.am
trunk/glom/mode_design/fields/box_db_table_definition.cc
trunk/glom/mode_design/fields/combo_fieldtype.h
trunk/glom/mode_design/fields/dialog_fieldcalculation.cc
trunk/glom/mode_design/fields/dialog_fieldcalculation.h
trunk/glom/mode_design/fields/dialog_fielddefinition.cc
trunk/glom/mode_design/fields/dialog_fielddefinition.h
trunk/glom/mode_design/print_layouts/Makefile.am
trunk/glom/mode_design/print_layouts/box_print_layouts.h
trunk/glom/mode_design/print_layouts/canvas_layout_item.cc
trunk/glom/mode_design/print_layouts/canvas_layout_item.h
trunk/glom/mode_design/print_layouts/canvas_print_layout.cc
trunk/glom/mode_design/print_layouts/canvas_print_layout.h
trunk/glom/mode_design/print_layouts/dialog_text_formatting.cc
trunk/glom/mode_design/print_layouts/dialog_text_formatting.h
trunk/glom/mode_design/print_layouts/window_print_layout_edit.cc
trunk/glom/mode_design/print_layouts/window_print_layout_edit.h
trunk/glom/mode_design/script_library/Makefile.am
trunk/glom/mode_design/script_library/dialog_script_library.cc
trunk/glom/mode_design/script_library/dialog_script_library.h
trunk/glom/mode_design/users/Makefile.am
trunk/glom/mode_design/users/dialog_groups_list.cc
trunk/glom/mode_design/users/dialog_users_list.cc
trunk/glom/mode_find/Makefile.am
trunk/glom/navigation/Makefile.am
trunk/glom/notebook_glom.h
trunk/glom/python_embed/Makefile.am
trunk/glom/python_embed/glom_python.cc
trunk/glom/python_embed/glom_python.h
trunk/glom/python_embed/python_module/Makefile.am
trunk/glom/python_embed/python_module/py_glom_module.cc
trunk/glom/relationships_overview/Makefile.am
trunk/glom/relationships_overview/canvas_group_dbtable.h
trunk/glom/relationships_overview/dialog_relationships_overview.h
trunk/glom/reports/Makefile.am
trunk/glom/reports/dialog_layout_report.cc
trunk/glom/reports/dialog_layout_report.h
trunk/glom/reports/report_builder.cc
trunk/glom/reports/report_builder.h
trunk/glom/reports/treestore_report_layout.cc
trunk/glom/reports/treestore_report_layout.h
trunk/glom/translation/Makefile.am
trunk/glom/translation/combobox_locale.cc
trunk/glom/translation/combobox_locale.h
trunk/glom/translation/dialog_copy_translation.h
trunk/glom/translation/dialog_identify_original.cc
trunk/glom/translation/dialog_identify_original.h
trunk/glom/translation/window_translations.cc
trunk/glom/translation/window_translations.h
trunk/glom/utility_widgets/Makefile.am
trunk/glom/utility_widgets/adddel/Makefile.am
trunk/glom/utility_widgets/adddel/adddel.cc
trunk/glom/utility_widgets/adddel/adddel.h
trunk/glom/utility_widgets/adddel/adddel_withbuttons.cc
trunk/glom/utility_widgets/buttonglom.h
trunk/glom/utility_widgets/canvas/Makefile.am
trunk/glom/utility_widgets/cellrendererlist/Makefile.am
trunk/glom/utility_widgets/checkglom.h
trunk/glom/utility_widgets/comboentry_currency.cc
trunk/glom/utility_widgets/comboentry_currency.h
trunk/glom/utility_widgets/comboentryglom.cc
trunk/glom/utility_widgets/comboentryglom.h
trunk/glom/utility_widgets/comboglom.cc
trunk/glom/utility_widgets/comboglom.h
trunk/glom/utility_widgets/comboglomchoicesbase.cc
trunk/glom/utility_widgets/comboglomchoicesbase.h
trunk/glom/utility_widgets/datawidget.cc
trunk/glom/utility_widgets/datawidget.h
trunk/glom/utility_widgets/db_adddel/Makefile.am
trunk/glom/utility_widgets/db_adddel/db_adddel.cc
trunk/glom/utility_widgets/db_adddel/db_adddel.h
trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.cc
trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.h
trunk/glom/utility_widgets/dialog_choose_date.h
trunk/glom/utility_widgets/dialog_choose_id.h
trunk/glom/utility_widgets/dialog_properties.cc
trunk/glom/utility_widgets/entryglom.cc
trunk/glom/utility_widgets/entryglom.h
trunk/glom/utility_widgets/filechooserdialog_saveextras.cc
trunk/glom/utility_widgets/filechooserdialog_saveextras.h
trunk/glom/utility_widgets/imageglom.cc
trunk/glom/utility_widgets/imageglom.h
trunk/glom/utility_widgets/labelglom.h
trunk/glom/utility_widgets/layoutwidgetbase.h
trunk/glom/utility_widgets/notebookglom.h
trunk/glom/utility_widgets/placeholder-glom.h
trunk/glom/utility_widgets/textviewglom.cc
trunk/glom/utility_widgets/textviewglom.h
trunk/glom/xsl_utils.cc
trunk/glom/xsl_utils.h
trunk/regression_tests/Makefile.am
trunk/regression_tests/test_parsing_time.cc
Modified: trunk/glom/Makefile.am
==============================================================================
--- trunk/glom/Makefile.am (original)
+++ trunk/glom/Makefile.am Tue Mar 3 22:21:36 2009
@@ -15,7 +15,7 @@
# We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
# We define PREFIX, SYSCONFDIR, LIBDIR, and DATADIR for the GNOME_PROGRAM_STANDARD_PROPERTIES macro.
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
$(MAEMO_LAUNCHER_CFLAGS) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
Modified: trunk/glom/application.cc
==============================================================================
--- trunk/glom/application.cc (original)
+++ trunk/glom/application.cc Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include "application.h"
#include "dialog_existing_or_new.h"
-#include <glom/libglom/dialog_progress_creating.h>
+#include <libglom/dialog_progress_creating.h>
#ifndef GLOM_ENABLE_CLIENT_ONLY
#include <glom/translation/dialog_change_language.h>
@@ -31,11 +31,11 @@
#include <glom/utility_widgets/filechooserdialog_saveextras.h>
#endif // !GLOM_ENABLE_CLIENT_ONLY
-#include <glom/libglom/utils.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/utils.h>
+#include <libglom/glade_utils.h>
-//#include <glom/libglom/connectionpool_backends/postgres_central.h>
-//#include <glom/libglom/connectionpool_backends/postgres_self.h>
+//#include <libglom/connectionpool_backends/postgres_central.h>
+//#include <libglom/connectionpool_backends/postgres_self.h>
#include <cstdio>
#include <memory> //For std::auto_ptr<>
Modified: trunk/glom/base_db.cc
==============================================================================
--- trunk/glom/base_db.cc (original)
+++ trunk/glom/base_db.cc Tue Mar 3 22:21:36 2009
@@ -22,10 +22,10 @@
#include "base_db.h"
#include "application.h" //App_Glom.
-#include <glom/libglom/appstate.h>
-#include <glom/libglom/standard_table_prefs_fields.h>
-#include <glom/libglom/document/document_glom.h>
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/appstate.h>
+#include <libglom/standard_table_prefs_fields.h>
+#include <libglom/document/document_glom.h>
+#include <libglom/data_structure/glomconversions.h>
#include "mode_data/dialog_choose_field.h"
//#ifndef GLOM_ENABLE_CLIENT_ONLY
@@ -36,15 +36,15 @@
//#endif // !GLOM_ENABLE_CLIENT_ONLY
//#include "reports/dialog_layout_report.h"
-#include <glom/libglom/utils.h>
-#include <glom/libglom/glade_utils.h>
-#include <glom/libglom/data_structure/glomconversions.h>
-#include <glom/libglom/data_structure/parameternamegenerator.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_summary.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_header.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h>
+#include <libglom/utils.h>
+#include <libglom/glade_utils.h>
+#include <libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/parameternamegenerator.h>
+#include <libglom/data_structure/layout/report_parts/layoutitem_summary.h>
+#include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
+#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/glom_postgres.h>
#include <glom/glom_privs.h>
Modified: trunk/glom/base_db.h
==============================================================================
--- trunk/glom/base_db.h (original)
+++ trunk/glom/base_db.h Tue Mar 3 22:21:36 2009
@@ -25,14 +25,14 @@
#include <gtkmm.h>
-#include <glom/libglom/document/view.h>
-#include <glom/libglom/connectionpool.h>
-#include <glom/libglom/appstate.h>
-#include <glom/libglom/data_structure/foundset.h>
-#include <glom/libglom/data_structure/privileges.h>
-#include <glom/libglom/data_structure/system_prefs.h>
-#include <glom/libglom/utils.h>
-#include <glom/libglom/calcinprogress.h>
+#include <libglom/document/view.h>
+#include <libglom/connectionpool.h>
+#include <libglom/appstate.h>
+#include <libglom/data_structure/foundset.h>
+#include <libglom/data_structure/privileges.h>
+#include <libglom/data_structure/system_prefs.h>
+#include <libglom/utils.h>
+#include <libglom/calcinprogress.h>
#include "bakery/View/View.h"
#include <bakery/Utilities/BusyCursor.h>
Modified: trunk/glom/base_db_table.cc
==============================================================================
--- trunk/glom/base_db_table.cc (original)
+++ trunk/glom/base_db_table.cc Tue Mar 3 22:21:36 2009
@@ -19,7 +19,7 @@
*/
#include "base_db_table.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <glom/application.h>
#include "python_embed/glom_python.h"
#include <sstream>
Modified: trunk/glom/base_db_table.h
==============================================================================
--- trunk/glom/base_db_table.h (original)
+++ trunk/glom/base_db_table.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#define BASE_DB_TABLE_H
#include "base_db.h"
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include <algorithm> //find_if used in various places.
namespace Glom
Modified: trunk/glom/base_db_table_data.cc
==============================================================================
--- trunk/glom/base_db_table_data.cc (original)
+++ trunk/glom/base_db_table_data.cc Tue Mar 3 22:21:36 2009
@@ -19,7 +19,7 @@
*/
#include "base_db_table_data.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <glom/application.h>
#include "python_embed/glom_python.h"
#include <sstream>
Modified: trunk/glom/base_db_table_data.h
==============================================================================
--- trunk/glom/base_db_table_data.h (original)
+++ trunk/glom/base_db_table_data.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#define BASE_DB_TABLE_DATA_H
#include "base_db_table.h"
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include <algorithm> //find_if used in various places.
namespace Glom
Modified: trunk/glom/box_db_table.cc
==============================================================================
--- trunk/glom/box_db_table.cc (original)
+++ trunk/glom/box_db_table.cc Tue Mar 3 22:21:36 2009
@@ -19,7 +19,7 @@
*/
#include "box_db_table.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include "python_embed/glom_python.h"
#include <sstream>
Modified: trunk/glom/box_db_table.h
==============================================================================
--- trunk/glom/box_db_table.h (original)
+++ trunk/glom/box_db_table.h Tue Mar 3 22:21:36 2009
@@ -24,7 +24,7 @@
#include <glom/box_withbuttons.h>
#include <glom/base_db_table.h>
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include <libglademm.h>
#include <algorithm> //find_if used in various places.
Modified: trunk/glom/box_reports.h
==============================================================================
--- trunk/glom/box_reports.h (original)
+++ trunk/glom/box_reports.h Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#define BOX_REPORTS_H
#include "box_db_table.h"
-#include <glom/libglom/data_structure/report.h>
+#include <libglom/data_structure/report.h>
namespace Glom
{
Modified: trunk/glom/box_withbuttons.cc
==============================================================================
--- trunk/glom/box_withbuttons.cc (original)
+++ trunk/glom/box_withbuttons.cc Tue Mar 3 22:21:36 2009
@@ -20,7 +20,7 @@
#include "box_withbuttons.h"
#include "application.h" //App_Glom.
-#include <glom/libglom/appstate.h>
+#include <libglom/appstate.h>
//#include <libgnomeui/gnome-app-helper.h>
#include <sstream> //For stringstream
Modified: trunk/glom/box_withbuttons.h
==============================================================================
--- trunk/glom/box_withbuttons.h (original)
+++ trunk/glom/box_withbuttons.h Tue Mar 3 22:21:36 2009
@@ -24,9 +24,9 @@
#include <gtkmm.h>
#include "utility_widgets/adddel/adddel_withbuttons.h"
-#include <glom/libglom/document/document_glom.h>
-#include <glom/libglom/connectionpool.h>
-#include <glom/libglom/appstate.h>
+#include <libglom/document/document_glom.h>
+#include <libglom/connectionpool.h>
+#include <libglom/appstate.h>
#include "base_db.h"
#include <bakery/Utilities/BusyCursor.h>
#include <libglademm.h>
Modified: trunk/glom/combobox_fields.h
==============================================================================
--- trunk/glom/combobox_fields.h (original)
+++ trunk/glom/combobox_fields.h Tue Mar 3 22:21:36 2009
@@ -23,9 +23,9 @@
#include <gtkmm/combobox.h>
#include <libglademm.h>
-#include <glom/libglom/data_structure/field.h>
-#include <glom/libglom/document/document_glom.h>
-#include <glom/libglom/sharedptr.h>
+#include <libglom/data_structure/field.h>
+#include <libglom/document/document_glom.h>
+#include <libglom/sharedptr.h>
#include <gtkmm/treestore.h>
Modified: trunk/glom/combobox_relationship.h
==============================================================================
--- trunk/glom/combobox_relationship.h (original)
+++ trunk/glom/combobox_relationship.h Tue Mar 3 22:21:36 2009
@@ -23,9 +23,9 @@
#include <gtkmm/combobox.h>
#include <libglademm.h>
-#include <glom/libglom/data_structure/relationship.h>
-#include <glom/libglom/document/document_glom.h>
-#include <glom/libglom/sharedptr.h>
+#include <libglom/data_structure/relationship.h>
+#include <libglom/document/document_glom.h>
+#include <libglom/sharedptr.h>
#include <gtkmm/treestore.h>
Modified: trunk/glom/dialog_connection.cc
==============================================================================
--- trunk/glom/dialog_connection.cc (original)
+++ trunk/glom/dialog_connection.cc Tue Mar 3 22:21:36 2009
@@ -22,11 +22,11 @@
#include "box_withbuttons.h" //For Box_WithButtons::connect_to_server().
#include <glibmm/i18n.h>
-#include <glom/libglom/connectionpool.h>
+#include <libglom/connectionpool.h>
#ifdef GLOM_ENABLE_POSTGRESQL
-#include <glom/libglom/connectionpool_backends/postgres_central.h>
-#include <glom/libglom/connectionpool_backends/postgres_self.h>
+#include <libglom/connectionpool_backends/postgres_central.h>
+#include <libglom/connectionpool_backends/postgres_self.h>
#endif //#ifdef GLOM_ENABLE_POSTGRESQL
namespace Glom
Modified: trunk/glom/dialog_connection.h
==============================================================================
--- trunk/glom/dialog_connection.h (original)
+++ trunk/glom/dialog_connection.h Tue Mar 3 22:21:36 2009
@@ -26,7 +26,7 @@
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
#include "base_db.h"
-#include <glom/libglom/connectionpool.h>
+#include <libglom/connectionpool.h>
namespace Glom
{
Modified: trunk/glom/dialog_database_preferences.cc
==============================================================================
--- trunk/glom/dialog_database_preferences.cc (original)
+++ trunk/glom/dialog_database_preferences.cc Tue Mar 3 22:21:36 2009
@@ -20,8 +20,8 @@
#include "dialog_database_preferences.h"
#include "box_withbuttons.h" //For Box_WithButtons::connect_to_server().
-#include <glom/libglom/standard_table_prefs_fields.h>
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/standard_table_prefs_fields.h>
+#include <libglom/data_structure/glomconversions.h>
#include <bakery/Utilities/BusyCursor.h>
#include <glibmm/i18n.h>
Modified: trunk/glom/dialog_database_preferences.h
==============================================================================
--- trunk/glom/dialog_database_preferences.h (original)
+++ trunk/glom/dialog_database_preferences.h Tue Mar 3 22:21:36 2009
@@ -27,8 +27,8 @@
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
#include "base_db.h"
-#include <glom/libglom/data_structure/system_prefs.h>
-#include <glom/libglom/connectionpool.h>
+#include <libglom/data_structure/system_prefs.h>
+#include <libglom/connectionpool.h>
#include "utility_widgets/imageglom.h"
namespace Glom
Modified: trunk/glom/dialog_import_csv.cc
==============================================================================
--- trunk/glom/dialog_import_csv.cc (original)
+++ trunk/glom/dialog_import_csv.cc Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#include "dialog_import_csv.h"
#include "config.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <gtkmm/messagedialog.h>
#include <gtkmm/cellrenderercombo.h>
Modified: trunk/glom/dialog_import_csv_progress.cc
==============================================================================
--- trunk/glom/dialog_import_csv_progress.cc (original)
+++ trunk/glom/dialog_import_csv_progress.cc Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#include "dialog_import_csv_progress.h"
#include "config.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <glibmm/i18n.h>
namespace Glom
Modified: trunk/glom/dialog_invalid_data.cc
==============================================================================
--- trunk/glom/dialog_invalid_data.cc (original)
+++ trunk/glom/dialog_invalid_data.cc Tue Mar 3 22:21:36 2009
@@ -19,9 +19,9 @@
*/
#include "dialog_invalid_data.h"
-#include <glom/libglom/data_structure/glomconversions.h>
-#include <glom/libglom/utils.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/data_structure/glomconversions.h>
+#include <libglom/utils.h>
+#include <libglom/glade_utils.h>
namespace Glom
{
Modified: trunk/glom/dialog_invalid_data.h
==============================================================================
--- trunk/glom/dialog_invalid_data.h (original)
+++ trunk/glom/dialog_invalid_data.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include <libglademm.h>
namespace Glom
Modified: trunk/glom/dialog_new_self_hosted_connection.h
==============================================================================
--- trunk/glom/dialog_new_self_hosted_connection.h (original)
+++ trunk/glom/dialog_new_self_hosted_connection.h Tue Mar 3 22:21:36 2009
@@ -26,7 +26,7 @@
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
#include "base_db.h"
-#include <glom/libglom/connectionpool.h>
+#include <libglom/connectionpool.h>
namespace Glom
{
Modified: trunk/glom/filechooser_export.cc
==============================================================================
--- trunk/glom/filechooser_export.cc (original)
+++ trunk/glom/filechooser_export.cc Tue Mar 3 22:21:36 2009
@@ -20,8 +20,8 @@
#include "filechooser_export.h"
#include "mode_data/dialog_layout_export.h"
-#include <glom/libglom/utils.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/utils.h>
+#include <libglom/glade_utils.h>
#include <gtkmm/stock.h>
#include <glibmm/i18n.h>
Modified: trunk/glom/filechooser_export.h
==============================================================================
--- trunk/glom/filechooser_export.h (original)
+++ trunk/glom/filechooser_export.h Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#ifndef FILECHOOSER_EXPORT_GLOM_H
#define FILECHOOSER_EXPORT_GLOM_H
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
#include <gtkmm/filechooserdialog.h>
namespace Glom
Modified: trunk/glom/frame_glom.cc
==============================================================================
--- trunk/glom/frame_glom.cc (original)
+++ trunk/glom/frame_glom.cc Tue Mar 3 22:21:36 2009
@@ -24,17 +24,17 @@
#include "application.h"
#include "dialog_import_csv.h"
#include "dialog_import_csv_progress.h"
-#include <glom/libglom/appstate.h>
+#include <libglom/appstate.h>
-#include <glom/libglom/connectionpool.h>
+#include <libglom/connectionpool.h>
#ifdef GLOM_ENABLE_POSTGRESQL
-#include <glom/libglom/connectionpool_backends/postgres_central.h>
-#include <glom/libglom/connectionpool_backends/postgres_self.h>
+#include <libglom/connectionpool_backends/postgres_central.h>
+#include <libglom/connectionpool_backends/postgres_self.h>
#endif
#ifdef GLOM_ENABLE_SQLITE
-# include <glom/libglom/connectionpool_backends/sqlite.h>
+# include <libglom/connectionpool_backends/sqlite.h>
#endif
#ifndef GLOM_ENABLE_CLIENT_ONLY
@@ -48,11 +48,11 @@
#include "relationships_overview/dialog_relationships_overview.h"
#endif // !GLOM_ENABLE_CLIENT_ONLY
-#include <glom/libglom/utils.h>
-#include <glom/libglom/glade_utils.h>
-#include <glom/libglom/data_structure/glomconversions.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_summary.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
+#include <libglom/utils.h>
+#include <libglom/glade_utils.h>
+#include <libglom/data_structure/glomconversions.h>
+#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>
#ifndef GLOM_ENABLE_CLIENT_ONLY
Modified: trunk/glom/frame_glom.h
==============================================================================
--- trunk/glom/frame_glom.h (original)
+++ trunk/glom/frame_glom.h Tue Mar 3 22:21:36 2009
@@ -25,7 +25,7 @@
#include <gtkmm/frame.h>
#include "bakery/View/View_Composite.h"
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
#include "dialog_glom.h"
#include "navigation/box_tables.h"
@@ -40,7 +40,7 @@
#endif // !GLOM_ENABLE_CLIENT_ONLY
#include "dialog_connection.h"
-#include <glom/libglom/utils.h>
+#include <libglom/utils.h>
#include "mode_data/box_data_list_related.h" //only for m_HackToFixLinkerError.
Modified: trunk/glom/glom_postgres.h
==============================================================================
--- trunk/glom/glom_postgres.h (original)
+++ trunk/glom/glom_postgres.h Tue Mar 3 22:21:36 2009
@@ -24,8 +24,8 @@
#include <gtkmm.h>
#include <glom/base_db.h>
-#include <glom/libglom/document/document_glom.h>
-#include <glom/libglom/connectionpool.h>
+#include <libglom/document/document_glom.h>
+#include <libglom/connectionpool.h>
namespace Glom
{
Modified: trunk/glom/glom_privs.cc
==============================================================================
--- trunk/glom/glom_privs.cc (original)
+++ trunk/glom/glom_privs.cc Tue Mar 3 22:21:36 2009
@@ -19,7 +19,7 @@
*/
#include "glom_privs.h"
-#include <glom/libglom/standard_table_prefs_fields.h>
+#include <libglom/standard_table_prefs_fields.h>
#include <glom/application.h>
namespace Glom
Modified: trunk/glom/layout_item_dialogs/Makefile.am
==============================================================================
--- trunk/glom/layout_item_dialogs/Makefile.am (original)
+++ trunk/glom/layout_item_dialogs/Makefile.am Tue Mar 3 22:21:36 2009
@@ -2,7 +2,7 @@
glomxsltdir = $(datadir)/glom/xslt/
# We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\" \
-DGLOM_XSLTDIR=\""$(glomxsltdir)/"\"
Modified: trunk/glom/layout_item_dialogs/box_formatting.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/box_formatting.cc (original)
+++ trunk/glom/layout_item_dialogs/box_formatting.cc Tue Mar 3 22:21:36 2009
@@ -19,7 +19,7 @@
*/
#include "box_formatting.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <glibmm/i18n.h>
namespace Glom
Modified: trunk/glom/layout_item_dialogs/box_formatting.h
==============================================================================
--- trunk/glom/layout_item_dialogs/box_formatting.h (original)
+++ trunk/glom/layout_item_dialogs/box_formatting.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <gtkmm.h>
#include "../utility_widgets/dialog_properties.h"
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
#include "../box_withbuttons.h"
#include "../utility_widgets/comboentry_currency.h"
#include "../combobox_relationship.h"
Modified: trunk/glom/layout_item_dialogs/combo_summarytype.h
==============================================================================
--- trunk/glom/layout_item_dialogs/combo_summarytype.h (original)
+++ trunk/glom/layout_item_dialogs/combo_summarytype.h Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_MODE_DESIGN_COMBO_SUMMARYTYPE_HH
#define GLOM_MODE_DESIGN_COMBO_SUMMARYTYPE_HH
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
+#include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
#include <gtkmm/combobox.h>
#include <libglademm.h>
Modified: trunk/glom/layout_item_dialogs/dialog_buttonscript.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_buttonscript.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_buttonscript.cc Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#include "dialog_buttonscript.h"
#include "../python_embed/glom_python.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <gtksourceviewmm/sourcelanguagemanager.h>
Modified: trunk/glom/layout_item_dialogs/dialog_buttonscript.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_buttonscript.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_buttonscript.h Tue Mar 3 22:21:36 2009
@@ -25,7 +25,7 @@
#include <gtkmm.h>
#include <libglademm.h>
-#include <glom/libglom/data_structure/layout/layoutitem_button.h>
+#include <libglom/data_structure/layout/layoutitem_button.h>
#include "../base_db.h"
#include <gtksourceviewmm/sourceview.h>
Modified: trunk/glom/layout_item_dialogs/dialog_field_layout.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_field_layout.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_field_layout.cc Tue Mar 3 22:21:36 2009
@@ -19,8 +19,8 @@
*/
#include "dialog_field_layout.h"
-#include <glom/libglom/data_structure/glomconversions.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/data_structure/glomconversions.h>
+#include <libglom/glade_utils.h>
#include <glibmm/i18n.h>
namespace Glom
Modified: trunk/glom/layout_item_dialogs/dialog_field_layout.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_field_layout.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_field_layout.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <gtkmm.h>
#include "../utility_widgets/dialog_properties.h"
-#include <glom/libglom/document/view.h>
+#include <libglom/document/view.h>
#include "../box_withbuttons.h"
#include "../utility_widgets/combo_textglade.h"
#include "../utility_widgets/comboentry_currency.h"
Modified: trunk/glom/layout_item_dialogs/dialog_field_summary.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_field_summary.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_field_summary.cc Tue Mar 3 22:21:36 2009
@@ -19,7 +19,7 @@
*/
#include "dialog_field_summary.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <glibmm/i18n.h>
namespace Glom
Modified: trunk/glom/layout_item_dialogs/dialog_field_summary.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_field_summary.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_field_summary.h Tue Mar 3 22:21:36 2009
@@ -23,8 +23,8 @@
#include <gtkmm.h>
#include "../utility_widgets/dialog_properties.h"
-#include <glom/libglom/document/document_glom.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
+#include <libglom/document/document_glom.h>
+#include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
#include "../box_withbuttons.h"
#include "../utility_widgets/combo_textglade.h"
#include "combo_summarytype.h"
Modified: trunk/glom/layout_item_dialogs/dialog_group_by.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_group_by.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_group_by.cc Tue Mar 3 22:21:36 2009
@@ -19,8 +19,8 @@
*/
#include "dialog_group_by.h"
-#include <glom/libglom/data_structure/glomconversions.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/data_structure/glomconversions.h>
+#include <libglom/glade_utils.h>
#include <sstream> //For stringstream
#include <glibmm/i18n.h>
Modified: trunk/glom/layout_item_dialogs/dialog_group_by.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_group_by.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_group_by.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <gtkmm.h>
#include "../utility_widgets/dialog_properties.h"
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
#include "../box_withbuttons.h"
#include "../utility_widgets/combo_textglade.h"
#include "../utility_widgets/comboentry_currency.h"
Modified: trunk/glom/layout_item_dialogs/dialog_imageobject.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_imageobject.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_imageobject.cc Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#include "dialog_imageobject.h"
#include "../python_embed/glom_python.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
//#include <libgnome/gnome-i18n.h>
#include <glibmm/i18n.h>
Modified: trunk/glom/layout_item_dialogs/dialog_imageobject.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_imageobject.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_imageobject.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <gtkmm.h>
#include <libglademm.h>
-#include <glom/libglom/data_structure/layout/layoutitem_image.h>
+#include <libglom/data_structure/layout/layoutitem_image.h>
#include "../base_db.h"
#include "../utility_widgets/imageglom.h"
Modified: trunk/glom/layout_item_dialogs/dialog_notebook.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_notebook.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_notebook.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include "../base_db.h"
#include "../mode_data/dialog_layout.h"
-#include <glom/libglom/data_structure/layout/layoutitem_notebook.h>
+#include <libglom/data_structure/layout/layoutitem_notebook.h>
#include <libglademm.h>
namespace Glom
Modified: trunk/glom/layout_item_dialogs/dialog_textobject.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_textobject.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_textobject.cc Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#include "dialog_textobject.h"
#include "../python_embed/glom_python.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
//#include <libgnome/gnome-i18n.h>
#include <glibmm/i18n.h>
Modified: trunk/glom/layout_item_dialogs/dialog_textobject.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_textobject.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_textobject.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <gtkmm.h>
#include <libglademm.h>
-#include <glom/libglom/data_structure/layout/layoutitem_text.h>
+#include <libglom/data_structure/layout/layoutitem_text.h>
#include "../base_db.h"
namespace Glom
Modified: trunk/glom/libglom/Makefile.am
==============================================================================
--- trunk/glom/libglom/Makefile.am (original)
+++ trunk/glom/libglom/Makefile.am Tue Mar 3 22:21:36 2009
@@ -7,7 +7,7 @@
# We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
# We define PREFIX, SYSCONFDIR, LIBDIR, and DATADIR for the GNOME_PROGRAM_STANDARD_PROPERTIES macro.
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
-DPREFIX=\""$(prefix)"\" \
@@ -19,16 +19,28 @@
-DGLOM_EXAMPLES_DIR=\""$(glom_examples_dir)"\" \
-DGLOM_ICON_DIR=\""$(glom_icon_dir)"\"
-lib_LTLIBRARIES = libglom-1.0.la
-libglom_1_0_la_SOURCES = appstate.h appstate.cc \
- calcinprogress.h calcinprogress.cc \
- connectionpool.h connectionpool.cc \
- dialog_progress_creating.h dialog_progress_creating.cc \
- spawn_with_feedback.h spawn_with_feedback.cc \
- utils.h utils.cc glade_utils.h \
+h_sources = appstate.h \
+ calcinprogress.h \
+ connectionpool.h \
+ dialog_progress_creating.h \
+ spawn_with_feedback.h \
+ utils.h glade_utils.h \
sharedptr.h \
standard_table_prefs_fields.h \
- gst-package.h gst-package.c
+ gst-package.h
+cc_sources = appstate.cc \
+ calcinprogress.cc \
+ connectionpool.cc \
+ dialog_progress_creating.cc \
+ spawn_with_feedback.cc \
+ utils.cc \
+ gst-package.c
+
+library_includedir=$(includedir)/glom-1.0/libglom
+library_include_HEADERS = $(h_sources)
+
+lib_LTLIBRARIES = libglom-1.0.la
+libglom_1_0_la_SOURCES = $(h_sources) $(cc_sources)
libglom_1_0_la_LDFLAGS = -no-undefined
@@ -55,7 +67,7 @@
#Small test programs:
-noinst_PROGRAMS = test_sharedptr_layoutitem test_connectionpool
+noinst_PROGRAMS = test_sharedptr_layoutitem test_connectionpool test_document
test_sharedptr_layoutitem_SOURCES = test_sharedptr_layoutitem.cc
test_sharedptr_layoutitem_LDADD = libglom-1.0.la \
@@ -65,6 +77,10 @@
test_connectionpool_LDADD = libglom-1.0.la \
$(GLOM_LIBS)
+test_document_SOURCES = test_document.cc
+test_document_LDADD = libglom.la \
+ $(GLOM_LIBS)
+
if !WIN32
test_sharedptr_layoutitem_LDADD += -lutil
test_connectionpool_LDADD += -lutil
Modified: trunk/glom/libglom/calcinprogress.h
==============================================================================
--- trunk/glom/libglom/calcinprogress.h (original)
+++ trunk/glom/libglom/calcinprogress.h Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_MODE_DATA_CALCINPROGRESS_H
#define GLOM_MODE_DATA_CALCINPROGRESS_H
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
namespace Glom
{
Modified: trunk/glom/libglom/connectionpool.cc
==============================================================================
--- trunk/glom/libglom/connectionpool.cc (original)
+++ trunk/glom/libglom/connectionpool.cc Tue Mar 3 22:21:36 2009
@@ -20,8 +20,8 @@
#include "config.h" // For GLOM_ENABLE_MAEMO
-#include <glom/libglom/connectionpool.h>
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/connectionpool.h>
+#include <libglom/document/document_glom.h>
#include <bakery/bakery.h>
//#include <libgdamm/connectionevent.h>
#include <glibmm/i18n.h>
Modified: trunk/glom/libglom/connectionpool.h
==============================================================================
--- trunk/glom/libglom/connectionpool.h (original)
+++ trunk/glom/libglom/connectionpool.h Tue Mar 3 22:21:36 2009
@@ -24,10 +24,10 @@
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
#include <libgdamm.h>
-#include <glom/libglom/sharedptr.h>
-#include <glom/libglom/data_structure/fieldtypes.h>
-#include <glom/libglom/data_structure/field.h>
-#include <glom/libglom/connectionpool_backends/backend.h>
+#include <libglom/sharedptr.h>
+#include <libglom/data_structure/fieldtypes.h>
+#include <libglom/data_structure/field.h>
+#include <libglom/connectionpool_backends/backend.h>
#include <memory> // For std::auto_ptr
Modified: trunk/glom/libglom/connectionpool_backends/Makefile.am
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/Makefile.am (original)
+++ trunk/glom/libglom/connectionpool_backends/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,5 +1,5 @@
AM_CPPFLAGS = \
- -I top_srcdir@/ $(GLOM_CFLAGS) \
+ -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) \
-DEXEEXT=\""$(EXEEXT)"\"
noinst_LTLIBRARIES = libconnectionpool_backends.la
Modified: trunk/glom/libglom/connectionpool_backends/backend.cc
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/backend.cc (original)
+++ trunk/glom/libglom/connectionpool_backends/backend.cc Tue Mar 3 22:21:36 2009
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include <glom/libglom/connectionpool_backends/backend.h>
+#include <libglom/connectionpool_backends/backend.h>
namespace Glom
{
Modified: trunk/glom/libglom/connectionpool_backends/backend.h
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/backend.h (original)
+++ trunk/glom/libglom/connectionpool_backends/backend.h Tue Mar 3 22:21:36 2009
@@ -23,8 +23,8 @@
#include <config.h> // For GLOM_ENABLE_CLIENT_ONLY
-#include <glom/libglom/sharedptr.h>
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/sharedptr.h>
+#include <libglom/data_structure/field.h>
#include <gtkmm/window.h>
Modified: trunk/glom/libglom/connectionpool_backends/postgres.cc
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres.cc (original)
+++ trunk/glom/libglom/connectionpool_backends/postgres.cc Tue Mar 3 22:21:36 2009
@@ -20,7 +20,7 @@
#include "config.h"
-#include <glom/libglom/connectionpool_backends/postgres.h>
+#include <libglom/connectionpool_backends/postgres.h>
#include <glibmm/i18n.h>
#include <bakery/bakery.h>
Modified: trunk/glom/libglom/connectionpool_backends/postgres.h
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres.h (original)
+++ trunk/glom/libglom/connectionpool_backends/postgres.h Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#define GLOM_BACKEND_POSTGRES_H
#include <libgdamm.h>
-#include <glom/libglom/connectionpool_backends/backend.h>
+#include <libglom/connectionpool_backends/backend.h>
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
Modified: trunk/glom/libglom/connectionpool_backends/postgres_central.cc
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres_central.cc (original)
+++ trunk/glom/libglom/connectionpool_backends/postgres_central.cc Tue Mar 3 22:21:36 2009
@@ -20,7 +20,7 @@
#include "config.h"
-#include <glom/libglom/connectionpool_backends/postgres_central.h>
+#include <libglom/connectionpool_backends/postgres_central.h>
#include <glibmm/i18n.h>
#include <bakery/bakery.h>
Modified: trunk/glom/libglom/connectionpool_backends/postgres_central.h
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres_central.h (original)
+++ trunk/glom/libglom/connectionpool_backends/postgres_central.h Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_BACKEND_POSTGRES_CENTRAL_H
#define GLOM_BACKEND_POSTGRES_CENTRAL_H
-#include <glom/libglom/connectionpool_backends/postgres.h>
+#include <libglom/connectionpool_backends/postgres.h>
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
Modified: trunk/glom/libglom/connectionpool_backends/postgres_self.cc
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres_self.cc (original)
+++ trunk/glom/libglom/connectionpool_backends/postgres_self.cc Tue Mar 3 22:21:36 2009
@@ -18,9 +18,9 @@
* Boston, MA 02111-1307, USA.
*/
-#include <glom/libglom/connectionpool_backends/postgres_self.h>
-#include <glom/libglom/utils.h>
-#include <glom/libglom/spawn_with_feedback.h>
+#include <libglom/connectionpool_backends/postgres_self.h>
+#include <libglom/utils.h>
+#include <libglom/spawn_with_feedback.h>
#include <glib/gstdio.h> // For g_remove
#include <bakery/bakery.h>
Modified: trunk/glom/libglom/connectionpool_backends/postgres_self.h
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres_self.h (original)
+++ trunk/glom/libglom/connectionpool_backends/postgres_self.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
-#include <glom/libglom/connectionpool_backends/postgres.h>
+#include <libglom/connectionpool_backends/postgres.h>
namespace Glom
{
Modified: trunk/glom/libglom/connectionpool_backends/sqlite.cc
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/sqlite.cc (original)
+++ trunk/glom/libglom/connectionpool_backends/sqlite.cc Tue Mar 3 22:21:36 2009
@@ -20,7 +20,7 @@
#include "config.h"
-#include <glom/libglom/connectionpool_backends/sqlite.h>
+#include <libglom/connectionpool_backends/sqlite.h>
#include <giomm/file.h>
Modified: trunk/glom/libglom/connectionpool_backends/sqlite.h
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/sqlite.h (original)
+++ trunk/glom/libglom/connectionpool_backends/sqlite.h Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#define GLOM_BACKEND_SQLITE_H
#include <libgdamm.h>
-#include <glom/libglom/connectionpool_backends/backend.h>
+#include <libglom/connectionpool_backends/backend.h>
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY, GLOM_ENABLE_SQLITE
Modified: trunk/glom/libglom/data_structure/Makefile.am
==============================================================================
--- trunk/glom/libglom/data_structure/Makefile.am (original)
+++ trunk/glom/libglom/data_structure/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,6 +1,6 @@
SUBDIRS = layout
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS)
h_sources = field.h \
foundset.h \
Modified: trunk/glom/libglom/data_structure/field.cc
==============================================================================
--- trunk/glom/libglom/data_structure/field.cc (original)
+++ trunk/glom/libglom/data_structure/field.cc Tue Mar 3 22:21:36 2009
@@ -19,9 +19,9 @@
*/
#include "field.h"
-#include <glom/libglom/connectionpool.h>
+#include <libglom/connectionpool.h>
#include "glomconversions.h"
-#include <glom/libglom/utils.h>
+#include <libglom/utils.h>
#include <glibmm/i18n.h>
namespace Glom
Modified: trunk/glom/libglom/data_structure/field.h
==============================================================================
--- trunk/glom/libglom/data_structure/field.h (original)
+++ trunk/glom/libglom/data_structure/field.h Tue Mar 3 22:21:36 2009
@@ -24,7 +24,7 @@
#include <libgdamm.h>
#include "translatable_item.h"
#include "layout/fieldformatting.h"
-#include <glom/libglom/sharedptr.h>
+#include <libglom/sharedptr.h>
//Predicate, for use with std::find_if():
Modified: trunk/glom/libglom/data_structure/fieldtypes.cc
==============================================================================
--- trunk/glom/libglom/data_structure/fieldtypes.cc (original)
+++ trunk/glom/libglom/data_structure/fieldtypes.cc Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#include "fieldtypes.h"
#include <iostream> //For debug output
#include <libgda/gda-util.h> // For gda_g_type_to_string
-#include <glom/libglom/connectionpool.h>
+#include <libglom/connectionpool.h>
namespace Glom
{
Modified: trunk/glom/libglom/data_structure/foundset.cc
==============================================================================
--- trunk/glom/libglom/data_structure/foundset.cc (original)
+++ trunk/glom/libglom/data_structure/foundset.cc Tue Mar 3 22:21:36 2009
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include <glom/libglom/data_structure/foundset.h>
+#include <libglom/data_structure/foundset.h>
namespace Glom
{
Modified: trunk/glom/libglom/data_structure/foundset.h
==============================================================================
--- trunk/glom/libglom/data_structure/foundset.h (original)
+++ trunk/glom/libglom/data_structure/foundset.h Tue Mar 3 22:21:36 2009
@@ -24,8 +24,8 @@
#include <glibmm/ustring.h>
#include <list>
#include <utility> //For std::pair
-#include <glom/libglom/data_structure/layout/layoutitem_field.h>
-#include <glom/libglom/sharedptr.h>
+#include <libglom/data_structure/layout/layoutitem_field.h>
+#include <libglom/sharedptr.h>
namespace Glom
{
Modified: trunk/glom/libglom/data_structure/glomconversions.cc
==============================================================================
--- trunk/glom/libglom/data_structure/glomconversions.cc (original)
+++ trunk/glom/libglom/data_structure/glomconversions.cc Tue Mar 3 22:21:36 2009
@@ -24,10 +24,10 @@
#include <libgda/gda-blob-op.h> // For gda_blob_op_read_all()
#include "glomconversions.h"
-#include <glom/libglom/connectionpool.h>
-#include <glom/libglom/utils.h>
+#include <libglom/connectionpool.h>
+#include <libglom/utils.h>
#include <gdkmm/pixbufloader.h>
-#include <glom/libglom/data_structure/layout/layoutitem_image.h> // For GLOM_IMAGE_FORMAT
+#include <libglom/data_structure/layout/layoutitem_image.h> // For GLOM_IMAGE_FORMAT
#include <glibmm/i18n.h>
#include <sstream> //For stringstream
Modified: trunk/glom/libglom/data_structure/glomconversions.h
==============================================================================
--- trunk/glom/libglom/data_structure/glomconversions.h (original)
+++ trunk/glom/libglom/data_structure/glomconversions.h Tue Mar 3 22:21:36 2009
@@ -21,10 +21,10 @@
#ifndef GLOM_DATASTRUCTURE_GLOMCONVERSIONS_H
#define GLOM_DATASTRUCTURE_GLOMCONVERSIONS_H
-#include <glom/libglom/data_structure/field.h>
-#include <glom/libglom/data_structure/numeric_format.h>
+#include <libglom/data_structure/field.h>
+#include <libglom/data_structure/numeric_format.h>
-#include <glom/libglom/data_structure/layout/layoutitem_field.h>
+#include <libglom/data_structure/layout/layoutitem_field.h>
#include <libxml++/libxml++.h>
#include <gdkmm/pixbuf.h>
Modified: trunk/glom/libglom/data_structure/iso_codes.cc
==============================================================================
--- trunk/glom/libglom/data_structure/iso_codes.cc (original)
+++ trunk/glom/libglom/data_structure/iso_codes.cc Tue Mar 3 22:21:36 2009
@@ -20,8 +20,8 @@
#include "iso_codes.h"
#include <libxml++/libxml++.h>
-#include <glom/libglom/document/document_glom.h>
-#include <glom/libglom/utils.h>
+#include <libglom/document/document_glom.h>
+#include <libglom/utils.h>
#include <glibmm/i18n.h>
#include "config.h" //For ISO_CODES_PREFIX.
Modified: trunk/glom/libglom/data_structure/iso_codes.h
==============================================================================
--- trunk/glom/libglom/data_structure/iso_codes.h (original)
+++ trunk/glom/libglom/data_structure/iso_codes.h Tue Mar 3 22:21:36 2009
@@ -21,8 +21,8 @@
#ifndef GLOM_DATASTRUCTURE_ISO_CODES_H
#define GLOM_DATASTRUCTURE_ISO_CODES_H
-#include <glom/libglom/data_structure/field.h>
-#include <glom/libglom/data_structure/numeric_format.h>
+#include <libglom/data_structure/field.h>
+#include <libglom/data_structure/numeric_format.h>
namespace Glom
{
Modified: trunk/glom/libglom/data_structure/layout/Makefile.am
==============================================================================
--- trunk/glom/libglom/data_structure/layout/Makefile.am (original)
+++ trunk/glom/libglom/data_structure/layout/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,6 +1,6 @@
SUBDIRS = report_parts
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS)
noinst_LTLIBRARIES = libdata_structure_layout.la
Modified: trunk/glom/libglom/data_structure/layout/fieldformatting.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/fieldformatting.h (original)
+++ trunk/glom/libglom/data_structure/layout/fieldformatting.h Tue Mar 3 22:21:36 2009
@@ -24,7 +24,7 @@
#include "usesrelationship.h"
#include "../numeric_format.h"
#include "../relationship.h"
-#include <glom/libglom/sharedptr.h>
+#include <libglom/sharedptr.h>
#include <libgdamm.h>
namespace Glom
Modified: trunk/glom/libglom/data_structure/layout/layoutitem_image.cc
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_image.cc (original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_image.cc Tue Mar 3 22:21:36 2009
@@ -19,8 +19,8 @@
*/
#include "layoutitem_image.h"
-#include <glom/libglom/utils.h>
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/utils.h>
+#include <libglom/data_structure/glomconversions.h>
#include <glibmm/i18n.h>
namespace Glom
Modified: trunk/glom/libglom/data_structure/layout/layoutitem_line.cc
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_line.cc (original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_line.cc Tue Mar 3 22:21:36 2009
@@ -19,7 +19,7 @@
*/
#include "layoutitem_line.h"
-#include <glom/libglom/utils.h>
+#include <libglom/utils.h>
#include <glibmm/i18n.h>
namespace Glom
Modified: trunk/glom/libglom/data_structure/layout/report_parts/Makefile.am
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/Makefile.am (original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS)
noinst_LTLIBRARIES = libdata_structure_layout_reportparts.la
Modified: trunk/glom/libglom/data_structure/layout/usesrelationship.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/usesrelationship.h (original)
+++ trunk/glom/libglom/data_structure/layout/usesrelationship.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include "../numeric_format.h"
#include "../relationship.h"
-#include <glom/libglom/sharedptr.h>
+#include <libglom/sharedptr.h>
#include <libgdamm.h>
namespace Glom
Modified: trunk/glom/libglom/data_structure/translatable_item.cc
==============================================================================
--- trunk/glom/libglom/data_structure/translatable_item.cc (original)
+++ trunk/glom/libglom/data_structure/translatable_item.cc Tue Mar 3 22:21:36 2009
@@ -19,7 +19,7 @@
*/
#include "translatable_item.h"
-#include <glom/libglom/utils.h>
+#include <libglom/utils.h>
#include <glibmm/i18n.h>
#include <iostream>
Modified: trunk/glom/libglom/data_structure/translatable_item.h
==============================================================================
--- trunk/glom/libglom/data_structure/translatable_item.h (original)
+++ trunk/glom/libglom/data_structure/translatable_item.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <glibmm/ustring.h>
#include <map>
-#include <glom/libglom/sharedptr.h>
+#include <libglom/sharedptr.h>
namespace Glom
{
Modified: trunk/glom/libglom/document/Makefile.am
==============================================================================
--- trunk/glom/libglom/document/Makefile.am (original)
+++ trunk/glom/libglom/document/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS)
h_sources = document_glom.h view.h
cc_sources = document_glom.cc
Modified: trunk/glom/libglom/document/document_glom.cc
==============================================================================
--- trunk/glom/libglom/document/document_glom.cc (original)
+++ trunk/glom/libglom/document/document_glom.cc Tue Mar 3 22:21:36 2009
@@ -18,24 +18,24 @@
* Boston, MA 02111-1307, USA.
*/
-#include <glom/libglom/document/document_glom.h>
-#include <glom/libglom/utils.h>
-//#include <glom/libglom/data_structure/glomconversions.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_summary.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_header.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h>
-#include <glom/libglom/data_structure/layout/layoutitem_button.h>
-#include <glom/libglom/data_structure/layout/layoutitem_text.h>
-#include <glom/libglom/data_structure/layout/layoutitem_image.h>
-#include <glom/libglom/data_structure/layout/layoutitem_calendarportal.h>
-#include <glom/libglom/data_structure/layout/layoutitem_line.h>
-#include <glom/libglom/standard_table_prefs_fields.h>
+#include <libglom/document/document_glom.h>
+#include <libglom/utils.h>
+//#include <libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/layout/report_parts/layoutitem_summary.h>
+#include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
+#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 <libglom/data_structure/layout/layoutitem_button.h>
+#include <libglom/data_structure/layout/layoutitem_text.h>
+#include <libglom/data_structure/layout/layoutitem_image.h>
+#include <libglom/data_structure/layout/layoutitem_calendarportal.h>
+#include <libglom/data_structure/layout/layoutitem_line.h>
+#include <libglom/standard_table_prefs_fields.h>
#include <giomm.h>
#include <bakery/Utilities/BusyCursor.h>
-#include <glom/libglom/connectionpool.h>
+#include <libglom/connectionpool.h>
#include <gtk/gtkpagesetup.h> //TODO: Remove this when we can use the C++ constructor.
Modified: trunk/glom/libglom/document/document_glom.h
==============================================================================
--- trunk/glom/libglom/document/document_glom.h (original)
+++ trunk/glom/libglom/document/document_glom.h Tue Mar 3 22:21:36 2009
@@ -25,19 +25,19 @@
#include <bakery/Document/Document_XML.h>
#include <bakery/View/View_Composite.h>
-#include <glom/libglom/data_structure/relationship.h>
-#include <glom/libglom/data_structure/field.h>
-#include <glom/libglom/data_structure/layout/layoutgroup.h>
-#include <glom/libglom/data_structure/layout/layoutitem_notebook.h>
-#include <glom/libglom/data_structure/layout/layoutitem_portal.h>
-#include <glom/libglom/data_structure/layout/layoutitem_button.h>
-#include <glom/libglom/data_structure/layout/layoutitem_text.h>
-#include <glom/libglom/data_structure/layout/layoutitem_image.h>
-#include <glom/libglom/data_structure/tableinfo.h>
-#include <glom/libglom/data_structure/groupinfo.h>
-#include <glom/libglom/data_structure/report.h>
-#include <glom/libglom/data_structure/print_layout.h>
-#include <glom/libglom/data_structure/foundset.h>
+#include <libglom/data_structure/relationship.h>
+#include <libglom/data_structure/field.h>
+#include <libglom/data_structure/layout/layoutgroup.h>
+#include <libglom/data_structure/layout/layoutitem_notebook.h>
+#include <libglom/data_structure/layout/layoutitem_portal.h>
+#include <libglom/data_structure/layout/layoutitem_button.h>
+#include <libglom/data_structure/layout/layoutitem_text.h>
+#include <libglom/data_structure/layout/layoutitem_image.h>
+#include <libglom/data_structure/tableinfo.h>
+#include <libglom/data_structure/groupinfo.h>
+#include <libglom/data_structure/report.h>
+#include <libglom/data_structure/print_layout.h>
+#include <libglom/data_structure/foundset.h>
#include "../appstate.h"
//#include <gtkmm/window.h>
#include <vector>
@@ -390,9 +390,9 @@
typedef sigc::signal<void, AppState::userlevels> type_signal_userlevel_changed;
type_signal_userlevel_changed signal_userlevel_changed();
-
+ //TODO: This is a rather indirect way for application.cc to request the UI to update for the userlevel.
void emit_userlevel_changed();
-#endif
+#endif //SWIG
static Glib::ustring get_default_layout_platform();
@@ -411,26 +411,33 @@
Glib::ustring build_and_get_contents() const;
- static sharedptr<TableInfo> create_table_system_preferences();
- static sharedptr<TableInfo> create_table_system_preferences(type_vecFields& fields);
- static sharedptr<Relationship> create_relationship_system_preferences(const Glib::ustring& table_name);
- static bool get_relationship_is_system_properties(const sharedptr<const Relationship>& relationship);
+protected:
+
+
+ //TODO: Remove this:
+ friend class ReportBuilder;
#ifndef GLOM_ENABLE_CLIENT_ONLY
///If value is equal to the default then no attribute will be set, to save text space in the XML file.
static void set_node_attribute_value_as_decimal(xmlpp::Element* node, const Glib::ustring& strAttributeName, guint value, guint value_default = 0);
#endif // !GLOM_ENABLE_CLIENT_ONLY
-
+
// This is required by the report builder, so it cannot be disabled
// in client only mode
static void set_node_attribute_value_as_decimal_double(xmlpp::Element* node, const Glib::ustring& strAttributeName, double value);
#endif //SWIG
-private:
+#ifndef SWIG
+public:
+ static sharedptr<TableInfo> create_table_system_preferences();
+ static sharedptr<TableInfo> create_table_system_preferences(type_vecFields& fields);
+ static sharedptr<Relationship> create_relationship_system_preferences(const Glib::ustring& table_name);
+ static bool get_relationship_is_system_properties(const sharedptr<const Relationship>& relationship);
+#endif //SWIG
+private:
//Overrides:
-
#ifndef GLOM_ENABLE_CLIENT_ONLY
virtual bool save_before();
void save_before_layout_group(xmlpp::Element* node, const sharedptr<const LayoutGroup>& group, bool with_print_layout_positions = false);
Modified: trunk/glom/libglom/document/view.h
==============================================================================
--- trunk/glom/libglom/document/view.h (original)
+++ trunk/glom/libglom/document/view.h Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#ifndef DOCUMENT_GLOM_VIEW_H
#define DOCUMENT_GLOM_VIEW_H
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
namespace Glom
{
Modified: trunk/glom/libglom/glom-1.0.pc.in
==============================================================================
--- trunk/glom/libglom/glom-1.0.pc.in (original)
+++ trunk/glom/libglom/glom-1.0.pc.in Tue Mar 3 22:21:36 2009
@@ -5,7 +5,7 @@
Name: libglom
Description: Library for accessing Glom documents and data structures.
-Requires: glibmm-2.4 giomm-2.4
+Requires: glibmm-2.4 giomm-2.4 bakery-2.6 libgdamm-4.0
Version: @VERSION@
Libs: -L${libdir} -lglom
Cflags: -I${includedir}/glom-1.0
Modified: trunk/glom/libglom/python_embed/Makefile.am
==============================================================================
--- trunk/glom/libglom/python_embed/Makefile.am (original)
+++ trunk/glom/libglom/python_embed/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,6 +1,6 @@
SUBDIRS =
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES)
noinst_LTLIBRARIES = libglom_python_embed.la
libglom_python_embed_la_SOURCES = py_glom_record.h py_glom_record.cc \
Modified: trunk/glom/libglom/python_embed/py_glom_record.cc
==============================================================================
--- trunk/glom/libglom/python_embed/py_glom_record.cc (original)
+++ trunk/glom/libglom/python_embed/py_glom_record.cc Tue Mar 3 22:21:36 2009
@@ -24,11 +24,11 @@
#include <eval.h> /* for PyEval_EvalCode */
#include <objimpl.h> /* for PyObject_New() */
-#include <glom/libglom/python_embed/py_glom_record.h>
-#include <glom/libglom/python_embed/py_glom_related.h>
+#include <libglom/python_embed/py_glom_record.h>
+#include <libglom/python_embed/py_glom_related.h>
#include "pygdavalue_conversions.h" //For pygda_value_as_pyobject().
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include <glibmm/ustring.h>
namespace Glom
Modified: trunk/glom/libglom/python_embed/py_glom_record.h
==============================================================================
--- trunk/glom/libglom/python_embed/py_glom_record.h (original)
+++ trunk/glom/libglom/python_embed/py_glom_record.h Tue Mar 3 22:21:36 2009
@@ -26,8 +26,8 @@
#include <Python.h>
-#include <glom/libglom/document/document_glom.h>
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/document/document_glom.h>
+#include <libglom/data_structure/field.h>
#include <glibmm/ustring.h>
namespace Glom
Modified: trunk/glom/libglom/python_embed/py_glom_related.cc
==============================================================================
--- trunk/glom/libglom/python_embed/py_glom_related.cc (original)
+++ trunk/glom/libglom/python_embed/py_glom_related.cc Tue Mar 3 22:21:36 2009
@@ -24,12 +24,12 @@
#include <eval.h> /* for PyEval_EvalCode */
#include <objimpl.h> /* for PyObject_New() */
-#include <glom/libglom/python_embed/py_glom_related.h>
-//#include <glom/libglom/python_embed/py_glom_record.h>
-#include <glom/libglom/python_embed/py_glom_relatedrecord.h>
+#include <libglom/python_embed/py_glom_related.h>
+//#include <libglom/python_embed/py_glom_record.h>
+#include <libglom/python_embed/py_glom_relatedrecord.h>
-#include <glom/libglom/data_structure/field.h>
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/field.h>
+#include <libglom/data_structure/glomconversions.h>
#include <glibmm/ustring.h>
Modified: trunk/glom/libglom/python_embed/py_glom_related.h
==============================================================================
--- trunk/glom/libglom/python_embed/py_glom_related.h (original)
+++ trunk/glom/libglom/python_embed/py_glom_related.h Tue Mar 3 22:21:36 2009
@@ -21,8 +21,8 @@
#ifndef GLOM_PYTHON_GLOM_RELATED_H
#define GLOM_PYTHON_GLOM_RELATED_H
-#include <glom/libglom/python_embed/py_glom_record.h>
-#include <glom/libglom/data_structure/relationship.h>
+#include <libglom/python_embed/py_glom_record.h>
+#include <libglom/data_structure/relationship.h>
namespace Glom
{
Modified: trunk/glom/libglom/python_embed/py_glom_relatedrecord.cc
==============================================================================
--- trunk/glom/libglom/python_embed/py_glom_relatedrecord.cc (original)
+++ trunk/glom/libglom/python_embed/py_glom_relatedrecord.cc Tue Mar 3 22:21:36 2009
@@ -24,12 +24,12 @@
#include <eval.h> /* for PyEval_EvalCode */
#include <objimpl.h> /* for PyObject_New() */
-#include <glom/libglom/python_embed/py_glom_relatedrecord.h>
-#include <glom/libglom/python_embed/py_glom_record.h>
+#include <libglom/python_embed/py_glom_relatedrecord.h>
+#include <libglom/python_embed/py_glom_record.h>
#include "pygdavalue_conversions.h" //For pygda_value_as_pyobject().
-#include <glom/libglom/connectionpool.h>
+#include <libglom/connectionpool.h>
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include <glibmm/ustring.h>
#include "glom/application.h"
Modified: trunk/glom/libglom/python_embed/py_glom_relatedrecord.h
==============================================================================
--- trunk/glom/libglom/python_embed/py_glom_relatedrecord.h (original)
+++ trunk/glom/libglom/python_embed/py_glom_relatedrecord.h Tue Mar 3 22:21:36 2009
@@ -24,8 +24,8 @@
#define NO_IMPORT_PYGTK //To avoid a multiple definition in pygtk.
#include <pygtk/pygtk.h> //For the PyGObject and PyGBoxed struct definitions.
-#include <glom/libglom/document/document_glom.h>
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/document/document_glom.h>
+#include <libglom/data_structure/field.h>
#include <glibmm/ustring.h>
namespace Glom
Modified: trunk/glom/libglom/spawn_with_feedback.cc
==============================================================================
--- trunk/glom/libglom/spawn_with_feedback.cc (original)
+++ trunk/glom/libglom/spawn_with_feedback.cc Tue Mar 3 22:21:36 2009
@@ -18,9 +18,9 @@
* Boston, MA 02111-1307, USA.
*/
-#include <glom/libglom/spawn_with_feedback.h>
-#include <glom/libglom/dialog_progress_creating.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/spawn_with_feedback.h>
+#include <libglom/dialog_progress_creating.h>
+#include <libglom/glade_utils.h>
#include <bakery/bakery.h>
#include <glibmm/i18n.h>
#include <iostream>
Modified: trunk/glom/libglom/test_avahi_publisher.cc
==============================================================================
--- trunk/glom/libglom/test_avahi_publisher.cc (original)
+++ trunk/glom/libglom/test_avahi_publisher.cc Tue Mar 3 22:21:36 2009
@@ -1,6 +1,6 @@
#include <gtkmm.h>
-#include <glom/libglom/avahi_publisher.h>
-#include <glom/libglom/utils.h>
+#include <libglom/avahi_publisher.h>
+#include <libglom/utils.h>
#include <iostream>
class TestWindow : public Gtk::Window
Modified: trunk/glom/libglom/test_connectionpool.cc
==============================================================================
--- trunk/glom/libglom/test_connectionpool.cc (original)
+++ trunk/glom/libglom/test_connectionpool.cc Tue Mar 3 22:21:36 2009
@@ -19,12 +19,12 @@
*/
#include <libgdamm/init.h>
-#include <glom/libglom/connectionpool.h>
+#include <libglom/connectionpool.h>
#ifdef GLOM_ENABLE_POSTGRESQL
-#include <glom/libglom/connectionpool_backends/postgres_central.h>
+#include <libglom/connectionpool_backends/postgres_central.h>
#else
-#include <glom/libglom/connectionpool_backends/sqlite.h>
+#include <libglom/connectionpool_backends/sqlite.h>
#endif //#GLOM_ENABLE_POSTGRESQL
Modified: trunk/glom/libglom/test_sharedptr_layoutitem.cc
==============================================================================
--- trunk/glom/libglom/test_sharedptr_layoutitem.cc (original)
+++ trunk/glom/libglom/test_sharedptr_layoutitem.cc Tue Mar 3 22:21:36 2009
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#include "glom/libglom/data_structure/layout/layoutgroup.h"
-#include "glom/libglom/data_structure/layout/layoutitem_field.h"
+#include <libglom/data_structure/layout/layoutgroup.h>
+#include <libglom/data_structure/layout/layoutitem_field.h>
int
Modified: trunk/glom/libglom/test_sync.cc
==============================================================================
--- trunk/glom/libglom/test_sync.cc (original)
+++ trunk/glom/libglom/test_sync.cc Tue Mar 3 22:21:36 2009
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "glom/libglom/spawn_with_feedback.h"
+#include <libglom/spawn_with_feedback.h>
#include <iostream>
int
Modified: trunk/glom/libglom/utils.cc
==============================================================================
--- trunk/glom/libglom/utils.cc (original)
+++ trunk/glom/libglom/utils.cc Tue Mar 3 22:21:36 2009
@@ -20,10 +20,10 @@
#include "config.h" // For GLOM_ENABLE_MAEMO
-#include <glom/libglom/utils.h>
-#include <glom/libglom/connectionpool.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/utils.h>
+#include <libglom/connectionpool.h>
+#include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
+#include <libglom/data_structure/glomconversions.h>
#include <glibmm/i18n.h>
#include <gtkmm/messagedialog.h>
Modified: trunk/glom/libglom/utils.h
==============================================================================
--- trunk/glom/libglom/utils.h (original)
+++ trunk/glom/libglom/utils.h Tue Mar 3 22:21:36 2009
@@ -21,10 +21,10 @@
#ifndef GLOM_UTILS_H
#define GLOM_UTILS_H
-#include <glom/libglom/data_structure/field.h>
-#include <glom/libglom/data_structure/numeric_format.h>
+#include <libglom/data_structure/field.h>
+#include <libglom/data_structure/numeric_format.h>
-#include <glom/libglom/data_structure/layout/layoutitem_field.h>
+#include <libglom/data_structure/layout/layoutitem_field.h>
#include <gtkmm/dialog.h>
#include <gtkmm/messagedialog.h>
Modified: trunk/glom/main.cc
==============================================================================
--- trunk/glom/main.cc (original)
+++ trunk/glom/main.cc Tue Mar 3 22:21:36 2009
@@ -29,14 +29,14 @@
// For postgres availability checks:
#ifdef GLOM_ENABLE_POSTGRESQL
-#include <glom/libglom/connectionpool_backends/postgres.h>
+#include <libglom/connectionpool_backends/postgres.h>
#ifndef GLOM_ENABLE_CLIENT_ONLY
-#include <glom/libglom/connectionpool_backends/postgres_self.h>
+#include <libglom/connectionpool_backends/postgres_self.h>
#endif //GLOM_ENABLE_CLIENT_ONLY
#endif //GLOM_ENABLE_POSTGRESQL
// For sanity checks:
-#include <glom/libglom/data_structure/glomconversions.h> // For GLOM_IMAGE_FORMAT
+#include <libglom/data_structure/glomconversions.h> // For GLOM_IMAGE_FORMAT
#ifndef GLOM_ENABLE_CLIENT_ONLY
#include <gtksourceviewmm/init.h>
@@ -49,7 +49,7 @@
#endif
#include "application.h"
-#include <glom/libglom/glade_utils.h>
+#include <libglom/glade_utils.h>
#ifndef G_OS_WIN32
#include <fontconfig/fontconfig.h> //For cleanup.
Modified: trunk/glom/mode_data/Makefile.am
==============================================================================
--- trunk/glom/mode_data/Makefile.am (original)
+++ trunk/glom/mode_data/Makefile.am Tue Mar 3 22:21:36 2009
@@ -2,7 +2,7 @@
glomxsltdir = $(datadir)/glom/xslt/
# We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\" \
-DGLOM_XSLTDIR=\""$(glomxsltdir)/"\"
Modified: trunk/glom/mode_data/box_data.cc
==============================================================================
--- trunk/glom/mode_data/box_data.cc (original)
+++ trunk/glom/mode_data/box_data.cc Tue Mar 3 22:21:36 2009
@@ -21,9 +21,9 @@
#include "config.h" // For GLOM_ENABLE_MAEMO
#include "box_data.h"
-#include <glom/libglom/data_structure/glomconversions.h>
-#include <glom/libglom/utils.h>
-#include <glom/libglom/data_structure/layout/layoutitem_field.h>
+#include <libglom/data_structure/glomconversions.h>
+#include <libglom/utils.h>
+#include <libglom/data_structure/layout/layoutitem_field.h>
#include <glom/glom_privs.h>
#include "../python_embed/glom_python.h"
#include <bakery/App/App_Gtk.h> //For util_bold_message().
Modified: trunk/glom/mode_data/box_data_calendar_related.cc
==============================================================================
--- trunk/glom/mode_data/box_data_calendar_related.cc (original)
+++ trunk/glom/mode_data/box_data_calendar_related.cc Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#include "box_data_calendar_related.h"
#include "dialog_layout_calendar_related.h"
#include <glom/application.h>
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <glom/frame_glom.h> //For show_ok_dialog()
#include <bakery/App/App_Gtk.h> //For util_bold_message().
#include <glibmm/i18n.h>
Modified: trunk/glom/mode_data/box_data_calendar_related.h
==============================================================================
--- trunk/glom/mode_data/box_data_calendar_related.h (original)
+++ trunk/glom/mode_data/box_data_calendar_related.h Tue Mar 3 22:21:36 2009
@@ -24,7 +24,7 @@
#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
#include "box_data_portal.h"
-#include <glom/libglom/data_structure/layout/layoutitem_calendarportal.h>
+#include <libglom/data_structure/layout/layoutitem_calendarportal.h>
#include "../utility_widgets/layoutwidgetbase.h"
#include "../utility_widgets/calendar/glomcalendar.h"
Modified: trunk/glom/mode_data/box_data_details.cc
==============================================================================
--- trunk/glom/mode_data/box_data_details.cc (original)
+++ trunk/glom/mode_data/box_data_details.cc Tue Mar 3 22:21:36 2009
@@ -20,12 +20,12 @@
#include "box_data_details.h"
#include "../frame_glom.h" //For show_ok_dialog().
-#include <glom/libglom/data_structure/field.h>
-#include <glom/libglom/data_structure/relationship.h>
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/field.h>
+#include <libglom/data_structure/relationship.h>
+#include <libglom/data_structure/glomconversions.h>
#include "dialog_layout_details.h"
-#include <glom/libglom/glade_utils.h>
-#include <glom/libglom/utils.h>
+#include <libglom/glade_utils.h>
+#include <libglom/utils.h>
#include <glom/glom_privs.h>
#include "../xsl_utils.h"
#include <bakery/App/App_Gtk.h> //For util_bold_message().
Modified: trunk/glom/mode_data/box_data_list.cc
==============================================================================
--- trunk/glom/mode_data/box_data_list.cc (original)
+++ trunk/glom/mode_data/box_data_list.cc Tue Mar 3 22:21:36 2009
@@ -19,8 +19,8 @@
*/
#include "box_data_list.h"
-#include <glom/libglom/data_structure/glomconversions.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/data_structure/glomconversions.h>
+#include <libglom/glade_utils.h>
#include <glom/reports/report_builder.h>
#include "dialog_layout_list.h"
#include <glom/glom_privs.h>
Modified: trunk/glom/mode_data/box_data_list_related.cc
==============================================================================
--- trunk/glom/mode_data/box_data_list_related.cc (original)
+++ trunk/glom/mode_data/box_data_list_related.cc Tue Mar 3 22:21:36 2009
@@ -20,8 +20,8 @@
#include "box_data_list_related.h"
#include "dialog_layout_list_related.h"
-#include <glom/libglom/data_structure/glomconversions.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/data_structure/glomconversions.h>
+#include <libglom/glade_utils.h>
#include <glom/frame_glom.h> //For show_ok_dialog()
#include <bakery/App/App_Gtk.h> //For util_bold_message().
#include <glibmm/i18n.h>
Modified: trunk/glom/mode_data/box_data_manyrecords.cc
==============================================================================
--- trunk/glom/mode_data/box_data_manyrecords.cc (original)
+++ trunk/glom/mode_data/box_data_manyrecords.cc Tue Mar 3 22:21:36 2009
@@ -19,8 +19,8 @@
*/
#include "box_data_manyrecords.h"
-#include <glom/libglom/data_structure/glomconversions.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/data_structure/glomconversions.h>
+#include <libglom/glade_utils.h>
#include <glom/reports/report_builder.h>
#include "dialog_layout_list.h"
#include <glom/glom_privs.h>
Modified: trunk/glom/mode_data/box_data_portal.cc
==============================================================================
--- trunk/glom/mode_data/box_data_portal.cc (original)
+++ trunk/glom/mode_data/box_data_portal.cc Tue Mar 3 22:21:36 2009
@@ -19,8 +19,8 @@
*/
#include "box_data_portal.h"
-#include <glom/libglom/data_structure/glomconversions.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/data_structure/glomconversions.h>
+#include <libglom/glade_utils.h>
#include <glom/frame_glom.h> //For show_ok_dialog()
#include <bakery/App/App_Gtk.h> //For util_bold_message().
#include <glibmm/i18n.h>
Modified: trunk/glom/mode_data/dialog_choose_field.h
==============================================================================
--- trunk/glom/mode_data/dialog_choose_field.h (original)
+++ trunk/glom/mode_data/dialog_choose_field.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <gtkmm.h>
#include "../utility_widgets/dialog_properties.h"
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
#include "../box_withbuttons.h"
#include "../utility_widgets/combo_textglade.h"
#include "../combobox_relationship.h"
Modified: trunk/glom/mode_data/dialog_choose_relationship.h
==============================================================================
--- trunk/glom/mode_data/dialog_choose_relationship.h (original)
+++ trunk/glom/mode_data/dialog_choose_relationship.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <gtkmm/dialog.h>
#include "../utility_widgets/dialog_properties.h"
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
#include "../box_withbuttons.h"
namespace Glom
Modified: trunk/glom/mode_data/dialog_layout.h
==============================================================================
--- trunk/glom/mode_data/dialog_layout.h (original)
+++ trunk/glom/mode_data/dialog_layout.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <gtkmm/dialog.h>
#include "../utility_widgets/dialog_properties.h"
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
#include "../box_withbuttons.h"
namespace Glom
Modified: trunk/glom/mode_data/dialog_layout_calendar_related.h
==============================================================================
--- trunk/glom/mode_data/dialog_layout_calendar_related.h (original)
+++ trunk/glom/mode_data/dialog_layout_calendar_related.h Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#define GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_RELATED_H
#include "dialog_layout_list.h"
-#include <glom/libglom/data_structure/layout/layoutitem_calendarportal.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>
Modified: trunk/glom/mode_data/dialog_layout_details.cc
==============================================================================
--- trunk/glom/mode_data/dialog_layout_details.cc (original)
+++ trunk/glom/mode_data/dialog_layout_details.cc Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#include "dialog_choose_relationship.h"
#include "../layout_item_dialogs/dialog_buttonscript.h"
#include "../layout_item_dialogs/dialog_notebook.h"
-#include <glom/libglom/glade_utils.h>
+#include <libglom/glade_utils.h>
#include "../frame_glom.h" //For show_ok_dialog()
//#include <libgnome/gnome-i18n.h>
#include <bakery/App/App_Gtk.h> //For util_bold_message().
Modified: trunk/glom/mode_data/flowtablewithfields.cc
==============================================================================
--- trunk/glom/mode_data/flowtablewithfields.cc (original)
+++ trunk/glom/mode_data/flowtablewithfields.cc Tue Mar 3 22:21:36 2009
@@ -29,13 +29,13 @@
#include <glom/utility_widgets/placeholder-glom.h>
#include "../application.h"
#include <gtkmm/checkbutton.h>
-#include <glom/libglom/data_structure/glomconversions.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/data_structure/glomconversions.h>
+#include <libglom/glade_utils.h>
#include "box_data_list_related.h"
#include "dialog_choose_relationship.h"
#include <bakery/App/App_Gtk.h> //For util_bold_message().
#include <glibmm/i18n.h>
-#include <glom/libglom/data_structure/layout/layoutitem_placeholder.h>
+#include <libglom/data_structure/layout/layoutitem_placeholder.h>
#include <glom/signal_reemitter.h>
namespace Glom
Modified: trunk/glom/mode_data/flowtablewithfields.h
==============================================================================
--- trunk/glom/mode_data/flowtablewithfields.h (original)
+++ trunk/glom/mode_data/flowtablewithfields.h Tue Mar 3 22:21:36 2009
@@ -28,16 +28,16 @@
#else
#include <glom/utility_widgets/flowtable_dnd.h>
#endif
-#include <glom/libglom/data_structure/layout/layoutgroup.h>
-#include <glom/libglom/data_structure/layout/layoutitem_field.h>
-#include <glom/libglom/data_structure/layout/layoutitem_notebook.h>
-#include <glom/libglom/data_structure/layout/layoutitem_portal.h>
-#include <glom/libglom/data_structure/layout/layoutitem_calendarportal.h>
-#include <glom/libglom/data_structure/layout/layoutitem_button.h>
-#include <glom/libglom/data_structure/layout/layoutitem_text.h>
-#include <glom/libglom/data_structure/layout/layoutitem_placeholder.h>
-#include <glom/libglom/data_structure/field.h>
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/data_structure/layout/layoutgroup.h>
+#include <libglom/data_structure/layout/layoutitem_field.h>
+#include <libglom/data_structure/layout/layoutitem_notebook.h>
+#include <libglom/data_structure/layout/layoutitem_portal.h>
+#include <libglom/data_structure/layout/layoutitem_calendarportal.h>
+#include <libglom/data_structure/layout/layoutitem_button.h>
+#include <libglom/data_structure/layout/layoutitem_text.h>
+#include <libglom/data_structure/layout/layoutitem_placeholder.h>
+#include <libglom/data_structure/field.h>
+#include <libglom/document/document_glom.h>
#include <glom/utility_widgets/layoutwidgetbase.h>
#include <glom/utility_widgets/layoutwidgetutils.h>
#include "box_data_list_related.h"
Modified: trunk/glom/mode_data/notebook_data.cc
==============================================================================
--- trunk/glom/mode_data/notebook_data.cc (original)
+++ trunk/glom/mode_data/notebook_data.cc Tue Mar 3 22:21:36 2009
@@ -19,7 +19,7 @@
*/
#include "notebook_data.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <glibmm/i18n.h>
namespace Glom
Modified: trunk/glom/mode_data/treestore_layout.h
==============================================================================
--- trunk/glom/mode_data/treestore_layout.h (original)
+++ trunk/glom/mode_data/treestore_layout.h Tue Mar 3 22:21:36 2009
@@ -22,8 +22,8 @@
#define GLOM_MODE_DATA_TREESTORE_LAYOUT_H
#include <gtkmm/treestore.h>
-#include <glom/libglom/data_structure/layout/layoutitem_portal.h>
-#include <glom/libglom/data_structure/layout/layoutitem_button.h>
+#include <libglom/data_structure/layout/layoutitem_portal.h>
+#include <libglom/data_structure/layout/layoutitem_button.h>
namespace Glom
{
Modified: trunk/glom/mode_design/Makefile.am
==============================================================================
--- trunk/glom/mode_design/Makefile.am (original)
+++ trunk/glom/mode_design/Makefile.am Tue Mar 3 22:21:36 2009
@@ -4,7 +4,7 @@
# We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
# We define PREFIX, SYSCONFDIR, LIBDIR, and DATADIR for the GNOME_PROGRAM_STANDARD_PROPERTIES macro.
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\"
noinst_LIBRARIES = libmode_design.a
Modified: trunk/glom/mode_design/dialog_design.h
==============================================================================
--- trunk/glom/mode_design/dialog_design.h (original)
+++ trunk/glom/mode_design/dialog_design.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <gtkmm.h>
#include <libglademm.h>
-#include <glom/libglom/document/view.h>
+#include <libglom/document/view.h>
namespace Glom
{
Modified: trunk/glom/mode_design/fields/Makefile.am
==============================================================================
--- trunk/glom/mode_design/fields/Makefile.am (original)
+++ trunk/glom/mode_design/fields/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,7 +1,7 @@
gladedir = $(datadir)/glom/glade/
# We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\"
Modified: trunk/glom/mode_design/fields/box_db_table_definition.cc
==============================================================================
--- trunk/glom/mode_design/fields/box_db_table_definition.cc (original)
+++ trunk/glom/mode_design/fields/box_db_table_definition.cc Tue Mar 3 22:21:36 2009
@@ -20,7 +20,7 @@
#include "box_db_table_definition.h"
#include <glom/frame_glom.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/glade_utils.h>
#include <bakery/App/App_Gtk.h> //For util_bold_message().
#include "../../../config.h"
#include <glibmm/i18n.h>
Modified: trunk/glom/mode_design/fields/combo_fieldtype.h
==============================================================================
--- trunk/glom/mode_design/fields/combo_fieldtype.h (original)
+++ trunk/glom/mode_design/fields/combo_fieldtype.h Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#ifndef COMBO_FIELDTYPE_HH
#define COMBO_FIELDTYPE_HH
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include <gtkmm/combobox.h>
#include <gtkmm/liststore.h>
#include <libgdamm.h>
Modified: trunk/glom/mode_design/fields/dialog_fieldcalculation.cc
==============================================================================
--- trunk/glom/mode_design/fields/dialog_fieldcalculation.cc (original)
+++ trunk/glom/mode_design/fields/dialog_fieldcalculation.cc Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include "../../box_db_table.h"
#include "../../frame_glom.h"
#include "../../python_embed/glom_python.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <gtksourceviewmm/sourcelanguagemanager.h>
//#include <libgnome/gnome-i18n.h>
Modified: trunk/glom/mode_design/fields/dialog_fieldcalculation.h
==============================================================================
--- trunk/glom/mode_design/fields/dialog_fieldcalculation.h (original)
+++ trunk/glom/mode_design/fields/dialog_fieldcalculation.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <gtkmm.h>
#include <libglademm.h>
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include "../../base_db.h"
#include <gtksourceviewmm/sourceview.h>
Modified: trunk/glom/mode_design/fields/dialog_fielddefinition.cc
==============================================================================
--- trunk/glom/mode_design/fields/dialog_fielddefinition.cc (original)
+++ trunk/glom/mode_design/fields/dialog_fielddefinition.cc Tue Mar 3 22:21:36 2009
@@ -20,7 +20,7 @@
#include "dialog_fielddefinition.h"
#include "dialog_fieldcalculation.h"
-#include <glom/libglom/glade_utils.h>
+#include <libglom/glade_utils.h>
#include "../../box_db_table.h"
//#include <libgnome/gnome-i18n.h>
#include <glibmm/i18n.h>
Modified: trunk/glom/mode_design/fields/dialog_fielddefinition.h
==============================================================================
--- trunk/glom/mode_design/fields/dialog_fielddefinition.h (original)
+++ trunk/glom/mode_design/fields/dialog_fielddefinition.h Tue Mar 3 22:21:36 2009
@@ -29,7 +29,7 @@
//#include "../../utility_widgets/entry_numerical.h"
#include "../../utility_widgets/dialog_properties.h"
#include "../../utility_widgets/datawidget.h"
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include "../../layout_item_dialogs/box_formatting.h"
#include "../../base_db.h"
#include <gtksourceviewmm/sourceview.h>
Modified: trunk/glom/mode_design/print_layouts/Makefile.am
==============================================================================
--- trunk/glom/mode_design/print_layouts/Makefile.am (original)
+++ trunk/glom/mode_design/print_layouts/Makefile.am Tue Mar 3 22:21:36 2009
@@ -5,7 +5,7 @@
# We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
# We define PREFIX, SYSCONFDIR, LIBDIR, and DATADIR for the GNOME_PROGRAM_STANDARD_PROPERTIES macro.
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\" \
-DGLOM_ICON_DIR=\""$(glom_icon_dir)"\"
Modified: trunk/glom/mode_design/print_layouts/box_print_layouts.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/box_print_layouts.h (original)
+++ trunk/glom/mode_design/print_layouts/box_print_layouts.h Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#define BOX_PRINT_LAYOUTS_H
#include <glom/box_db_table.h>
-#include <glom/libglom/data_structure/print_layout.h>
+#include <libglom/data_structure/print_layout.h>
#include <glom/utility_widgets/adddel/adddel_withbuttons.h>
namespace Glom
Modified: trunk/glom/mode_design/print_layouts/canvas_layout_item.cc
==============================================================================
--- trunk/glom/mode_design/print_layouts/canvas_layout_item.cc (original)
+++ trunk/glom/mode_design/print_layouts/canvas_layout_item.cc Tue Mar 3 22:21:36 2009
@@ -25,14 +25,14 @@
#include <glom/utility_widgets/canvas/canvas_line_movable.h>
#include <glom/utility_widgets/canvas/canvas_group_movable.h>
#include <glom/utility_widgets/canvas/canvas_table_movable.h>
-#include <glom/libglom/data_structure/layout/layoutitem_button.h>
-#include <glom/libglom/data_structure/layout/layoutitem_text.h>
-#include <glom/libglom/data_structure/layout/layoutitem_image.h>
-#include <glom/libglom/data_structure/layout/layoutitem_field.h>
-#include <glom/libglom/data_structure/layout/layoutitem_line.h>
-#include <glom/libglom/data_structure/layout/layoutitem_portal.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/layout/layoutitem_button.h>
+#include <libglom/data_structure/layout/layoutitem_text.h>
+#include <libglom/data_structure/layout/layoutitem_image.h>
+#include <libglom/data_structure/layout/layoutitem_field.h>
+#include <libglom/data_structure/layout/layoutitem_line.h>
+#include <libglom/data_structure/layout/layoutitem_portal.h>
+#include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
+#include <libglom/data_structure/glomconversions.h>
#include <glibmm/i18n.h>
#include <math.h>
#include <algorithm> //For std::max().
Modified: trunk/glom/mode_design/print_layouts/canvas_layout_item.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/canvas_layout_item.h (original)
+++ trunk/glom/mode_design/print_layouts/canvas_layout_item.h Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#define GLOM_MODE_DESIGN_PRINT_LAYOUTS_CANVAS_LAYOUT_ITEM_H
#include <glom/utility_widgets/canvas/canvas_group_resizable.h>
-#include <glom/libglom/data_structure/layout/layoutitem.h>
+#include <libglom/data_structure/layout/layoutitem.h>
#include <libgdamm/value.h>
namespace Glom
Modified: trunk/glom/mode_design/print_layouts/canvas_print_layout.cc
==============================================================================
--- trunk/glom/mode_design/print_layouts/canvas_print_layout.cc (original)
+++ trunk/glom/mode_design/print_layouts/canvas_print_layout.cc Tue Mar 3 22:21:36 2009
@@ -29,9 +29,9 @@
#include <glom/utility_widgets/canvas/canvas_table_movable.h>
#include <glom/utility_widgets/canvas/canvas_image_movable.h>
#include <glom/utility_widgets/canvas/canvas_text_movable.h>
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/glade_utils.h>
#include <glibmm/i18n.h>
namespace Glom
Modified: trunk/glom/mode_design/print_layouts/canvas_print_layout.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/canvas_print_layout.h (original)
+++ trunk/glom/mode_design/print_layouts/canvas_print_layout.h Tue Mar 3 22:21:36 2009
@@ -24,7 +24,7 @@
#include <glom/base_db.h>
#include <glom/utility_widgets/canvas/canvas_editable.h>
#include <glom/mode_design/print_layouts/canvas_layout_item.h>
-#include <glom/libglom/data_structure/print_layout.h>
+#include <libglom/data_structure/print_layout.h>
#include <gtkmm/uimanager.h>
#include <gtkmm/toggleaction.h>
#include <gtkmm/pagesetup.h>
Modified: trunk/glom/mode_design/print_layouts/dialog_text_formatting.cc
==============================================================================
--- trunk/glom/mode_design/print_layouts/dialog_text_formatting.cc (original)
+++ trunk/glom/mode_design/print_layouts/dialog_text_formatting.cc Tue Mar 3 22:21:36 2009
@@ -20,7 +20,7 @@
#include "dialog_text_formatting.h"
#include <glom/box_db_table.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/glade_utils.h>
#include <glibmm/i18n.h>
namespace Glom
Modified: trunk/glom/mode_design/print_layouts/dialog_text_formatting.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/dialog_text_formatting.h (original)
+++ trunk/glom/mode_design/print_layouts/dialog_text_formatting.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <gtkmm.h>
#include <libglademm.h>
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
#include <glom/layout_item_dialogs/box_formatting.h>
namespace Glom
Modified: trunk/glom/mode_design/print_layouts/window_print_layout_edit.cc
==============================================================================
--- trunk/glom/mode_design/print_layouts/window_print_layout_edit.cc (original)
+++ trunk/glom/mode_design/print_layouts/window_print_layout_edit.cc Tue Mar 3 22:21:36 2009
@@ -22,8 +22,8 @@
#include "window_print_layout_edit.h"
#include <glom/box_db_table.h>
#include "canvas_layout_item.h"
-#include <glom/libglom/data_structure/layout/layoutitem_line.h>
-#include <glom/libglom/data_structure/layout/layoutitem_portal.h>
+#include <libglom/data_structure/layout/layoutitem_line.h>
+#include <libglom/data_structure/layout/layoutitem_portal.h>
//#include <libgnome/gnome-i18n.h>
#include <bakery/App/App_Gtk.h> //For util_bold_message().
#include <gtkmm/scrolledwindow.h>
Modified: trunk/glom/mode_design/print_layouts/window_print_layout_edit.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/window_print_layout_edit.h (original)
+++ trunk/glom/mode_design/print_layouts/window_print_layout_edit.h Tue Mar 3 22:21:36 2009
@@ -21,11 +21,11 @@
#ifndef WINDOW_PRINT_LAYOUT_EDIT_H
#define WINDOW_PRINT_LAYOUT_EDIT_H
-#include <glom/libglom/data_structure/print_layout.h>
+#include <libglom/data_structure/print_layout.h>
#include <glom/mode_design/print_layouts/canvas_print_layout.h>
#include <glom/mode_design/print_layouts/print_layout_toolbar.h>
#include <glom/mode_design/print_layouts/print_layout_toolbar_button.h>
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
#include <gtkmm/window.h>
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
Modified: trunk/glom/mode_design/script_library/Makefile.am
==============================================================================
--- trunk/glom/mode_design/script_library/Makefile.am (original)
+++ trunk/glom/mode_design/script_library/Makefile.am Tue Mar 3 22:21:36 2009
@@ -4,7 +4,7 @@
# We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
# We define PREFIX, SYSCONFDIR, LIBDIR, and DATADIR for the GNOME_PROGRAM_STANDARD_PROPERTIES macro.
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\"
noinst_LIBRARIES = libmode_design_script_library.a
Modified: trunk/glom/mode_design/script_library/dialog_script_library.cc
==============================================================================
--- trunk/glom/mode_design/script_library/dialog_script_library.cc (original)
+++ trunk/glom/mode_design/script_library/dialog_script_library.cc Tue Mar 3 22:21:36 2009
@@ -21,8 +21,8 @@
#include "dialog_script_library.h"
#include "../../python_embed/glom_python.h"
-#include <glom/libglom/data_structure/glomconversions.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/data_structure/glomconversions.h>
+#include <libglom/glade_utils.h>
#include <glom/mode_design/script_library/dialog_new_script.h>
#include <gtksourceviewmm/sourcelanguagemanager.h>
#include <glom/application.h>
Modified: trunk/glom/mode_design/script_library/dialog_script_library.h
==============================================================================
--- trunk/glom/mode_design/script_library/dialog_script_library.h (original)
+++ trunk/glom/mode_design/script_library/dialog_script_library.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <gtkmm.h>
#include <libglademm.h>
-#include <glom/libglom/data_structure/layout/layoutitem_button.h>
+#include <libglom/data_structure/layout/layoutitem_button.h>
#include <glom/base_db.h>
#include <gtksourceviewmm/sourceview.h>
#include <glom/utility_widgets/combo_textglade.h>
Modified: trunk/glom/mode_design/users/Makefile.am
==============================================================================
--- trunk/glom/mode_design/users/Makefile.am (original)
+++ trunk/glom/mode_design/users/Makefile.am Tue Mar 3 22:21:36 2009
@@ -4,7 +4,7 @@
# We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
# We define PREFIX, SYSCONFDIR, LIBDIR, and DATADIR for the GNOME_PROGRAM_STANDARD_PROPERTIES macro.
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\"
noinst_LIBRARIES = libmode_design_users.a
@@ -12,4 +12,4 @@
dialog_groups_list.cc dialog_groups_list.h \
dialog_user.cc dialog_user.h \
dialog_new_group.cc dialog_new_group.h \
- dialog_choose_user.cc dialog_choose_user.h
\ No newline at end of file
+ dialog_choose_user.cc dialog_choose_user.h
Modified: trunk/glom/mode_design/users/dialog_groups_list.cc
==============================================================================
--- trunk/glom/mode_design/users/dialog_groups_list.cc (original)
+++ trunk/glom/mode_design/users/dialog_groups_list.cc Tue Mar 3 22:21:36 2009
@@ -22,8 +22,8 @@
#include "dialog_user.h"
#include "dialog_users_list.h"
#include "dialog_new_group.h"
-#include <glom/libglom/standard_table_prefs_fields.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/standard_table_prefs_fields.h>
+#include <libglom/glade_utils.h>
#include <glom/glom_privs.h>
//#include <libgnome/gnome-i18n.h>
#include <bakery/App/App_Gtk.h> //For util_bold_message().
Modified: trunk/glom/mode_design/users/dialog_users_list.cc
==============================================================================
--- trunk/glom/mode_design/users/dialog_users_list.cc (original)
+++ trunk/glom/mode_design/users/dialog_users_list.cc Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#include "dialog_user.h"
#include "dialog_choose_user.h"
#include <glom/glom_privs.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/glade_utils.h>
#include <bakery/App/App_Gtk.h> //For util_bold_message().
//#include <libgnome/gnome-i18n.h>
#include <glibmm/i18n.h>
Modified: trunk/glom/mode_find/Makefile.am
==============================================================================
--- trunk/glom/mode_find/Makefile.am (original)
+++ trunk/glom/mode_find/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS)
noinst_LIBRARIES = libmode_find.a
libmode_find_a_SOURCES = box_data_details_find.cc box_data_details_find.h \
Modified: trunk/glom/navigation/Makefile.am
==============================================================================
--- trunk/glom/navigation/Makefile.am (original)
+++ trunk/glom/navigation/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS)
noinst_LIBRARIES = libnavigation.a
libnavigation_a_SOURCES = box_tables.cc box_tables.h
Modified: trunk/glom/notebook_glom.h
==============================================================================
--- trunk/glom/notebook_glom.h (original)
+++ trunk/glom/notebook_glom.h Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#define NOTEBOOK_GLOM_H
#include "box_withbuttons.h"
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
namespace Glom
{
Modified: trunk/glom/python_embed/Makefile.am
==============================================================================
--- trunk/glom/python_embed/Makefile.am (original)
+++ trunk/glom/python_embed/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES)
SUBDIRS = python_module
Modified: trunk/glom/python_embed/glom_python.cc
==============================================================================
--- trunk/glom/python_embed/glom_python.cc (original)
+++ trunk/glom/python_embed/glom_python.cc Tue Mar 3 22:21:36 2009
@@ -19,8 +19,8 @@
*/
//We need to include this before anything else, to avoid redefinitions:
-#include <glom/libglom/python_embed/py_glom_record.h>
-#include <glom/libglom/python_embed/pygdavalue_conversions.h>
+#include <libglom/python_embed/py_glom_record.h>
+#include <libglom/python_embed/pygdavalue_conversions.h>
#define NO_IMPORT_PYGTK //To avoid a multiple definition in pygtk.
#include <pygtk/pygtk.h> //For the PyGObject and PyGBoxed struct definitions.
@@ -30,7 +30,7 @@
#include <eval.h> /* for PyEval_EvalCode */
#include "glom_python.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <list>
#include <glib.h> //For g_warning().
#include <glibmm/i18n.h>
Modified: trunk/glom/python_embed/glom_python.h
==============================================================================
--- trunk/glom/python_embed/glom_python.h (original)
+++ trunk/glom/python_embed/glom_python.h Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_PYTHON_H
#define GLOM_PYTHON_H
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include <glibmm/ustring.h>
namespace Glom
Modified: trunk/glom/python_embed/python_module/Makefile.am
==============================================================================
--- trunk/glom/python_embed/python_module/Makefile.am (original)
+++ trunk/glom/python_embed/python_module/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES)
SUBDIRS =
Modified: trunk/glom/python_embed/python_module/py_glom_module.cc
==============================================================================
--- trunk/glom/python_embed/python_module/py_glom_module.cc (original)
+++ trunk/glom/python_embed/python_module/py_glom_module.cc Tue Mar 3 22:21:36 2009
@@ -24,9 +24,9 @@
#include <eval.h> /* for PyEval_EvalCode */
#include <objimpl.h> /* for PyObject_New() */
-#include <glom/libglom/python_embed/py_glom_record.h>
-#include <glom/libglom/python_embed/py_glom_related.h>
-#include <glom/libglom/python_embed/py_glom_relatedrecord.h>
+#include <libglom/python_embed/py_glom_record.h>
+#include <libglom/python_embed/py_glom_related.h>
+#include <libglom/python_embed/py_glom_relatedrecord.h>
static PyMethodDef pyglom_methods[] = {
{NULL, 0, 0, 0} /* Sentinel */
Modified: trunk/glom/relationships_overview/Makefile.am
==============================================================================
--- trunk/glom/relationships_overview/Makefile.am (original)
+++ trunk/glom/relationships_overview/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,7 +1,7 @@
gladedir = $(datadir)/glom/glade/
# We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\"
noinst_LIBRARIES = librelationshipsoverview.a
Modified: trunk/glom/relationships_overview/canvas_group_dbtable.h
==============================================================================
--- trunk/glom/relationships_overview/canvas_group_dbtable.h (original)
+++ trunk/glom/relationships_overview/canvas_group_dbtable.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include "glom/utility_widgets/canvas/canvas_group_movable.h"
#include <goocanvasmm/polyline.h>
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
namespace Glom
{
Modified: trunk/glom/relationships_overview/dialog_relationships_overview.h
==============================================================================
--- trunk/glom/relationships_overview/dialog_relationships_overview.h (original)
+++ trunk/glom/relationships_overview/dialog_relationships_overview.h Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_DIALOG_RELATIONSHIPS_OVERVIEW
#define GLOM_DIALOG_RELATIONSHIPS_OVERVIEW
-#include <glom/libglom/document/view.h>
+#include <libglom/document/view.h>
#include "glom/utility_widgets/canvas/canvas_editable.h"
#include "canvas_group_dbtable.h"
#include <gtkmm/dialog.h>
Modified: trunk/glom/reports/Makefile.am
==============================================================================
--- trunk/glom/reports/Makefile.am (original)
+++ trunk/glom/reports/Makefile.am Tue Mar 3 22:21:36 2009
@@ -2,7 +2,7 @@
glomxsltdir = $(datadir)/glom/xslt/
# We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\" \
-DGLOM_XSLTDIR=\""$(glomxsltdir)/"\"
Modified: trunk/glom/reports/dialog_layout_report.cc
==============================================================================
--- trunk/glom/reports/dialog_layout_report.cc (original)
+++ trunk/glom/reports/dialog_layout_report.cc Tue Mar 3 22:21:36 2009
@@ -19,16 +19,16 @@
*/
#include "dialog_layout_report.h"
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_summary.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_header.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h>
-#include <glom/libglom/data_structure/layout/layoutitem_field.h>
-#include <glom/libglom/data_structure/layout/layoutitem_text.h>
-#include <glom/libglom/data_structure/layout/layoutitem_image.h>
-#include <glom/libglom/glade_utils.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>
+#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 <libglom/data_structure/layout/layoutitem_field.h>
+#include <libglom/data_structure/layout/layoutitem_text.h>
+#include <libglom/data_structure/layout/layoutitem_image.h>
+#include <libglom/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"
Modified: trunk/glom/reports/dialog_layout_report.h
==============================================================================
--- trunk/glom/reports/dialog_layout_report.h (original)
+++ trunk/glom/reports/dialog_layout_report.h Tue Mar 3 22:21:36 2009
@@ -22,10 +22,10 @@
#define GLOM_DIALOG_LAYOUT_REPORT
#include "../mode_data/dialog_layout.h"
-#include <glom/libglom/data_structure/report.h>
+#include <libglom/data_structure/report.h>
#include "treestore_report_layout.h"
-//#include <glom/libglom/data_structure/layout/layoutitem.h>
-//#include <glom/libglom/sharedptr.h>
+//#include <libglom/data_structure/layout/layoutitem.h>
+//#include <libglom/sharedptr.h>
namespace Glom
{
Modified: trunk/glom/reports/report_builder.cc
==============================================================================
--- trunk/glom/reports/report_builder.cc (original)
+++ trunk/glom/reports/report_builder.cc Tue Mar 3 22:21:36 2009
@@ -19,13 +19,13 @@
*/
#include "report_builder.h"
-#include <glom/libglom/utils.h>
-#include <glom/libglom/data_structure/glomconversions.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_summary.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_header.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h>
+#include <libglom/utils.h>
+#include <libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/layout/report_parts/layoutitem_summary.h>
+#include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
+#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 <glom/xsl_utils.h>
namespace Glom
Modified: trunk/glom/reports/report_builder.h
==============================================================================
--- trunk/glom/reports/report_builder.h (original)
+++ trunk/glom/reports/report_builder.h Tue Mar 3 22:21:36 2009
@@ -22,8 +22,8 @@
#define GLOM_REPORTS_REPORT_BUILDER
#include <glom/base_db.h>
-#include <glom/libglom/data_structure/report.h>
-#include <glom/libglom/sharedptr.h>
+#include <libglom/data_structure/report.h>
+#include <libglom/sharedptr.h>
namespace Glom
{
Modified: trunk/glom/reports/treestore_report_layout.cc
==============================================================================
--- trunk/glom/reports/treestore_report_layout.cc (original)
+++ trunk/glom/reports/treestore_report_layout.cc Tue Mar 3 22:21:36 2009
@@ -19,14 +19,14 @@
*/
#include "treestore_report_layout.h"
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_summary.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_header.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h>
-#include <glom/libglom/data_structure/layout/layoutitem_field.h>
-#include <glom/libglom/data_structure/layout/layoutitem_text.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>
+#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 <libglom/data_structure/layout/layoutitem_field.h>
+#include <libglom/data_structure/layout/layoutitem_text.h>
#include <iostream>
namespace Glom
Modified: trunk/glom/reports/treestore_report_layout.h
==============================================================================
--- trunk/glom/reports/treestore_report_layout.h (original)
+++ trunk/glom/reports/treestore_report_layout.h Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_MODE_DATA_TREESTORE_REPORT_LAYOUT_H
#define GLOM_MODE_DATA_TREESTORE_REPORT_LAYOUT_H
-#include <glom/libglom/data_structure/layout/layoutitem.h>
+#include <libglom/data_structure/layout/layoutitem.h>
#include <gtkmm/treestore.h>
namespace Glom
Modified: trunk/glom/translation/Makefile.am
==============================================================================
--- trunk/glom/translation/Makefile.am (original)
+++ trunk/glom/translation/Makefile.am Tue Mar 3 22:21:36 2009
@@ -2,7 +2,7 @@
glomxsltdir = $(datadir)/glom/xslt/
# We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\" \
-DGLOM_XSLTDIR=\""$(glomxsltdir)/"\"
Modified: trunk/glom/translation/combobox_locale.cc
==============================================================================
--- trunk/glom/translation/combobox_locale.cc (original)
+++ trunk/glom/translation/combobox_locale.cc Tue Mar 3 22:21:36 2009
@@ -20,7 +20,7 @@
#include "combobox_locale.h"
#include <gtk/gtkcomboboxentry.h>
-#include <glom/libglom/data_structure/iso_codes.h>
+#include <libglom/data_structure/iso_codes.h>
namespace Glom
{
Modified: trunk/glom/translation/combobox_locale.h
==============================================================================
--- trunk/glom/translation/combobox_locale.h (original)
+++ trunk/glom/translation/combobox_locale.h Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_TRANSLATION_COMBOBOX_LOCALE_HH
#define GLOM_TRANSLATION_COMBOBOX_LOCALE_HH
-#include <glom/libglom/data_structure/iso_codes.h>
+#include <libglom/data_structure/iso_codes.h>
#include <gtkmm/combobox.h>
#include <libglademm.h>
Modified: trunk/glom/translation/dialog_copy_translation.h
==============================================================================
--- trunk/glom/translation/dialog_copy_translation.h (original)
+++ trunk/glom/translation/dialog_copy_translation.h Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#define GLOM_TRANSLATIONS_DIALOG_COPY_TRANSLATION_H
#include "combobox_locale.h"
-#include <glom/libglom/document/document_glom.h> // For View_Composite_Glom
+#include <libglom/document/document_glom.h> // For View_Composite_Glom
#include <libglademm.h>
#include <gtkmm/dialog.h>
Modified: trunk/glom/translation/dialog_identify_original.cc
==============================================================================
--- trunk/glom/translation/dialog_identify_original.cc (original)
+++ trunk/glom/translation/dialog_identify_original.cc Tue Mar 3 22:21:36 2009
@@ -19,7 +19,7 @@
*/
#include "dialog_identify_original.h"
-#include <glom/libglom/data_structure/iso_codes.h>
+#include <libglom/data_structure/iso_codes.h>
#include <bakery/App/App_Gtk.h> //For util_bold_message().
#include <glibmm/i18n.h>
Modified: trunk/glom/translation/dialog_identify_original.h
==============================================================================
--- trunk/glom/translation/dialog_identify_original.h (original)
+++ trunk/glom/translation/dialog_identify_original.h Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#define GLOM_TRANSLATIONS_DIALOG_IDENTIFY_ORIGINAL_H
#include "combobox_locale.h"
-#include <glom/libglom/document/view.h> // For View_Glom
+#include <libglom/document/view.h> // For View_Glom
#include <libglademm.h>
#include <gtkmm/dialog.h>
Modified: trunk/glom/translation/window_translations.cc
==============================================================================
--- trunk/glom/translation/window_translations.cc (original)
+++ trunk/glom/translation/window_translations.cc Tue Mar 3 22:21:36 2009
@@ -23,8 +23,8 @@
#include "dialog_identify_original.h"
#include "dialog_copy_translation.h"
#include <bakery/App/App_Gtk.h> //For util_bold_message().
-#include "glom/libglom/utils.h"
-#include "glom/libglom/glade_utils.h"
+#include <libglom/utils.h>
+#include <libglom/glade_utils.h>
#include <glibmm/i18n.h>
#include <string.h> // for memset
Modified: trunk/glom/translation/window_translations.h
==============================================================================
--- trunk/glom/translation/window_translations.h (original)
+++ trunk/glom/translation/window_translations.h Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_TRANSLATIONS_DIALOG_TRANSLATIONS_H
#define GLOM_TRANSLATIONS_DIALOG_TRANSLATIONS_H
-#include <glom/libglom/document/view.h>
+#include <libglom/document/view.h>
#include <gtkmm.h>
#include <libglademm.h>
Modified: trunk/glom/utility_widgets/Makefile.am
==============================================================================
--- trunk/glom/utility_widgets/Makefile.am (original)
+++ trunk/glom/utility_widgets/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,12 +1,10 @@
-#AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS)
-
SUBDIRS = cellrendererlist adddel db_adddel canvas calendar egg
gladedir = $(datadir)/glom/glade/
glom_icon_dir = $(datadir)/glom/pixmaps
# We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\" \
-DGLOM_ICON_DIR=\""$(glom_icon_dir)"\" \
-DDATADIR=\""$(datadir)"\"
Modified: trunk/glom/utility_widgets/adddel/Makefile.am
==============================================================================
--- trunk/glom/utility_widgets/adddel/Makefile.am (original)
+++ trunk/glom/utility_widgets/adddel/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,6 +1,6 @@
SUBDIRS = eggcolumnchooser
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS)
noinst_LIBRARIES = libutility_widgets_adddel.a
libutility_widgets_adddel_a_SOURCES = adddel.cc adddel.h adddel_withbuttons.cc adddel_withbuttons.h \
Modified: trunk/glom/utility_widgets/adddel/adddel.cc
==============================================================================
--- trunk/glom/utility_widgets/adddel/adddel.cc (original)
+++ trunk/glom/utility_widgets/adddel/adddel.cc Tue Mar 3 22:21:36 2009
@@ -25,9 +25,9 @@
#include <glibmm/i18n.h>
#include "../cellrendererlist/cellrendererlist.h"
#include "treeviewcolumn_glom.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include "../../dialog_invalid_data.h"
-#include <glom/libglom/utils.h>
+#include <libglom/utils.h>
#include "bakery/App/App_Gtk.h"
#include <iostream> //For debug output.
Modified: trunk/glom/utility_widgets/adddel/adddel.h
==============================================================================
--- trunk/glom/utility_widgets/adddel/adddel.h (original)
+++ trunk/glom/utility_widgets/adddel/adddel.h Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#define ADDDEL_H
#include <gtkmm.h>
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include <libgdamm.h>
#include <libglademm.h>
Modified: trunk/glom/utility_widgets/adddel/adddel_withbuttons.cc
==============================================================================
--- trunk/glom/utility_widgets/adddel/adddel_withbuttons.cc (original)
+++ trunk/glom/utility_widgets/adddel/adddel_withbuttons.cc Tue Mar 3 22:21:36 2009
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include <glom/libglom/utils.h>
+#include <libglom/utils.h>
#include "adddel_withbuttons.h"
//#include <libgnome/gnome-i18n.h>
Modified: trunk/glom/utility_widgets/buttonglom.h
==============================================================================
--- trunk/glom/utility_widgets/buttonglom.h (original)
+++ trunk/glom/utility_widgets/buttonglom.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <gtkmm.h>
#include "layoutwidgetutils.h"
-#include <glom/libglom/data_structure/layout/layoutitem_button.h>
+#include <libglom/data_structure/layout/layoutitem_button.h>
#include <libglademm.h>
namespace Glom
Modified: trunk/glom/utility_widgets/canvas/Makefile.am
==============================================================================
--- trunk/glom/utility_widgets/canvas/Makefile.am (original)
+++ trunk/glom/utility_widgets/canvas/Makefile.am Tue Mar 3 22:21:36 2009
@@ -5,7 +5,7 @@
gladedir = $(datadir)/glom/glade/
# We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\" \
-DDATADIR=\""$(datadir)"\"
Modified: trunk/glom/utility_widgets/cellrendererlist/Makefile.am
==============================================================================
--- trunk/glom/utility_widgets/cellrendererlist/Makefile.am (original)
+++ trunk/glom/utility_widgets/cellrendererlist/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,6 +1,6 @@
SUBDIRS =
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS)
noinst_LIBRARIES = libutility_widgets_cellrendererlist.a
libutility_widgets_cellrendererlist_a_SOURCES = cellrendererlist.h cellrendererlist.cc
Modified: trunk/glom/utility_widgets/checkglom.h
==============================================================================
--- trunk/glom/utility_widgets/checkglom.h (original)
+++ trunk/glom/utility_widgets/checkglom.h Tue Mar 3 22:21:36 2009
@@ -24,7 +24,7 @@
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
#include <gtkmm.h>
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include "layoutwidgetfield.h"
#include <libglademm.h>
Modified: trunk/glom/utility_widgets/comboentry_currency.cc
==============================================================================
--- trunk/glom/utility_widgets/comboentry_currency.cc (original)
+++ trunk/glom/utility_widgets/comboentry_currency.cc Tue Mar 3 22:21:36 2009
@@ -20,7 +20,7 @@
#include "comboentry_currency.h"
#include <gtk/gtkcomboboxentry.h>
-#include <glom/libglom/data_structure/iso_codes.h>
+#include <libglom/data_structure/iso_codes.h>
namespace Glom
{
Modified: trunk/glom/utility_widgets/comboentry_currency.h
==============================================================================
--- trunk/glom/utility_widgets/comboentry_currency.h (original)
+++ trunk/glom/utility_widgets/comboentry_currency.h Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_MODE_DESIGN_COMBOENTRY_CURRENCY_HH
#define GLOM_MODE_DESIGN_COMBOENTRY_CURRENCY_HH
-#include <glom/libglom/data_structure/iso_codes.h>
+#include <libglom/data_structure/iso_codes.h>
#include <gtkmm/comboboxentry.h>
#include <libglademm.h>
Modified: trunk/glom/utility_widgets/comboentryglom.cc
==============================================================================
--- trunk/glom/utility_widgets/comboentryglom.cc (original)
+++ trunk/glom/utility_widgets/comboentryglom.cc Tue Mar 3 22:21:36 2009
@@ -19,10 +19,10 @@
*/
#include "comboentryglom.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <gtkmm/messagedialog.h>
#include "../dialog_invalid_data.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include "../application.h"
#include <glibmm/i18n.h>
//#include <sstream> //For stringstream
Modified: trunk/glom/utility_widgets/comboentryglom.h
==============================================================================
--- trunk/glom/utility_widgets/comboentryglom.h (original)
+++ trunk/glom/utility_widgets/comboentryglom.h Tue Mar 3 22:21:36 2009
@@ -24,7 +24,7 @@
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
#include <gtkmm.h>
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include "comboglomchoicesbase.h"
#include <libglademm.h>
Modified: trunk/glom/utility_widgets/comboglom.cc
==============================================================================
--- trunk/glom/utility_widgets/comboglom.cc (original)
+++ trunk/glom/utility_widgets/comboglom.cc Tue Mar 3 22:21:36 2009
@@ -19,10 +19,10 @@
*/
#include "comboglom.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <gtkmm/messagedialog.h>
#include "../dialog_invalid_data.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include "../application.h"
#include <glibmm/i18n.h>
//#include <sstream> //For stringstream
Modified: trunk/glom/utility_widgets/comboglom.h
==============================================================================
--- trunk/glom/utility_widgets/comboglom.h (original)
+++ trunk/glom/utility_widgets/comboglom.h Tue Mar 3 22:21:36 2009
@@ -24,7 +24,7 @@
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
#include <gtkmm.h>
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include "comboglomchoicesbase.h"
#include <libglademm.h>
Modified: trunk/glom/utility_widgets/comboglomchoicesbase.cc
==============================================================================
--- trunk/glom/utility_widgets/comboglomchoicesbase.cc (original)
+++ trunk/glom/utility_widgets/comboglomchoicesbase.cc Tue Mar 3 22:21:36 2009
@@ -19,7 +19,7 @@
*/
#include "comboglomchoicesbase.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <glibmm/i18n.h>
//#include <sstream> //For stringstream
Modified: trunk/glom/utility_widgets/comboglomchoicesbase.h
==============================================================================
--- trunk/glom/utility_widgets/comboglomchoicesbase.h (original)
+++ trunk/glom/utility_widgets/comboglomchoicesbase.h Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#define GLOM_UTILITY_WIDGETS_COMBO_GLOM_CHOICESBASE_H
#include <gtkmm.h>
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include "layoutwidgetfield.h"
namespace Glom
Modified: trunk/glom/utility_widgets/datawidget.cc
==============================================================================
--- trunk/glom/utility_widgets/datawidget.cc (original)
+++ trunk/glom/utility_widgets/datawidget.cc Tue Mar 3 22:21:36 2009
@@ -26,14 +26,14 @@
#include "comboglom.h"
#include "textviewglom.h"
#include "imageglom.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include "../application.h"
#include "../mode_data/dialog_choose_field.h"
#include "dialog_choose_id.h"
#include "dialog_choose_date.h"
#include "../layout_item_dialogs/dialog_field_layout.h"
-#include <glom/libglom/utils.h>
-#include <glom/libglom/glade_utils.h>
+#include <libglom/utils.h>
+#include <libglom/glade_utils.h>
#include <glibmm/i18n.h>
namespace Glom
Modified: trunk/glom/utility_widgets/datawidget.h
==============================================================================
--- trunk/glom/utility_widgets/datawidget.h (original)
+++ trunk/glom/utility_widgets/datawidget.h Tue Mar 3 22:21:36 2009
@@ -26,9 +26,9 @@
#include "placeholder.h"
#include "layoutwidgetmenu.h"
#include <gtkmm/label.h>
-#include <glom/libglom/data_structure/field.h>
-#include <glom/libglom/document/view.h>
-#include <glom/libglom/data_structure/layout/layoutitem_field.h>
+#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.
namespace Glom
Modified: trunk/glom/utility_widgets/db_adddel/Makefile.am
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/Makefile.am (original)
+++ trunk/glom/utility_widgets/db_adddel/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,6 +1,6 @@
SUBDIRS =
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS)
noinst_LIBRARIES = libutility_widgets_db_adddel.a
libutility_widgets_db_adddel_a_SOURCES = db_adddel.cc db_adddel.h db_adddel_withbuttons.cc db_adddel_withbuttons.h \
Modified: trunk/glom/utility_widgets/db_adddel/db_adddel.cc
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/db_adddel.cc (original)
+++ trunk/glom/utility_widgets/db_adddel/db_adddel.cc Tue Mar 3 22:21:36 2009
@@ -23,10 +23,10 @@
#include <glibmm/i18n.h>
#include "../cellrendererlist/cellrendererlist.h"
#include "db_treeviewcolumn_glom.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include "../../dialog_invalid_data.h"
#include "../../application.h"
-#include <glom/libglom/utils.h>
+#include <libglom/utils.h>
#include "cellrenderer_buttonimage.h"
#include "cellrenderer_buttontext.h"
#include <glom/utility_widgets/imageglom.h> //For ImageGlom::scale_keeping_ratio().
Modified: trunk/glom/utility_widgets/db_adddel/db_adddel.h
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/db_adddel.h (original)
+++ trunk/glom/utility_widgets/db_adddel/db_adddel.h Tue Mar 3 22:21:36 2009
@@ -22,10 +22,10 @@
#define GLOM_DB_ADDDEL_H
#include <gtkmm.h>
-#include <glom/libglom/data_structure/layout/layoutitem_field.h>
+#include <libglom/data_structure/layout/layoutitem_field.h>
#include <libgdamm.h>
#include "glom_db_treemodel.h"
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
#include <glom/base_db_table_data.h>
#include <vector>
Modified: trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.cc
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.cc (original)
+++ trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.cc Tue Mar 3 22:21:36 2009
@@ -21,9 +21,9 @@
#include <iostream>
#include "glom_db_treemodel.h"
-#include <glom/libglom/connectionpool.h>
-#include <glom/libglom/data_structure/glomconversions.h> //For util_build_sql
-#include <glom/libglom/utils.h>
+#include <libglom/connectionpool.h>
+#include <libglom/data_structure/glomconversions.h> //For util_build_sql
+#include <libglom/utils.h>
#include "glom/application.h"
Modified: trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.h
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.h (original)
+++ trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.h Tue Mar 3 22:21:36 2009
@@ -23,8 +23,8 @@
#include <gtkmm/treemodel.h>
#include <gtkmm/treepath.h>
-#include <glom/libglom/data_structure/layout/layoutitem_field.h>
-#include <glom/libglom/connectionpool.h>
+#include <libglom/data_structure/layout/layoutitem_field.h>
+#include <libglom/connectionpool.h>
#include "../../base_db.h"
namespace Glom
Modified: trunk/glom/utility_widgets/dialog_choose_date.h
==============================================================================
--- trunk/glom/utility_widgets/dialog_choose_date.h (original)
+++ trunk/glom/utility_widgets/dialog_choose_date.h Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#define GLOM_MODE_DATA_DIALOG_CHOOSE_DATE_H
#include <gtkmm/dialog.h>
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
#include "../base_db.h"
#include "../mode_find/box_data_details_find.h"
#include "../mode_data/box_data_list.h"
Modified: trunk/glom/utility_widgets/dialog_choose_id.h
==============================================================================
--- trunk/glom/utility_widgets/dialog_choose_id.h (original)
+++ trunk/glom/utility_widgets/dialog_choose_id.h Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#define GLOM_MODE_DATA_DIALOG_CHOOSE_ID_H
#include <gtkmm/dialog.h>
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
#include "../base_db.h"
#include "../mode_find/box_data_details_find.h"
#include "../mode_data/box_data_list.h"
Modified: trunk/glom/utility_widgets/dialog_properties.cc
==============================================================================
--- trunk/glom/utility_widgets/dialog_properties.cc (original)
+++ trunk/glom/utility_widgets/dialog_properties.cc Tue Mar 3 22:21:36 2009
@@ -19,7 +19,7 @@
*/
#include "dialog_properties.h"
-#include "adddel/adddel.h"
+#include "glom/utility_widgets/adddel/adddel.h"
namespace Glom
{
Modified: trunk/glom/utility_widgets/entryglom.cc
==============================================================================
--- trunk/glom/utility_widgets/entryglom.cc (original)
+++ trunk/glom/utility_widgets/entryglom.cc Tue Mar 3 22:21:36 2009
@@ -19,10 +19,10 @@
*/
#include "entryglom.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <gtkmm/messagedialog.h>
#include "../dialog_invalid_data.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include "../application.h"
#include <glibmm/i18n.h>
//#include <sstream> //For stringstream
Modified: trunk/glom/utility_widgets/entryglom.h
==============================================================================
--- trunk/glom/utility_widgets/entryglom.h (original)
+++ trunk/glom/utility_widgets/entryglom.h Tue Mar 3 22:21:36 2009
@@ -24,7 +24,7 @@
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
#include <gtkmm.h>
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include "layoutwidgetfield.h"
#include <libglademm.h>
Modified: trunk/glom/utility_widgets/filechooserdialog_saveextras.cc
==============================================================================
--- trunk/glom/utility_widgets/filechooserdialog_saveextras.cc (original)
+++ trunk/glom/utility_widgets/filechooserdialog_saveextras.cc Tue Mar 3 22:21:36 2009
@@ -19,7 +19,7 @@
*/
#include <glom/utility_widgets/filechooserdialog_saveextras.h>
-#include <glom/libglom/utils.h>
+#include <libglom/utils.h>
#include <gtkmm/alignment.h>
#include <bakery/App/App_Gtk.h> //For util_bold_message().
#include <glibmm/i18n.h>
Modified: trunk/glom/utility_widgets/filechooserdialog_saveextras.h
==============================================================================
--- trunk/glom/utility_widgets/filechooserdialog_saveextras.h (original)
+++ trunk/glom/utility_widgets/filechooserdialog_saveextras.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY, GLOM_ENABLE_SQLITE
-#include <glom/libglom/document/document_glom.h>
+#include <libglom/document/document_glom.h>
#include <gtkmm/filechooserdialog.h>
#include <gtkmm/label.h>
Modified: trunk/glom/utility_widgets/imageglom.cc
==============================================================================
--- trunk/glom/utility_widgets/imageglom.cc (original)
+++ trunk/glom/utility_widgets/imageglom.cc Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#include "imageglom.h"
#include <glibmm/i18n.h>
#include "../application.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
//#include <sstream> //For stringstream
#include <iostream> // for cout, endl
Modified: trunk/glom/utility_widgets/imageglom.h
==============================================================================
--- trunk/glom/utility_widgets/imageglom.h (original)
+++ trunk/glom/utility_widgets/imageglom.h Tue Mar 3 22:21:36 2009
@@ -22,7 +22,7 @@
#define GLOM_UTILITY_WIDGETS_IMAGE_GLOM_H
#include <gtkmm.h>
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include "layoutwidgetfield.h"
#include <libglademm.h>
Modified: trunk/glom/utility_widgets/labelglom.h
==============================================================================
--- trunk/glom/utility_widgets/labelglom.h (original)
+++ trunk/glom/utility_widgets/labelglom.h Tue Mar 3 22:21:36 2009
@@ -24,7 +24,7 @@
#include <gtkmm.h>
#include "layoutwidgetbase.h"
#include "layoutwidgetutils.h"
-#include <glom/libglom/data_structure/layout/layoutitem_button.h>
+#include <libglom/data_structure/layout/layoutitem_button.h>
#include <libglademm.h>
namespace Glom
Modified: trunk/glom/utility_widgets/layoutwidgetbase.h
==============================================================================
--- trunk/glom/utility_widgets/layoutwidgetbase.h (original)
+++ trunk/glom/utility_widgets/layoutwidgetbase.h Tue Mar 3 22:21:36 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_MODE_DATA_LAYOUT_WIDGET_BASE_H
#define GLOM_MODE_DATA_LAYOUT_WIDGET_BASE_H
-#include <glom/libglom/data_structure/layout/layoutitem.h>
+#include <libglom/data_structure/layout/layoutitem.h>
#include <gtkmm.h>
#include "../mode_data/treestore_layout.h" //Forthe enum.
Modified: trunk/glom/utility_widgets/notebookglom.h
==============================================================================
--- trunk/glom/utility_widgets/notebookglom.h (original)
+++ trunk/glom/utility_widgets/notebookglom.h Tue Mar 3 22:21:36 2009
@@ -23,7 +23,7 @@
#include <gtkmm.h>
#include "layoutwidgetmenu.h"
-#include <glom/libglom/data_structure/layout/layoutitem_notebook.h>
+#include <libglom/data_structure/layout/layoutitem_notebook.h>
#include <libglademm.h>
namespace Glom
Modified: trunk/glom/utility_widgets/placeholder-glom.h
==============================================================================
--- trunk/glom/utility_widgets/placeholder-glom.h (original)
+++ trunk/glom/utility_widgets/placeholder-glom.h Tue Mar 3 22:21:36 2009
@@ -24,7 +24,7 @@
#include <gtkmm.h>
#include "layoutwidgetbase.h"
-//#include <glom/libglom/data_structure/layout/layoutitem_button.h>
+//#include <libglom/data_structure/layout/layoutitem_button.h>
//#include <libglademm.h>
#ifndef GLOM_UTILITY_WIDGETS_PLACEHOLDER_GLOM_H_
Modified: trunk/glom/utility_widgets/textviewglom.cc
==============================================================================
--- trunk/glom/utility_widgets/textviewglom.cc (original)
+++ trunk/glom/utility_widgets/textviewglom.cc Tue Mar 3 22:21:36 2009
@@ -19,10 +19,10 @@
*/
#include "textviewglom.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include <gtkmm/messagedialog.h>
#include "../dialog_invalid_data.h"
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
#include "../application.h"
#include <glibmm/i18n.h>
//#include <sstream> //For stringstream
Modified: trunk/glom/utility_widgets/textviewglom.h
==============================================================================
--- trunk/glom/utility_widgets/textviewglom.h (original)
+++ trunk/glom/utility_widgets/textviewglom.h Tue Mar 3 22:21:36 2009
@@ -24,7 +24,7 @@
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
#include <gtkmm.h>
-#include <glom/libglom/data_structure/field.h>
+#include <libglom/data_structure/field.h>
#include "layoutwidgetfield.h"
#include <libglademm.h>
Modified: trunk/glom/xsl_utils.cc
==============================================================================
--- trunk/glom/xsl_utils.cc (original)
+++ trunk/glom/xsl_utils.cc Tue Mar 3 22:21:36 2009
@@ -21,9 +21,9 @@
#include "config.h" // For GLOM_ENABLE_MAEMO
#include "xsl_utils.h"
-#include <glom/libglom/connectionpool.h>
-#include <glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
-#include <glom/libglom/data_structure/glomconversions.h>
+#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 <libxml++/libxml++.h>
#include <libxslt/transform.h>
Modified: trunk/glom/xsl_utils.h
==============================================================================
--- trunk/glom/xsl_utils.h (original)
+++ trunk/glom/xsl_utils.h Tue Mar 3 22:21:36 2009
@@ -21,10 +21,10 @@
#ifndef GLOM_XSL_UTILS_H
#define GLOM_XSL_UTILS_H
-#include <glom/libglom/data_structure/field.h>
-#include <glom/libglom/data_structure/numeric_format.h>
+#include <libglom/data_structure/field.h>
+#include <libglom/data_structure/numeric_format.h>
-#include <glom/libglom/data_structure/layout/layoutitem_field.h>
+#include <libglom/data_structure/layout/layoutitem_field.h>
#include <libxml++/libxml++.h>
namespace Gtk
Modified: trunk/regression_tests/Makefile.am
==============================================================================
--- trunk/regression_tests/Makefile.am (original)
+++ trunk/regression_tests/Makefile.am Tue Mar 3 22:21:36 2009
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
$(MAEMO_LAUNCHER_CFLAGS) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
Modified: trunk/regression_tests/test_parsing_time.cc
==============================================================================
--- trunk/regression_tests/test_parsing_time.cc (original)
+++ trunk/regression_tests/test_parsing_time.cc Tue Mar 3 22:21:36 2009
@@ -1,4 +1,4 @@
-#include <glom/libglom/data_structure/glomconversions.h>
+#include <libglom/data_structure/glomconversions.h>
int main()
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
