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

2008-02-18 Raphael Ackermann <raphael.ackermann@gmail.com>

Browse Source 
* src/DataViews/PersonView.py
	* src/ViewManager.py
	* src/GrampsCfg.py
	* src/plugins/WriteCD.py
	* src/plugins/FindDupes.py
	* src/Merge/_MergePerson.py
	* src/DbManager.py
	* src/ArgHandler.py
	* src/docgen/HtmlDoc.py
	* src/DbLoader.py
	use from QuestionDialog import ErrorDialog etc to bring in line with
	rest of gramps
	* src/Editors/_EditPrimary.py: EditPrimary._uses_duplicate_id() check
	for duplicates and give error dialog if id is already used. #0001347
	* src/Editors/_EditFamily.py: EditFamily.__do_save(), add call to 
	_uses_duplicate_id(). #0001347 

svn: r10046
This commit is contained in:
Raphael Ackermann
2008-02-18 10:09:50 +00:00
parent 347cb51593
commit de5edf9f29
13 changed files with 126 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/DataViews/PersonView.py
View File

@@ -51,7 +51,7 @@ from DisplayModels import PeopleModel
import PageView
from BasicUtils import name_displayer
import Utils
import QuestionDialog
from QuestionDialog import ErrorDialog, QuestionDialog
import TreeTips
import Errors
import Config
@@ -186,7 +186,7 @@ class PersonView(PageView.PersonNavView):
mlist = self.get_selected_objects()
if len(mlist) != 2:
QuestionDialog.ErrorDialog(
ErrorDialog(
_("Cannot merge people"),
_("Exactly two people must be selected to perform a merge. "
"A second person can be selected by holding down the "
@@ -199,7 +199,7 @@ class PersonView(PageView.PersonNavView):
Merge.PersonCompare(self.dbstate, self.uistate, person1,
person2, self.build_tree)
else:
QuestionDialog.ErrorDialog(
ErrorDialog(
_("Cannot merge people"),
_("Exactly two people must be selected to perform a "
"merge. A second person can be selected by holding "
@@ -210,7 +210,7 @@ class PersonView(PageView.PersonNavView):
mlist = self.get_selected_objects()
if len(mlist) != 2:
QuestionDialog.ErrorDialog(
ErrorDialog(
_("Cannot merge people"),
_("Exactly two people must be selected to perform a merge. "
"A second person can be selected by holding down the "
@@ -224,7 +224,7 @@ class PersonView(PageView.PersonNavView):
Merge.MergePeopleUI(self.dbstate, self.uistate, person1,
person2, self.build_tree)
else:
QuestionDialog.ErrorDialog(
ErrorDialog(
_("Cannot merge people"),
_("Exactly two people must be selected to perform a merge. "
"A second person can be selected by holding down the "
@@ -603,7 +603,7 @@ class PersonView(PageView.PersonNavView):
msg = _('Deleting the person will remove the person '
'from the database.')
msg = "%s %s" % (msg, Utils.data_recover_msg)
QuestionDialog.QuestionDialog(_('Delete %s?') % name,
QuestionDialog(_('Delete %s?') % name,
msg,
_('_Delete Person'),
self.delete_person_response)