Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Window titles, bug fixes in Doc interfaces, spelling fixes

Browse Source 
svn: r713
This commit is contained in:
Don Allingham
2002-01-22 23:48:43 +00:00
parent 341099ecc5
commit e148f7df44
12 changed files with 105 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/AbiWordDoc.py
View File

@@ -80,7 +80,7 @@ class AbiWordDoc(TextDoc):
self.f.write('orientation="portrait" ')
else:
self.f.write('orientation="landscape" ')
self.f.write('width="%.4f" ' self.width/2.54)
self.f.write('width="%.4f" ' % self.width/2.54)
self.f.write('height="%.4f" ' % self.height/2.54)
self.f.write('units="inch" page-scale="1.000000"/>\n')
self.f.write('<section ')

28
src/FindDoc.py
View File

@@ -65,56 +65,64 @@ try:
import OpenOfficeDoc
_textdoc.append((_OpenOffice, _has_tables, _paper, _styles))
except:
pass
import traceback
traceback.print_exc()
try:
import OpenDrawDoc
_drawdoc.append(_OpenOffice)
except:
pass
import traceback
traceback.print_exc()
try:
import AbiWordDoc
_textdoc.append((_AbiWord, _no_tables, _paper, _styles))
except:
pass
import traceback
traceback.print_exc()
try:
import PdfDoc
_textdoc.append((_PDF, _has_tables, _paper, _styles))
except:
pass
import traceback
traceback.print_exc()
try:
import PdfDrawDoc
_drawdoc.append(_PDF)
except:
pass
import traceback
traceback.print_exc()
try:
import HtmlDoc
_textdoc.append((_HTML, _has_tables, _template, _styles))
except:
pass
import traceback
traceback.print_exc()
try:
import KwordDoc
_textdoc.append((_KWord, _no_tables, _paper, _styles))
except:
pass
import traceback
traceback.print_exc()
try:
import RTFDoc
_textdoc.append((_RTF, _has_tables, _paper, _styles))
except:
pass
import traceback
traceback.print_exc()
try:
import LaTeXDoc
_textdoc.append((_LATEX, _no_tables, _paper, _no_styles))
except:
pass
import traceback
traceback.print_exc()
#-------------------------------------------------------------------------
#

5
src/ImageSelect.py
View File

@@ -251,7 +251,10 @@ class Gallery(ImageSelect):
name = utils.thumb_path(self.db.getSavePath(),object)
thumb = GdkImlib.Image(name)
self.icon_cache.append(thumb)
self.icon_list.append_imlib(thumb,object.getDescription())
description = object.getDescription()
if len(description) > 50:
description = "%s..." % description[0:50]
self.icon_list.append_imlib(thumb,description)
#-------------------------------------------------------------------------
#

2
src/OpenOfficeDoc.py
View File

@@ -253,7 +253,7 @@ class OpenOfficeDoc(TextDoc):
self.f.write(tag)
self.f.write('" text:anchor-type="paragraph" ')
self.f.write('svg:width="%.3fcm" ' % x_cm*scale)
self.f.write('svg:height="%.3fcm" ' y_cm*scale)
self.f.write('svg:height="%.3fcm" ' % y_cm*scale)
self.f.write('draw:z-index="0" ')
self.f.write('xlink:href="#Pictures/')
self.f.write(base)

51
src/PedView.py
View File

@@ -50,6 +50,7 @@ class PedigreeView:
self.sb = status_bar
self.change_active_person = change_active
self.load_person = lp
self.presel_descendants = []
def load_canvas(self,person):
"""Redraws the pedigree view window, using the passed person
@@ -58,7 +59,9 @@ class PedigreeView:
for i in self.canvas_items:
i.destroy()
self.active_person = person
if person is not self.active_person:
del self.presel_descendants[:]
self.active_person = person
if person == None:
return
@@ -100,11 +103,12 @@ class PedigreeView:
xdiv = 3.0
xpts = self.build_x_coords(cw/xdiv,cpad)
ypts = self.build_y_coords(ch/32.0)
ypts = self.build_y_coords((ch - h)/32.0, h)
for family in self.active_person.getFamilyList():
if len(family.getChildList()) > 0:
button,arrow = self.make_arrow_button(GTK.ARROW_LEFT,self.on_show_child_menu)
button,arrow = self.make_arrow_button(GTK.ARROW_LEFT,
self.on_show_child_menu)
item = self.root.add("widget", widget=button,
x=x1, y=ypts[0]+(h/2.0),
height=h, width=h,
@@ -122,6 +126,15 @@ class PedigreeView:
p = list[2]
self.add_parent_button(p[0],x2-_PAD,ypts[2],h)
gen_no = len(self.presel_descendants) + 1
for i in range(int(xdiv)):
item = self.root.add("text", x=(cw*i/xdiv + cpad), y=h,
text=str(gen_no),
font_gdk=style.font,
anchor=GTK.ANCHOR_WEST)
self.canvas_items.append(item)
gen_no = gen_no + 1
for i in range(gen):
if list[i]:
if i < int(gen/2):
@@ -151,11 +164,17 @@ class PedigreeView:
return (button, arrow)
def on_show_child_menu(self,obj):
"""Build and display the menu attached to the left pointing arrow
button. The menu consists of the children of the current root
person of the tree. Attach a child to each menu item."""
"""User clicked button to move to child of active person"""
if self.active_person:
if self.presel_descendants:
# Go to a previously selected child.
person = self.presel_descendants.pop(-1)
self.active_person = person
self.load_canvas(person)
elif self.active_person:
# Build and display the menu attached to the left pointing arrow
# button. The menu consists of the children of the current root
# person of the tree. Attach a child to each menu item.
myMenu = gtk.GtkMenu()
for family in self.active_person.getFamilyList():
for child in family.getChildList():
@@ -195,7 +214,11 @@ class PedigreeView:
"""Callback to right pointing arrow button. Gets the person
attached to the button and change the root person to that
person, redrawing the view."""
self.load_canvas(obj.get_data(_PERSON))
person = obj.get_data(_PERSON)
if self.active_person:
self.presel_descendants.append(self.active_person)
self.active_person = person
self.load_canvas(person)
def draw_canvas_line(self,x1,y1,x2,y2,h,w,data,style,ls):
"""Draw an two segment line between the x,y point pairs. Attach
@@ -216,13 +239,14 @@ class PedigreeView:
return [cpad] + [x+cpad]*2 + [x*2+cpad]*4 + \
[x*3+cpad]*8 + [x*4+cpad]*16
def build_y_coords(self,y):
def build_y_coords(self, y, top_pad):
"""Build the array of y coordinates for the possible positions
on the pedegree view."""
return [ y*16, y*8, y*24, y*4, y*12, y*20, y*28, y*2,
y*6, y*10, y*14, y*18, y*22, y*26, y*30, y,
y*3, y*5, y*7, y*9, y*11, y*13, y*15, y*17,
y*19, y*21, y*23, y*25, y*27, y*29, y*31]
res = [ y*16, y*8, y*24, y*4, y*12, y*20, y*28, y*2,
y*6, y*10, y*14, y*18, y*22, y*26, y*30, y,
y*3, y*5, y*7, y*9, y*11, y*13, y*15, y*17,
y*19, y*21, y*23, y*25, y*27, y*29, y*31 ]
return map(lambda coord, top_pad=top_pad: coord + top_pad, res)
def add_box(self,x,y,bwidth,bheight,person,style):
"""Draw a box of the specified size at the specified location.
@@ -270,6 +294,7 @@ class PedigreeView:
person = obj.get_data(_PERSON)
if (event.state & GDK.SHIFT_MASK) or (event.state & GDK.CONTROL_MASK):
self.change_active_person(person)
del self.presel_descendants[:]
self.load_canvas(person)
else:
self.load_person(person)

2
src/WriteXML.py
View File

@@ -458,7 +458,7 @@ class XmlWriter:
self.g.write('%s<dateval val="%s"%s%s/>\n' % (sp,dstr,pref,calstr))
else:
self.g.write('%s<datestr val="%s"/>\n' %(sp,date.getText()))
self.g.write('%s<datestr val="%s"/>\n' %(sp,fix(date.getText())))
def write_force_line(self,label,value,indent=1):
if value != None:

2
src/config.glade
View File

@@ -42,7 +42,7 @@
<object>initDruid</object>
<last_modification_time>Sat, 23 Dec 2000 22:53:01 GMT</last_modification_time>
</signal>
<title>Gramps - Getting Started</title>
<title>Getting Started</title>
<text>Welcome to Gramps, the Genealogical Research
and Analysis Management Programming System.

5
src/gramps.glade
View File

@@ -5846,6 +5846,7 @@ Unknown
<widget>
<class>GtkButton</class>
<name>button88</name>
<tooltip>Accept and close</tooltip>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
@@ -5861,6 +5862,7 @@ Unknown
<widget>
<class>GtkButton</class>
<name>button90</name>
<tooltip>Reject changes and close</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -6211,6 +6213,7 @@ Unknown
<widget>
<class>GtkButton</class>
<name>add_photo</name>
<tooltip>Place new media object in this gallery</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -6226,6 +6229,7 @@ Unknown
<widget>
<class>GtkButton</class>
<name>delete_photo</name>
<tooltip>Remove selected object from this gallery only</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -6241,6 +6245,7 @@ Unknown
<widget>
<class>GtkButton</class>
<name>button146</name>
<tooltip>Modify selected object</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>

13
src/imagesel.glade
View File

@@ -1241,7 +1241,7 @@
<widget>
<class>GtkButton</class>
<name>button86</name>
<tooltip>Creates a new event from the above data</tooltip>
<tooltip>Creates a new object attribute from the above data</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -1257,7 +1257,7 @@
<widget>
<class>GtkButton</class>
<name>button87</name>
<tooltip>Updates the selected event with the above data</tooltip>
<tooltip>Updates the selected object attribute with the above data</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -1273,7 +1273,7 @@
<widget>
<class>GtkButton</class>
<name>button88</name>
<tooltip>Delete the selected event</tooltip>
<tooltip>Delete the selected attribute</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -1840,6 +1840,7 @@
<widget>
<class>GtkButton</class>
<name>makelocal</name>
<tooltip>Copies the object into the database</tooltip>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
@@ -2241,7 +2242,7 @@
<widget>
<class>GtkButton</class>
<name>button93</name>
<tooltip>Creates a new event from the above data</tooltip>
<tooltip>Creates a new attribute from the above data</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -2257,7 +2258,7 @@
<widget>
<class>GtkButton</class>
<name>button94</name>
<tooltip>Updates the selected event with the above data</tooltip>
<tooltip>Updates the selected attribute with the above data</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -2273,7 +2274,7 @@
<widget>
<class>GtkButton</class>
<name>button95</name>
<tooltip>Delete the selected event</tooltip>
<tooltip>Delete the selected attribute</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>

13
src/marriage.glade
View File

@@ -20,7 +20,7 @@
<handler>on_delete_event</handler>
<last_modification_time>Fri, 03 Aug 2001 22:30:26 GMT</last_modification_time>
</signal>
<title>Gramps - Marriage/Relationship Editor</title>
<title>Marriage/Relationship Editor - GRAMPS</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
@@ -63,6 +63,7 @@
<widget>
<class>GtkButton</class>
<name>button107</name>
<tooltip>Accept and close</tooltip>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
@@ -78,6 +79,7 @@
<widget>
<class>GtkButton</class>
<name>button108</name>
<tooltip>Reject changes and close</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -892,6 +894,7 @@
<widget>
<class>GtkButton</class>
<name>marriageAddBtn</name>
<tooltip>Add new event for this marriage</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -907,6 +910,7 @@
<widget>
<class>GtkButton</class>
<name>marriageUpdateBtn</name>
<tooltip>Modify the selected event</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -922,6 +926,7 @@
<widget>
<class>GtkButton</class>
<name>marriageDeleteBtn</name>
<tooltip>Delete selected event</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -1300,6 +1305,7 @@
<widget>
<class>GtkButton</class>
<name>button103</name>
<tooltip>Create a new attribute for this marriage</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -1315,6 +1321,7 @@
<widget>
<class>GtkButton</class>
<name>button104</name>
<tooltip>Modify the selected attribute</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -1330,6 +1337,7 @@
<widget>
<class>GtkButton</class>
<name>button105</name>
<tooltip>Delete the selected attribute</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -1457,6 +1465,7 @@
<widget>
<class>GtkButton</class>
<name>button100</name>
<tooltip>Place new media object in this gallery</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -1472,6 +1481,7 @@
<widget>
<class>GtkButton</class>
<name>button101</name>
<tooltip>Remove selected object from this gallery only</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
@@ -1487,6 +1497,7 @@
<widget>
<class>GtkButton</class>
<name>button109</name>
<tooltip>Modify selected object</tooltip>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>

4
src/mergedata.glade
View File

@@ -16,7 +16,7 @@
<class>GnomeDialog</class>
<name>merge_places</name>
<width>400</width>
<title>Gramps - Merge Places</title>
<title>Merge Places - GRAMPS</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>True</modal>
@@ -292,7 +292,7 @@
<widget>
<class>GnomeDialog</class>
<name>merge</name>
<title>Gramps - Merge People</title>
<title>Merge People - GRAMPS</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>True</modal>