GNOME.org
 

[glom/online-glom: 20/20] Merge branch 'glom-1-18' into online-glom

commit c39f122a37bb872902d8c0f2dac77782835fdf45
Merge: 006ec97 8bb4162
Author: Ben Konrath <ben bagu org>
Date:   Mon Mar 14 16:55:28 2011 +0100

    Merge branch 'glom-1-18' into online-glom
    
    Conflicts:
    	ChangeLog
    	glom/libglom/init.cc

 COPYING                                            |  912 ++++++++++-----
 ChangeLog                                          |  183 +++-
 Makefile.am                                        |    9 +-
 Makefile_glom.am                                   |   16 +-
 Makefile_libglom.am                                |    5 +-
 Makefile_tests.am                                  |    3 +-
 NEWS                                               |    4 +
 configure.ac                                       |    4 +-
 glom/dialog_existing_or_new.cc                     |    5 +-
 glom/glom_developer.glade                          |   38 +-
 glom/import_csv/csv_parser.cc                      |   10 +-
 glom/import_csv/csv_parser.h                       |    1 +
 glom/libglom/connectionpool.cc                     |    2 +-
 glom/libglom/data_structure/translatable_item.cc   |    3 +-
 glom/libglom/db_utils.cc                           |    4 +-
 glom/libglom/init.cc                               |    2 -
 glom/libglom/utils.cc                              |   31 +-
 glom/mode_data/datawidget/comboentry.cc            |   10 +-
 glom/mode_data/datawidget/comboentry.h             |    4 +-
 glom/mode_design/comboentry_currency.cc            |    4 +-
 glom/mode_design/comboentry_currency.h             |    4 +-
 glom/mode_design/dialog_add_related_table.cc       |    4 +-
 glom/mode_design/fields/dialog_fielddefinition.cc  |    4 +-
 glom/mode_design/iso_codes.cc                      |    7 +-
 glom/mode_design/layout/dialog_choose_field.cc     |    2 +-
 .../layout_item_dialogs/comboentry_borderwidth.cc  |    4 +-
 .../layout_item_dialogs/comboentry_borderwidth.h   |    4 +-
 .../print_layouts/print_layout_toolbar_button.cc   |    2 +-
 .../print_layouts/window_print_layout_edit.cc      |   33 +-
 .../print_layouts/window_print_layout_edit.h       |   10 +-
 .../script_library/dialog_script_library.cc        |    4 +-
 glom/mode_design/translation/combobox_locale.cc    |   11 +-
 glom/mode_design/users/dialog_choose_user.cc       |    2 +-
 glom/mode_design/users/dialog_users_list.cc        |    8 +-
 glom/print_layout/canvas_print_layout.cc           |    6 +-
 glom/utility_widgets/db_adddel/db_adddel.cc        |   19 +-
 glom/utility_widgets/db_adddel/db_adddel.h         |    3 +-
 glom/utility_widgets/flowtable.cc                  |   27 +-
 glom/utility_widgets/flowtable.h                   |    1 -
 glom/utility_widgets/gimpruler/gimpruler.c         | 1279 ++++++++++++++++++++
 glom/utility_widgets/gimpruler/gimpruler.h         |   83 ++
 .../gimpruler/libgimpbase/gimpbase-private.c       |   49 +
 .../gimpruler/libgimpbase/gimpbase-private.h       |   68 +
 .../gimpruler/libgimpbase/gimpbase.h               |   43 +
 .../gimpruler/libgimpbase/gimpbaseenums.h          |  541 +++++++++
 .../gimpruler/libgimpbase/gimpbasetypes.h          |   97 ++
 .../gimpruler/libgimpbase/gimpparam.h              |   66 +
 .../gimpruler/libgimpbase/gimpunit.c               |  656 ++++++++++
 .../gimpruler/libgimpbase/gimpunit.h               |  103 ++
 .../gimpruler/libgimpmath/gimpmath.h               |  119 ++
 glom/utility_widgets/imageglom.cc                  |    7 +-
 glom/utility_widgets/layouttoolbarbutton.cc        |    2 +-
 glom/variablesmap.cc                               |   14 +-
 glom/variablesmap.h                                |    4 +-
 po/ChangeLog                                       |    6 +
 tests/import/test_parsing.cc                       |    5 +-
 56 files changed, 4109 insertions(+), 438 deletions(-)
---
diff --cc ChangeLog
index 2ff4ea4,5696ce1..11d9556
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,25 -1,170 +1,192 @@@
 +2011-01-12  Ben Konrath  <ben bagu org>
 +
 +	Revert previous 'hide methods in sharedptr' patch.
 +
 +	* glom/libglom/sharedptr.h: Remove the #ifdefs as we no longer need to
 +	hide these methods from swig with the recently commited glom_sharedptr
 +	macro.
 +
 +2010-12-23  Ben Konrath  <ben bagu org>
 +
 +	Hide some methods in sharedptr from swig.
 +
 +	* glom/libglom/sharedptr.h: Add #ifdefs to stop swig warnings and hide
 +	internal methods from the java code generation.
 +
 +2010-12-17  Ben Konrath  <ben bagu org>
 +
 +	Remove python code in libglom to avoid python errors when using the
 +	generated Java bindings.
 +
 +	* glom/libglom/init.cc: Remove python code in init and deinit.
 +
+ 2011-03-14  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Fix the build.
+ 
+ 	* glom/libglom/init.cc: Add an include so we can use std::cerr.
+ 
+ 2011-03-14  Murray Cumming  <murrayc murrayc com>
+ 
+ 	libglom_init(): Show the python exception when PyDateTime_IMPORT fails.
+ 
+ 	* glom/libglom/init.cc: The linker seems to behave differently when this
+ 	code is run from inside a JVM in OnlineGlom. This gives us a clue.
+ 
+ 2011-02-26  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Fix the CSV import test.
+ 
+ 	* tests/import/test_parsing.cc: Correct the number of expected tokens.
+ 	This was previously just the number that was (incorrectly) parsed before.
+ 
+ 2011-02-26  Murray Cumming  <murrayc murrayc com>
+ 
+ 	CSV Import: Fix quoted-newline detection, so we don't drop rows.
+ 
+ 	* glom/import_csv/csv_parser.[h|cc]: on_idle_parse(): Make in_quotes a
+ 	member variable, initialized in clear(), so we remember it across calls to
+ 	on_idle_parse(), instead of thinking that we are in quotes just because we
+ 	are parsing arbitrary chunks of bytes that look that way individually.
+ 
+ 	This fixes bug #637529 (Darmon Xavier), so all rows should be imported
+ 	instead of dropping some in the middle.
+ 
+ 2011-01-06  Murray Cumming  <murrayc murrayc com>
+ 
+ 	tests: Link to all necessary libraries.
+ 
+ 	* Makefile_libglom.am: Define libglom_all_libs to avoid duplication.
+ 	* Makefile_glom.am: Use libglom_all_libs instead of repeating.
+ 	* Makefile_tests.am: Use libglom_all_libs to explicitly link against the
+ 	dependencies of libglom. This seems to have been automatic with the linker in
+ 	previous versions of Ubuntu, but not with Ubuntu Natty.
+ 
+ 2011-02-25  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Adapt to libgdamm API change.
+ 
+ 	* glom/libglom/connectionpool.cc:
+ 	* glom/libglom/db_utils.cc: Adapt to the libgdamm change to use vector
+ 	instead of list.
+ 
+ 2011-02-25  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Avoid GTK+ warning when clicking on the list button.
+ 
+ 	* glom/mode_data/db_adddel/db_adddel.[h|cc]: on_cell_button_clicked():
+ 	Delay the response to the click, to an idle handler, to avoid confusing
+ 	GtkTreeView, which was showing a warning with GTK+ 3 about a NULL GtkAdjustment.
+ 
+ 2011-01-28  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Adapt to the gtkmm 3 change to using vectors.
+ 
+ 	* glom/mode_data/datawidget/cellrenderer_dblist.cc:
+ 	* glom/mode_data/db_adddel/db_adddel.cc:
+ 	* glom/mode_design/layout/dialog_choose_field.cc:
+ 	* glom/mode_design/print_layouts/print_layout_toolbar_button.cc:
+ 	* glom/mode_design/print_layouts/window_print_layout_edit.h:
+ 	* glom/utility_widgets/imageglom.cc:
+ 	* glom/utility_widgets/layouttoolbarbutton.cc: Use std::vector instead of
+ 	std::list.
+ 	* glom/dialog_existing_or_new.cc: This one even used the intermediate type
+ 	directly, showing how necessary this API change was.
+ 
+ 2011-01-18  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Disable more deprecated API.
+ 
+ 	* configure.ac: Add PANGO, PANGOMM, and CAIRO to the list.
+ 
+ 2011-01-27  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Fix the build with gtkmm 2.23/24 with --enable-warnings=fatal.
+ 
+   * configure.ac: Require the latest gtkmm-2.4 version.
+ 	* glom/mode_design/dialog_add_related_table.cc:
+ 	* glom/mode_design/fields/dialog_fielddefinition.cc:
+ 	* glom/mode_design/script_library/dialog_script_library.cc:
+ 	* glom/mode_design/users/dialog_choose_user.cc:
+ 	* glom/mode_design/users/dialog_users_list.cc:
+ 	* glom/utility_widgets/db_adddel/db_adddel.cc: More use of the non-deprecated
+ 	version of some methods.
+ 
+ 2011-01-27  Murray Cumming  <murrayc murrayc com>
+ 
+ 	GimpRuler: Use the GTK+-2.0 version of this code.
+ 
+ 	* glom/utility_widgets/gimpruler/gimpruler.[h|c]: Use the version of the code
+ 	that builds with GTK+-2.0 rather than GTK+-3.0.
+ 
+ 2010-09-02  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Fix the build with latest gtkmm.
+ 
+ 	* glom/utility_widgets/flowtable.[h|cc]: on_expose_event(): Use
+   Cairo for drawing instead of Gdk::GC, which no longer exists.
+ 
+ 2011-01-27  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Fix ComboBoxEntry removal.
+ 
+ 	* glom/mode_data/datawidget/comboentry.cc:
+ 	* glom/mode_design/comboentry_currency.cc:
+ 	* glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidt
+ 	h.[h|cc]:
+ 	* glom/variablesmap.cc: Use only non-deprecated ComobBox API.
+ 
+ 2010-01-27  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Replaced GtkRuler with GimpRuler because GtkRuler was removed from GTK 3.
+ 
+ 	* glom/utility_widgets/gimpruler/: Added several source files from
+ 	gimp, with small changes to make it build for us, to provide the GimpRuler
+ 	widget.
+ 	* COPYING: Switch to GPL version 3 (instead of 2), because the GIMP source
+ 	code uses it.
+ 	* Makefile_glom.am:
+ 	* glom/glom_developer.glade:
+ 	* glom/mode_design/print_layouts/window_print_layout_edit.[cc|cc]: Use
+ 	GimpRuler instead of GtkRuler, creating and adding them in code instead of
+ 	in the .glade file, to avoid Glade needing to know about that widget.
+ 
+ 2011-01-27  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Do not use deprecated Gtk::ComboBoxEntry.
+ 
+ 	* glom/glom_developer.glade:
+ 	* glom/mode_data/datawidget/comboentry.[h|cc]:
+ 	* glom/mode_design/comboentry_currency.[h|cc]:
+ 	* glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidt
+ 	h.[h|cc]:
+ 	* glom/variablesmap.[h|cc]: Replace use of (deprecated) Gtk::ComboboxEntry
+ 	with ComboBox with has_entry=true.
+ 
+ This is the glom-1-18 branch, which uses gtkmm 2.24.
+ 
+ 2011-01-27  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Do not use deprecated Gtk::ComboBoxEntry.
+ 
+ 	* glom/glom_developer.glade:
+ 	* glom/mode_data/datawidget/comboentry.[h|cc]:
+ 	* glom/mode_design/comboentry_currency.[h|cc]:
+ 	* glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidt
+ 	h.[h|cc]:
+ 	* glom/variablesmap.[h|cc]: Replace use of (deprecated) Gtk::ComboboxEntry
+ 	with ComboBox with has_entry=true.
+ 
+ This is the glom-1-18 branch, which uses gtkmm 2.24.
+ 
+ 2011-01-06  Murray Cumming  <murrayc murrayc com>
+ 
+ 	get_current_locale(): Handle more complex setlocale(NULL) results.
+ 
+ 	* glom/libglom/utils.cc: locale_simplify(): On Ubuntu Natty,
+ 	setlocale() has started returning a more complex string. Parse it, or the
+ 	older simpler syntax.
+ 
  2010-12-15  Ben Konrath  <ben bagu org>
  
  	Add Eclipse 3.6 / CDT 7.0 configuration files.
diff --cc glom/libglom/init.cc
index e9aeb6d,f345601..4001289
--- a/glom/libglom/init.cc
+++ b/glom/libglom/init.cc
@@@ -32,7 -45,19 +32,6 @@@ void libglom_init(
  
    Gnome::Gda::init();
    Gio::init();
--
 -  Py_Initialize();
 -  PyDateTime_IMPORT; //A macro, needed to use PyDate_Check(), PyDateTime_Check(), etc.
 -  if(!PyDateTimeAPI)
 -  {
 -    //Give people a clue on stdout:
 -    std::cerr << G_STRFUNC << ": PyDateTime_IMPORT (a python module import) failed." << std::endl;
 -
 -    //This gives more information. When this happens it is generally a linker
 -    //failure while importing a python module:
 -    PyErr_Print();
 -  }
 -  g_assert(PyDateTimeAPI); //This should have been set by the PyDateTime_IMPORT macro.
  }
  
  void libglom_deinit()
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]