diff --git a/ChangeLog b/ChangeLog index cd274f50f..fd3ee9443 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2007-03-21 Zsolt Foldvari + * 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 * src/plugins/IndivComplete.py: handle multiple notes diff --git a/src/Editors/_EditAddress.py b/src/Editors/_EditAddress.py index 969bb84d6..65414e7a0 100644 --- a/src/Editors/_EditAddress.py +++ b/src/Editors/_EditAddress.py @@ -81,9 +81,9 @@ class EditAddress(EditSecondary): def _setup_fields(self): table = self.top.get_widget('table26') - date_entry = ValidatableMaskedEntry(str) + date_entry = ValidatableMaskedEntry(str) 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( date_entry, diff --git a/src/Editors/_EditEvent.py b/src/Editors/_EditEvent.py index 22526b9b7..00b7d2fd5 100644 --- a/src/Editors/_EditEvent.py +++ b/src/Editors/_EditEvent.py @@ -92,7 +92,7 @@ class EditEvent(EditPrimary): def _local_init(self): self.top = gtk.glade.XML(const.gladeFile, "event_edit","gramps") 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.share_btn = self.top.get_widget('select_place') @@ -146,9 +146,9 @@ class EditEvent(EditPrimary): custom_values=self.get_custom_events()) table = self.top.get_widget('table21') - date_entry = ValidatableMaskedEntry(str) + date_entry = ValidatableMaskedEntry(str) 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( date_entry, @@ -157,7 +157,7 @@ class EditEvent(EditPrimary): self.uistate, self.track, self.db.readonly) - date_entry.grab_focus() + date_entry.grab_focus() def _create_tabbed_pages(self): """ diff --git a/src/Editors/_EditEventRef.py b/src/Editors/_EditEventRef.py index bcfec1aad..a9b5b6fb1 100644 --- a/src/Editors/_EditEventRef.py +++ b/src/Editors/_EditEventRef.py @@ -89,8 +89,8 @@ class EditEventRef(EditReference): def _connect_signals(self): self.define_ok_button(self.top.get_widget('ok'),self.ok_clicked) self.define_cancel_button(self.top.get_widget('cancel')) - # FIXME: activate when help page is available - #self.define_help_button(self.top.get_widget('help'), 'tag') + # FIXME: activate when help page is available + #self.define_help_button(self.top.get_widget('help'), 'tag') def _setup_fields(self): @@ -140,9 +140,9 @@ class EditEventRef(EditReference): custom_values=self.get_custom_events()) table = self.top.get_widget('table62') - date_entry = ValidatableMaskedEntry(str) + date_entry = ValidatableMaskedEntry(str) 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( date_entry, diff --git a/src/Editors/_EditLdsOrd.py b/src/Editors/_EditLdsOrd.py index 0f019c88a..1d6be79aa 100644 --- a/src/Editors/_EditLdsOrd.py +++ b/src/Editors/_EditLdsOrd.py @@ -176,9 +176,9 @@ class EditLdsOrd(EditSecondary): self.obj, self.db.readonly) table = self.top.get_widget('table') - date_entry = ValidatableMaskedEntry(str) + date_entry = ValidatableMaskedEntry(str) 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( date_entry, @@ -366,9 +366,9 @@ class EditFamilyLdsOrd(EditSecondary): self.obj, self.db.readonly) table = self.top.get_widget('table') - date_entry = ValidatableMaskedEntry(str) + date_entry = ValidatableMaskedEntry(str) 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( date_entry, diff --git a/src/Editors/_EditMedia.py b/src/Editors/_EditMedia.py index e7838fae2..d51ab9c40 100644 --- a/src/Editors/_EditMedia.py +++ b/src/Editors/_EditMedia.py @@ -98,9 +98,9 @@ class EditMedia(EditPrimary): def _setup_fields(self): table = self.glade.get_widget('table8') - date_entry = ValidatableMaskedEntry(str) + date_entry = ValidatableMaskedEntry(str) 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( date_entry, diff --git a/src/Editors/_EditName.py b/src/Editors/_EditName.py index 47676d703..6fb43fc57 100644 --- a/src/Editors/_EditName.py +++ b/src/Editors/_EditName.py @@ -161,9 +161,9 @@ class EditName(EditSecondary): self.db.readonly) table = self.top.get_widget('table23') - date_entry = ValidatableMaskedEntry(str) + date_entry = ValidatableMaskedEntry(str) 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( date_entry, diff --git a/src/Editors/_EditSourceRef.py b/src/Editors/_EditSourceRef.py index ddb026a19..e8bbb01ba 100644 --- a/src/Editors/_EditSourceRef.py +++ b/src/Editors/_EditSourceRef.py @@ -122,7 +122,7 @@ class EditSourceRef(EditReference): table = self.top.get_widget('table67') date_entry = ValidatableMaskedEntry(str) 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( date_entry, diff --git a/src/MarkupText.py b/src/MarkupText.py index c6c5ad1d8..e925ece60 100644 --- a/src/MarkupText.py +++ b/src/MarkupText.py @@ -297,7 +297,7 @@ class MarkupBuffer(gtk.TextBuffer): def set_text(self, xmltext): """Set the content of the buffer with markup tags.""" try: - parseString(xmltext, self.parser) + parseString(str(xmltext), self.parser) text = self.parser.content except: # if parse fails remove all tags and use clear text instead