2007-03-21 Zsolt Foldvari <zfoldvar@users.sourceforge.net>

* src/MarkupText.py (MarkupBuffer.set_text): convert unicode to byte
	string for parseString.
	* src/Editors/_EditAddress.py:
	* src/Editors/_EditLdsOrd.py:
	* src/Editors/_EditSourceRef.py:
	* src/Editors/_EditEventRef.py:
	* src/Editors/_EditMedia.py:
	* src/Editors/_EditName.py:
	* src/Editors/_EditEvent.py: attach ValidatableMaskedEntry into table
	with FILL=False yoption for having the validation error tip at right
	position.



svn: r8309
This commit is contained in:
Zsolt Foldvari 2007-03-21 22:11:52 +00:00
parent e92a5979a8
commit 8c6223ba1e
9 changed files with 33 additions and 20 deletions

View File

@ -1,3 +1,16 @@
2007-03-21 Zsolt Foldvari <zfoldvar@users.sourceforge.net>
* src/MarkupText.py (MarkupBuffer.set_text): convert unicode to byte
string for parseString.
* src/Editors/_EditAddress.py:
* src/Editors/_EditLdsOrd.py:
* src/Editors/_EditSourceRef.py:
* src/Editors/_EditEventRef.py:
* src/Editors/_EditMedia.py:
* src/Editors/_EditName.py:
* src/Editors/_EditEvent.py: attach ValidatableMaskedEntry into table
with FILL=False yoption for having the validation error tip at right
position.
2007-03-20 Brian Matherly <brian@gramps-project.org> 2007-03-20 Brian Matherly <brian@gramps-project.org>
* src/plugins/IndivComplete.py: handle multiple notes * src/plugins/IndivComplete.py: handle multiple notes

View File

@ -81,9 +81,9 @@ class EditAddress(EditSecondary):
def _setup_fields(self): def _setup_fields(self):
table = self.top.get_widget('table26') table = self.top.get_widget('table26')
date_entry = ValidatableMaskedEntry(str) date_entry = ValidatableMaskedEntry(str)
date_entry.show() date_entry.show()
table.attach(date_entry, 1, 6, 0, 1) table.attach(date_entry, 1, 6, 0, 1, yoptions=gtk.EXPAND)
self.addr_start = MonitoredDate( self.addr_start = MonitoredDate(
date_entry, date_entry,

View File

@ -92,7 +92,7 @@ class EditEvent(EditPrimary):
def _local_init(self): def _local_init(self):
self.top = gtk.glade.XML(const.gladeFile, "event_edit","gramps") self.top = gtk.glade.XML(const.gladeFile, "event_edit","gramps")
self.set_window(self.top.get_widget("event_edit"), None, self.set_window(self.top.get_widget("event_edit"), None,
self.get_menu_title()) self.get_menu_title())
self.place = self.top.get_widget('place') self.place = self.top.get_widget('place')
self.share_btn = self.top.get_widget('select_place') self.share_btn = self.top.get_widget('select_place')
@ -146,9 +146,9 @@ class EditEvent(EditPrimary):
custom_values=self.get_custom_events()) custom_values=self.get_custom_events())
table = self.top.get_widget('table21') table = self.top.get_widget('table21')
date_entry = ValidatableMaskedEntry(str) date_entry = ValidatableMaskedEntry(str)
date_entry.show() date_entry.show()
table.attach(date_entry, 3, 4, 0, 1) table.attach(date_entry, 3, 4, 0, 1, yoptions=gtk.EXPAND)
self.date_field = MonitoredDate( self.date_field = MonitoredDate(
date_entry, date_entry,
@ -157,7 +157,7 @@ class EditEvent(EditPrimary):
self.uistate, self.uistate,
self.track, self.track,
self.db.readonly) self.db.readonly)
date_entry.grab_focus() date_entry.grab_focus()
def _create_tabbed_pages(self): def _create_tabbed_pages(self):
""" """

View File

@ -89,8 +89,8 @@ class EditEventRef(EditReference):
def _connect_signals(self): def _connect_signals(self):
self.define_ok_button(self.top.get_widget('ok'),self.ok_clicked) self.define_ok_button(self.top.get_widget('ok'),self.ok_clicked)
self.define_cancel_button(self.top.get_widget('cancel')) self.define_cancel_button(self.top.get_widget('cancel'))
# FIXME: activate when help page is available # FIXME: activate when help page is available
#self.define_help_button(self.top.get_widget('help'), 'tag') #self.define_help_button(self.top.get_widget('help'), 'tag')
def _setup_fields(self): def _setup_fields(self):
@ -140,9 +140,9 @@ class EditEventRef(EditReference):
custom_values=self.get_custom_events()) custom_values=self.get_custom_events())
table = self.top.get_widget('table62') table = self.top.get_widget('table62')
date_entry = ValidatableMaskedEntry(str) date_entry = ValidatableMaskedEntry(str)
date_entry.show() date_entry.show()
table.attach(date_entry, 1, 2, 1, 2) table.attach(date_entry, 1, 2, 1, 2, yoptions=gtk.EXPAND)
self.date_check = MonitoredDate( self.date_check = MonitoredDate(
date_entry, date_entry,

View File

@ -176,9 +176,9 @@ class EditLdsOrd(EditSecondary):
self.obj, self.db.readonly) self.obj, self.db.readonly)
table = self.top.get_widget('table') table = self.top.get_widget('table')
date_entry = ValidatableMaskedEntry(str) date_entry = ValidatableMaskedEntry(str)
date_entry.show() date_entry.show()
table.attach(date_entry, 1, 2, 3, 4) table.attach(date_entry, 1, 2, 3, 4, yoptions=gtk.EXPAND)
self.date_field = MonitoredDate( self.date_field = MonitoredDate(
date_entry, date_entry,
@ -366,9 +366,9 @@ class EditFamilyLdsOrd(EditSecondary):
self.obj, self.db.readonly) self.obj, self.db.readonly)
table = self.top.get_widget('table') table = self.top.get_widget('table')
date_entry = ValidatableMaskedEntry(str) date_entry = ValidatableMaskedEntry(str)
date_entry.show() date_entry.show()
table.attach(date_entry, 1, 2, 3, 4) table.attach(date_entry, 1, 2, 3, 4, yoptions=gtk.EXPAND)
self.date_field = MonitoredDate( self.date_field = MonitoredDate(
date_entry, date_entry,

View File

@ -98,9 +98,9 @@ class EditMedia(EditPrimary):
def _setup_fields(self): def _setup_fields(self):
table = self.glade.get_widget('table8') table = self.glade.get_widget('table8')
date_entry = ValidatableMaskedEntry(str) date_entry = ValidatableMaskedEntry(str)
date_entry.show() date_entry.show()
table.attach(date_entry, 2, 3, 2, 3) table.attach(date_entry, 2, 3, 2, 3, yoptions=gtk.EXPAND)
self.date_field = MonitoredDate( self.date_field = MonitoredDate(
date_entry, date_entry,

View File

@ -161,9 +161,9 @@ class EditName(EditSecondary):
self.db.readonly) self.db.readonly)
table = self.top.get_widget('table23') table = self.top.get_widget('table23')
date_entry = ValidatableMaskedEntry(str) date_entry = ValidatableMaskedEntry(str)
date_entry.show() date_entry.show()
table.attach(date_entry, 2, 3, 4, 5) table.attach(date_entry, 2, 3, 4, 5, yoptions=gtk.EXPAND)
self.date = MonitoredDate( self.date = MonitoredDate(
date_entry, date_entry,

View File

@ -122,7 +122,7 @@ class EditSourceRef(EditReference):
table = self.top.get_widget('table67') table = self.top.get_widget('table67')
date_entry = ValidatableMaskedEntry(str) date_entry = ValidatableMaskedEntry(str)
date_entry.show() date_entry.show()
table.attach(date_entry, 1, 2, 0, 1) table.attach(date_entry, 1, 2, 0, 1, yoptions=gtk.EXPAND)
self.date = MonitoredDate( self.date = MonitoredDate(
date_entry, date_entry,

View File

@ -297,7 +297,7 @@ class MarkupBuffer(gtk.TextBuffer):
def set_text(self, xmltext): def set_text(self, xmltext):
"""Set the content of the buffer with markup tags.""" """Set the content of the buffer with markup tags."""
try: try:
parseString(xmltext, self.parser) parseString(str(xmltext), self.parser)
text = self.parser.content text = self.parser.content
except: except:
# if parse fails remove all tags and use clear text instead # if parse fails remove all tags and use clear text instead