GNOME.org
 

[glom: 2/3] Merged from glom_1_12

commit 7be4077a5b2b85a666e95dc6f9f6998b2d1afaca
Merge: d8c979e 6522d9c
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Jan 27 08:41:17 2010 +0100

    Merged from glom_1_12

 ChangeLog                                          |   32 ++++++++++++++-----
 glom/libglom/appstate.cc                           |    2 +-
 glom/libglom/calcinprogress.cc                     |    2 +-
 glom/libglom/data_structure/field.cc               |    4 +-
 glom/libglom/data_structure/field.h                |    4 +-
 glom/libglom/data_structure/fieldtypes.cc          |    2 +-
 glom/libglom/data_structure/glomconversions.cc     |    2 +-
 glom/libglom/data_structure/groupinfo.cc           |    2 +-
 glom/libglom/data_structure/groupinfo.h            |    4 +-
 glom/libglom/data_structure/has_title_singular.cc  |    2 +-
 glom/libglom/data_structure/layout/custom_title.cc |    2 +-
 .../data_structure/layout/fieldformatting.cc       |    2 +-
 glom/libglom/data_structure/layout/layoutgroup.cc  |    6 ++--
 glom/libglom/data_structure/layout/layoutgroup.h   |    2 +-
 glom/libglom/data_structure/layout/layoutitem.cc   |    2 +-
 .../data_structure/layout/layoutitem_button.cc     |    2 +-
 .../data_structure/layout/layoutitem_button.h      |    2 +-
 .../layout/layoutitem_calendarportal.cc            |    2 +-
 .../layout/layoutitem_calendarportal.h             |    2 +-
 .../data_structure/layout/layoutitem_field.cc      |    2 +-
 .../data_structure/layout/layoutitem_image.cc      |    2 +-
 .../data_structure/layout/layoutitem_image.h       |    2 +-
 .../data_structure/layout/layoutitem_line.cc       |    2 +-
 .../data_structure/layout/layoutitem_line.h        |    2 +-
 .../data_structure/layout/layoutitem_notebook.cc   |    2 +-
 .../data_structure/layout/layoutitem_notebook.h    |    2 +-
 .../layout/layoutitem_placeholder.cc               |    2 +-
 .../data_structure/layout/layoutitem_placeholder.h |    2 +-
 .../data_structure/layout/layoutitem_portal.cc     |    2 +-
 .../data_structure/layout/layoutitem_text.cc       |    2 +-
 .../data_structure/layout/layoutitem_text.h        |    4 +-
 .../layout/report_parts/layoutitem_footer.cc       |    2 +-
 .../layout/report_parts/layoutitem_header.cc       |    2 +-
 .../report_parts/layoutitem_verticalgroup.cc       |    2 +-
 .../data_structure/layout/usesrelationship.cc      |    2 +-
 glom/libglom/data_structure/numeric_format.cc      |    2 +-
 .../data_structure/parameternamegenerator.cc       |    2 +-
 glom/libglom/data_structure/print_layout.cc        |    2 +-
 glom/libglom/data_structure/print_layout.h         |    4 +-
 glom/libglom/data_structure/privileges.cc          |    2 +-
 glom/libglom/data_structure/relationship.cc        |    2 +-
 glom/libglom/data_structure/report.cc              |    2 +-
 glom/libglom/data_structure/report.h               |    4 +-
 glom/libglom/data_structure/system_prefs.cc        |    1 -
 glom/libglom/data_structure/tableinfo.cc           |    2 +-
 glom/libglom/data_structure/translatable_item.cc   |    2 +-
 glom/libglom/python_embed/py_glom_record.cc        |    2 +-
 glom/libglom/python_embed/py_glom_relatedrecord.cc |    2 +-
 48 files changed, 77 insertions(+), 64 deletions(-)
---
diff --cc ChangeLog
index 6f640f4,94482e5..456e9fa
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,248 -1,31 +1,262 @@@
+ 2010-01-26  Murray Cumming  <murrayc murrayc com>
+ 
+ 	libglom: Correct includes.
+ 
+ 	* glom/libglom/*.h: Use the full include libglom/ path for headers, to 
+ 	avoid confusion and make life easier for other users of libglom.
+ 
 +2010-01-25  Murray Cumming  <murrayc murrayc com>
 +
 +	* glom/libglom/data_structure/numeric_format.h: Remove unnecessary 
 +	include of privileges.h.
 +
 +2010-01-25  Murray Cumming  <murrayc murrayc com>
 +
 +	Allow new files to have quotes in their titles.
 +
 +	* glom/frame_glom.cc: 
 +	connection_request_password_and_choose_new_database_name(): 
 +	Remove quotes (and other unusual characters) from the generated 
 +	database name, to avoid errors from the database backend.
 +	Bug #607957 (Michael Hasselmann) 
 +
+ 2010-01-24  Michael Hasselmann  <michael taschenorakel de>
+ 
+ 	Fixed out-ouf-bounds access during CSV imports
 -
++    
+ 	* glom/import_csv/dialog_import_csv.cc (get_field_for_column): Added boundary
+ 	check for direct field access. Fixes bug #607938.
+ 
 -2010-01-25 Murray Cumming <murrayc murrayc com>
 +2010-01-24  Murray Cumming  <murrayc murrayc com>
  
 -	* glom/libglom/data_structure/numeric_format.h: Remove unnecessary
 -	include of privileges.h.
 +	* ldtp/central-info.xml.example: Added an example central-info.xml, as 
 +	mentioned in the README.
  
 -2010-01-25 Murray Cumming <murrayc murrayc com>
 +1.13.2:
  
 -	Allow new files to have quotes in their titles.
 +2010-01-24  Murray Cumming  <murrayc murrayc com>
  
-   Details: Buttons: Use horizontal aligment from formatting.
 -	* glom/frame_glom.cc:
 -	connection_request_password_and_choose_new_database_name():
 -	Remove quotes (and other unusual characters) from the generated
 -	database name, to avoid errors from the database backend.
 -	Bug #607957 (Michael Hasselmann)
++	Details: Buttons: Use horizontal aligment from formatting.
 +  
 +	* glom/mode_data/flowtablewithfields.cc: add_button_at_position():
 +	Use a Gtk::HBox with either pack_start() or pack_end(), putting it in the 
 +	FlowTable with expand=true to have alignment in the button's space, if we 
 +	don't want the FlowTable's default (left) alignment.
 +
 +2010-01-24  Murray Cumming  <murrayc murrayc com>
 +
-   Details: Static Text items: Use horizontal alignment from formatting.
++	Details: Static Text items: Use horizontal alignment from formatting.
 +  
 +	* glom/utility_widgets/labelglom.[h|cc]: Add a constructor that does not 
 +	take alignment values, like the Gtk::Label base class, so we can easily 
 +	use the default for vertical alignment.
 +	* glom/mode_data/flowtablewithfields.cc: add_textobject_at_position():
 +	Use expand=true when adding the widget to the FlowTable, so that labels can 
 +	have the full space in which to actually have alignment.
 +	* glom/utility_widgets/layoutwidgetbase.cc: apply_formatting: Use appropriate 
 +	multi-line justification for labels, as a user would expect when setting 
 +	horizontal alignment.
 +
 +2010-01-23  Murray Cumming  <murrayc murrayc com>
 +
-   Details: Buttons: Use background color from formatting.
++	Details: Buttons: Use background color from formatting.
 +  
 +	* glom/mode_data/flowtablewithfields.cc: add_button_at_position(): Call 
 +	apply_formatting on the button, not the label, so it has a chance to do the 
 +	right thing on the right widget.
 +
 +2010-01-23  Murray Cumming  <murrayc murrayc com>
 +
-   Details: Static Text items: Use background color from formatting.
++	Details: Static Text items: Use background color from formatting.
 +  
 +	* glom/utility_widgets/labelglom.cc: Do not call set_visible_window(false)
 +	because we really need a visible child X window to be able to change the 
 +	background color.
 +
 +2010-01-23  Murray Cumming  <murrayc murrayc com>
 +
-   Details: Static Text items and Buttons: Use foreground color from formatting.
++	Details: Static Text items and Buttons: Use foreground color from formatting.
 +   
 +	* glom/utility_widgets/layoutwidgetbase.cc: apply_formatting(): Use the 
 +	foreground color for labels (static text items and buttons).
 +
 +2010-01-22  Murray Cumming  <murrayc murrayc com>
 +
-   Details: Static Text items: Use formatting.
++	Details: Static Text items: Use formatting.
 +  
 +	* glom/utility_widgets/labelglom.[h|cc]: Added get_label(), because this 
 +	really has a label as a child.
 +	* glom/utility_widgets/layoutwidgetbase.cc: apply_formatting(): Use get_label() 
 +	to make formatting work on static text items too.
 +
 +2.13.1:
 +
 +2010-01-22  Murray Cumming  <murrayc murrayc com>
 +
-   Fixed compiler warnings.
++	Fixed compiler warnings.
 +  
 +	* glom/libglom/data_structure/layout/layoutitem_field.cc: 
 +	get_formatting_used_horizontal_alignment():
 +	* glom/print_layout/canvas_layout_item.cc: apply_formatting(): Fixed 
 +	compiler warnings.
 +
 +2010-01-22  Murray Cumming  <murrayc murrayc com>
 +
 +	Make libglom-1.14 install in parallel with libglom-1.12.
 +
 +	* glom/libglom/glom-1.12.pc.in: Rename to glom-1.14.pc.in
 +	* configure.ac: Change the libglom ABI version variable and specify the 
 +	changed .pc.in file.
 +	* Makefile.am, Makefile_libglom.am: Adapt.
 +	* glom/python_embed/python_module/py_glom_module.[h|cc]: Mention 
 +	2.14 instead of 2.14.
 +	* tests/test_load_python_library.cc: Adapt.
 +
 +	* glom/libglom/document/document.cc: 
 +	get_latest_known_document_format_version(): Increment.
 +
 +2010-01-22  Murray Cumming  <murrayc murrayc com>
 +
 +	Really use formatting for multi-line fields.
 +
 +	* glom/utility_widgets/textviewglom.[h|cc]: Added get_textview().
 +	* glom/utility_widgets/layoutwidgetbase.cc: apply_formatting(): 
 +	Get the appropriate child for buttons and textviews, making this work 
 +	for textviews (multi line fields), but it still does not work for 
 +	labels (static text items) and buttons.
 +
- 2010-01-22  Murray Cumming  <murrayc murrayc com>>
++2010-01-22  Murray Cumming  <murrayc murrayc com>
 +
 +	Allow custom text formatting of Buttons as well as text items and fields.
 +
 +	* glom/libglom/data_structure/layout/layoutitem_button.[h|cc]:
 +	Derive from LayoutItem_WithFormatting.
 +	* glom/libglom/document/document.[h|cc]: Make loading/saving of 
 +	formatting generic so we get it for free whenever a new class 
 +	derives from LayoutItem_WithFormatting.
 +	* glom/mode_data/flowtablewithfields.cc:
 +	on_dnd_add_layout_item_button(): Try to apply the formatting to 
 +	the button's label, though it doesn't seem to work.
 +
- 2010-01-22  Murray Cumming  <murrayc murrayc com>>
++2010-01-22  Murray Cumming  <murrayc murrayc com>
 +
 +	Allow editing of formatting for static text items.
 +
 +	* glom/mode_design/layout/layout_item_dialogs/dialog_formatting.[h|cc]:
 +	Added generic formatting (not choices, not default/custom) dialog 
 +	for static text items and maybe others.
 +	* glom/mode_design/layout/layout_item_dialogs/box_formatting.[h|cc]:
 +	set_formatting(): Add optional bool paramters to hide numeric formatting 
 +	and choices.
 +	* glom/base_db.[h|cc]: Added offer_item_formatting() to use this dialog.
 +	* glom/mode_design/layout/dialog_layout_details.cc(): Allow editing of
 +	the formatting for static text items instead of just fields.
 +
 +	* glom/utility_widgets/db_adddel/db_adddel.cc: 
 +	construct_specified_columns_cellrenderer(): Apply the formatting to 
 +	any LayoutItem_WithFormatting, not just fields.
 +	* glom/mode_data/flowtablewithfields.cc: add_textobject_at_position():
 +	Try to apply the formatting to the label, but it doesn't seem to work.
 +
 +2010-01-22  Murray Cumming  <murrayc murrayc com>
 +
 +	Add LayoutItem_WithFormatting as a Field/StaticText common base class.
 +
 +	* glom/libglom/data_structure/layout/layoutitem_withformatting.[h|cc]:
 +	Added LayoutItem_WithFormatting.
 +	* glom/libglom/data_structure/layout/layoutitem_text.[h|cc]:
 +	* glom/libglom/data_structure/layout/layoutitem_field.[h|cc]:
 +	Derive from Layout_WithFormatting, so we can use the base class 
 +	polymorphically, making it easier to support formatting for static text 
 +	items.
 +	* glom/utility_widgets/layoutwidgetbase.[h|cc]: apply_formatting(),
 +	* glom/print_layout/canvas_layout_item.[h|cc]: apply_formatting():
 +	Make this generic for LayoutItem_WithFormatting.
 +
 +2010-01-22  Murray Cumming  <murrayc murrayc com>
 +
 +	Show the alternative colors for negatives in fields with choices too.
 +
 +	* glom/utility_widgets/comboentryglom.cc: set_value():
 +	* glom/utility_widgets/comboglom.cc: set_value(): Use the alternative 
 +	negative color feature here too.
 +
 +2010-01-21  Murray Cumming  <murrayc murrayc com>
 +
 +	Field Formatting: Text Formatting: Add horizontal alignment option.
 +
 +	* glom/libglom/data_structure/layout/fieldformatting.[h|cc]:
 +	Added get/set_horizontal_alignment().
 +	* glom/libglom/data_structure/layout/layoutitem_field.[h|cc]:
 +	Added get_formatting_used_horizontal_alignment() to interpret the 
 +	AUTO alignment depending on the fields details.
 +	* 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 the alignment combo.
 +	* glom/mode_design/layout/layout_item_dialogs/box_formatting.[h|cc]:
 +	Show/Save the alignment.
 +	* glom/utility_widgets/db_adddel/db_adddel.cc: apply_formatting():
 +	* glom/utility_widgets/entryglom.cc: set_layout_item():
 +	* glom/utility_widgets/comboentryglom.cc: set_layout_item():
 +	Set xalign from get_formatting_used_horizontal_alignment().
 +
 +2010-01-16  Murray Cumming  <murrayc murrayc com>
 +
 +	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/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():
 +	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
 +
 +	* 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):
  
diff --cc glom/libglom/data_structure/layout/fieldformatting.cc
index a4ec106,bd47f7d..10228cc
--- a/glom/libglom/data_structure/layout/fieldformatting.cc
+++ b/glom/libglom/data_structure/layout/fieldformatting.cc
@@@ -18,8 -18,7 +18,8 @@@
   * Boston, MA 02111-1307, USA.
   */
  
 +#include "fieldformatting.h"
- #include <glom/libglom/data_structure/glomconversions.h>
+ #include <libglom/data_structure/layout/fieldformatting.h>
  #include <glibmm/i18n.h>
  
  const guint MULTILINE_TEXT_DEFAULT_HEIGHT_LINES = 6;
diff --cc glom/libglom/data_structure/layout/layoutitem_button.h
index 443af0c,a705165..30ec1db
--- a/glom/libglom/data_structure/layout/layoutitem_button.h
+++ b/glom/libglom/data_structure/layout/layoutitem_button.h
@@@ -21,7 -21,7 +21,7 @@@
  #ifndef GLOM_DATASTRUCTURE_LAYOUTITEM_BUTTON_H
  #define GLOM_DATASTRUCTURE_LAYOUTITEM_BUTTON_H
  
- #include "layoutitem_withformatting.h"
 -#include <libglom/data_structure/layout/layoutitem.h>
++#include  <libglom/data_structure/layout/layoutitem_withformatting.h>
  
  namespace Glom
  {
diff --cc glom/libglom/data_structure/layout/layoutitem_text.h
index 94cc35d,f739050..f751b92
--- a/glom/libglom/data_structure/layout/layoutitem_text.h
+++ b/glom/libglom/data_structure/layout/layoutitem_text.h
@@@ -21,8 -21,8 +21,8 @@@
  #ifndef GLOM_DATASTRUCTURE_LAYOUTITEM_TEXT_H
  #define GLOM_DATASTRUCTURE_LAYOUTITEM_TEXT_H
  
- #include "layoutitem_withformatting.h"
- #include "fieldformatting.h"
 -#include <libglom/data_structure/layout/layoutitem.h>
++#include <libglom/data_structure/layout/layoutitem_withformatting.h.h>
+ #include <libglom/data_structure/layout/fieldformatting.h>
  
  namespace Glom
  {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]