glom r1703 - in trunk: . glom/libglom/document glom/mode_design/print_layouts

[murrayc svn gnome org]

Author: murrayc
Date: Thu Oct  9 15:43:10 2008
New Revision: 1703
URL: http://svn.gnome.org/viewvc/glom?rev=1703&view=rev

Log:
Increased version

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.in
   trunk/glom/libglom/document/document_glom.cc
   trunk/glom/mode_design/print_layouts/canvas_print_layout.cc

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Oct  9 15:43:10 2008
@@ -1,5 +1,15 @@
 1.7.3:
 
+* Print Layout: Fields can now be specified for related records 
+  portals, and their data appears in the printout, though the 
+  whole Print Layout feature is still rather unfinished.
+* Print Layout list: Add a default title when adding a print layout.
+* Related Records layout: Fix a bug that was introduced some time 
+  during 1.7.x, preventing static text and images from being added.
+  (Murray Cumming)
+* Drag and Drop layout: Add a related records toolbar item, to add 
+  portals to the layout.
+
 1.7.2:
 
 * Drag-and-drop Layout:

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Oct  9 15:43:10 2008
@@ -4,7 +4,7 @@
 AM_CONFIG_HEADER(config.h)
 
 # Package name and version number:
-AM_INIT_AUTOMAKE(glom, 1.7.2)
+AM_INIT_AUTOMAKE(glom, 1.7.3)
 
 AM_MAINTAINER_MODE
 
@@ -86,7 +86,7 @@
 fi
 
 # Do not require, goocanvas and gtksourceviewmm in client only mode
-REQUIRED_LIBS="bakery-2.6 >= 2.4.2 gtkmm-2.4 >= 2.10 gthread-2.0 libxslt >= 1.1.10 pygda-3.0 pygtk-2.0 >= 2.6.0 libgdamm-3.0 >= 2.9.82 libgda-3.0 >= 3.0.1 libgda-postgres-3.0 goocanvasmm-1.0 >= 0.9.0"
+REQUIRED_LIBS="bakery-2.6 >= 2.6.0 gtkmm-2.4 >= 2.10 gthread-2.0 libxslt >= 1.1.10 pygda-3.0 pygtk-2.0 >= 2.6.0 libgdamm-3.0 >= 2.9.82 libgda-3.0 >= 3.0.1 libgda-postgres-3.0 goocanvasmm-1.0 >= 0.9.0"
 if test $enable_client_only != yes; then
 	REQUIRED_LIBS="$REQUIRED_LIBS gtksourceviewmm-2.0"
 fi

Modified: trunk/glom/libglom/document/document_glom.cc
==============================================================================
--- trunk/glom/libglom/document/document_glom.cc	(original)
+++ trunk/glom/libglom/document/document_glom.cc	Thu Oct  9 15:43:10 2008
@@ -1627,7 +1627,6 @@
 
 bool Document_Glom::set_userlevel(AppState::userlevels userlevel)
 {
-  std::cout << "debug: Document_Glom::set_userlevel(): " << userlevel << std::endl;
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   //Prevent incorrect user level:
   if((userlevel == AppState::USERLEVEL_DEVELOPER) && get_read_only())

Modified: trunk/glom/mode_design/print_layouts/canvas_print_layout.cc
==============================================================================
--- trunk/glom/mode_design/print_layouts/canvas_print_layout.cc	(original)
+++ trunk/glom/mode_design/print_layouts/canvas_print_layout.cc	Thu Oct  9 15:43:10 2008
@@ -188,7 +188,7 @@
       {
       */
         sharedptr<LayoutItem> layout_item = canvas_item->get_layout_item();
-        std::cout << "DEBUG: saving layout_item type=" << layout_item->get_part_type_name() << std::endl;
+        //std::cout << "DEBUG: saving layout_item type=" << layout_item->get_part_type_name() << std::endl;
         update_layout_position_from_canvas(layout_item, canvas_item);
 
         group->add_item(layout_item);
@@ -317,26 +317,7 @@
 
   Utils::show_window_until_hide(dialog);
 
-  if(portal)
-  {
-    double x = 0;
-    double y = 0;
-    double width =0;
-    double height = 0;
-    portal->get_print_layout_position(x, y, width, height);
-    std::cout << "DEBUG before: x=" << x << ", y=" << y << ", width=" << width << ", height=" << height << std::endl;
-  }
-
   result = dialog->get_portal_layout();
-  if(result)
-  {
-    double x = 0;
-    double y = 0;
-    double width =0;
-    double height = 0;
-    result->get_print_layout_position(x, y, width, height);
-    std::cout << "DEBUG after: x=" << x << ", y=" << y << ", width=" << width << ", height=" << height << std::endl;
-  }
 
   delete dialog;
   dialog = 0;