diff --git a/ChangeLog b/ChangeLog index f7b7f9433..c70bc2c8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +2003-12-17 Alex Roitman + * src/Sources.py: Unicode conversion from gtk.TextView. + * src/Witness.py: Unicode conversion from gtk.TextView. + * src/Report.py: Unicode conversion from gtk.TextView. + * src/NameEdit.py: Unicode conversion from gtk.TextView. + * src/Marriage.py: Unicode conversion from gtk.TextView. + * src/ImageSelect.py: Unicode conversion from gtk.TextView. + * src/EventEdit.py: Unicode conversion from gtk.TextView. + * src/EditSource.py: Unicode conversion from gtk.TextView. + * src/EditPlace.py: Unicode conversion from gtk.TextView. + * src/EditPerson.py: Unicode conversion from gtk.TextView. + * src/AutoComp.py: Unicode conversion from gtk.TextView. + * src/AttrEdit.py: Unicode conversion from gtk.TextView. + * src/AddrEdit.py: Unicode conversion from gtk.TextView. + * src/plugins/BookReport.py: Unicode conversion from gtk.Entry + and gtk.TextView. + * src/plugins/ChangeTypes.py: Unicode conversion. + * src/plugins/EventCmp.py: Unicode conversion. + * src/plugins/FilterEditor.py: Unicode conversion. + * src/plugins/SimpleBookTitle.py: Unicode conversion. + * src/plugins/TimeLine.py: Unicode conversion. + * src/plugins/WebPage.py: Unicode conversion. + * src/plugins/WriteGedcom.py: Unicode conversion. + * src/plugins/WritePkg.py: Unicode conversion. + * src/plugins/eval.py: Unicode conversion. + * src/plugins/soundgen.py: Unicode conversion. + 2003-12-17 Tim Waugh * src/plugins/Ancestors.py (ComprehensiveAncestorsReport.write_report): No need for separate diff --git a/src/AddrEdit.py b/src/AddrEdit.py index f303b6eec..968153765 100644 --- a/src/AddrEdit.py +++ b/src/AddrEdit.py @@ -155,7 +155,7 @@ class AddressEditor: phone = unicode(self.phone.get_text()) postal = unicode(self.postal.get_text()) b = self.note_field.get_buffer() - note = b.get_text(b.get_start_iter(),b.get_end_iter(),gtk.FALSE) + note = unicode(b.get_text(b.get_start_iter(),b.get_end_iter(),gtk.FALSE)) format = self.preform.get_active() priv = self.priv.get_active() @@ -195,7 +195,7 @@ class AddressEditor: def on_switch_page(self,obj,a,page): buf = self.note_field.get_buffer() - text = buf.get_text(buf.get_start_iter(),buf.get_end_iter(),gtk.FALSE) + text = unicode(buf.get_text(buf.get_start_iter(),buf.get_end_iter(),gtk.FALSE)) if text: Utils.bold_label(self.notes_label) else: diff --git a/src/AttrEdit.py b/src/AttrEdit.py index ed8dc7c85..047bd7341 100644 --- a/src/AttrEdit.py +++ b/src/AttrEdit.py @@ -156,7 +156,7 @@ class AttributeEditor: value = unicode(self.value_field.get_text()) buf = self.note_field.get_buffer() - note = buf.get_text(buf.get_start_iter(),buf.get_end_iter(),gtk.FALSE) + note = unicode(buf.get_text(buf.get_start_iter(),buf.get_end_iter(),gtk.FALSE)) format = self.preform.get_active() priv = self.priv.get_active() @@ -193,7 +193,7 @@ class AttributeEditor: def on_switch_page(self,obj,a,page): buf = self.note_field.get_buffer() - text = buf.get_text(buf.get_start_iter(),buf.get_end_iter(),gtk.FALSE) + text = unicode(buf.get_text(buf.get_start_iter(),buf.get_end_iter(),gtk.FALSE)) if text: Utils.bold_label(self.notes_label) else: diff --git a/src/AutoComp.py b/src/AutoComp.py index 88cf5e22c..a7b6d3f21 100644 --- a/src/AutoComp.py +++ b/src/AutoComp.py @@ -18,6 +18,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# $Id$ + """ Adds autocompletion to a GtkEntry box, using the passed list of strings as the possible completions. This work was adapted from code @@ -193,7 +195,7 @@ class AutoCombo(AutoCompBase): return # Get the user's text - typed = entry.get_text() + typed = unicode(entry.get_text()) if (not typed): return if type(typed) != self.t: @@ -259,7 +261,7 @@ class AutoEntry(AutoCompBase): gtk.timeout_remove(timer) # Get the user's text - typed = entry.get_text() + typed = unicode(entry.get_text()) if type(typed) != self.t: typed = unicode(typed) diff --git a/src/EditPerson.py b/src/EditPerson.py index 8fc634b13..ba27aa1f8 100644 --- a/src/EditPerson.py +++ b/src/EditPerson.py @@ -822,7 +822,6 @@ class EditPerson: # Remember old combo list input bplace_text = unicode(self.bplace.get_text()) - dplace_text = unicode(self.dplace.get_text()) prev_btext = Utils.strip_id(bplace_text) @@ -1013,8 +1012,8 @@ class EditPerson: male = self.is_male.get_active() female = self.is_female.get_active() unknown = self.is_unknown.get_active() - text = self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), - self.notes_buffer.get_end_iter(),gtk.FALSE) + text = unicode(self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), + self.notes_buffer.get_end_iter(),gtk.FALSE)) format = self.preform.get_active() idval = unicode(self.gid.get_text()) @@ -1491,8 +1490,8 @@ class EditPerson: "the person's marriages.") ErrorDialog(msg) - text = self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), - self.notes_buffer.get_end_iter(),gtk.FALSE) + text = unicode(self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), + self.notes_buffer.get_end_iter(),gtk.FALSE)) if text != self.person.getNote(): self.person.setNote(text) @@ -1632,8 +1631,8 @@ class EditPerson: elif page == 9 and self.lds_not_loaded: self.lds_not_loaded = 0 self.draw_lds() - text = self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), - self.notes_buffer.get_end_iter(),gtk.FALSE) + text = unicode(self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), + self.notes_buffer.get_end_iter(),gtk.FALSE)) if text: Utils.bold_label(self.notes_label) else: diff --git a/src/EditPlace.py b/src/EditPlace.py index e3e0d2979..755a5f868 100644 --- a/src/EditPlace.py +++ b/src/EditPlace.py @@ -289,8 +289,8 @@ class EditPlace: def on_place_apply_clicked(self): - note = self.note_buffer.get_text(self.note_buffer.get_start_iter(), - self.note_buffer.get_end_iter(),gtk.FALSE) + note = unicode(self.note_buffer.get_text(self.note_buffer.get_start_iter(), + self.note_buffer.get_end_iter(),gtk.FALSE)) format = self.preform.get_active() mloc = self.place.get_main_location() @@ -331,8 +331,8 @@ class EditPlace: elif page == 6 and self.ref_not_loaded: self.ref_not_loaded = 0 self.display_references() - text = self.note_buffer.get_text(self.note_buffer.get_start_iter(), - self.note_buffer.get_end_iter(),gtk.FALSE) + text = unicode(self.note_buffer.get_text(self.note_buffer.get_start_iter(), + self.note_buffer.get_end_iter(),gtk.FALSE)) if text: Utils.bold_label(self.notes_label) else: diff --git a/src/EditSource.py b/src/EditSource.py index 26f69bcb2..7e72df40b 100644 --- a/src/EditSource.py +++ b/src/EditSource.py @@ -238,8 +238,8 @@ class EditSource: author = unicode(self.author.get_text()) pubinfo = unicode(self.pubinfo.get_text()) abbrev = unicode(self.abbrev.get_text()) - note = self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), - self.notes_buffer.get_end_iter(),gtk.FALSE) + note = unicode(self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), + self.notes_buffer.get_end_iter(),gtk.FALSE)) format = self.preform.get_active() if author != self.source.getAuthor(): @@ -278,8 +278,8 @@ class EditSource: elif page == 3 and self.ref_not_loaded: self.ref_not_loaded = 0 self.display_references() - text = self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), - self.notes_buffer.get_end_iter(),gtk.FALSE) + text = unicode(self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), + self.notes_buffer.get_end_iter(),gtk.FALSE)) if text: Utils.bold_label(self.notes_label) else: diff --git a/src/EventEdit.py b/src/EventEdit.py index 3dfa711f2..30c558bc0 100644 --- a/src/EventEdit.py +++ b/src/EventEdit.py @@ -218,7 +218,7 @@ class EventEditor: self.date_check.set_calendar(cobj()) def get_place(self,field,makenew=0): - text = unicode(strip(field.get_text())) + text = strip(unicode(field.get_text())) if text: if self.pmap.has_key(text): return self.parent.db.getPlaceMap()[self.pmap[text]] @@ -243,7 +243,7 @@ class EventEditor: eplace_obj = self.get_place(self.place_field,1) buf = self.note_field.get_buffer() - enote = buf.get_text(buf.get_start_iter(),buf.get_end_iter(),gtk.FALSE) + enote = unicode(buf.get_text(buf.get_start_iter(),buf.get_end_iter(),gtk.FALSE)) eformat = self.preform.get_active() edesc = unicode(self.descr_field.get_text()) epriv = self.priv.get_active() @@ -305,7 +305,7 @@ class EventEditor: def on_switch_page(self,obj,a,page): buf = self.note_field.get_buffer() - text = buf.get_text(buf.get_start_iter(),buf.get_end_iter(),gtk.FALSE) + text = unicode(buf.get_text(buf.get_start_iter(),buf.get_end_iter(),gtk.FALSE)) if text: Utils.bold_label(self.notes_label) else: diff --git a/src/ImageSelect.py b/src/ImageSelect.py index cdbe6113b..afccc6613 100644 --- a/src/ImageSelect.py +++ b/src/ImageSelect.py @@ -736,7 +736,7 @@ class LocalMediaProperties: def on_notebook_switch_page(self,obj,junk,page): t = self.notes.get_buffer() - text = t.get_text(t.get_start_iter(),t.get_end_iter(),gtk.FALSE) + text = unicode(t.get_text(t.get_start_iter(),t.get_end_iter(),gtk.FALSE)) if text: Utils.bold_label(self.notes_label) else: @@ -746,7 +746,7 @@ class LocalMediaProperties: priv = self.change_dialog.get_widget("private").get_active() t = self.notes.get_buffer() - text = t.get_text(t.get_start_iter(),t.get_end_iter(),gtk.FALSE) + text = unicode(t.get_text(t.get_start_iter(),t.get_end_iter(),gtk.FALSE)) note = self.photo.getNote() format = self.preform.get_active() if text != note or priv != self.photo.getPrivacy(): @@ -976,7 +976,7 @@ class GlobalMediaProperties: if page == 3: self.display_refs() t = self.notes.get_buffer() - text = t.get_text(t.get_start_iter(),t.get_end_iter(),gtk.FALSE) + text = unicode(t.get_text(t.get_start_iter(),t.get_end_iter(),gtk.FALSE)) if text: Utils.bold_label(self.notes_label) else: @@ -984,7 +984,7 @@ class GlobalMediaProperties: def on_apply_clicked(self, obj): t = self.notes.get_buffer() - text = t.get_text(t.get_start_iter(),t.get_end_iter(),gtk.FALSE) + text = unicode(t.get_text(t.get_start_iter(),t.get_end_iter(),gtk.FALSE)) desc = unicode(self.descr_window.get_text()) note = self.object.getNote() format = self.preform.get_active() diff --git a/src/Marriage.py b/src/Marriage.py index 64d283dc8..efe464722 100644 --- a/src/Marriage.py +++ b/src/Marriage.py @@ -430,8 +430,8 @@ class Marriage: if self.complete.get_active() != self.family.getComplete(): changed = 1 - text = self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), - self.notes_buffer.get_end_iter(),gtk.FALSE) + text = unicode(self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), + self.notes_buffer.get_end_iter(),gtk.FALSE)) format = self.preform.get_active() if text != self.family.getNote(): @@ -526,8 +526,8 @@ class Marriage: self.family.setRelationship(val) Utils.modified() - text = self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), - self.notes_buffer.get_end_iter(),gtk.FALSE) + text = unicode(self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), + self.notes_buffer.get_end_iter(),gtk.FALSE)) if text != self.family.getNote(): self.family.setNote(text) Utils.modified() @@ -699,8 +699,8 @@ class Marriage: list.insert(dest,obj) def on_switch_page(self,obj,a,page): - text = self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), - self.notes_buffer.get_end_iter(),gtk.FALSE) + text = unicode(self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), + self.notes_buffer.get_end_iter(),gtk.FALSE)) if text: Utils.bold_label(self.notes_label) else: @@ -721,7 +721,7 @@ class Marriage: def get_place(self,makenew=0): field = self.lds_place.entry - text = unicode(string.strip(field.get_text())) + text = string.strip(unicode(field.get_text())) if text: if self.pmap.has_key(text): return self.db.getPlaceMap()[self.pmap[text]] diff --git a/src/NameEdit.py b/src/NameEdit.py index d06c148d5..beccfb8fc 100644 --- a/src/NameEdit.py +++ b/src/NameEdit.py @@ -136,8 +136,8 @@ class NameEditor: last = unicode(self.surname_field.get_text()) title = unicode(self.title_field.get_text()) suffix = unicode(self.suffix_field.get_text()) - note = self.note_buffer.get_text(self.note_buffer.get_start_iter(), - self.note_buffer.get_end_iter(),gtk.FALSE) + note = unicode(self.note_buffer.get_text(self.note_buffer.get_start_iter(), + self.note_buffer.get_end_iter(),gtk.FALSE)) format = self.preform.get_active() priv = self.priv.get_active() @@ -195,8 +195,8 @@ class NameEditor: self.parent.lists_changed = 1 def on_switch_page(self,obj,a,page): - text = self.note_buffer.get_text(self.note_buffer.get_start_iter(), - self.note_buffer.get_end_iter(),gtk.FALSE) + text = unicode(self.note_buffer.get_text(self.note_buffer.get_start_iter(), + self.note_buffer.get_end_iter(),gtk.FALSE)) if text: Utils.bold_label(self.notes_label) else: diff --git a/src/Report.py b/src/Report.py index 8af9eb206..48dd0c018 100644 --- a/src/Report.py +++ b/src/Report.py @@ -19,6 +19,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# $Id$ + "Report Generation Framework" __author__ = "David R. Hampton, Donald N. Allingham" @@ -694,7 +696,7 @@ class BareReportDialog: if self.extra_textbox: b = self.extra_textbox.get_buffer() - text_val = b.get_text(b.get_start_iter(),b.get_end_iter(),gtk.FALSE) + text_val = unicode(b.get_text(b.get_start_iter(),b.get_end_iter(),gtk.FALSE)) self.report_text = text_val.split('\n') else: self.report_text = "" diff --git a/src/Sources.py b/src/Sources.py index 9090702e6..80a910e59 100644 --- a/src/Sources.py +++ b/src/Sources.py @@ -359,16 +359,16 @@ class SourceEditor: conf = self.get_widget("conf").get_menu().get_active().get_data('a') buffer = self.get_widget("scomment").get_buffer() - comments = buffer.get_text(buffer.get_start_iter(), - buffer.get_end_iter(),gtk.FALSE) + comments = unicode(buffer.get_text(buffer.get_start_iter(), + buffer.get_end_iter(),gtk.FALSE)) buffer = self.get_widget("stext").get_buffer() - text = buffer.get_text(buffer.get_start_iter(), - buffer.get_end_iter(),gtk.FALSE) + text = unicode(buffer.get_text(buffer.get_start_iter(), + buffer.get_end_iter(),gtk.FALSE)) buffer = self.get_widget('spage').get_buffer() - page = buffer.get_text(buffer.get_start_iter(), - buffer.get_end_iter(),gtk.FALSE) + page = unicode(buffer.get_text(buffer.get_start_iter(), + buffer.get_end_iter(),gtk.FALSE)) self.source_ref.setPage(page) self.source_ref.getDate().set(date) diff --git a/src/Witness.py b/src/Witness.py index 233fb3892..07ab01862 100644 --- a/src/Witness.py +++ b/src/Witness.py @@ -190,6 +190,6 @@ class WitnessEditor: self.ref.set_value(unicode(self.name.get_text())) c = self.comment.get_buffer() - self.ref.set_comment(c.get_text(c.get_start_iter(),c.get_end_iter(),gtk.FALSE)) + self.ref.set_comment(unicode(c.get_text(c.get_start_iter(),c.get_end_iter(),gtk.FALSE))) if self.update: self.update() diff --git a/src/plugins/BookReport.py b/src/plugins/BookReport.py index 192359cbd..bf72ccae0 100644 --- a/src/plugins/BookReport.py +++ b/src/plugins/BookReport.py @@ -863,7 +863,7 @@ class BookReportSelector: Save the current book in the xml booklist file. """ self.book_list = BookList(self.file) - name = self.name_entry.get_text() + name = unicode(self.name_entry.get_text()) self.book.set_name(name) self.book.set_dbname(self.db.getSavePath()) self.book_list.set_book(name,self.book) diff --git a/src/plugins/ChangeTypes.py b/src/plugins/ChangeTypes.py index 3e9577416..a0fbcf55f 100644 --- a/src/plugins/ChangeTypes.py +++ b/src/plugins/ChangeTypes.py @@ -18,6 +18,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# $Id$ + "Database Processing/Rename personal event types" import os @@ -73,8 +75,8 @@ class ChangeTypes: def on_apply_clicked(self,obj): modified = 0 - original = self.glade.get_widget("original_text").get_text() - new = self.glade.get_widget("new_text").get_text() + original = unicode(self.glade.get_widget("original_text").get_text()) + new = unicode(self.glade.get_widget("new_text").get_text()) for person in self.db.getPersonMap().values(): for event in person.getEventList(): diff --git a/src/plugins/EventCmp.py b/src/plugins/EventCmp.py index 2bbbcebb7..9a6b2dce6 100644 --- a/src/plugins/EventCmp.py +++ b/src/plugins/EventCmp.py @@ -18,6 +18,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# $Id$ + "Analysis and Exploration/Compare individual events" #------------------------------------------------------------------------ @@ -321,7 +323,7 @@ class DisplayChart: def on_save_clicked(self,obj): - name = self.form.get_widget("filename").get_text() + name = unicode(self.form.get_widget("filename").get_text()) pstyle = BaseDoc.PaperStyle("junk",10,10) doc = OpenSpreadSheet.OpenSpreadSheet(pstyle,BaseDoc.PAPER_PORTRAIT) diff --git a/src/plugins/FilterEditor.py b/src/plugins/FilterEditor.py index 2e65fc15e..f7deb537f 100644 --- a/src/plugins/FilterEditor.py +++ b/src/plugins/FilterEditor.py @@ -18,6 +18,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# $Id$ + """Generic Filtering Routines""" __author__ = "Don Allingham" @@ -121,7 +123,7 @@ class MyFilters(gtk.Combo): def get_text(self): if self.ok: - return self.entry.get_text() + return unicode(self.entry.get_text()) else: return "" @@ -176,7 +178,7 @@ class MyID(gtk.HBox): self.set_text(val.getId()) def get_text(self): - return self.entry.get_text() + return unicode(self.entry.get_text()) def set_text(self,val): try: @@ -203,7 +205,7 @@ class MySelect(gtk.Combo): self.show() def get_text(self): - return self.entry.get_text() + return unicode(self.entry.get_text()) def set_text(self,val): self.entry.set_text(val) @@ -346,7 +348,7 @@ class FilterEditor: self.draw_rules() def filter_name_changed(self,obj): - name = self.fname.get_text() + name = unicode(self.fname.get_text()) self.ok.set_sensitive(len(name) != 0) def select_row(self,obj): @@ -367,11 +369,11 @@ class FilterEditor: self.top.destroy() def on_ok_clicked(self,obj): - n = self.fname.get_text().strip() + n = unicode(self.fname.get_text()).strip() if n == '': return self.filter.set_name(n) - self.filter.set_comment(self.comment.get_text().strip()) + self.filter.set_comment(unicode(self.comment.get_text()).strip()) for f in self.filterdb.get_filters()[:]: if n == f.get_name(): self.filterdb.get_filters().remove(f) @@ -556,13 +558,13 @@ class FilterEditor: self.draw_rules() def rule_ok(self,obj): - name = self.rule_name.get_text() + name = unicode(self.rule_name.get_text()) try: page = self.name2page[name] (n,c,v,t) = self.page[page] value_list = [] for x in t: - value_list.append(x.get_text()) + value_list.append(unicode(x.get_text())) store,iter = self.rlist.get_selected() new_rule = c(value_list) if self.active_rule: diff --git a/src/plugins/SimpleBookTitle.py b/src/plugins/SimpleBookTitle.py index 8a9b75efa..377cbe25b 100644 --- a/src/plugins/SimpleBookTitle.py +++ b/src/plugins/SimpleBookTitle.py @@ -17,6 +17,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# $Id$ + #------------------------------------------------------------------------ # # python modules @@ -344,9 +346,9 @@ class SimpleBookTitleDialog(Report.BareReportDialog): Report.BareReportDialog.parse_report_options_frame(self) # get values from the widgets - self.title_string = self.title_entry.get_text() - self.subtitle_string = self.subtitle_entry.get_text() - self.footer_string = self.footer_entry.get_text() + self.title_string = unicode(self.title_entry.get_text()) + self.subtitle_string = unicode(self.subtitle_entry.get_text()) + self.footer_string = unicode(self.footer_entry.get_text()) self.size_index = self.size_menu.get_history() def on_cancel(self, obj): diff --git a/src/plugins/TimeLine.py b/src/plugins/TimeLine.py index 64936a042..6ab7b8d4e 100644 --- a/src/plugins/TimeLine.py +++ b/src/plugins/TimeLine.py @@ -18,6 +18,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# $Id$ + """ Timeline report """ @@ -446,7 +448,7 @@ class TimeLineDialog(Report.DrawReportDialog): def make_report(self): - title = self.title_box.get_text() + title = unicode(self.title_box.get_text()) sort_func = self.sort_menu.get_active().get_data('sort') try: @@ -600,7 +602,7 @@ class TimeLineBareDialog(Report.BareReportDialog): self.person = self.new_person self.filter_num = self.filter_combo.get_history() self.sort_func_num = self.sort_style.get_history() - self.title_str = self.title_box.get_text() + self.title_str = unicode(self.title_box.get_text()) self.options = ( self.person.getId(), self.filter_num, self.sort_func_num, self.title_str ) diff --git a/src/plugins/WebPage.py b/src/plugins/WebPage.py index 511de0904..6b016c7bd 100644 --- a/src/plugins/WebPage.py +++ b/src/plugins/WebPage.py @@ -1170,14 +1170,14 @@ class WebReportDialog(Report.ReportDialog): user selected choices for later use.""" self.restrict = self.restrict_living.get_active() self.private = self.no_private.get_active() - self.img_dir_text = self.imgdir.get_text() + self.img_dir_text = unicode(self.imgdir.get_text()) - self.html_ext = string.strip(self.ext.entry.get_text()) + self.html_ext = string.strip(unicode(self.ext.entry.get_text())) if self.html_ext[0] == '.': self.html_ext = self.html_ext[1:] self.use_id = self.include_id.get_active() self.use_gendex = self.gendex.get_active() - self.id_link = string.strip(self.linkpath.get_text()) + self.id_link = string.strip(unicode(self.linkpath.get_text())) self.srccomments = self.no_comments.get_active() if self.no_images.get_active() == 1: self.photos = 0 diff --git a/src/plugins/WriteGedcom.py b/src/plugins/WriteGedcom.py index a73a81e6d..cc7bd258c 100644 --- a/src/plugins/WriteGedcom.py +++ b/src/plugins/WriteGedcom.py @@ -461,7 +461,7 @@ class GedcomWriter: self.images = self.topDialog.get_widget ("images").get_active () if self.images: images_path = self.topDialog.get_widget ("images_path") - self.images_path = images_path.get_text () + self.images_path = unicode(images_path.get_text ()) self.dest = self.target_ged.get_dest() self.adopt = self.target_ged.get_adopt() @@ -481,7 +481,7 @@ class GedcomWriter: self.cnvtxt = keep_utf8 self.nl = self.cnvtxt(self.target_ged.get_endl()) - name = self.topDialog.get_widget("filename").get_text() + name = unicode(self.topDialog.get_widget("filename").get_text()) if cfilter == None: for p in self.db.getPersonKeys(): diff --git a/src/plugins/WritePkg.py b/src/plugins/WritePkg.py index 6286fd7e5..edd58fefa 100644 --- a/src/plugins/WritePkg.py +++ b/src/plugins/WritePkg.py @@ -95,7 +95,7 @@ class PackageWriter: self.top.get_widget("packageExport").show() def on_ok_clicked(self,obj): - name = self.top.get_widget("filename").get_text() + name = unicode(self.top.get_widget("filename").get_text()) Utils.destroy_passed_object(obj) self.export(name) diff --git a/src/plugins/eval.py b/src/plugins/eval.py index 2a1c72b9f..187a6ad43 100644 --- a/src/plugins/eval.py +++ b/src/plugins/eval.py @@ -18,6 +18,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# $Id$ + """ Provides a python evaluation window """ @@ -53,8 +55,8 @@ class EvalWindow: _("Python Evaluation Window")) def apply_clicked(self,obj): - text = self.ebuf.get_text(self.ebuf.get_start_iter(), - self.ebuf.get_end_iter(),gtk.FALSE) + text = unicode(self.ebuf.get_text(self.ebuf.get_start_iter(), + self.ebuf.get_end_iter(),gtk.FALSE)) outtext = cStringIO.StringIO() errtext = cStringIO.StringIO() diff --git a/src/plugins/soundgen.py b/src/plugins/soundgen.py index e97633815..358ee105f 100644 --- a/src/plugins/soundgen.py +++ b/src/plugins/soundgen.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000 Donald N. Allingham +# Copyright (C) 2000-2003 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +18,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# $Id$ + "Utilities/Generate SoundEx codes" import os @@ -80,7 +82,7 @@ class SoundGen: self.glade.get_widget("soundEx").show() def on_apply_clicked(self,obj): - self.value.set_text(soundex.soundex(obj.get_text())) + self.value.set_text(soundex.soundex(unicode(obj.get_text()))) #------------------------------------------------------------------------- # @@ -95,5 +97,3 @@ register_tool( category=_("Utilities"), description=_("Generates SoundEx codes for names") ) - -