Report cleanup.

svn: r94

gramps/src/EditPerson.glade

@@ -859,7 +859,7 @@
 	  <widget>
 	    <class>GtkFrame</class>
 	    <name>frame6</name>
-	    <label>Indentification</label>
+	    <label>Identification</label>
 	    <label_xalign>0</label_xalign>
 	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	    <child>

gramps/src/HtmlDoc.py

@@ -79,7 +79,7 @@ class HtmlDoc(TextDoc):
                     if top_add == 1:
                         self.top.append(line)
                         match = start.search(line)
-                        if match != None:
+                        if match:
                             top_add = 0
                     elif bottom_add == 0:
                         match = stop.search(line)

gramps/src/StyleEditor.py

@@ -192,9 +192,9 @@ class StyleEditor:
         else:
             p.set_alignment(PARA_ALIGN_JUSTIFY)            
 
-        p.set_right_margin(float(self.top.get_widget("rmargin").get_text()))
+        p.set_right_margin(utils.txt2fl(self.top.get_widget("rmargin").get_text()))
-        p.set_left_margin(float(self.top.get_widget("lmargin").get_text()))
+        p.set_left_margin(utils.txt2fl(self.top.get_widget("lmargin").get_text()))
-        p.set_padding(float(self.top.get_widget("pad").get_text()))
+        p.set_padding(utils.txt2fl(self.top.get_widget("pad").get_text()))
         p.set_top_border(self.top.get_widget("tborder").get_active())
         p.set_left_border(self.top.get_widget("lborder").get_active())
         p.set_right_border(self.top.get_widget("rborder").get_active())

gramps/src/TextDoc.py

@@ -22,6 +22,7 @@ import string
 import os
 import xml.sax
 import xml.sax.saxutils
+import utils
 
 #-------------------------------------------------------------------------
 #
@@ -424,10 +425,11 @@ class StyleSheetList:
                 f.write('bold="%d" ' % font.get_bold())
                 f.write('underline="%d" ' % font.get_bold())
                 f.write('color="#%02x%02x%02x"/>\n' % font.get_color())
-                f.write('<para rmargin="%.3f" ' % p.get_right_margin())
+                f.write('<para ')
-                f.write('lmargin="%.3f" ' % p.get_left_margin())
+                f.write('rmargin="%s" ' % utils.fl2txt("%.3f",p.get_right_margin()))
-                f.write('first="%.3f" ' % p.get_first_indent())
+                f.write('lmargin="%.3f" ' % utils.fl2txt("%.3f",p.get_left_margin()))
-                f.write('pad="%.3f" ' % p.get_padding())
+                f.write('first="%.3f" ' % utils.fl2txt("%.3f",p.get_first_indent()))
+                f.write('pad="%.3f" ' % utils.fl2txt("%.3f",p.get_padding()))
                 f.write('bgcolor="#%02x%02x%02x" ' % p.get_background_color())
                 f.write('align="%d" ' % p.get_alignment())
                 f.write('tborder="%d" ' % p.get_top_border())
@@ -517,10 +519,10 @@ class SheetParser(xml.sax.handler.ContentHandler):
             self.f.set_underline(int(attrs['underline']))
             self.f.set_color(cnv2color(attrs['color']))
         elif tag == "para":
-            self.p.set_right_margin(float(attrs['rmargin']))
+            self.p.set_right_margin(utils.txt2fl(attrs['rmargin']))
-            self.p.set_left_margin(float(attrs['lmargin']))
+            self.p.set_left_margin(utils.txt2fl(attrs['lmargin']))
-            self.p.set_first_indent(float(attrs['first']))
+            self.p.set_first_indent(utils.txt2fl(attrs['first']))
-            self.p.set_padding(float(attrs['pad']))
+            self.p.set_padding(utils.txt2fl(attrs['pad']))
             self.p.set_alignment(int(attrs['align']))
             self.p.set_right_border(int(attrs['rborder']))
             self.p.set_left_border(int(attrs['lborder']))

gramps/src/bookmarks.glade

@@ -172,7 +172,7 @@
 	      <class>GtkLabel</class>
 	      <child_name>CList:title</child_name>
 	      <name>label2</name>
-	      <label>label2</label>
+	      <label></label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0.5</xalign>

gramps/src/const.py

@@ -71,9 +71,7 @@ progName     = "gramps"
 version      = "0.2.0"
 copyright    = "(C) 2001 Donald N. Allingham"
 authors      = ["Donald N. Allingham"]
-comments     = _("Gramps (Genealogical Research and Analysis Management ") +\
+comments     = _("Gramps (Genealogical Research and Analysis Management Programming System) is a personal genealogy program that can be extended by using the Python programming language.")
-               _("Programming System) is a personal genealogy program that ") +\
-               _("can be extended by using the Python programming language.")
 
 #-------------------------------------------------------------------------
 #
@@ -151,7 +149,7 @@ personalConstantEvents = {
 
 personalConstantAttributes = {
     "Description"           : "DSCR",
-    "Indentification Number": "IDNO",
+    "Identification Number": "IDNO",
     "Social Security Number": "SSN"
     }
 

gramps/src/gramps.glade

@@ -221,7 +221,7 @@
 		<handler>on_sources_activate</handler>
 		<last_modification_time>Wed, 30 May 2001 01:59:42 GMT</last_modification_time>
 	      </signal>
-	      <label>Sources</label>
+	      <label>_Sources</label>
 	      <right_justify>False</right_justify>
 	    </widget>
 	  </widget>
@@ -1288,7 +1288,7 @@
 	      <class>GtkLabel</class>
 	      <child_name>Notebook:tab</child_name>
 	      <name>label199</name>
-	      <label>label199</label>
+	      <label></label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0.5</xalign>
@@ -1309,7 +1309,7 @@
 	      <class>GtkLabel</class>
 	      <child_name>Notebook:tab</child_name>
 	      <name>label200</name>
-	      <label>label200</label>
+	      <label></label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0.5</xalign>

gramps/src/plugins/AncestorChart.py

@@ -257,7 +257,7 @@ def on_save_clicked(obj):
 #
 #------------------------------------------------------------------------
 def get_description():
-    return _("Produces a graphical ancestral tree graph")
+    return _("Produces a graphical ancestral tree")
 
 
 #------------------------------------------------------------------------

gramps/src/plugins/AncestorGraph.py

@@ -381,7 +381,7 @@ def mysort(first, second) :
 #
 #------------------------------------------------------------------------
 def get_description():
-    return _("Produces a graphical ancestral tree graph")
+    return _("Displays an ancestral tree graph")
 
 def get_name():
     return _("View/View an ancestor graph")

gramps/src/plugins/DescendReport.py

@@ -84,7 +84,7 @@ class DescendantReport:
         name = self.person.getPrimaryName().getRegularName()
         self.doc.write_text(_("Descendants of %s") % name)
         self.doc.end_paragraph()
-        self.dump(1,self.person)
+        self.dump(0,self.person)
 
     #--------------------------------------------------------------------
     #
@@ -92,6 +92,8 @@ class DescendantReport:
     #
     #--------------------------------------------------------------------
     def dump(self,level,person):
+
+        if level != 0:
             self.doc.start_paragraph("Level" + str(level))
             self.doc.write_text(str(level) + '. ')
             self.doc.write_text(person.getPrimaryName().getRegularName())

gramps/src/plugins/FamilyGroup.py

@@ -428,7 +428,10 @@ def report(database,person):
             spouse = family.getMother()
         else:
             spouse = family.getFather()
+        if spouse:
             item = GtkMenuItem(spouse.getPrimaryName().getName())
+        else:
+            item = GtkMenuItem("unknown")
         item.set_data("f",family)
         item.show()
         my_menu.append(item)
@@ -496,7 +499,7 @@ def on_save_clicked(obj):
     item = topDialog.get_widget("format").get_menu().get_active()
     format = item.get_data("name")
     
-    doc = FindDoc.make_text_doc(format,paper,orien,template)
+    doc = FindDoc.make_text_doc(styles,format,paper,orien,template)
     
     MyReport = FamilyGroup(db,family,outputName,doc)
 

gramps/src/plugins/GraphViz.py

@@ -243,7 +243,7 @@ def dump_index(person_list,file):
 def get_description():
     return _("Generates relationship graphs, currently only in GraphViz format.") + \
            " " + \
-           _("GraphViz (dot) will transform the graph into postscript, jpeg, png, vrml, svg, and many other formats.") + \
+           _("GraphViz (dot) can transform the graph into postscript, jpeg, png, vrml, svg, and many other formats.") + \
            " " + \
            _("For more information or to get a copy of GraphViz, goto http://www.graphviz.org")
 

gramps/src/plugins/HtmlReport.py

@@ -215,6 +215,7 @@ def report(database,person):
 
     name = person.getPrimaryName().getName()
     topDialog.get_widget("personName").set_text(name)
+    topDialog.get_widget("prefix").get_text("ind")
 
     top.show()
     

gramps/src/plugins/IndivSummary.py

@@ -334,6 +334,9 @@ def report(database,person):
     global db
     global style_sheet_list
 
+    if person == None:
+        return
+    
     active_person = person
     db = database
 

gramps/src/plugins/htmlreport.glade

@@ -153,7 +153,7 @@
 	<editable>True</editable>
 	<text_visible>True</text_visible>
 	<text_max_length>0</text_max_length>
-	<text>ind</text>
+	<text></text>
 	<child>
 	  <left_attach>1</left_attach>
 	  <right_attach>2</right_attach>

gramps/src/plugins/merge.glade

@@ -745,7 +745,7 @@
 		  <class>GtkLabel</class>
 		  <child_name>CList:title</child_name>
 		  <name>label51</name>
-		  <label>label51</label>
+		  <label></label>
 		  <justify>GTK_JUSTIFY_CENTER</justify>
 		  <wrap>False</wrap>
 		  <xalign>0.5</xalign>
@@ -1399,7 +1399,7 @@
 		  <class>GtkLabel</class>
 		  <child_name>CList:title</child_name>
 		  <name>label50</name>
-		  <label>label48</label>
+		  <label></label>
 		  <justify>GTK_JUSTIFY_CENTER</justify>
 		  <wrap>False</wrap>
 		  <xalign>0.5</xalign>

gramps/src/styles.glade

@@ -184,7 +184,7 @@
 	      <class>GtkLabel</class>
 	      <child_name>CList:title</child_name>
 	      <name>label2</name>
-	      <label>label2</label>
+	      <label></label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0.5</xalign>

gramps/src/utils.py

@@ -97,3 +97,34 @@ def destroy_passed_object(obj):
     while gtk.events_pending():
         gtk.mainiteration()
 
+#-------------------------------------------------------------------------
+#
+# Get around python's interpretation of commas/periods in floating
+# point numbers
+#
+#-------------------------------------------------------------------------
+import string
+
+if string.find("%.3f" % 1.2, ",") == -1:
+    _use_comma = 0
+else:
+    _use_comma = 1
+
+#-------------------------------------------------------------------------
+#
+#
+#
+#-------------------------------------------------------------------------
+def txt2fl(st):
+    if _use_comma:
+        return string.atof(string.replace(st,'.',','))
+    else:
+        return string.atof(string.replace(st,',','.'))
+
+#-------------------------------------------------------------------------
+#
+#
+#
+#-------------------------------------------------------------------------
+def fl2txt(fmt,val):
+    return string.replace(fmt % val, ',', '.')