diff --git a/gramps2/configure b/gramps2/configure index 667440793..7494b72d9 100755 --- a/gramps2/configure +++ b/gramps2/configure @@ -1621,7 +1621,7 @@ fi -LANGUAGES="sv pl de fr es it pt_BR ru da_DK cs ro nl" +LANGUAGES="cs da_DK de es fr it nl pl pt_BR ro ru sv" DISTLANGS= diff --git a/gramps2/src/Find.py b/gramps2/src/Find.py index d57e814bd..e808f29dc 100644 --- a/gramps2/src/Find.py +++ b/gramps2/src/Find.py @@ -36,15 +36,17 @@ import string # #------------------------------------------------------------------------- import gtk -from gnome.ui import * +import gtk.glade #------------------------------------------------------------------------- # # gramps modules # #------------------------------------------------------------------------- +import const import GrampsCfg import AutoComp +import Utils from intl import gettext as _ #------------------------------------------------------------------------- @@ -66,23 +68,15 @@ class FindBase: self.clist = clist self.nlist = [] self.task = task - title = "%s - GRAMPS" % name - self.top = GnomeDialog(title,STOCK_BUTTON_PREV, - STOCK_BUTTON_NEXT,STOCK_BUTTON_CLOSE) - self.top.set_policy(0,1,0) - self.top.vbox.set_spacing(5) - self.top.vbox.pack_start(gtk.GtkLabel(name),0,0,5) - self.top.vbox.pack_start(gtk.GtkHSeparator(),0,0,0) - self.entry = gtk.GtkEntry() - self.top.vbox.pack_start(self.entry,0,0,25) - self.top.button_connect(0,self.on_prev_clicked) - self.top.button_connect(1,self.on_next_clicked) - self.top.button_connect(2,self.on_close_clicked) - self.top.set_usize(350,175) - self.top.set_default(1) - self.top.show_all() - self.top.editable_enters(self.entry) - self.entry.grab_focus() + self.glade = gtk.glade.XML(const.gladeFile,"find") + self.glade.signal_autoconnect({ + 'on_next_clicked' : self.on_next_clicked, + 'on_back_clicked' : self.on_prev_clicked, + 'on_close_clicked' : self.on_close_clicked, + }) + self.top = self.glade.get_widget('find') + self.entry = self.glade.get_widget('entry') + Utils.set_titles(self.top, self.glade.get_widget('title'), name) def get_value(self,id): return None @@ -92,17 +86,7 @@ class FindBase: self.comp = AutoComp.AutoEntry(self.entry,self.nlist) def advance(self,func): - try: - self.row = self.clist.selection[0] - except IndexError: - gtk.gdk_beep() - return - text = self.entry.get_text() - if self.row == None or text == "": - gtk.gdk_beep() - return - orow = self.row func() while self.row != orow: id = self.clist.get_row_data(self.row) @@ -145,14 +129,14 @@ class FindBase: class FindPerson(FindBase): """Opens a Find Person dialog for GRAMPS""" - def __init__(self,clist,task,db): + def __init__(self,id,task,db): """Opens a dialog box instance that allows users to search for a person. clist - GtkCList containing the people information task - function to call to change the active person""" - FindBase.__init__(self,clist,task,_("Find Person"),db) + FindBase.__init__(self,id,task,_("Find Person"),db) for n in self.db.getPersonKeys(): val = self.db.getPersonDisplay(n) self.nlist.append(val[0]) diff --git a/gramps2/src/Makefile.in b/gramps2/src/Makefile.in index cd862754e..fece68251 100644 --- a/gramps2/src/Makefile.in +++ b/gramps2/src/Makefile.in @@ -182,6 +182,7 @@ pkgpython_PYTHON = \ QuestionDialog.py\ QuickAdd.py\ ReadXML.py\ + Relationship.py\ RelImage.py\ RelLib.py\ Report.py\ diff --git a/gramps2/src/Report.py b/gramps2/src/Report.py index 362fe2352..80019542a 100644 --- a/gramps2/src/Report.py +++ b/gramps2/src/Report.py @@ -225,6 +225,9 @@ class ReportDialog: # Allow for post processing of the format frame, since the # show_all task calls events that may reset values + + menu = self.format_menu.get_menu() + self.doc_type_changed(menu.get_active()) self.setup_post_process() diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade index 921d26471..d23996863 100644 --- a/gramps2/src/gramps.glade +++ b/gramps2/src/gramps.glade @@ -6161,7 +6161,7 @@ - + True GTK_WINDOW_TOPLEVEL @@ -6169,15 +6169,169 @@ False True False + gramps.png + False - - + + True - splash.jpg - 0.5 - 0.5 - 0 - 0 + False + 12 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-go-back + True + GTK_RELIEF_NORMAL + 0 + + + + + + + True + True + True + True + gtk-go-forward + True + GTK_RELIEF_NORMAL + 0 + + + + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + -7 + + + + + + 0 + False + True + GTK_PACK_END + + + + + + 12 + True + False + 0 + + + + True + True + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + _Text: + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + entry + + + 6 + False + False + + + + + + True + True + True + True + 0 + + True + * + True + + + 0 + True + True + + + + + 12 + False + False + + + + + 0 + True + True + + diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index deaefcf02..5762421d7 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -431,7 +431,7 @@ class Gramps: def on_find_activate(self,obj): """Display the find box""" if self.notebook.get_current_page() == 4: - Find.FindPlace(self.place_view.place_list,self.find_goto_place,self.db) + Find.FindPlace(self.active_person.getId(),self.find_goto_place,self.db) elif self.notebook.get_current_page() == 3: Find.FindSource(self.source_view.source_list,self.find_goto_source,self.db) elif self.notebook.get_current_page() == 5: @@ -443,10 +443,9 @@ class Gramps: """Display the find box""" pass - def find_goto_to(self,row): + def find_goto_to(self,id): """Find callback to jump to the selected person""" - id = self.person_list.get_row_data(row) - self.change_active_person(self.db.getPerson(id)) + self.change_active_person(id) self.goto_active_person() self.update_display(0) diff --git a/gramps2/src/po/de.mo b/gramps2/src/po/de.mo index bd0ca2c6b..bcc954905 100644 Binary files a/gramps2/src/po/de.mo and b/gramps2/src/po/de.mo differ