* src/plugins/NavWebPage.py: enhancements, almost usable

* src/Report.py: fixed spacing


svn: r4916

gramps2/ChangeLog

@@ -1,3 +1,7 @@
+2005-07-10  Don Allingham  <don@gramps-project.org>
+	* src/plugins/NavWebPage.py: enhancements, almost usable
+	* src/Report.py: fixed spacing
+
 2005-07-09  Alex Roitman  <shura@gramps-project.org>
 	* src/ReadXML.py (stop_ref): Properly read id-based witness
 	reference created by old gramps.

gramps2/configure.in

@@ -7,8 +7,8 @@ AC_PREREQ(2.57)
 AC_INIT(gramps, 2.0.6, gramps-bugs@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(src/gramps.py)
 AM_INIT_AUTOMAKE(1.6.3)
-RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-')
-dnl RELEASE=1
+dnl RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-')
+RELEASE=1
 
 VERSIONSTRING=$VERSION
 if test x"$RELEASE" != "x"

gramps2/src/Report.py

@@ -545,7 +545,7 @@ class BareReportDialog:
         label.set_use_markup(1)
         label.set_alignment(0.0,0.5)
         self.tbl.set_border_width(12)
-        self.tbl.attach(label,0,4,self.col,self.col+1)
+        self.tbl.attach(label, 0, 4, self.col, self.col+1, gtk.FILL|gtk.EXPAND)
         self.col += 1
 
     def setup_center_person(self): 
@@ -1079,7 +1079,7 @@ class ReportDialog(BareReportDialog):
         label.set_use_markup(1)
         label.set_alignment(0.0,0.5)
         self.tbl.set_border_width(12)
-        self.tbl.attach(label,0,4,self.col,self.col+1)
+        self.tbl.attach(label, 0, 4, self.col, self.col+1, gtk.FILL)
         self.col += 1
         
         hid = self.get_stylesheet_savefile()
@@ -1090,13 +1090,15 @@ class ReportDialog(BareReportDialog):
 
         if self.get_target_is_directory():
             self.target_fileentry.set_directory_entry(1)
-            label = gtk.Label("%s:" % _("Directory"))
+            self.doc_label = gtk.Label("%s:" % _("Directory"))
         else:
-            label = gtk.Label("%s:" % _("Filename"))
-        label.set_alignment(0.0,0.5)
+            self.doc_label = gtk.Label("%s:" % _("Filename"))
+        self.doc_label.set_alignment(0.0,0.5)
 
-        self.tbl.attach(label,1,2,self.col,self.col+1,gtk.SHRINK|gtk.FILL)
-        self.tbl.attach(self.target_fileentry,2,4,self.col,self.col+1)
+        self.tbl.attach(self.doc_label, 1, 2, self.col, self.col+1,
+                        gtk.SHRINK|gtk.FILL)
+        self.tbl.attach(self.target_fileentry, 2, 4, self.col, self.col+1,
+                        gtk.EXPAND|gtk.FILL)
         self.col += 1
         
         spath = self.get_default_directory()