diff --git a/gramps2/src/ChooseParents.py b/gramps2/src/ChooseParents.py index d358fa208..d4afc8437 100644 --- a/gramps2/src/ChooseParents.py +++ b/gramps2/src/ChooseParents.py @@ -50,7 +50,6 @@ import const import Utils import GrampsCfg import ListModel -import Date _titles = [(_('Name'),3,200),(_('ID'),1,50),(_('Birth date'),4,50),('',0,50),('',0,0)] diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py index 9374ac338..dc0a0368a 100644 --- a/gramps2/src/EditPerson.py +++ b/gramps2/src/EditPerson.py @@ -72,7 +72,7 @@ pycode_tgts = [('url', 0, 0), #------------------------------------------------------------------------- class EditPerson: - def __init__(self,person,db,callback=None,gender=RelLib.Person.female): + def __init__(self,person,db,callback=None): """Creates an edit window. Associates a person with the window.""" self.person = person self.original_id = person.getId() diff --git a/gramps2/src/ListModel.py b/gramps2/src/ListModel.py index 090ab1f6f..d4b41a093 100644 --- a/gramps2/src/ListModel.py +++ b/gramps2/src/ListModel.py @@ -202,6 +202,16 @@ class ListModel: self.sel_iter = iter return iter + def set(self,iter,data,info=None,select=0): + col = 0 + for object in data: + self.model.set_value(iter,col,object) + col = col + 1 + self.model.set_value(iter,col,info) + if select: + self.sel_iter = iter + return iter + def add_and_select(self,data,info=None): self.count = self.count + 1 iter = self.model.append() diff --git a/gramps2/src/Makefile.am b/gramps2/src/Makefile.am index 4367aa2ee..f30a1fa9c 100644 --- a/gramps2/src/Makefile.am +++ b/gramps2/src/Makefile.am @@ -97,7 +97,6 @@ pkgpython_PYTHON = \ # If not using GNU make, then list all files individually # The latter is more portable and POSIX-friendly :) GLADEFILES = \ - config.glade\ dialog.glade\ edit_person.glade\ errdialogs.glade\ diff --git a/gramps2/src/Makefile.in b/gramps2/src/Makefile.in index a866e33aa..4fcd95c1b 100644 --- a/gramps2/src/Makefile.in +++ b/gramps2/src/Makefile.in @@ -207,7 +207,6 @@ pkgpython_PYTHON = \ # If not using GNU make, then list all files individually # The latter is more portable and POSIX-friendly :) GLADEFILES = \ - config.glade\ dialog.glade\ edit_person.glade\ errdialogs.glade\ @@ -260,7 +259,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README $(dist_pkgdata_DATA) $(pkgpython_PYTHON) AUTHORS \ - ChangeLog Makefile.am Makefile.in NEWS TODO const.py.in + ChangeLog Makefile.am Makefile.in NEWS const.py.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive diff --git a/gramps2/src/Plugins.py b/gramps2/src/Plugins.py index 7739e27c8..24fada900 100644 --- a/gramps2/src/Plugins.py +++ b/gramps2/src/Plugins.py @@ -505,7 +505,6 @@ def register_draw_doc(name,classref,paper,style, ext): #------------------------------------------------------------------------- def register_relcalc(func, languages): """Register a relationshp calculator""" - import sys global _relcalc_task try: diff --git a/gramps2/src/ReadXML.py b/gramps2/src/ReadXML.py index 59c13d0a4..e4202709f 100644 --- a/gramps2/src/ReadXML.py +++ b/gramps2/src/ReadXML.py @@ -206,7 +206,6 @@ def importData(database, filename, callback,cl=0): for OldMediaID in parser.MediaFileMap.keys(): NewMediaID = parser.MediaFileMap[OldMediaID] oldfile = ObjectMap[NewMediaID].getPath() - oldpath = os.path.dirname(oldfile) (junk,oldext) = os.path.splitext(os.path.basename(oldfile)) oldfile = os.path.join(basefile,OldMediaID+oldext) newfile = os.path.join(newpath,NewMediaID+oldext) diff --git a/gramps2/src/Relationship.py b/gramps2/src/Relationship.py index 12b932679..34dc0741f 100644 --- a/gramps2/src/Relationship.py +++ b/gramps2/src/Relationship.py @@ -176,7 +176,7 @@ def get_nephew(level): return _nephew_level[level] def get_niece(level): - return _niece_level[level],f + return _niece_level[level] def is_spouse(orig,other): for f in orig.getFamilyList(): @@ -199,9 +199,6 @@ def get_relationship(orig_person,other_person): if orig_person == None: return ("undefined",[]) - firstName = orig_person.getPrimaryName().getRegularName() - secondName = other_person.getPrimaryName().getRegularName() - if orig_person == other_person: return ('', []) if is_spouse(orig_person,other_person): diff --git a/gramps2/src/Report.py b/gramps2/src/Report.py index 3109d21aa..f1a93837c 100644 --- a/gramps2/src/Report.py +++ b/gramps2/src/Report.py @@ -787,8 +787,8 @@ class ReportDialog(BareReportDialog): def get_default_basename(self): """What should the default name be? """ - path = self.get_stylesheet_savefile() - return path.split('.')[0] + spath = self.get_stylesheet_savefile() + return spath.split('.')[0] def get_print_pagecount_map(self): """Return the data used to fill out the 'pagecount' option @@ -859,11 +859,11 @@ class ReportDialog(BareReportDialog): if not self.get_target_is_directory(): fname = self.target_fileentry.get_full_path(0) - (path,ext) = os.path.splitext(fname) + (spath,ext) = os.path.splitext(fname) ext_val = obj.get_data('ext') if ext_val: - fname = path + ext_val + fname = spath + ext_val self.target_fileentry.set_filename(fname) # Does this report format use styles? @@ -909,8 +909,8 @@ class ReportDialog(BareReportDialog): self.tbl.attach(self.target_fileentry,2,4,self.col,self.col+1) self.col += 1 - path = self.get_default_directory() - self.target_fileentry.set_default_path(path) + spath = self.get_default_directory() + self.target_fileentry.set_default_path(spath) def setup_format_frame(self): @@ -931,13 +931,13 @@ class ReportDialog(BareReportDialog): if ext == None: ext = "" if type: - path = self.get_default_directory() + spath = self.get_default_directory() if self.get_target_is_directory(): - self.target_fileentry.set_filename(path) + self.target_fileentry.set_filename(spath) else: base = self.get_default_basename() - path = os.path.normpath("%s/%s%s" % (path,base,ext)) - self.target_fileentry.set_filename(path) + spath = os.path.normpath("%s/%s%s" % (spath,base,ext)) + self.target_fileentry.set_filename(spath) def setup_output_notebook(self): @@ -1310,12 +1310,12 @@ class TemplateParser(handler.ContentHandler): try: parser = make_parser() - path = const.template_dir - parser.setContentHandler(TemplateParser(_template_map,path)) - parser.parse("file://%s/templates.xml" % path) + apath = const.template_dir + parser.setContentHandler(TemplateParser(_template_map,spath)) + parser.parse("file://%s/templates.xml" % spath) parser = make_parser() - path = os.path.expanduser("~/.gramps/templates") - parser.setContentHandler(TemplateParser(_template_map,path)) - parser.parse("file://%s/templates.xml" % path) + spath = os.path.expanduser("~/.gramps/templates") + parser.setContentHandler(TemplateParser(_template_map,spath)) + parser.parse("file://%s/templates.xml" % spath) except (IOError,OSError,SAXParseException): pass diff --git a/gramps2/src/StartupDialog.py b/gramps2/src/StartupDialog.py index 91dd2835f..48cd8229c 100644 --- a/gramps2/src/StartupDialog.py +++ b/gramps2/src/StartupDialog.py @@ -23,7 +23,6 @@ import gtk.glade import gnome import gnome.ui import gconf -import Utils from intl import gettext as _ diff --git a/gramps2/src/StyleEditor.py b/gramps2/src/StyleEditor.py index 1c3e4e08f..f41b330f1 100644 --- a/gramps2/src/StyleEditor.py +++ b/gramps2/src/StyleEditor.py @@ -89,14 +89,12 @@ class StyleListDisplay: """Redraws the list of styles that are current available""" self.list.model.clear() - sheet = self.sheetlist.get_style_sheet("default") self.list.add(["default"]) index = 1 for style in self.sheetlist.get_style_names(): if style == "default": continue - sheet = self.sheetlist.get_style_sheet(style) self.list.add([style]) index = index + 1 diff --git a/gramps2/src/VersionControl.py b/gramps2/src/VersionControl.py index f1b1b4986..e8c5f569e 100644 --- a/gramps2/src/VersionControl.py +++ b/gramps2/src/VersionControl.py @@ -119,12 +119,11 @@ class RevisionSelect: self.model = ListModel.ListModel(self.revlist,titles) - index = 0 for f in l: a = f[0].split('.') revsort = '' for v in a: - revsort = "%s.%06d" % (revsort,int(a[0])) + revsort = "%s.%06d" % (revsort,int(v)) self.model.add([f[0],f[1],f[3],f[2],revsort],f[0]) def on_cancel_clicked(self,obj): diff --git a/gramps2/src/docgen/AbiWord2Doc.py b/gramps2/src/docgen/AbiWord2Doc.py index 0ef7e48e9..723ec7e95 100644 --- a/gramps2/src/docgen/AbiWord2Doc.py +++ b/gramps2/src/docgen/AbiWord2Doc.py @@ -26,14 +26,14 @@ Provides a TextDoc based interface to the AbiWord document format. # Imported Modules # #------------------------------------------------------------------------- -import os import base64 import TextDoc -from latin_utf8 import latin_to_utf8 -import string +import Errors import Plugins import ImgManip + +from latin_utf8 import latin_to_utf8 from intl import gettext as _ #------------------------------------------------------------------------- @@ -194,7 +194,6 @@ class AbiWordDoc(TextDoc.TextDoc): self.icount += 1 def start_superscript(self): - fsize = self.my_para.get_font().get_size() self.text = self.text + '' def end_superscript(self): diff --git a/gramps2/src/docgen/AbiWordDoc.py b/gramps2/src/docgen/AbiWordDoc.py index 15382c1c0..d6d58279d 100644 --- a/gramps2/src/docgen/AbiWordDoc.py +++ b/gramps2/src/docgen/AbiWordDoc.py @@ -34,6 +34,7 @@ from latin_utf8 import latin_to_utf8 import string import Plugins import ImgManip +import Errors from intl import gettext as _ #------------------------------------------------------------------------- @@ -140,7 +141,6 @@ class AbiWordDoc(TextDoc.TextDoc): self.f.write('height:%.3fin"/>' % act_height) def start_superscript(self): - fsize = self.my_para.get_font().get_size() self.text = self.text + '' def end_superscript(self): diff --git a/gramps2/src/docgen/HtmlDoc.py b/gramps2/src/docgen/HtmlDoc.py index c929bf220..707708f61 100644 --- a/gramps2/src/docgen/HtmlDoc.py +++ b/gramps2/src/docgen/HtmlDoc.py @@ -28,7 +28,7 @@ import Plugins import ImgManip import TarFile import const - +import Errors import TextDoc from intl import gettext as _ diff --git a/gramps2/src/docgen/KwordDoc.py b/gramps2/src/docgen/KwordDoc.py index e05dfa977..916326657 100644 --- a/gramps2/src/docgen/KwordDoc.py +++ b/gramps2/src/docgen/KwordDoc.py @@ -22,8 +22,7 @@ import TextDoc from latin_utf8 import latin_to_utf8 import time -import StringIO -import string +import cStringIO import gzip import Errors @@ -51,8 +50,8 @@ class KwordDoc(TextDoc.TextDoc): else: self.filename = filename - self.f = StringIO.StringIO() - self.m = StringIO.StringIO() + self.f = cStringIO.StringIO() + self.m = cStringIO.StringIO() self.m.write('') self.m.write('\n') diff --git a/gramps2/src/docgen/LaTeXDoc.py b/gramps2/src/docgen/LaTeXDoc.py index 7fff048f4..05bb64f3e 100644 --- a/gramps2/src/docgen/LaTeXDoc.py +++ b/gramps2/src/docgen/LaTeXDoc.py @@ -38,6 +38,8 @@ import string import TextDoc import Plugins import ImgManip +import Errors + from intl import gettext as _ #------------------------------------------------------------------------ @@ -206,15 +208,12 @@ class LaTeXDoc(TextDoc.TextDoc): thisstyle.font_end = thisstyle.font_end + " " left = style.get_left_margin() - right = style.get_right_margin() first = style.get_first_indent() + left thisstyle.leftIndent = left thisstyle.firstLineIndent = first self.latexstyle[style_name] = thisstyle - - def close(self): """Clean up and close the document""" diff --git a/gramps2/src/docgen/PSDrawDoc.py b/gramps2/src/docgen/PSDrawDoc.py index 232583dda..066c09aa4 100644 --- a/gramps2/src/docgen/PSDrawDoc.py +++ b/gramps2/src/docgen/PSDrawDoc.py @@ -18,19 +18,40 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +#------------------------------------------------------------------------- +# +# python modules +# +#------------------------------------------------------------------------- import string from math import pi, cos, sin -import cStringIO +#------------------------------------------------------------------------- +# +# Gramps modules +# +#------------------------------------------------------------------------- import Plugins -from intl import gettext as _ - +import Errors import TextDoc import DrawDoc +from intl import gettext as _ + + +#------------------------------------------------------------------------- +# +# pt2cm - points to cm conversion +# +#------------------------------------------------------------------------- def pt2cm(val): return (float(val)/72.0)*2.54 +#------------------------------------------------------------------------- +# +# PSDrawDoc +# +#------------------------------------------------------------------------- class PSDrawDoc(DrawDoc.DrawDoc): def __init__(self,styles,type,orientation): @@ -129,7 +150,6 @@ class PSDrawDoc(DrawDoc.DrawDoc): stype = self.draw_styles[style] pname = stype.get_paragraph_style() p = self.style_list[pname] - font = p.get_font() self.f.write('gsave\n') self.f.write('%.4f %.4f %.4f setrgbcolor\n' % rgb_color(stype.get_color())) diff --git a/gramps2/src/docgen/PdfDrawDoc.py b/gramps2/src/docgen/PdfDrawDoc.py index 7c71d21b3..b62b47586 100644 --- a/gramps2/src/docgen/PdfDrawDoc.py +++ b/gramps2/src/docgen/PdfDrawDoc.py @@ -231,11 +231,11 @@ class PdfDrawDoc(DrawDoc.DrawDoc): self.f.setFillColor(make_color(font.get_color())) val = len(text) - y = ((-font.get_size() * val)/2.0) + font.get_size() + y = ((-size * val)/2.0) + size for line in text: self.f.drawCentredString(0,y,line.encode('iso-8859-1')) - y += font.get_size() + y += size self.f.restoreState() @@ -276,17 +276,14 @@ class PdfDrawDoc(DrawDoc.DrawDoc): self.f.restoreState() def left_print(self,text,font,x,y): - size = font.get_size() - self.f.saveState() self.f.setStrokeColor(make_color(font.get_color())) self.pdf_set_font(font) - self.f.drawString(start_x,start_y,text.encode('iso-8859-1')) + self.f.drawString(x,y,text.encode('iso-8859-1')) self.f.restoreState() - def make_color(c): return Color(float(c[0])/255.0, float(c[1])/255.0, float(c[2])/255.0) diff --git a/gramps2/src/docgen/RTFDoc.py b/gramps2/src/docgen/RTFDoc.py index 35534befd..4fa65818b 100644 --- a/gramps2/src/docgen/RTFDoc.py +++ b/gramps2/src/docgen/RTFDoc.py @@ -26,6 +26,7 @@ import TextDoc import Plugins import ImgManip +import Errors from intl import gettext as _ diff --git a/gramps2/src/docgen/SvgDrawDoc.py b/gramps2/src/docgen/SvgDrawDoc.py index 0a5e74877..957da5fc7 100644 --- a/gramps2/src/docgen/SvgDrawDoc.py +++ b/gramps2/src/docgen/SvgDrawDoc.py @@ -99,13 +99,11 @@ class SvgDrawDoc(DrawDoc.DrawDoc): font = p.get_font() size = font.get_size() - height = size*(len(text)) width = 0 for line in text: width = max(width,FontScale.string_width(font,line)) - rangle = -((pi/180.0) * angle) - +# rangle = -((pi/180.0) * angle) centerx,centery = units((x+self.lmargin,y+self.tmargin)) yh = 0 @@ -116,15 +114,13 @@ class SvgDrawDoc(DrawDoc.DrawDoc): ypos = (centery) xd = 0 yd = yh -# xd = yh * sin(-rangle) - # yd = yh * cos(-rangle) - - print centerx, centery, xpos, ypos, angle, line +# xd = yh * sin(-rangle) +# yd = yh * cos(-rangle) self.f.write('