diff --git a/gramps2/src/Makefile.in b/gramps2/src/Makefile.in index 336589ecf..cd862754e 100644 --- a/gramps2/src/Makefile.in +++ b/gramps2/src/Makefile.in @@ -260,7 +260,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README $(dist_pkgdata_DATA) $(pkgpython_PYTHON) AUTHORS \ - ChangeLog Makefile.am Makefile.in NEWS const.py.in + ChangeLog Makefile.am Makefile.in NEWS TODO const.py.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive diff --git a/gramps2/src/RelLib.py b/gramps2/src/RelLib.py index 948e18814..40399ef75 100644 --- a/gramps2/src/RelLib.py +++ b/gramps2/src/RelLib.py @@ -895,9 +895,15 @@ class Name(DataObj): """returns a name string built from the components of the Name instance, in the form of Firstname Surname""" if (self.Suffix == ""): - return "%s %s" % (self.FirstName, self.Surname) + if self.Prefix: + return "%s %s %s" % (self.FirstName, self.Prefix, self.Surname) + else: + return "%s %s" % (self.FirstName, self.Surname) else: - return "%s %s, %s" % (self.FirstName, self.Surname, self.Suffix) + if self.Prefix: + return "%s %s %s, %s" % (self.FirstName, self.Prefix, self.Surname, self.Suffix) + else: + return "%s %s, %s" % (self.FirstName, self.Surname, self.Suffix) def are_equal(self,other): """compares to names to see if they are equal, return 0 if they diff --git a/gramps2/src/const.py b/gramps2/src/const.py index bd6e9ce8d..606ab718d 100644 --- a/gramps2/src/const.py +++ b/gramps2/src/const.py @@ -126,6 +126,7 @@ translators = u'Radek Malcic - Czech\n' \ u'Marcos Bedinelli - Brazilian-Portuguese (Portugu\xeas do Brasil)\n' \ u'Alex Roitman - Russian\n' \ u'Jens Arvidsson - Swedish (Svenska)' \ + u'Tino Meinen - Dutch' \ diff --git a/gramps2/src/const.py.in b/gramps2/src/const.py.in index f3adbaac5..16e0c4633 100644 --- a/gramps2/src/const.py.in +++ b/gramps2/src/const.py.in @@ -125,7 +125,8 @@ translators = u'Radek Malcic - Czech\n' \ u'Marco Molteni - Italian (Italiano)\n' \ u'Marcos Bedinelli - Brazilian-Portuguese (Portugu\xeas do Brasil)\n' \ u'Alex Roitman - Russian\n' \ - u'Jens Arvidsson - Swedish (Svenska)' \ + u'Jens Arvidsson - Swedish (Svenska)\n' \ + u'Tino Meinen - Dutch' \ diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade index c0d89ac0a..c2367754e 100644 --- a/gramps2/src/gramps.glade +++ b/gramps2/src/gramps.glade @@ -7,7 +7,6 @@ - True GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index e8dd57bcb..55b3f947b 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -159,7 +159,6 @@ class Gramps: """ self.gtop = gtk.glade.XML(const.gladeFile, "gramps") self.topWindow = self.gtop.get_widget("gramps") - self.topWindow.hide() self.report_button = self.gtop.get_widget("reports") self.tool_button = self.gtop.get_widget("tools") @@ -1295,16 +1294,12 @@ class Gramps: self.gtop.get_widget("filter").set_text("") self.statusbar.set_progress_percentage(1.0) - self.full_update() person = self.db.getDefaultPerson() if person: self.active_person = person -# elif self.person_list.rows > 0: -# id = self.person_list.get_row_data(0) -# self.active_person = self.db.getPerson(id) - self.goto_active_person() + self.full_update() self.statusbar.set_progress_percentage(0.0) return 1 @@ -1337,10 +1332,6 @@ class Gramps: self.status_text("") def complete_rebuild(self): - keys = self.alpha_page.keys() - - for key in keys: - self.alpha_page[key].new_model() self.id2col = {} self.model_used = {} @@ -1355,18 +1346,14 @@ class Gramps: if pg != '@': if not self.alpha_page.has_key(pg): self.create_new_panel(pg) - model = self.alpha_page[pg] - else: - model = self.default_list self.apply_filter() - for key in keys: - self.alpha_page[key].connect_model() self.goto_active_person() self.modify_statusbar() def apply_filter(self,current_model=None): + self.status_text(_('Updating display...')) datacomp = self.DataFilter.compare