[glom: 8/8] Fixed conflict.

[Murray Cumming <murrayc src gnome org>]

commit 2bd8d2d2a924ba0e91bf6aa538792741fdc81271
Merge: 6f48b64 d614587
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Jan 20 12:44:46 2010 +0100

    Fixed conflict.

 ChangeLog                                      |   43 ++++++++++++++++---
 NEWS                                           |   11 +++++
 glom/libglom/data_structure/glomconversions.cc |    7 +++
 glom/libglom/data_structure/glomconversions.h  |    2 +
 glom/utility_widgets/db_adddel/db_adddel.cc    |   54 +++++++++++++++++++++---
 po/de.po                                       |    1 +
 po/sl.po                                       |    1 +
 7 files changed, 107 insertions(+), 12 deletions(-)
---
diff --cc ChangeLog
index 9ab85f2,337df9b..cd56004
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,59 -1,32 +1,81 @@@
 +2010-01-16  Murray Cumming  <murrayc murrayc com>
 +
-   Field Formatting: Negative values color: Make this just a bool check box.
++	Field Formatting: Negative values color: Make this just a bool check box.
 +  
-   * glom/libglom/data_structure/numeric_format.[h|cc]: Use just a bool 
-   to say if negative values should be shown in an alternative color.
-   Add static get_alternative_color_for_negatives() to get that color.
++	* glom/libglom/data_structure/numeric_format.[h|cc]: Use just a bool 
++	to say if negative values should be shown in an alternative color.
++	Add static get_alternative_color_for_negatives() to get that color.
 + 	* glom/libglom/data_structure/layout/fieldformatting.cc:
 + 	get_text_format_color_foreground_to_use(): Updated the implementation.
 + 	* glom/libglom/document/document.cc:
-   load_after_layout_item_formatting(), save_before_layout_item_formatting():
++	load_after_layout_item_formatting(), save_before_layout_item_formatting():
 +	Updated.
 +	
 +	* glom/glom_developer.glade: window_formatting: Show only a checkbox, not 
 +	a color too, for the alternative color for negatives.
 +	* glom/mode_design/layout/layout_item_dialogs/box_formatting.[h|cc]:
 +	Updated.
 +
 +2010-01-15  Michael Hasselmann  <michaelh openismus com>
 +
 +	Add forgotten header to libglom's Makefile
 +
 +	* Makefile_libglom.am: libglom_include_HEADERS forgot to mention utils.h
 +	although it was mentioned in the *_la_SOURCES.
 +
 +
 +2010-01-15  Michael Hasselmann  <michaelh openismus com>
 +
- Updated the comment for NumericFormat's default precision
++	Updated the comment for NumericFormat's default precision
 +
 +	* glom/libglom/data_structure/numeric_format.h (get_default_precision): The
 +	precision applies to the decimal places only, not the whole number. Comment
 +	updated.
 +
 +2010-01-15  Murray Cumming  <murrayc murrayc com>
 +
 +	Field Formatting: Allow an alternative color for negative values.
 +
 +	* glom/libglom/data_structure/numeric_format.[h|cc]: 
 +	Added m_foreground_color_for_negatives.
 +	* glom/libglom/data_structure/layout/fieldformatting.[h|cc]:
 +	Added get_text_format_color_foreground_to_use().
 +	* glom/libglom/document/document.cc: 
 +	load_after_layout_item_formatting(), save_before_layout_item_formatting():
 +	load/save the new setting.
 +
 +	* glom/glom_developer.glade: window_formatting: Added negatives color 
 +	and checkbox to the numeric formatting tab.
 +	* glom/mode_design/layout/layout_item_dialogs/box_formatting.[h|cc]:
 +	Show/Save the color.
 +	* glom/utility_widgets/db_adddel/db_adddel.cc: 
 +	treeviewcolumn_on_cell_data()_
 +	* glom/utility_widgets/entryglom.cc: set_value():
 +	Use the color for negatives if appropriate. 
 +	* glom/print_layout/canvas_layout_item.cc: Add a TODO to use it here too.
 +
+ 1.12.5 (stable):
+ 
+ 2010-01-20  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Fix a crash in previous commit.
+ 
+ 	* glom/utility_widgets/db_adddel/db_adddel.cc: get_fixed_cell_height():
+ 	Fixed a null-pointer crash when also checking LayoutItem_Text items, 
+ 	though the UI doesn't actually allow the font to be specified for them 
+ 	yet.
+ 
+ 2010-01-20  Murray Cumming  <murrayc murrayc com>
+ 
+ 	List View: Don't chop off the bottom of text when using large fonts.
+ 
+ 	* glom/utility_widgets/db_adddel/db_adddel.cc: get_fixed_cell_height():
+ 	Use the font description from the FieldFormatting, to get a more 
+ 	suitable max height for all columns.
+ 	remove_all_columns(): Set m_fixed_cell_height back to 0 so it 
+ 	will be recalculated for the new columns.
+ 	Fixes bug #607023 (Michael Hasselmann)
+ 
 -2010-01-15  Michael Hasselmann  <michaelh openismus com>
 -
 -	Add forgotten header to libglom's Makefile
 -
 -	* Makefile_libglom.am: libglom_include_HEADERS forgot to mention utils.h
 -	although it was mentioned in the *_la_SOURCES.
 -
  2010-01-14  Murray Cumming  <murrayc murrayc com>
  
  	libglom: Some API documentation.
diff --cc po/de.po
index 6c632f2,09023be..c55e826
--- a/po/de.po
+++ b/po/de.po
@@@ -3888,3 -3880,3 +3888,4 @@@ msgstr "Der Bericht wird nun in Ihrem W
  
  #~ msgid "The image file could not be opened:\n"
  #~ msgstr "Die Bilddatei konnte nicht geöffnet werden:\n"
++
diff --cc po/sl.po
index 5451614,fb3a1fd..89d213b
--- a/po/sl.po
+++ b/po/sl.po
@@@ -3425,3 -3416,3 +3425,4 @@@ msgstr "PoroÄ?ilo je konÄ?ano
  msgid "The report will now be opened in your web browser."
  msgstr "PoroÄ?ilo bo sedaj odprto v vaÅ¡em spletnem brskalniku."
  
++