diff --git a/ChangeLog b/ChangeLog index a8a3fd7a2..bca9785c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-04-02 Don Allingham + * src/GrampsWidgets.py: Fix place autocompletion + * src/glade/gramps.glade: start of LDS Ord editor + 2006-04-01 Don Allingham * src/ViewManager.py: dbstate.active fixes * src/GrampsDb/_GrampsDbBase.py: dbstate.active fixes diff --git a/src/GrampsWidgets.py b/src/GrampsWidgets.py index f0bb07fc2..7dd516f86 100644 --- a/src/GrampsWidgets.py +++ b/src/GrampsWidgets.py @@ -393,10 +393,11 @@ class PlaceEntry: self.obj.set_editable(True) store = gtk.ListStore(str) - foo = self.places.values() - foo.sort(locale.strcoll) + foo = [ (locale.strxfrm(self.places[v]),v) \ + for v in self.places.keys()] + foo.sort() for val in foo: - store.append(row=[val[0]]) + store.append(row=[self.places[val[1]]]) completion = gtk.EntryCompletion() completion.set_text_column(0) completion.set_model(store) diff --git a/src/glade/gramps.glade b/src/glade/gramps.glade index 50bf69c51..5cd7f5392 100644 --- a/src/glade/gramps.glade +++ b/src/glade/gramps.glade @@ -9534,7 +9534,7 @@ Text Beside Icons - + True GTK_WINDOW_TOPLEVEL @@ -15283,4 +15283,390 @@ You should select parents before adding any new information. If you select paren + + True + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + 600 + 450 + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + False + + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + + True + Accept changes and close window + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + -5 + + + + + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + True + -11 + + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + False + 0 + + + + True + + False + True + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 10 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + 12 + True + 4 + 3 + False + 6 + 12 + + + + True + _Date: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + Place: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + + True + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 2 + 3 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 3 + 4 + + + + + + + True + True + GTK_RELIEF_NONE + True + False + False + + + + True + 1 + gtk-dialog-authentication + 0.5 + 0.5 + 0 + 0 + + + + + 2 + 3 + 3 + 4 + + + + + + + + True + True + GTK_RELIEF_NONE + True + + + + True + 0.5 + 0.5 + 0 + 0 + + + + + 2 + 3 + 2 + 3 + + fill + + + + + + True + Ordinance: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + LDS Temple: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + False + True + + + 1 + 2 + 0 + 1 + fill + fill + + + + + + True + False + True + + + 1 + 2 + 1 + 2 + fill + fill + + + + + 0 + False + True + + + + + 0 + True + True + + + + + +