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

2007-06-22 Zsolt Foldvari <zfoldvar@users.sourceforge.net>

Browse Source 
* src/NameDisplay.py: fix indentation (use only spaces).
	* src/GrampsCfg.py: handle invalid name format: #1025.



svn: r8619
This commit is contained in:
Zsolt Foldvari
2007-06-21 23:06:05 +00:00
parent e515508586
commit 79257df532
3 changed files with 78 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
2007-06-22 Zsolt Foldvari <zfoldvar@users.sourceforge.net>
* src/NameDisplay.py: fix indentation (use only spaces).
* src/GrampsCfg.py: handle invalid name format: #1025.
2007-06-20 Alex Roitman <shura@gramps-project.org> 2007-06-20 Alex Roitman <shura@gramps-project.org>
* src/Filters/Rules/Person/_RelationshipPathBetween.py * src/Filters/Rules/Person/_RelationshipPathBetween.py
(apply_filter): Object/handle mixup, #1090. (apply_filter): Object/handle mixup, #1090.

37
src/GrampsCfg.py
View File

@@ -372,12 +372,12 @@ class GrampsPreferences(ManagedWindow.ManagedWindow):
Name format editor Edit button callback Name format editor Edit button callback
""" """
num,name,fmt = self.selected_fmt[COL_NUM:COL_EXPL] num,name,fmt = self.selected_fmt[COL_NUM:COL_EXPL]
dlg = NameFormatEditDlg(name,fmt,self.examplename) dlg = NameFormatEditDlg(name, fmt, self.examplename)
dlg.dlg.set_transient_for(self.window) dlg.dlg.set_transient_for(self.window)
(res,name,fmt) = dlg.run() (res,name,fmt) = dlg.run()
if name != self.selected_fmt[COL_NAME] or \ if res == gtk.RESPONSE_OK and (name != self.selected_fmt[COL_NAME] or
fmt != self.selected_fmt[COL_FMT]: fmt != self.selected_fmt[COL_FMT]):
exmpl = _nd.format_str(self.examplename,fmt) exmpl = _nd.format_str(self.examplename,fmt)
self.fmt_model.set(self.iter,COL_NAME,name, self.fmt_model.set(self.iter,COL_NAME,name,
COL_FMT,fmt, COL_FMT,fmt,
@@ -570,12 +570,13 @@ class NameFormatEditDlg:
""" """
""" """
def __init__(self,fmt_name,fmt_str,name): def __init__(self, fmt_name, fmt_str, name):
self.fmt_name = fmt_name self.fmt_name = fmt_name
self.fmt_str = fmt_str self.fmt_str = fmt_str
self.name = name self.name = name
self.valid = True
self.top = gtk.glade.XML(const.gladeFile,'namefmt_edit','gramps') self.top = gtk.glade.XML(const.gladeFile, 'namefmt_edit','gramps')
self.dlg = self.top.get_widget('namefmt_edit') self.dlg = self.top.get_widget('namefmt_edit')
ManagedWindow.set_titles(self.dlg, None, _('Name Format Editor')) ManagedWindow.set_titles(self.dlg, None, _('Name Format Editor'))
@@ -585,7 +586,7 @@ class NameFormatEditDlg:
self.nameentry.set_text(self.fmt_name) self.nameentry.set_text(self.fmt_name)
self.formatentry = self.top.get_widget('format_entry') self.formatentry = self.top.get_widget('format_entry')
self.formatentry.connect('changed',self.cb_format_changed) self.formatentry.connect('changed', self.cb_format_changed)
self.formatentry.set_text(self.fmt_str) self.formatentry.set_text(self.fmt_str)
def run(self): def run(self):
@@ -598,7 +599,15 @@ class NameFormatEditDlg:
self.fmt_str = self.formatentry.get_text() self.fmt_str = self.formatentry.get_text()
if self.response == gtk.RESPONSE_OK: if self.response == gtk.RESPONSE_OK:
if self.fmt_name == '' and self.fmt_str == '': if not self.valid:
q = QuestionDialog.QuestionDialog2(
_('The format definition is invalid'),
_('What would you like to do?'),
_('_Continue anyway'), _('_Modify format'),
parent=self.dlg)
running = not q.run()
self.response = gtk.RESPONSE_CANCEL
elif self.fmt_name == '' and self.fmt_str == '':
self.response = gtk.RESPONSE_CANCEL self.response = gtk.RESPONSE_CANCEL
elif (self.fmt_name == '') ^ (self.fmt_str == ''): elif (self.fmt_name == '') ^ (self.fmt_str == ''):
QuestionDialog.ErrorDialog( QuestionDialog.ErrorDialog(
@@ -609,11 +618,15 @@ class NameFormatEditDlg:
self.dlg.destroy() self.dlg.destroy()
return (self.response, self.fmt_name, self.fmt_str) return (self.response, self.fmt_name, self.fmt_str)
def cb_format_changed(self,obj): def cb_format_changed(self, obj):
try: try:
t = (_nd.format_str(self.name,obj.get_text())) t = (_nd.format_str(self.name, obj.get_text()))
sample = '<span weight="bold" style="italic">%s</span>' % t
self.valid = True
except ValueError, msg: except ValueError, msg:
t = _("Invalid format string: %s") % msg t = _("Invalid or incomplete format definition")
self.examplelabel.set_text( sample = '<span foreground="#FF0000">%s</span>' % t
'<span weight="bold" style="italic">%s</span>' % t) self.valid = False
self.examplelabel.set_text(sample)
self.examplelabel.set_use_markup(True) self.examplelabel.set_use_markup(True)