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

[Murray Cumming <murrayc src gnome org>]

commit 872d5e63b675bbeefb5ee212dcbe997402f12768
Merge: 99daa7f 91de055
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed May 12 11:54:16 2010 +0200

    Merge branch 'master' into sqlbuilder2

 ChangeLog                                          |   54 ++
 Makefile.am                                        |   13 +-
 Makefile_libglom.am                                |  163 +------
 docs/libglom_reference/Doxyfile.in                 |   24 +-
 docs/libglom_reference/Makefile.am                 |    6 +-
 glom/application.cc                                |   27 +-
 glom/frame_glom.cc                                 |   17 +-
 glom/frame_glom.h                                  |    3 +-
 glom/libglom/filelist.am                           |  180 +++++++
 glom/utility_widgets/db_adddel/db_adddel.cc        |    4 +
 .../filechooserdialog_saveextras.cc                |   12 +-
 po/sl.po                                           |  548 ++++++++++----------
 12 files changed, 587 insertions(+), 464 deletions(-)
---
diff --cc ChangeLog
index 3ed73bb,cced08d..15ddc1f
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,35 -1,57 +1,89 @@@
+ 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.
diff --cc glom/frame_glom.cc
index 4832d6b,c9389fe..de9b26c
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@@ -1466,10 -1470,9 +1470,9 @@@ void Frame_Glom::on_button_quickfind(
    }
  }
  
 -void Frame_Glom::on_notebook_find_criteria(const Glib::ustring& where_clause)
 +void Frame_Glom::on_notebook_find_criteria(const Gnome::Gda::SqlExpr& where_clause)
  {
    //std::cout << "Frame_Glom::on_notebook_find_criteria(): " << where_clause << std::endl;
-   //on_menu_Mode_Data();
  
    Application* pApp = dynamic_cast<Application*>(get_app_window());
    if(pApp)