From e49925cffb34d1184965be7f8cbccc06a2c05255 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Tue, 22 Jan 2002 23:48:43 +0000 Subject: [PATCH] Window titles, bug fixes in Doc interfaces, spelling fixes svn: r713 --- gramps/doc/gramps-manual/C/gramps-manual.sgml | 30 +++++------ gramps/src/AbiWordDoc.py | 2 +- gramps/src/FindDoc.py | 28 ++++++---- gramps/src/ImageSelect.py | 5 +- gramps/src/OpenOfficeDoc.py | 2 +- gramps/src/PedView.py | 51 ++++++++++++++----- gramps/src/WriteXML.py | 2 +- gramps/src/config.glade | 2 +- gramps/src/gramps.glade | 5 ++ gramps/src/imagesel.glade | 13 ++--- gramps/src/marriage.glade | 13 ++++- gramps/src/mergedata.glade | 4 +- 12 files changed, 105 insertions(+), 52 deletions(-) diff --git a/gramps/doc/gramps-manual/C/gramps-manual.sgml b/gramps/doc/gramps-manual/C/gramps-manual.sgml index 3c1f0ebf1..f61e19700 100644 --- a/gramps/doc/gramps-manual/C/gramps-manual.sgml +++ b/gramps/doc/gramps-manual/C/gramps-manual.sgml @@ -584,7 +584,7 @@ reference in the gallery adding some specific information, such as "Aunt Martha is the third person from the right in the second row". Clicking the Edit - Properites allows you to edit the local properties. + Properties allows you to edit the local properties.
Local Media Properties @@ -870,7 +870,7 @@ screen, or by choosing the View - Pedgree + Pedigree entry from the menus. @@ -920,7 +920,7 @@ person. shows navigation using this method. When the mouse is over one of the lines connecting individuals, the line widens and becomes highlighted. In this - case, double clcking on the line would make Hjalmar Smith the + case, double clicking on the line would make Hjalmar Smith the active person. @@ -1009,7 +1009,7 @@ Media objects can be either local or external to a GRAMPS database. If GRAMPS is told to import an object as - alocal object, it will make its own copy of the file in the + a local object, it will make its own copy of the file in the database directory. If the object is not imported as a local object, the original file is used. @@ -1036,8 +1036,8 @@ Objects may also be added using the Add Media Object button. This will add the object to the Media View, but not to any gallery. When you select the file to be - added, a preview will be displayed in the preview window. The - the file is an image, the image will be displayed. Otherwise, an + added, a preview will be displayed in the preview window. If the + file is an image, the image will be displayed. Otherwise, an icon representing the file type will be displayed. In the dialog box, you may choose to either import the object as a local object, or leave it as an external object. @@ -1141,7 +1141,7 @@ Bookmarks work similar to bookmarks in HTML browsers. They allow you to quickly jump to a person, making that person the active person. This allows you to avoid searching for them - everytime you want to add/change something in their information. + every time you want to add/change something in their information.
Using Bookmarks @@ -1205,7 +1205,7 @@ RCS system to handle revisions. - Revison control is enabled in the Revision Control tab of the + Revision control is enabled in the Revision Control tab of the preferences dialog. Once enabled, every save is logged into the revision control database. If you have enabled prompting for a comment, then a dialog box will be displayed on every save asking @@ -1239,7 +1239,7 @@ will display a dialog box that will allow you to choose which version you would like to view. The dialog box displays the version number, the date the version was saved, who saved the database, and any comment supplied - when the datbase was saved. + when the database was saved.
Choosing a revision @@ -1254,7 +1254,7 @@ database. If you do not save the retrieved database, it will not replace the current version. If for some reason you accidentally save the retrieved database when you did not want to replace the - current version, you can always use the revison control + current version, you can always use the revision control mechanism to get back the version you replaced. @@ -1308,7 +1308,7 @@ GRAMPS normally compresses its - data file to conserve disk space. If you do not whish to + data file to conserve disk space. If you do not wish to have the file compressed, selecting this option will cause GRAMPS to leave the file uncompressed. This may be desirable if other applications @@ -1340,7 +1340,7 @@ This option allows advanced users to edit the internal - GRAMPS indentification strings + GRAMPS identification strings for certain entries. @@ -1369,7 +1369,7 @@
The Formats tab allows you to change the - display formats of several different typs of data. This includes + display formats of several different types of data. This includes dates and names. @@ -1552,7 +1552,7 @@ Selecting one of those options you can then change the font (font face, size, color, and options) for each Paragraph Style along with the Paragraph Options (Alignment, background color, margins, - and dorders). Once you are satisfied with the style you are ready + and borders). Once you are satisfied with the style you are ready to proceed with the generation of your report. The next step is to choose the options (if any for that specific report) and then Choose the Template (for HTML format only) and click OK. Your @@ -1742,7 +1742,7 @@ appear in every GRAMPS generated file. Relationship calculator - Calulates the relationship between two people. + Calculates the relationship between two people. diff --git a/gramps/src/AbiWordDoc.py b/gramps/src/AbiWordDoc.py index a9be9569c..a7a56be8d 100644 --- a/gramps/src/AbiWordDoc.py +++ b/gramps/src/AbiWordDoc.py @@ -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('
50: + description = "%s..." % description[0:50] + self.icon_list.append_imlib(thumb,description) #------------------------------------------------------------------------- # diff --git a/gramps/src/OpenOfficeDoc.py b/gramps/src/OpenOfficeDoc.py index 617c543f0..95d0e933f 100644 --- a/gramps/src/OpenOfficeDoc.py +++ b/gramps/src/OpenOfficeDoc.py @@ -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) diff --git a/gramps/src/PedView.py b/gramps/src/PedView.py index 6e19307dd..d163b59db 100644 --- a/gramps/src/PedView.py +++ b/gramps/src/PedView.py @@ -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) diff --git a/gramps/src/WriteXML.py b/gramps/src/WriteXML.py index f797261af..f61d999e8 100644 --- a/gramps/src/WriteXML.py +++ b/gramps/src/WriteXML.py @@ -458,7 +458,7 @@ class XmlWriter: self.g.write('%s\n' % (sp,dstr,pref,calstr)) else: - self.g.write('%s\n' %(sp,date.getText())) + self.g.write('%s\n' %(sp,fix(date.getText()))) def write_force_line(self,label,value,indent=1): if value != None: diff --git a/gramps/src/config.glade b/gramps/src/config.glade index 37bc75995..825f89efe 100644 --- a/gramps/src/config.glade +++ b/gramps/src/config.glade @@ -42,7 +42,7 @@ initDruid Sat, 23 Dec 2000 22:53:01 GMT - Gramps - Getting Started + Getting Started Welcome to Gramps, the Genealogical Research and Analysis Management Programming System. diff --git a/gramps/src/gramps.glade b/gramps/src/gramps.glade index 2c703fe68..e46609803 100644 --- a/gramps/src/gramps.glade +++ b/gramps/src/gramps.glade @@ -5846,6 +5846,7 @@ Unknown GtkButton button88 + Accept and close True True True @@ -5861,6 +5862,7 @@ Unknown GtkButton button90 + Reject changes and close True True @@ -6211,6 +6213,7 @@ Unknown GtkButton add_photo + Place new media object in this gallery True True @@ -6226,6 +6229,7 @@ Unknown GtkButton delete_photo + Remove selected object from this gallery only True True @@ -6241,6 +6245,7 @@ Unknown GtkButton button146 + Modify selected object True True diff --git a/gramps/src/imagesel.glade b/gramps/src/imagesel.glade index 3d8c23e59..a47fc5ef1 100644 --- a/gramps/src/imagesel.glade +++ b/gramps/src/imagesel.glade @@ -1241,7 +1241,7 @@ GtkButton button86 - Creates a new event from the above data + Creates a new object attribute from the above data True True @@ -1257,7 +1257,7 @@ GtkButton button87 - Updates the selected event with the above data + Updates the selected object attribute with the above data True True @@ -1273,7 +1273,7 @@ GtkButton button88 - Delete the selected event + Delete the selected attribute True True @@ -1840,6 +1840,7 @@ GtkButton makelocal + Copies the object into the database True clicked @@ -2241,7 +2242,7 @@ GtkButton button93 - Creates a new event from the above data + Creates a new attribute from the above data True True @@ -2257,7 +2258,7 @@ GtkButton button94 - Updates the selected event with the above data + Updates the selected attribute with the above data True True @@ -2273,7 +2274,7 @@ GtkButton button95 - Delete the selected event + Delete the selected attribute True True diff --git a/gramps/src/marriage.glade b/gramps/src/marriage.glade index 69e69ed32..551f07680 100644 --- a/gramps/src/marriage.glade +++ b/gramps/src/marriage.glade @@ -20,7 +20,7 @@ on_delete_event Fri, 03 Aug 2001 22:30:26 GMT - Gramps - Marriage/Relationship Editor + Marriage/Relationship Editor - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -63,6 +63,7 @@ GtkButton button107 + Accept and close True True True @@ -78,6 +79,7 @@ GtkButton button108 + Reject changes and close True True @@ -892,6 +894,7 @@ GtkButton marriageAddBtn + Add new event for this marriage True True @@ -907,6 +910,7 @@ GtkButton marriageUpdateBtn + Modify the selected event True True @@ -922,6 +926,7 @@ GtkButton marriageDeleteBtn + Delete selected event True True @@ -1300,6 +1305,7 @@ GtkButton button103 + Create a new attribute for this marriage True True @@ -1315,6 +1321,7 @@ GtkButton button104 + Modify the selected attribute True True @@ -1330,6 +1337,7 @@ GtkButton button105 + Delete the selected attribute True True @@ -1457,6 +1465,7 @@ GtkButton button100 + Place new media object in this gallery True True @@ -1472,6 +1481,7 @@ GtkButton button101 + Remove selected object from this gallery only True True @@ -1487,6 +1497,7 @@ GtkButton button109 + Modify selected object True True diff --git a/gramps/src/mergedata.glade b/gramps/src/mergedata.glade index 9e8e1bbf6..6085c01f4 100644 --- a/gramps/src/mergedata.glade +++ b/gramps/src/mergedata.glade @@ -16,7 +16,7 @@ GnomeDialog merge_places 400 - Gramps - Merge Places + Merge Places - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -292,7 +292,7 @@ GnomeDialog merge - Gramps - Merge People + Merge People - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True