diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 9dfae57a6..adba1e719 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,8 @@ +2006-06-22 Don Allingham + * src/GrampsDb/_GrampsDbBase.py: remove unused variable + * src/Editors/_EditPlace.py: Allow duplicate names + * src/Editors/_EditFamily.py: improve error message + 2006-06-21 Don Allingham * src/GrampsDb/_ReadXML.py: handle witness ref properly diff --git a/gramps2/help/C/gramps-manual.xml b/gramps2/help/C/gramps-manual.xml index 1e277c8a8..e3a83954e 100644 --- a/gramps2/help/C/gramps-manual.xml +++ b/gramps2/help/C/gramps-manual.xml @@ -349,11 +349,11 @@ The manual also provides assorted bits of additional information in tips and notes, as follows. - Tip + Example Tip Tips and bits of extra information will look like this. - Note + Example Note Notes will look like this. @@ -423,10 +423,9 @@ The first time you run the program, GRAMPS will display the "Getting Started" dialogs. Follow the directions that guide you through - Researcher information, Numerical date - formats, Alternate calendar support, and - the LDS extensions sections. You should find them - to be self-explanatory. + Researcher information and the LDS + extensions sections. You should find them to be + self-explanatory. Dialog boxes @@ -893,8 +892,21 @@ Genealogical databases can contain information on many people, families, places, and objects. It's therefore possible for a View to contain a long list of data that's difficult to work with. GRAMPS - gives you a means for controlling this condition by allowing you to - filter a list to a more manageable size. + gives you two different means for controlling this condition by + allowing you to filter a list to a more manageable size. These + methods are Search and Filtering. + + Search is a simple but fast method of searching the columns + displayed on the screen. Typing the characters into the Search box + and clicking the Find button will display only lines that match the + text. + + Alternatively, you can enable the Filter sidebar, which will + be displayed on the right hand side of the display. When the filter + sidebar is displayed, the Search bar is not displayed. The Filter + side bar allows you to interactive build a set of filter rules that + can be applied to the display. The filter is applied based on the + rules and the data, not on the screen display. @@ -919,43 +931,7 @@ When GRAMPS opens a database, no filtering is in effect. In People View, for example, all people in the database are listed by - default. To filter the list, go to - View - - Filter - . This will place a new menu just above the list of - People. Click on the double arrows of this menu to get a pop-up list - of all the criteria by which you can filter the People listed. - Choose a filter (for example, "Males" or "People with children") and - click Apply. - - - Displaying the filter - - To reduce screen clutter, the filter menu is hidden by - default. To display it, go to the - View - - Filter - menu. Please understand that even if the filter - menu is not displayed, filtering may still be in effect. (Thus, we - say that filtering is persistent.) If you are unsure if your list - is filtered, bring up the filter menu (by going to - View - - Filter - ) and check if any filtering is set. - - - - Example filter use - - To show males only, choose the Males - filter, then click the Apply button. To - cancel any filtering, set the filter to Entire - Database and then click the - Apply button. - + default. @@ -3853,24 +3829,6 @@ - - - - Witnesses - - - The Witnesses tab lets you view and - edit witnesses to the event. The central part of the window - lists all such witnesses stored in the database. The buttons - +, Edit, and - - let you add, modify, and remove a - witness reference to this event (see ). Note that the Edit - and - buttons become available - only - - - @@ -8499,7 +8457,7 @@ please let us know. To find more information about GRAMPS, please visit the GRAMPS Project Web + type="http" url="http://gramps-project.org">GRAMPS Project Web page. To report a bug or make a suggestion regarding this application or diff --git a/gramps2/src/Editors/_EditFamily.py b/gramps2/src/Editors/_EditFamily.py index 1cdc20c4b..07473fb68 100644 --- a/gramps2/src/Editors/_EditFamily.py +++ b/gramps2/src/Editors/_EditFamily.py @@ -658,7 +658,9 @@ class EditFamily(EditPrimary): _('Duplicate Family'), _('A family with these parents already exists ' 'in the database. If you save, you will create ' - 'a duplicate family.')) + 'a duplicate family. It is recommended that ' + 'you cancel the editing of this window, and ' + 'select the existing family')) else: for fh in father.get_family_handle_list(): fam = self.dbstate.db.get_family_from_handle(fh) diff --git a/gramps2/src/Editors/_EditPlace.py b/gramps2/src/Editors/_EditPlace.py index 48de124f3..a9e107d22 100644 --- a/gramps2/src/Editors/_EditPlace.py +++ b/gramps2/src/Editors/_EditPlace.py @@ -135,16 +135,6 @@ class EditPlace(EditPrimary): win_menu_label = _("New Place") return (win_menu_label, _('Edit Place')) - def build_pdmap(self): - self.pdmap = {} - cursor = self.db.get_place_cursor() - data = cursor.next() - while data: - if data[1][2]: - self.pdmap[data[1][2]] = data[0] - data = cursor.next() - cursor.close() - def _create_tabbed_pages(self): """ Creates the notebook tabs and inserts them into the main @@ -188,24 +178,14 @@ class EditPlace(EditPrimary): def save(self,*obj): title = self.obj.get_title() - self.build_pdmap() - - if self.pdmap.has_key(title) and self.pdmap[title] != self.obj.handle: - import QuestionDialog - QuestionDialog.ErrorDialog( - _("Place title is already in use"), - _("Each place must have a unique title, and " - "title you have selected is already used by " - "another place")) - return trans = self.db.transaction_begin() if self.obj.get_handle(): self.db.commit_place(self.obj,trans) else: self.db.add_place(self.obj,trans) - self.db.transaction_commit(trans, - _("Edit Place (%s)") % self.obj.get_title()) + self.db.transaction_commit( + trans, _("Edit Place (%s)") % self.obj.get_title()) if self.callback: self.callback(self.obj) diff --git a/gramps2/src/GrampsDb/_GrampsDbBase.py b/gramps2/src/GrampsDb/_GrampsDbBase.py index db6772104..d1a1d977c 100644 --- a/gramps2/src/GrampsDb/_GrampsDbBase.py +++ b/gramps2/src/GrampsDb/_GrampsDbBase.py @@ -281,7 +281,6 @@ class GrampsDbBase(GrampsDBCallback): self.repo_bookmarks = [] self.media_bookmarks = [] self.path = "" - self.place2title = {} self.name_group = {} def rebuild_secondary(self, callback=None):