GNOME.org
 

[glom] Make libglom-1.14 install in parallel with libglom-1.12.

commit d9609e9e111888a57665d867d8c6a6fb69f2a3b0
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jan 22 17:40:31 2010 +0100

    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.

 ChangeLog                                         |   15 +++++++++++++++
 Makefile.am                                       |   12 ++++++------
 Makefile_libglom.am                               |   14 +++++++-------
 NEWS                                              |   12 ++++++++++++
 configure.ac                                      |    6 +++---
 glom/libglom/document/document.cc                 |    3 ++-
 glom/libglom/{glom-1.12.pc.in => glom-1.14.pc.in} |    0
 glom/python_embed/python_module/py_glom_module.cc |    2 +-
 glom/python_embed/python_module/py_glom_module.h  |    2 +-
 po/POTFILES.in                                    |    1 +
 tests/test_load_python_library.cc                 |    2 +-
 11 files changed, 49 insertions(+), 20 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5e6337a..59dde56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 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().
diff --git a/Makefile.am b/Makefile.am
index 21deb26..8d7fdbb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,8 +50,8 @@ endif
 SUFFIXES = .rc .res
 
 bin_PROGRAMS = glom/glom
-lib_LTLIBRARIES = glom/libglom/libglom-1.12.la
-pyexec_LTLIBRARIES = glom/python_embed/python_module/glom_1_12.la
+lib_LTLIBRARIES = glom/libglom/libglom-1.14.la
+pyexec_LTLIBRARIES = glom/python_embed/python_module/glom_1_14.la
 
 noinst_LIBRARIES =						\
 	glom/utility_widgets/egg/toolpalette/libeggtoolpalette.a\
@@ -62,11 +62,11 @@ include Makefile_libglom.am
 include Makefile_glom.am
 include Makefile_tests.am
 
-glom_python_embed_python_module_glom_1_12_la_SOURCES =		\
+glom_python_embed_python_module_glom_1_14_la_SOURCES =		\
 	glom/python_embed/python_module/py_glom_module.cc	\
 	glom/python_embed/python_module/py_glom_module.h
 
-glom_python_embed_python_module_glom_1_12_la_LIBADD = \
+glom_python_embed_python_module_glom_1_14_la_LIBADD = \
 	glom/libglom/libglom-$(GLOM_ABI_VERSION).la \
 	$(LIBGLOM_LIBS) $(PYTHON_LIBS)
 
@@ -76,10 +76,10 @@ else
 pymod_ldflags = -module -avoid-version -no-undefined
 endif
 glom_pyexport = -export-symbols-regex '^_*initglom'
-glom_python_embed_python_module_glom_1_12_la_LDFLAGS = $(pymod_ldflags) $(glom_pyexport)
+glom_python_embed_python_module_glom_1_14_la_LDFLAGS = $(pymod_ldflags) $(glom_pyexport)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = glom/libglom/glom-1.12.pc
+pkgconfig_DATA = glom/libglom/glom-1.14.pc
 
 dist_pkgdata_DATA = glom/glom_document.dtd
 
diff --git a/Makefile_libglom.am b/Makefile_libglom.am
index 4f080a5..0868d98 100644
--- a/Makefile_libglom.am
+++ b/Makefile_libglom.am
@@ -85,7 +85,7 @@ libglom_d_b_view_include_HEADERS =				\
 	glom/libglom/document/bakery/view/view_composite.h	\
 	glom/libglom/document/bakery/view/viewbase.h
 
-glom_libglom_libglom_1_12_la_SOURCES =					\
+glom_libglom_libglom_1_14_la_SOURCES =					\
 	glom/libglom/appstate.cc					\
 	glom/libglom/calcinprogress.cc					\
 	glom/libglom/calcinprogress.h					\
@@ -151,25 +151,25 @@ glom_libglom_libglom_1_12_la_SOURCES =					\
 	glom/libglom/python_embed/pygdavalue_conversions.c		\
 	glom/libglom/python_embed/pygdavalue_conversions.h
 
-glom_libglom_libglom_1_12_la_SOURCES +=				\
+glom_libglom_libglom_1_14_la_SOURCES +=				\
 	glom/libglom/connectionpool_backends/postgres.cc	\
 	glom/libglom/connectionpool_backends/postgres.h		\
 	glom/libglom/connectionpool_backends/postgres_central.cc\
 	glom/libglom/connectionpool_backends/postgres_central.h
 
 if !GLOM_ENABLE_CLIENT_ONLY
-glom_libglom_libglom_1_12_la_SOURCES +=				\
+glom_libglom_libglom_1_14_la_SOURCES +=				\
 	glom/libglom/connectionpool_backends/postgres_self.cc	\
 	glom/libglom/connectionpool_backends/postgres_self.h
 endif
 
-glom_libglom_libglom_1_12_la_SOURCES +=				\
+glom_libglom_libglom_1_14_la_SOURCES +=				\
 	glom/libglom/connectionpool_backends/sqlite.cc		\
 	glom/libglom/connectionpool_backends/sqlite.h
 
-glom_libglom_libglom_1_12_la_LIBADD = $(LIBGLOM_LIBS) $(PYTHON_LIBS)
+glom_libglom_libglom_1_14_la_LIBADD = $(LIBGLOM_LIBS) $(PYTHON_LIBS)
 if HOST_WIN32
-glom_libglom_libglom_1_12_la_LIBADD += -lws2_32
+glom_libglom_libglom_1_14_la_LIBADD += -lws2_32
 endif
 
-glom_libglom_libglom_1_12_la_LDFLAGS = -no-undefined
+glom_libglom_libglom_1_14_la_LDFLAGS = -no-undefined
diff --git a/NEWS b/NEWS
index 101988a..9c57600 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+1.13.1 (unstable):
+
+* Details and List layouts:
+  Allow custom formatting of static text and buttons instead of just fields.
+  (Murray Cumming) 
+* Field Formatting:
+  - Add the option to use a different text color for negative values.
+    (suggested by Mathias Hasselmann)
+  - Add a horizontal alignment option, though we still right-align numbers 
+    by default. #591125 (Patrick Chan)
+  (Murray Cumming)
+
 1.12.5 (stable):
 
 * List View: Don't chop off the bottom of text when using large fonts.
diff --git a/configure.ac b/configure.ac
index 1eb0aaf..995b8a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([Glom], [1.12.4], [http://bugzilla.gnome.org/enter_bug.cgi?product=Glom], [glom])
+AC_INIT([Glom], [1.13.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=Glom], [glom])
 AC_PREREQ([2.60])
 
 AC_CONFIG_SRCDIR([glom/main.cc])
@@ -40,7 +40,7 @@ AC_PROG_LIBTOOL
 # Used for the install directories for headers.  The same number is used in
 # the library name, which must be kept in sync, but variables can't be used
 # with that.
-AC_SUBST([GLOM_ABI_VERSION], [1.12])
+AC_SUBST([GLOM_ABI_VERSION], [1.14])
 AC_DEFINE_UNQUOTED([GLOM_ABI_VERSION], ["$GLOM_ABI_VERSION"],
 		   [Define to the Glom ABI version string.])
 # Python modules can't be called glom-1.x, so we use underlines.
@@ -240,6 +240,6 @@ AC_CONFIG_FILES([Makefile
                  docs/user-guide/Makefile
                  po/Makefile.in
                  glom.desktop.in
-                 glom/libglom/glom-1.12.pc
+                 glom/libglom/glom-1.14.pc
                  win32/glom.iss])
 AC_OUTPUT
diff --git a/glom/libglom/document/document.cc b/glom/libglom/document/document.cc
index 7377ae7..c5d0e27 100644
--- a/glom/libglom/document/document.cc
+++ b/glom/libglom/document/document.cc
@@ -4150,8 +4150,9 @@ guint Document::get_latest_known_document_format_version()
   // Version 2: hosting_mode="postgres-central|postgres-self|sqlite" instead of self_hosted="true|false". Can open Version 1 documents, by falling back to the self_hosted attribute if hosting_mode is not set.
   // Version 3: (Glom 1.10). Support for the old one-big-string example_rows format was removed, and we now use (unquoted) non-postgres libgda escaping. 
   // Version 4: (Glom 1.12). Portal navigation options were simplified, with a "none" option. network_sharing was added, defaulting to off.
+  // Version 5: (Glom 1.14). Extra layout item formatting options were added.
 
-  return 4;
+  return 5;
 }
 
 std::vector<Glib::ustring> Document::get_library_module_names() const
diff --git a/glom/libglom/glom-1.12.pc.in b/glom/libglom/glom-1.14.pc.in
similarity index 100%
rename from glom/libglom/glom-1.12.pc.in
rename to glom/libglom/glom-1.14.pc.in
diff --git a/glom/python_embed/python_module/py_glom_module.cc b/glom/python_embed/python_module/py_glom_module.cc
index 332019c..790bafa 100644
--- a/glom/python_embed/python_module/py_glom_module.cc
+++ b/glom/python_embed/python_module/py_glom_module.cc
@@ -34,7 +34,7 @@ static PyMethodDef pyglom_methods[] = {
 };
 
 PyMODINIT_FUNC
-initglom_1_12(void) 
+initglom_1_14(void) 
 {
   PyObject* m;
 
diff --git a/glom/python_embed/python_module/py_glom_module.h b/glom/python_embed/python_module/py_glom_module.h
index 65eafcd..1faa97e 100644
--- a/glom/python_embed/python_module/py_glom_module.h
+++ b/glom/python_embed/python_module/py_glom_module.h
@@ -37,7 +37,7 @@
  * - field values: for instance, name = record.related["contacts"]["name_first"];
  * - Summary functions: for instance, total = record.related["invoice_lines"].sum("price");
  */
-PyMODINIT_FUNC initglom_1_12(void);
+PyMODINIT_FUNC initglom_1_14(void);
 
 
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b96428f..2913512 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -86,6 +86,7 @@ glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
 glom/mode_design/layout/layout_item_dialogs/combo_summarytype.cc
 glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.cc
 glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.cc
+glom/mode_design/layout/layout_item_dialogs/dialog_formatting.cc
 glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc
 glom/mode_design/layout/layout_item_dialogs/dialog_groupby_secondaryfields.cc
 glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.cc
diff --git a/tests/test_load_python_library.cc b/tests/test_load_python_library.cc
index 7da5202..85ec613 100644
--- a/tests/test_load_python_library.cc
+++ b/tests/test_load_python_library.cc
@@ -6,7 +6,7 @@ int main()
 {
   // Attempt to dynamically load the python module, 
   // attempting to resolve all symbols immediately:
-  const char* path = "glom/python_embed/python_module/.libs/glom_1_12.so";
+  const char* path = "glom/python_embed/python_module/.libs/glom_1_14.so";
   void* lib = dlopen(path, RTLD_NOW);
 
   if(!lib)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]