[glom/spread-table: 7/7] Fixed merge

[Murray Cumming <murrayc src gnome org>]

commit 06abd404eeeff93232776857076ae804ad22f11b
Merge: 9711c2d b4f16b8
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Oct 14 11:09:56 2010 +0200

    Fixed merge

 ChangeLog                                          |   79 +++
 glom/bakery/app.h                                  |    2 -
 glom/bakery/app_withdoc_gtk.cc                     |    1 +
 glom/base_db_table.h                               |    1 -
 glom/base_db_table_data.cc                         |    1 +
 glom/box_db_table.h                                |    1 -
 glom/dialog_connection.cc                          |    2 +-
 glom/dialog_connection.h                           |    2 +-
 glom/dialog_existing_or_new.cc                     |   10 +-
 glom/dialog_existing_or_new.h                      |    2 +-
 glom/dialog_invalid_data.cc                        |    2 +-
 glom/dialog_invalid_data.h                         |    2 +-
 glom/import_csv/csv_parser.cc                      |    1 +
 glom/import_csv/dialog_import_csv.cc               |    1 +
 glom/import_csv/dialog_import_csv_progress.cc      |    2 +
 glom/libglom/connectionpool.cc                     |    2 +
 glom/libglom/connectionpool_backends/postgres.cc   |   10 +-
 glom/libglom/connectionpool_backends/postgres.h    |    4 +-
 .../connectionpool_backends/postgres_central.cc    |    4 +-
 .../connectionpool_backends/postgres_central.h     |    4 +-
 .../connectionpool_backends/postgres_self.cc       |   14 +-
 .../connectionpool_backends/postgres_self.h        |    4 +-
 glom/libglom/connectionpool_backends/sqlite.cc     |    6 +-
 glom/libglom/data_structure/field.cc               |    2 +
 glom/libglom/data_structure/glomconversions.cc     |    4 +-
 glom/libglom/data_structure/glomconversions.h      |    2 +-
 glom/libglom/data_structure/numeric_format.h       |    1 -
 glom/libglom/document/bakery/document.cc           |    2 +-
 glom/libglom/document/bakery/document.h            |    1 -
 glom/libglom/document/bakery/document_xml.cc       |    2 +-
 glom/libglom/document/document.cc                  |    5 +-
 glom/libglom/document/document.h                   |    6 +-
 glom/libglom/privs.cc                              |    2 +
 glom/libglom/python_embed/py_glom_record.cc        |    4 +-
 glom/libglom/python_embed/py_glom_record.h         |    8 +-
 glom/libglom/python_embed/py_glom_related.cc       |    2 +-
 glom/libglom/python_embed/py_glom_related.h        |    2 +-
 glom/libglom/python_embed/py_glom_relatedrecord.cc |    2 +-
 glom/libglom/python_embed/py_glom_relatedrecord.h  |    7 +-
 glom/libglom/sharedptr.h                           |    3 +-
 glom/libglom/utils.cc                              |    2 +-
 glom/mode_data/datawidget/treemodel_db.cc          |    3 +-
 glom/mode_data/notebook_data.cc                    |    2 +
 glom/mode_design/dialog_database_preferences.cc    |    2 +
 glom/mode_design/fields/combo_fieldtype.h          |    1 -
 glom/mode_design/iso_codes.cc                      |    2 +
 glom/mode_design/layout/combobox_fields.cc         |    2 +
 .../layout/dialog_layout_calendar_related.cc       |    2 +
 .../layout/dialog_layout_list_related.cc           |    2 +
 .../print_layouts/window_print_layout_edit.cc      |    3 +-
 .../dialog_relationships_overview.cc               |    2 +-
 glom/mode_design/translation/combobox_locale.cc    |    2 +
 .../translation/dialog_identify_original.cc        |    2 +
 glom/navigation/box_tables.cc                      |    2 +
 glom/print_layout/canvas_layout_item.cc            |    3 +-
 glom/python_embed/glom_python.cc                   |    2 +
 glom/utility_widgets/layoutwidgetmenu.cc           |    1 +
 glom/utility_widgets/notebooklabelglom.cc          |    2 +
 glom/utils_ui.cc                                   |    8 +-
 po/cs.po                                           |  699 ++++++++++----------
 po/es.po                                           |  443 +++++++------
 61 files changed, 765 insertions(+), 634 deletions(-)
---
diff --cc ChangeLog
index 0e5bb92,919a5d5..e8625a4
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,77 -1,82 +1,156 @@@
+ 2010-10-11  David King  <davidk openismus com>
+ 
+ 	Change some uses of long to more appropriate types
+ 
+ 	* glom/libglom/python_embed/py_glom_record.[cc|h]:
+ 	* glom/libglom/python_embed/py_glom_related.[cc|h]:
+ 	* glom/libglom/python_embed/py_glom_relatedrecord.[cc|h]:
+ 	* glom/libglom/utils.cc:
+ 	* glom/utility_widgets/db_addel/glom_db_treemodel.cc:
+ 	* glom/utils_ui.cc: Use other types than long where appropriate.
+ 
+ 2010-10-11  David King  <davidk openismus com>
+ 
+ 	Use array notation where appropriate
+ 
+ 	* glom/dialog_connection.[cc|h]:
+ 	* glom/dialog_existing_or_new.[cc|h]:
+ 	* glom/dialog_invalid_data.[cc|h]:
+ 	* glom/libglom/connectionpool_backends/postgres.cc:
+ 	* glom/libglom/connectionpool_backends/postgres_self.cc:
+ 	* glom/libglom/connectionpool_backends/sqlite.cc:
+ 	* glom/utils_ui.cc: Use array notation when initializing constant
+ 	character arrays.
+ 
+ 2010-10-11  David King  <davidk openismus com>
+ 
+ 	Use unsigned integers where appropriate
+ 
+ 	* glom/libglom/connectionpool_backends/postgres.[cc|h]:
+ 	* glom/libglom/connectionpool_backends/postgres_central.[cc|h]:
+ 	* glom/libglom/connectionpool_backends/postgres_self.[cc|h]:
+ 	* glom/libglom/data_structure/glomconversions.[cc|h]:
+ 	* glom/libglom/document/document.[cc|h]: Use unsigned integers where
+ 	the variable cannot be negative.
+ 
+ 2010-10-08  David King  <davidk openismus com>
+ 
+ 	Remove some unnecessary includes
+ 
+ 	* glom/bakery/app.h:
+ 	* glom/base_db_table.h:
+ 	* glom/base_db_table_data.h:
+ 	* glom/box_db_table.h:
+ 	* glom/libglom/sharedptr.h:
+ 	* glom/mode_design/fields/combo_fieldtype.h:
+ 	* glom/mode_design/relationships_overview/
+ 	  dialog_relationships_overview.cc: Remove some unnecessary includes.
+ 
+ 	* glom/bakery/app_withdoc_gtk.cc:
+ 	* glom/base_db_table_data.cc:
+ 	* glom/glom_privs.cc:
+ 	* glom/import_csv/csv_parser.cc:
+ 	* glom/import_csv/dialog_import_csv.cc:
+ 	* glom/import_csv/dialog_import_csv_progress.cc:
+ 	* glom/libglom/connectionpool.cc:
+ 	* glom/libglom/connectionpool_backends/postgres.cc:
+ 	* glom/libglom/connectionpool_backends/postgres_self.cc:
+ 	* glom/libglom/connectionpool_backends/sqlite.cc:
+ 	* glom/libglom/data_structure/field.cc:
+ 	* glom/libglom/document/bakery/document.cc:
+ 	* glom/libglom/document/bakery/document_xml.cc:
+ 	* glom/libglom/document/document.cc:
+ 	* glom/libglom/python_embed/py_glom_record.cc:
+ 	* glom/mode_data/notebook_data.cc:
+ 	* glom/mode_design/dialog_database_preferences.cc:
+ 	* glom/mode_design/iso_codes.cc:
+ 	* glom/mode_design/layout/combobox_fields.cc:
+ 	* glom/mode_design/layout/dialog_layout_calendar_related.cc:
+ 	* glom/mode_design/layout/dialog_layout_list_related.cc:
+ 	* glom/mode_design/print_layouts/window_print_layout_edit.cc:
+ 	* glom/mode_design/translation/combobox_locale.cc:
+ 	* glom/mode_design/translation/dialog_identify_original.cc:
+ 	* glom/navigation/box_tables.cc:
+ 	* glom/print_layout/canvas_layout_item.cc:
+ 	* glom/python_embed/glom_python.cc:
+ 	* glom/utility_widgets/flowtable_dnd.cc:
+ 	* glom/utility_widgets/layoutwidgetmenu.cc:
+ 	* glom/utility_widgets/notebooklabelglom.cc: Add iostream include.
+ 
 +2010-10-14  Murray Cumming  <murrayc murrayc com>>
 +
 +	FlowTable: More fixes for child HBox memory management.
 +
 +	* glom/utility_widgets/flowtable.cc: Added checks and corrections, though
 +  there is still an odd warning about a refcount.
 +
 +2010-10-14  Murray Cumming  <murrayc murrayc com>
 +
 +	FlowTable: Fix child HBox memory management.
 +
 +	* glom/utility_widgets/flowtable.[h|cc]: insert(), remove_all(), remove(),
 +  destructor: Remember the implementation-only Gtk::HBox widgets and delete
 +  them when appropriate. A simple Gtk::manage() was not enough for this.
 +
 +2010-10-12  Murray Cumming  <murrayc murrayc com>
 +
 +	FlowTable: Avoid some runtime warnings.
 +
 +	* glom/utility_widgets/flowtable.[h|cc]: Re-add remove().
 +  get_column_for_first_widget(): Fix the implementation when it deals with
 +  children of the hbox.
 +	* glom/mode_data/flowtablewithfields.cc: Destructor: Avoid use of
 +  remove(widget), because it is complicated.
 +
 +2010-10-12  Murray Cumming  <murrayc murrayc com>
 +
 +	FlowTable: Implement insert_before().
 +
 +	* glom/utility_widgets/flowtable.[h|cc]: Re-added insert_before() which
 +  we will need for drag and drop support.
 +
 +2010-10-11  Murray Cumming  <murrayc murrayc com>
 +
 +	Details: Use of GtkSpreadTable: Remove FlowTable:m_children.
 +
 +	* glom/utility_widgets/flowtable.[h|cc]: Remove m_children and remove the
 +  remove() override, simplifying things.
 +
 +2010-10-11  Murray Cumming  <murrayc murrayc com>
 +
 +	Details: Use of GtkSpreadTable: Use specified alignement again.
 +
 +	* glom/mode_data/flowtablewithfields.cc:
 +	* glom/utility_widgets/flowtable.[h|cc]: FlowTableItem: Remove the
 +  m_expand_first_full and m_expand_second members, because we no longer need
 +  to remember that information.
 +  add(): Use set_halign() to specify fill/left depending on the expand
 +  choice.
 +
 +2010-10-11  Murray Cumming  <murrayc murrayc com>
 +
 +	Details: Use of GtkSpreadTable: Align widgets again.
 +
 +	* glom/mode_data/flowtablewithfields.cc: apply_size_groups_to_labels():
 +  Re-enable the code to align adjacent widgets.
 +	* glom/utility_widgets/flowtable.[h|cc]: get_column_for_first_widget():
 +  Bring this code back, this time using the new
 +  gtk_spread_table_get_child_line() function.
 +
 +2010-10-08  Murray Cumming  <murrayc murrayc com>
 +
 +	Details: FlowTable: Initial use of GtkSpreadTable instead of custom code.
 +
 +  * glom/utility_widgets/flowtable.[h|cc]: Derive from GtkSpreadTable,
 +  removing API and implementation that is then provided by that base class.
 +	* glom/utility_widgets/flowtable_dnd.[h|cc]: Remove FlowTable_DND (and its
 +  use for now. We will need to reimplement it somehow with GtkSpreadTable,
 +  hopefully in a simpler way.
 +
 +  * glom/mode_data/box_data_details.cc
 +  * glom/mode_data/flowtablewithfieldse.[h|cc]:
 +  * glom/utility_widgets/test_flowtable.cc: Adapted.
 +
  2010-10-07  Murray Cumming  <murrayc murrayc com>
  
  	Choices: Do not offer editing formatting features when choosign extra fields.