GNOME.org
 

[glom/glom-1-16: 14/14] Merge

commit 79acb9bd88730f27844c54574e94e58db6a9361c
Merge: 3a0e5b9 b29cded
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Jun 19 15:56:53 2010 +0200

    Merge

 ChangeLog                                          |   68 ++++++++++++++++++++
 NEWS                                               |    7 ++
 configure.ac                                       |    5 +-
 glom/application.cc                                |    5 +-
 glom/bakery/app_withdoc_gtk.cc                     |    2 -
 glom/libglom/data_structure/print_layout.cc        |    1 -
 glom/libglom/document/document.cc                  |    2 -
 glom/libglom/gst-package.c                         |    3 +-
 glom/mode_design/comboentry_currency.cc            |    1 -
 glom/mode_design/fields/combo_fieldtype.cc         |    1 -
 glom/mode_design/layout/combobox_fields.cc         |    1 -
 glom/mode_design/layout/combobox_relationship.cc   |    1 -
 .../layout_item_dialogs/combo_summarytype.cc       |    1 -
 .../layout_item_dialogs/comboentry_borderwidth.cc  |    1 -
 .../print_layouts/print_layout_toolbar.cc          |    3 -
 glom/mode_design/translation/combobox_locale.cc    |    1 -
 .../cellrendererlist/cellrendererlist.cc           |    1 -
 glom/utility_widgets/combo_textglade.cc            |    1 -
 .../db_adddel/cellrenderer_buttonimage.cc          |    2 -
 .../db_adddel/cellrenderer_buttonimage.h           |    1 -
 .../db_adddel/cellrenderer_buttontext.cc           |    2 -
 .../db_adddel/cellrenderer_buttontext.h            |    1 -
 glom/utility_widgets/db_adddel/db_adddel.cc        |    2 -
 glom/utility_widgets/flowtable.cc                  |    9 +--
 glom/utility_widgets/layouttoolbar.cc              |    1 -
 glom/xsl_utils.cc                                  |    1 -
 26 files changed, 81 insertions(+), 43 deletions(-)
---
diff --cc ChangeLog
index d425fb5,28ec2a4..122bf41
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,312 -1,124 +1,380 @@@
 -1.14.3:
 +1.15.1:
  
 -2010-06-19  Murray Cumming  <murrayc murrayc com>
 -
 -	Revert previous "Fix a crash when using find mode" commit.
 +2010-05-25  Murray Cumming  <murrayc murrayc com>
  
 -	* glom/application.cc: 
 -	* glom/application.h: This was apparently only a problem due to a previous 
 -	UI-changing commit in the glom-1-16 branch.
 -	
 -2010-05-03  Daniel Borgmann  <danielb openismus com>
 +	* glom/libglom/utils.cc: build_sql_select_with_where_clause(): Fix a crash.
  
 -	Set default icon instead of individual window icons.
 +2010-05-25  Murray Cumming  <murrayc murrayc com>
  
 -	* glom/application.cc: Set default window icon.
 +	libglom: Utils: Avoid SQL strings for extra_join for doubly-related records.
  
 -	* glom/dialog_existing_or_new.cc:
 -	* glom/filechooser_export.cc:
 +	* glom/libglom/data_structure/foundset.[h|cc]: Remove the extra_group_by 
 +	member variable.
 +	* glom/base_db.cc: set_found_set_where_clause_for_portal(): Do not create 
 +	the SQL GROUP BY string here.
 +	* glom/libglom/utils.[h|cc]: build_sql_select_with_where_clause(): Remove 
 +	the extra_group_by parameter, instead grouping by all fields if there is 
 +	an extra_join_by, because there is a 1-to-1 correlation.
 +	Also take extra_join as a Relationship instead of a SQL JOIN string, and 
 +	reuse the existing code to define a join from a relationship.
  	* glom/frame_glom.cc:
 -	* glom/glade_utils.h:
 -	* glom/mode_design/script_library/dialog_script_library.cc:
 -	* glom/mode_design/translation/window_translations.cc:
 -	* glom/mode_design/users/dialog_groups_list.cc:
 -	* glom/utility_widgets/filechooserdialog_saveextras.cc:
 -	* glom/utils_ui.cc:
 -	* glom/window_boxholder.cc:
 -
 -	Don't call set_icon_name() on individual windows.
 +	* glom/libglom/data_structure/foundset.cc:
 +	* glom/libglom/data_structure/foundset.h:
 +	* glom/libglom/utils.cc:
 +	* glom/libglom/utils.h:
 +	* glom/mode_data/box_data_calendar_related.cc:
 +	* glom/print_layout/canvas_print_layout.cc:
 +	* glom/report_builder.cc:
 +	* glom/utility_widgets/db_adddel/glom_db_treemodel.cc: Adapt.
  
 -2010-05-12 Daniel Borgmann <danielb openismus com>
 +2010-05-25  Murray Cumming  <murrayc murrayc com>
  
 -	Don't allow deleting placeholder rows.
 +	Document: get_field_used_in_relationship_to_one(): const correction.
  
 -	* glom/utility_widgets/db_adddel/db_adddel.cc: Don't allow deleting a
 -	placeholder row (which leads to broken behaviour).
 +	* glom/libglom/document/document.[h|cc]: 
 +	get_field_used_in_relationship_to_one(): Make the relationship parameter 
 +	const and adapt other code.
  
 -2010-05-14  Daniel Borgmann  <danielb openismus com>
 +2010-05-25  Murray Cumming  <murrayc murrayc com>
  
 -	Fix position of "Records / Found" labels.
 +	libglom: build_sql_select_add_fields_to_get(): Define joins here.
  
 -	* glom/glom.glade: Make sure "Records: X Found: X" appears in the right
 -	order.
 +	* glom/libglom/data_structure/layout/usesrelationship.[h|cc]:
 +	Remove add_sql_join_alias_definition(), moving its code into 
 +	Utils::build_sql_select_add_fields_to_get() because that was the only code 
 +	that called it.
 +	get/set_relationship(), get/set_related_relationship(): const corrections.
 +	* several files: Adapt to const corrections.
  
 -2010-05-14  Daniel Borgmann  <danielb openismus com>
 +2010-05-24  Murray Cumming  <murrayc murrayc 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.
 +	UsesRelationship: Correct use of SqlBuilder for related relationships.
+ 
+ 2010-06-19  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Remove unnecessary gtk C includes.
+ 
+ 	* glom/application.cc:
+ 	* glom/bakery/app_withdoc_gtk.cc:
+ 	* glom/libglom/data_structure/print_layout.cc:
+ 	* glom/libglom/document/document.cc:
+ 	* glom/libglom/gst-package.c:
+ 	* glom/mode_design/comboentry_currency.cc:
+ 	* glom/mode_design/fields/combo_fieldtype.cc:
+ 	* glom/mode_design/layout/combobox_fields.cc:
+ 	* glom/mode_design/layout/combobox_relationship.cc:
+ 	* glom/mode_design/layout/layout_item_dialogs/combo_summarytype.cc:
+ 	* glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc:
+ 	* glom/mode_design/print_layouts/print_layout_toolbar.cc:
+ 	* glom/mode_design/translation/combobox_locale.cc:
+ 	* glom/utility_widgets/cellrendererlist/cellrendererlist.cc:
+ 	* glom/utility_widgets/combo_textglade.cc:
+ 	* glom/utility_widgets/db_adddel/cellrenderer_buttonimage.cc:
+ 	* glom/utility_widgets/db_adddel/cellrenderer_buttonimage.h:
+ 	* glom/utility_widgets/db_adddel/cellrenderer_buttontext.cc:
+ 	* glom/utility_widgets/db_adddel/cellrenderer_buttontext.h:
+ 	* glom/utility_widgets/db_adddel/db_adddel.cc:
+ 	* glom/utility_widgets/flowtable.cc:
+ 	* glom/utility_widgets/layouttoolbar.cc:
+ 	* glom/xsl_utils.cc: Remove now-unnecessary gtk+/gtk* includes, 
+ 	replacing some with use of C++ API. These caused warnings due to GSEAL.
+ 
+ 2010-06-19  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Configure: Remove checks for libegg dependencies, because we don't use it.
+ 
+ 	* configure.ac: We don't build libegg code here any more.
+ 
+ 2010-06-19  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Remove the avahi-ui dependency because we don't use it any more.
+ 
+ 	* configure.ac: Don't check for avahi-ui.
+ 	* glom/application.cc: Don't include avahi-ui.h
+ 
+ 1.14.2:
+ 
+ 2010-05-02  Murray Cumming  <murrayc murrayc-x61>
+ 
+ 	Python calculations: Really convert to expected types.
+ 	
+ 	* glom/libglom/data_structure/glomconversions.cc: 
+ 	get_double_for_gda_value_numeric(): Handle all numeric GTypes - not just 
+ 	G_TYPE_INT..
+ 	convert_value(): Remove the special case for G_TYPE_INT (now handled in 
+ 	get_double_for_gda_value_numeric instead). Make sure that all numeric GTypes 
+ 	are converted to GDA_TYPE_NUMERIC, making it easier for callers to check.
+ 
+ 2010-05-01  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Add test of type conversion after python calculations.
+ 	
+ 	* Makefile_tests.am:
+ 	* tests/test_python_execute_func_change_result_type.cc: Add a test that 
+ 	calls a python function that returns a number, for a text field, to 
+ 	check that the conversion is done.
+ 
+ 2010-05-01  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Python scripts and calculations: Test buttons now show python errors.
  	
 -	* glom/python_embed/glom_python.[h|cc]: 
 -	glom_execute_python_function_implementation(), 
 -	glom_evaluate_python_function_implementation(): Add an error_message output 
 +	* glom/libglom/data_structure/layout/usesrelationship.cc:
 +	add_sql_join_alias_definition(): Correct the join definition for 
 +	related relationships.
 +
 +2010-05-21  Murray Cumming  <murrayc murrayc com>
 +
 +	UsesRelationship: Use SqlBuilder::select_add_target() with the join.
 +
 +	* glom/libglom/data_structure/layout/usesrelationship.cc:
 +    add_sql_join_alias_definition(): Use select_add_target() instead of
 +    add_id() with the join's first target, to avoid the warning about an
 +    unknown ID, though we now get a warning about unimplmented code in libgda,
 +    which I emailed the gnome-db mailing list about.
 +
 +2010-05-21  Murray Cumming  <murrayc murrayc com>
 +
 +	Really replace the last non-users string-based SQL query.
 +
 +	* glom/libglom/db_utils.cc:
 +    get_database_preferences(): Add a missing call to select_add_target().
 +    insert_example_data(): Use SqlBuilder.
 +
 +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.
 +
 +	* glom/utility_widgets/db_adddel/db_adddel.cc: Don't add a new row
 +	if the edited row was a placeholder and no text was entered.
 +
 +2010-05-10  Daniel Elstner  <danielk openismus com>
 +
 +	Move list of libglom sources to separate file
 +
 +	* glom/libglom/filelist.am: New Automake include file, defining the
 +	lists of source and header files for building libglom.
 +	* Makefile_libglom.am: Include glom/libglom/filelist.am for the lists
 +	of header and source files, instead of listing them directly.
 +	* docs/libglom_reference/Makefile.am: Include the list of libglom
 +	source files from glom/libglom/filelist.am.
 +	(doc_input): Instead of naming a directory for Doxygen to search,
 +	explicitly define the Doxygen input to the list of all public libglom
 +	header files.
 +
 +2010-05-10  Daniel Elstner  <danielk openismus com>
 +
 +	Update Doxygen configuration for libglom reference
 +
 +	* docs/libglom_reference/Doxyfile.in: Correct strip prefixes and
 +	include paths.  Do include the mm-common stylesheet and reference
 +	the external tag files.  Also clean some cruft.
 +
 +2010-05-10  Daniel Elstner  <danielk openismus com>
 +
 +	Honor --disable-documentation configure option
 +
 +	* Makefile.am (gnome_doc_subdirs): Rename from $(doc_subdirs).
 +	(doc_subdirs): Conditionally define to the subdirectories of the
 +	reference documentation, depending on whether ENABLE_DOCUMENTATION
 +	is true.
 +	(SUBDIRS): Expand $(doc_subdirs) and $(gnome_doc_subdirs).
 +
 +2010-05-10  Daniel Borgmann  <danielb openismus com>
 +
 +	Make Find mode a toggle and move it to the Edit menu.
 +
 +	* glom/application.cc: Move Find menu item, remove Mode menu.
 +	* glom/frame_glom.cc/h: Replace on_menu_Mode_Find()/Data() with
 +	on_menu_Mode_Toggle().
 +
 +2010-05-06  Daniel Borgmann  <danielb openismus com>
 +
 +	Save extras alignment improvements.
 +
 +	* glom/utility_widgets/filechooserdialog_saveextras.cc: Adjust
 +	alignments and hide extra label if empty (thus not taking up space).
 +
 +2010-05-12  Murray Cumming  <murrayc murrayc com>
 +
 +    Use Gnome::Gda::SqlExpr for where clauses.
 +
 +	* glom/libglom/utils.[h|cc]: Added build_simple_where_expression()
 +    and build_combined_where_expression() to make it easier to work with
 +    Gnome::Gda::SqlExpr.
 +    build_sql_select_with_key(): Return a SqlExpr instead of a string.
 +	* glom/base_db.[h|cc]:
 +	* glom/base_db_table_data.cc:
 +	* glom/frame_glom.[h|cc]:
 +	* glom/libglom/data_structure/foundset.[h|cc]:
 +	* glom/mode_data/box_data.[h|cc]:
 +	* glom/mode_data/box_data_calendar_related.cc:
 +	* glom/mode_data/box_data_details.cc:
 +	* glom/mode_data/box_data_list.cc:
 +	* glom/mode_data/box_data_portal.cc:
 +	* glom/mode_data/datawidget/dialog_choose_id..[h|cc]:
 +	* glom/mode_find/notebook_find.[h|cc]:
 +	* glom/print_layout/canvas_print_layout.cc:
 +	* glom/report_builder.cc:
 +	* glom/utility_widgets/db_adddel/glom_db_treemodel.cc:
 +    Adapt, using SqlExpr instead of a string for where clauses.
 +
 +2010-05-06  Murray Cumming  <murrayc murrayc com>
 +
 +    Utils::get_choice_values(): Complete the use of SqlBuilder.
 +
 +	* glom/libglom/utils.cc: get_choice_values(): Use the new return value from
 +    Builder::select_add_field() for the ORDER BY, so we specify the field table
 +    too.
 +
 +2010-05-03  Daniel Borgmann  <danielb openismus com>
 +
 +	Set default icon instead of individual window icons.
 +
 +	* glom/application.cc: Set default window icon.
 +
 +	* glom/dialog_existing_or_new.cc:
 +	* glom/filechooser_export.cc:
 +	* glom/frame_glom.cc:
 +	* glom/glade_utils.h:
 +	* glom/mode_design/script_library/dialog_script_library.cc:
 +	* glom/mode_design/translation/window_translations.cc:
 +	* glom/mode_design/users/dialog_groups_list.cc:
 +	* glom/utility_widgets/filechooserdialog_saveextras.cc:
 +	* glom/utils_ui.cc:
 +	* glom/window_boxholder.cc:
 +
 +	Don't call set_icon_name() on individual windows.
 +
 +1.14.2:
 +
 +2010-05-02  Murray Cumming  <murrayc murrayc com>
 +
 +	Python calculations: Really convert to expected types.
 +
 +	* glom/libglom/data_structure/glomconversions.cc:
 +	get_double_for_gda_value_numeric(): Handle all numeric GTypes - not just
 +	G_TYPE_INT..
 +	convert_value(): Remove the special case for G_TYPE_INT (now handled in
 +	get_double_for_gda_value_numeric instead). Make sure that all numeric GTypes
 +	are converted to GDA_TYPE_NUMERIC, making it easier for callers to check.
 +
 +2010-05-01  Murray Cumming  <murrayc murrayc com>
 +
 +	Add test of type conversion after python calculations.
 +
 +	* Makefile_tests.am:
 +	* tests/test_python_execute_func_change_result_type.cc: Add a test that
 +	calls a python function that returns a number, for a text field, to
 +	check that the conversion is done.
 +
 +2010-05-01  Murray Cumming  <murrayc murrayc com>
 +
 +	Python scripts and calculations: Test buttons now show python errors.
 +
 +	* glom/python_embed/glom_python.[h|cc]:
 +	glom_execute_python_function_implementation(),
 +	glom_evaluate_python_function_implementation(): Add an error_message output
  	parameter, to report syntax errors, for instance.
  	* glom/mode_design/fields/dialog_fieldcalculation.cc:
    * glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc:
diff --cc NEWS
index d056717,ef737ef..2f477e8
--- a/NEWS
+++ b/NEWS
@@@ -1,21 -1,10 +1,28 @@@
 +1.15.1 (unstable):
 +
 +* Uses Gnome::Gda::SqlBuilder in most places to avoid manually building SQL 
 +  query strings. This should be more robust and safer.
 +  (Murray Cumming)
 +* Correct the position of "Records / Found" labels.
 +  (Daniel Borgmann)
 +* Find:
 +  - Make Find mode a toggle and move it to the Edit menu.
 +  - Fix a crash when using find mode.
 +  (Daniel Borgmann)
 +* List view:
 +  - Don't add a new row when cancelling editing of a placeholder row.
 +  - Don't allow placeholder rows to be delteted.
 +  (Daniel Borgmann)
 +* Build libglom and pyglom API documentation.
 +  (Murray Cumming, Daniel Elstner)
 +
+ 1.14.3 (stable):
+ 
+ * Fix position of "Records / Found" labels.
+   (Daniel Borgmann)
+ * List: Don't allow deleting placeholder rows.
+   (Daniel Borgmann)
+ * Build: Don't require avahi-ui.
    
  1.14.2 (stable):
  
diff --cc glom/utility_widgets/db_adddel/db_adddel.cc
index 231660b,fe895c3..c61a6f5
--- a/glom/utility_widgets/db_adddel/db_adddel.cc
+++ b/glom/utility_widgets/db_adddel/db_adddel.cc
@@@ -30,11 -30,8 +30,9 @@@
  #include "cellrenderer_buttonimage.h"
  #include "cellrenderer_buttontext.h"
  #include <glom/utils_ui.h> //For Utils::image_scale_keeping_ratio().
 +#include <libglom/db_utils.h>
  
  #include <iostream> //For debug output.
- #include <gtk/gtktreeview.h>
- #include <gtk/gtkstock.h>
  
  #ifdef GLOM_ENABLE_MAEMO
  //TODO: Remove this when we don't need to call C hildon functions:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]