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

* 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

View File

@@ -19,7 +19,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# $Id$
# $Id:HtmlDoc.py 9912 2008-01-22 09:17:46Z acraphae $
#------------------------------------------------------------------------
#
@@ -42,7 +42,7 @@ import tarfile
import const
import Errors
import BaseDoc
import QuestionDialog
from QuestionDialog import ErrorDialog, WarningDialog
import Mime
import Utils
@@ -156,7 +156,7 @@ class HtmlDoc(BaseDoc.BaseDoc,BaseDoc.TextDoc):
if top_add == 1:
mymsg = _("The marker '<!-- START -->' was not in the template")
QuestionDialog.ErrorDialog(_("Template Error"),mymsg)
ErrorDialog(_("Template Error"),mymsg)
def load_html(self):
start = re.compile(r"<!--\s*START\s*-->")
@@ -181,7 +181,7 @@ class HtmlDoc(BaseDoc.BaseDoc,BaseDoc.TextDoc):
if top_add == 1:
mymsg = _("The marker '<!-- START -->' was not in the template")
QuestionDialog.ErrorDialog(_("Template Error"),mymsg)
ErrorDialog(_("Template Error"),mymsg)
def load_template(self):
if self.template:
@@ -193,13 +193,13 @@ class HtmlDoc(BaseDoc.BaseDoc,BaseDoc.TextDoc):
except IOError,msg:
mymsg = _("Could not open %s\nUsing the default template") % \
self.template
QuestionDialog.WarningDialog(mymsg,str(msg))
WarningDialog(mymsg,str(msg))
self.bottom = _bottom
self.top = _top
except:
mymsg = _("Could not open %s\nUsing the default template") % \
self.template
QuestionDialog.WarningDialog(mymsg)
WarningDialog(mymsg)
self.bottom = _bottom
self.top = _top
else: