[glom: 13/13] Fixed merge.

[Murray Cumming <murrayc src gnome org>]

commit 2d466df92f46d9b14a98dfe144683554fa564bdb
Merge: 0f0af70... 8c090f6...
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Oct 7 22:37:29 2009 +0200

    Fixed merge.

 ChangeLog                                          |   74 ++++
 .../test_sqlite_music/glom_musiccollection21.db    |  Bin 0 -> 15360 bytes
 .../test_sqlite_music/test_sqlite_music.glom       |  378 ++++++++++++++++++++
 glom/libglom/data_structure/layout/layoutitem.cc   |    7 +-
 glom/libglom/data_structure/layout/layoutitem.h    |    2 +-
 glom/libglom/data_structure/translatable_item.cc   |   16 +-
 glom/libglom/data_structure/translatable_item.h    |    4 +
 glom/libglom/document/document.cc                  |   73 +++-
 glom/mode_data/box_data_list_related.cc            |    6 +-
 glom/mode_design/layout/dialog_layout_details.cc   |    2 +-
 glom/print_layout/canvas_layout_item.cc            |    3 +-
 glom/utility_widgets/db_adddel/db_adddel.cc        |   87 ++++-
 glom/utility_widgets/db_adddel/db_adddel.h         |    6 +-
 .../db_adddel/db_adddel_withbuttons.cc             |   37 ++-
 .../db_adddel/db_adddel_withbuttons.h              |   24 ++-
 tests/import/utils.cc                              |   26 ++-
 16 files changed, 687 insertions(+), 58 deletions(-)
---
diff --cc ChangeLog
index fc32ed1,0fde5ec..01f9387
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,32 -1,69 +1,98 @@@
+ 2009-10-07  Murray Cumming  <murrayc murrayc com>
+ 
+   Tests: Import: Fixed the no-exceptions build.
+   
+ 	* tests/import/utils.cc: Fixed the no-exceptions build.
++	
 +2009-10-06  Daniel Elstner  <daniel kitta gmail com>
 +
 +	Support Automake silent rules
 +
 +	* configure.ac: Call the AM_SILENT_RULES macro if it is defined.
 +	* Makefile.am (.rc.res): Prefix command with $(AM_V_GEN) to suppress
 +	the echoing of the command line if silent rules are enabled.
 +	* Makefile_libegg.am (eggmarshalers.h), (eggmarshalers.c): ditto.
 +
 +1.12.2:
 +
 +2009-10-05  Murray Cumming  <murrayc murrayc com>
 +
 +	Import: Handle large unquoted text (binary image data).
 +
 +	* glom/import_csv/csv_parser.cc: on_idle_parse(): When we reach the 
 +	end of the buffer without finding a newline, store all of the remaining 
 +	text instead of just since the last quote, so we don't discard parts 
 +	of large unquoted text, such as parts of binary image data.  
 +	This seems to break the test_fail_on_non_matching_quotes test, but 
 +	the tests are too hard to run until we have removed the idle handling 
 +	(and its timing problems) from CSvParser.
 +  	
 +	* glom/libglom/data_structure/field.cc: to_file_format(): Also 
 +	escape carriage-returns, just in case.
 +	* tests/import/test_parsing.cc: Comment out the 
 +	test_skip_on_no_ending_newline test, because I see no reason why we 
 +	would want to ignore last lines with no newline.
  
+ 2009-10-06  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Maemo: List: Click to view details.
+ 	
+ 	* glom/utility_widgets/db_adddel/db_adddel.[h|cc]: Connect to 
+ 	TouchSelector::signal_changed to respond to clicks on the list. Note that 
+ 	a drag to pan (scroll) does not cause that signal to be emitted.
+ 	* glom/utility_widgets/db_adddel/db_adddel_withbuttons.[h|cc]: On Mameo, 
+ 	remove the Delete and Edit buttons because deleting can be done via the 
+ 	details window (viewable on Maemo). The Add button is still there and is ugly. 
+ 
+ 2009-10-06  Murray Cumming  <murrayc murrayc com>
+ 
+ 	DbAddDel: Expand an appropriate column.
+ 	
+ 	* glom/libglom/data_structure/layout/layoutitem.[h|cc]: get_display_width(): 
+ 	Remove the bool return and just return the value, because 0 already means no 
+ 	specified width.
+ 	* glom/libglom/document/document.cc:
+ 	* glom/mode_design/layout/dialog_layout_details.cc:
+ 	* glom/print_layout/canvas_layout_item.cc: Adapt.
+ 	
+ 	* glom/utility_widgets/db_adddel/db_adddel.[h|cc]:
+ 	Added get_column_to_expand() to choose the last expandable (text, no specified 
+ 	width) column.
+ 	treeview_append_column(): Add a bool expand property and use it.
+ 	construct_specified_columns(): Expand the expandable column, to avoid 
+ 	wasting space or expanding an inappropriate column.
+ 
+ 2009-10-05  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Maemo: Allow editing of hidden tables (only) via its details window.
+ 
+ 	* glom/mode_data/box_data_list_related.cc: enable_buttons(): Add a maemo 
+ 	ifdef around m_AddDel.set_allow_view_details().
+ 
+ 2009-10-05  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Maemo: List: Use only 2 columns by default, so some have enough space.
+ 	
+ 	* glom/libglom/document/document.cc: get_data_layout_groups_plus_new_fields():
+ 	Restrict maemo to 2 list columns by default.
+ 
+ 2009-10-05  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Maemo: Related Records / AddDel: Use icon-only Hildon buttons.
+ 	
+ 	* glom/utility_widgets/db_adddel/db_adddel_withbuttons.[h|cc]: Use Hildon 
+ 	Buttons, with only icons.
+ 
+ 2009-10-05  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Maemo: Hide group titles by default.
+ 	
+ 	* glom/libglom/data_structure/translatable_item.[h|cc]:
+ 	Added clear_title_in_all_locales().
+ 	* glom/libglom/document/document.cc:
+ 	maemo_restrict_layouts_to_single_column_group(): Also clear the group titles 
+ 	to make the default maemo layout more compact.
+ 	
  2009-10-05  Murray Cumming  <murrayc murrayc-desktop>
  
  	Export: Correct problems in the binary data for images: Escape newlines.