[glom/sqlbuilder2: 10/10] Merge branch 'master' into sqlbuilder2

[Murray Cumming <murrayc src gnome org>]

commit 9db10bb78c0df938c8dccb3345d4ab6e4626b70a
Merge: a7e84d4 109890f
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu May 20 12:52:46 2010 +0200

    Merge branch 'master' into sqlbuilder2

 ChangeLog                                          |   28 +
 docs/user-guide/de/de.po                           |  111 +++--
 docs/user-guide/de/figures/glom_data_details.png   |  Bin 0 -> 91903 bytes
 docs/user-guide/de/figures/glom_data_list.png      |  Bin 0 -> 87176 bytes
 docs/user-guide/de/figures/glom_design_fields.png  |  Bin 0 -> 68628 bytes
 .../de/figures/glom_design_layout_details.png      |  Bin 0 -> 145165 bytes
 .../de/figures/glom_design_layout_list.png         |  Bin 0 -> 45481 bytes
 docs/user-guide/de/figures/glom_design_reports.png |  Bin 0 -> 27168 bytes
 .../de/figures/glom_design_reports_details.png     |  Bin 0 -> 69508 bytes
 .../de/figures/glom_design_reports_group_by.png    |  Bin 0 -> 25661 bytes
 .../figures/glom_design_reports_vertical_group.png |  Bin 0 -> 82896 bytes
 .../de/figures/glom_design_translations.png        |  Bin 0 -> 79368 bytes
 docs/user-guide/de/figures/glom_tables.png         |  Bin 0 -> 24086 bytes
 docs/user-guide/de/figures/start.png               |  Bin 0 -> 48969 bytes
 docs/user-guide/es/es.po                           |   45 +-
 glom/application.cc                                |   12 +-
 glom/application.h                                 |    2 +-
 glom/glom.glade                                    |   12 +-
 glom/utility_widgets/db_adddel/db_adddel.cc        |    2 +-
 po/cs.po                                           |  256 +++++-----
 po/es.po                                           |  540 ++++++++++----------
 21 files changed, 545 insertions(+), 463 deletions(-)
---
diff --cc ChangeLog
index 70e0ca7,e50fd85..3e44301
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,83 -1,31 +1,111 @@@
+ 2010-05-14  Daniel Borgmann  <danielb openismus com>
+ 
+ 	reviewed by: <delete if not using a buddy>
+ 	patch by: <delete if not someone else's patch>
+ 
+ 	* glom/glom.glade:
+ 
+ 2010-05-14  Daniel Borgmann  <danielb openismus com>
+ 
+ 	Fix position of "Records / Found" labels.
+ 
+ 	* glom/glom.glade: Make sure "Records: X Found: X" appears in the right
+ 	order.
+ 
+ 2010-05-14  Daniel Borgmann  <danielb openismus com>
+ 
+ 	Fix a crash when using find mode.
+ 
+ 	* glom/application.cc: Don't access m_action_mode_data.
+ 	* glom/application.h: Remove m_action_mode_data.
+ 
+ 2010-05-12  Daniel Borgmann  <danielb openismus com>
+ 
+ 	Don't allow deleting placeholder rows.
+ 
+ 	* glom/utility_widgets/db_adddel/db_adddel.cc: Don't allow deleting a
+ 	placeholder row (which leads to broken behaviour).
+ 
 +2010-05-20  Murray Cumming  <murrayc murrayc com>
 +
 +    Correct use of SQL functions with SqlBuilder.
 +
 +	* glom/base_db.cc: count_rows_returned_by(): Use SqlBuilder::add_field_id()
 +    so the function is really used. And add a target alias. This now works.
 +	* glom/libglom/python_embed/py_glom_relatedrecord.cc: generic_aggregate()
 +	* glom/libglom/utils.cc: build_sql_select_add_fields_to_get():
 +	* glom/utility_widgets/db_adddel/glom_db_treemodel.cc: get_record_counts():
 +    Use add_field_id() when adding a function to SqlBuilder, so it is
 +    really used.
 +
 +2010-05-19  Murray Cumming  <murrayc murrayc com>
 +
 +	More use of SqlBuilder. Almost finished.
 +
 +	* glom/base_db.cc:
 +	* glom/libglom/data_structure/layout/usesrelationship.[h|cc]:
 +    Change get_sql_join_alias_definition() to get_sql_join_alias_definition().
 +	* glom/libglom/db_utils.[h|cc]: query_execute_select(): Add an optional
 +    use_cursor bool to use the non-random database access.
 +	* glom/libglom/utils.[h|cc]: Change build_sql_select_fields_to_get() to
 +    build_sql_select_add_fields_to_get().
 +    build_sql_select_with_where_clause(): Use SqlBuilder.
 +	* glom/utility_widgets/db_adddel/glom_db_treemodel.cc:
 +    refresh_from_database(): Use DbUtils::query_execute_select(), to simplify
 +    the code. This is possible now that the function is not in BaseDB.
 +
 +2010-05-13  Murray Cumming  <murrayc murrayc com>
 +
 +	DbUtils: Catch SqlError exception.
 +
 +	* glom/libglom/db_utils.cc: query_execute_select(), query_execute_select():
 +	Catch SqlError too, as this seems to be thrown too.
 +
 +2010-05-13  Murray Cumming  <murrayc murrayc com>
 +
 +	DbUtils::query_execute(): Remove params parameter.
 +
 +	* glom/libglom/db_utils.[h|cc]: query_execute(): Remove the unused params
 +	parameter.
 +
 +2010-05-13  Murray Cumming  <murrayc murrayc com>
 +
 +	Use SqlBuilder in all possible remaining places.
 +
 +	* glom/libglom/db_utils.[h|cc]: Renamed query_execute(string) to
 +	query_execute_string() so we catch uses of it that could use SqlBuilder.
 +
 +	* glom/base_db.cc: Replaced some INSERT and DELETE string sql queries
 +	with SqlBuilder.
 +	* glom/base_db_table_data.cc:
 +	* glom/libglom/db_utils.cc:
 +	* glom/libglom/db_utils.h:
 +	* glom/libglom/privs.cc:
 +	* glom/mode_design/users/dialog_groups_list.cc:
 +	* glom/mode_design/users/dialog_users_list.cc:
 +	* glom/navigation/box_tables.cc: Adapt.
 +
 +2010-05-12  Murray Cumming  <murrayc murrayc com>
 +
 +	Remove redundant BaseDb::query_execute*() methods.
 +
 +	* glom/base_db.[h|cc]: Removed query_execute_select() and query_execute().
 +	The same methods in DbUtils replace them.
 +	* glom/libglom/db_utils.[h|cc]: Removed the query_execute_select(string) override.
 +	* glom/mode_data/box_data_calendar_related.cc:
 +	* glom/mode_data/box_data_details.cc:
 +	* glom/mode_data/box_data_portal.cc:
 +	* glom/mode_design/dialog_database_preferences.cc:
 +	* glom/mode_design/fields/box_db_table_definition.cc:
 +	* glom/mode_design/users/dialog_groups_list.cc:
 +	* glom/mode_design/users/dialog_users_list.cc:
 +	* glom/navigation/box_tables.cc:
 +	* glom/print_layout/canvas_print_layout.cc:
 +	* glom/report_builder.cc:
 +	* glom/base_db_table_data.cc:
 +	* glom/frame_glom.cc:
 +	* glom/libglom/db_utils.cc: Adapted.
 +
  2010-05-11  Daniel Borgmann  <danielb openismus com>
  
  	Don't add a new row when cancelling a placeholder edit.