From 42ab304330f3f9fe6d8f21cadc6b3549ce8b99a8 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Tue, 24 Dec 2002 22:36:46 +0000 Subject: [PATCH] Support for natural find svn: r1230 --- example/gramps/data.gramps | Bin 3770 -> 3773 bytes src/ListModel.py | 2 ++ src/docgen/HtmlDoc.py | 5 ++++- src/gramps.glade | 37 +++++++++++++++++++++----------- src/gramps_main.py | 11 +++++++++- src/plugins/Desbrowser.py | 42 ++++++++++++++++++++++--------------- src/plugins/WebPage.py | 25 ++++++++++++++-------- 7 files changed, 82 insertions(+), 40 deletions(-) diff --git a/example/gramps/data.gramps b/example/gramps/data.gramps index 10666b1b7ede4c94287662e894183a9ee58be042..3f2d5ce4b1f2702220f9dddeb27989302cd8d6b4 100644 GIT binary patch delta 3657 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 o<6&b}9N#ncT`azOjnu!N1-Qqi_@% diff --git a/src/ListModel.py b/src/ListModel.py index b0e45552b..2f734dd26 100644 --- a/src/ListModel.py +++ b/src/ListModel.py @@ -28,6 +28,8 @@ class ListModel: self.mylist = [TYPE_STRING]*l + [TYPE_PYOBJECT] self.tree.set_rules_hint(gtk.TRUE) + self.tree.set_enable_search(gtk.TRUE) + self.tree.set_search_column(gtk.TRUE) self.new_model() self.selection = self.tree.get_selection() self.selection.set_mode(mode) diff --git a/src/docgen/HtmlDoc.py b/src/docgen/HtmlDoc.py index 55dd9e185..8c5b0c94b 100644 --- a/src/docgen/HtmlDoc.py +++ b/src/docgen/HtmlDoc.py @@ -386,9 +386,12 @@ class HtmlDoc(TextDoc): self.f.write('

\n') def write_text(self,text): + text = string.replace(text,'&','&'); # Must be first + text = string.replace(text,'<','<'); + text = string.replace(text,'>','>'); + text = string.replace(text,'\n','
') if text != "": self.empty = 0 - text = string.replace(text,'\n','
') self.f.write(text) Plugins.register_text_doc(_("HTML"),HtmlDoc,1,0,1) diff --git a/src/gramps.glade b/src/gramps.glade index 575838c3a..8158a9d76 100644 --- a/src/gramps.glade +++ b/src/gramps.glade @@ -77,7 +77,7 @@ - + True gtk-revert-to-saved 1 @@ -113,7 +113,7 @@ True - + True gtk-convert 1 @@ -134,7 +134,7 @@ - + True gtk-refresh 1 @@ -177,8 +177,21 @@ True - GNOMEUIINFO_MENU_FIND_ITEM + Find... + True + + + + True + gtk-find + 1 + 0.5 + 0.5 + 0 + 0 + + @@ -190,7 +203,7 @@ - + True gtk-convert 1 @@ -258,7 +271,7 @@ - + True gtk-index 1 @@ -280,7 +293,7 @@ - + True gnome-stock-book-open 1 @@ -352,7 +365,7 @@ - + True gtk-home 1 @@ -386,7 +399,7 @@ - + True gnome-stock-book-red 1 @@ -407,7 +420,7 @@ - + True gnome-stock-book-blue 1 @@ -428,7 +441,7 @@ - + True gtk-jump-to 1 @@ -449,7 +462,7 @@ - + True gnome-stock-mail 1 diff --git a/src/gramps_main.py b/src/gramps_main.py index 3bce4ebb0..c1bebe614 100755 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -1358,10 +1358,19 @@ class Gramps: self.status_text("") def complete_rebuild(self): - self.status_text(_("Updating display...")) + import time + t = time.time() keys = self.alpha_page.keys() + + for key in keys: + self.alpha_page[key].new_model() + self.id2col = {} self.apply_filter() + for key in keys: + self.alpha_page[key].connect_model() + self.modify_statusbar() + self.status_text(_("Updating display... %d") % (time.time()-t)) def apply_filter(self): datacomp = self.DataFilter.compare diff --git a/src/plugins/Desbrowser.py b/src/plugins/Desbrowser.py index 51ddc7862..d4b7733df 100644 --- a/src/plugins/Desbrowser.py +++ b/src/plugins/Desbrowser.py @@ -42,6 +42,7 @@ import GrampsCfg # GTK/GNOME modules # #------------------------------------------------------------------------ +import gobject import gtk import gtk.glade @@ -71,31 +72,38 @@ class DesBrowse: "destroy_passed_object" : Utils.destroy_passed_object, }) top = self.glade.get_widget("top") - tree= self.glade.get_widget("tree1") + self.tree= self.glade.get_widget("tree1") + col = gtk.TreeViewColumn('',gtk.CellRendererText(),text=0) + self.tree.append_column(col) + self.model = gtk.TreeStore(gobject.TYPE_STRING,gobject.TYPE_PYOBJECT) + self.tree.set_model(self.model) + self.tree.set_rules_hint(gtk.TRUE) + self.tree.set_headers_visible(gtk.FALSE) - self.add_to_tree(tree,self.active) + self.add_to_tree(None,None,self.active) + self.tree.expand_all() + self.tree.connect('event',self.button_press_event) + top.show() - def add_to_tree(self,tree,person): - item = gtk.TreeItem(GrampsCfg.nameof(person)) - item.show() - item.connect('button-press-event',self.button_press_event) - item.set_data('d',person) - tree.append(item) - subtree = None + def add_to_tree(self,parent,sib,person): + item = self.model.insert_after(parent,sib) + self.model.set(item,0,GrampsCfg.nameof(person)) + self.model.set(item,1,person) + prev = None for family in person.getFamilyList(): for child in family.getChildList(): - if subtree == None: - subtree = gtk.Tree() - subtree.show() - item.set_subtree(subtree) - self.add_to_tree(subtree,child) - + prev = self.add_to_tree(item,prev,child) + return item + def button_press_event(self,obj,event): import EditPerson + if event.type == gtk.gdk._2BUTTON_PRESS and event.button == 1: - person = obj.get_data('d') - EditPerson.EditPerson(person,self.db,self.callback) + store,iter = self.tree.get_selection().get_selected() + if iter: + person = store.get_value(iter,1) + EditPerson.EditPerson(person,self.db,self.callback) #------------------------------------------------------------------------ # diff --git a/src/plugins/WebPage.py b/src/plugins/WebPage.py index 04e51cb23..853cba352 100644 --- a/src/plugins/WebPage.py +++ b/src/plugins/WebPage.py @@ -68,6 +68,9 @@ class HtmlLinkDoc(HtmlDoc): def newline(self): self.f.write('
\n') + def write_raw(self,text): + self.f.write(text) + #------------------------------------------------------------------------ # # @@ -114,7 +117,9 @@ class IndividualPage: if sreflist: for sref in sreflist: self.doc.start_link("#s%d" % self.scnt) - self.doc.write_text("%d" % self.scnt) + self.doc.write_raw('') + self.doc.write_text('%d' % self.scnt) + self.doc.write_raw('') self.doc.end_link() self.scnt = self.scnt + 1 self.slist.append(sref) @@ -160,7 +165,7 @@ class IndividualPage: self.doc.start_cell("NormalCell") self.doc.start_paragraph("Data") if person: - if self.list.has_key(person): + if self.list.has_key(person.getId()): self.doc.start_link("%s.%s" % (person.getId(),self.ext)) self.doc.write_text(person.getPrimaryName().getRegularName()) self.doc.end_link() @@ -179,7 +184,9 @@ class IndividualPage: index = 1 for sref in self.slist: self.doc.start_paragraph("SourceParagraph") - self.doc.write_text('%d. ' % (index,index)) + self.doc.start_link("s%d" % index) + self.doc.write_text('%d. ' % index) + self.doc.end_link() index = index + 1 self.write_info(sref.getBase().getTitle()) self.write_info(sref.getBase().getAuthor()) @@ -510,7 +517,7 @@ class IndividualPage: self.doc.start_cell("NormalCell",2) self.doc.start_paragraph("Spouse") if spouse: - if self.list.has_key(spouse): + if self.list.has_key(spouse.getId()): self.doc.start_link("%s.%s" % (spouse.getId(),self.ext)) self.doc.write_text(spouse.getPrimaryName().getRegularName()) self.doc.end_link() @@ -547,7 +554,7 @@ class IndividualPage: first = 0 else: self.doc.write_text('\n') - if self.list.has_key(child): + if self.list.has_key(child.getId()): self.doc.start_link("%s.%s" % (child.getId(),self.ext)) self.doc.write_text(name) self.doc.end_link() @@ -695,8 +702,8 @@ class WebReport(Report): col_len = len(person_list) + len(a.keys()) col_len = col_len/2 - doc.write_text('') - doc.write_text('
') + doc.write_raw('') + doc.write_raw('
') last = '' end_col = 0 for person in person_list: @@ -719,7 +726,7 @@ class WebReport(Report): else: doc.newline() col_len = col_len - 1 - doc.write_text('
') + doc.write_raw('
') doc.close() doc.write_support_files() @@ -773,7 +780,7 @@ class WebReport(Report): my_map = {} for l in ind_list: - my_map[l] = 1 + my_map[l.getId()] = l for person in ind_list: tdoc = HtmlLinkDoc(self.selected_style,None,None,None,doc) tdoc.set_extension(self.ext)