Tabbed pages in the person list

svn: r1174
This commit is contained in:
Don Allingham 2002-11-10 00:38:58 +00:00
parent 47f08c4eb2
commit 1b684d51fa
8 changed files with 786 additions and 87 deletions

2
gramps2/configure vendored
View File

@ -1567,7 +1567,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
RELEASE=pre3 RELEASE=pre4
VERSIONSTRING=$VERSION VERSIONSTRING=$VERSION
if test x"$RELEASE" != "x" if test x"$RELEASE" != "x"

View File

@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl May need to run automake && aclocal first dnl May need to run automake && aclocal first
AC_INIT(src/gramps.py) AC_INIT(src/gramps.py)
AM_INIT_AUTOMAKE(gramps, 0.9.0) AM_INIT_AUTOMAKE(gramps, 0.9.0)
RELEASE=pre3 RELEASE=pre4
VERSIONSTRING=$VERSION VERSIONSTRING=$VERSION
if test x"$RELEASE" != "x" if test x"$RELEASE" != "x"

View File

@ -1,5 +1,5 @@
%define ver 0.9.0 %define ver 0.9.0
%define rel pre3 %define rel pre4
%define prefix /usr %define prefix /usr
Summary: Genealogical Research and Analysis Management Programming System. Summary: Genealogical Research and Analysis Management Programming System.
@ -13,10 +13,12 @@ BuildRoot: /var/tmp/%{name}-%{version}-root
URL: http://gramps.sourceforge.net URL: http://gramps.sourceforge.net
Requires: python >= 1.5.2 Requires: python >= 2.2
Requires: pygnome >= 1.0.53 Requires: gnome-python2 >= 1.99
Requires: _gladegnomemodule.so Requires: gnome-python2-gconf >= 1.99
Requires: pyexpat.so Requires: gnome-python2-canvas >= 1.99
Requires: pygtk2 >= 1.99
Requires: pygtk2-libglade >= 1.99
BuildRequires: scrollkeeper >= 0.1.4 BuildRequires: scrollkeeper >= 0.1.4
BuildRequires: automake >= 1.6 BuildRequires: automake >= 1.6

View File

@ -22,7 +22,7 @@ from gobject import TYPE_STRING
import gtk import gtk
class ListModel: class ListModel:
def __init__(self,tree,dlist): def __init__(self,tree,dlist,select_func=None,event_func=None):
self.tree = tree self.tree = tree
l = len(dlist) l = len(dlist)
self.model = gtk.ListStore(*[TYPE_STRING]*l) self.model = gtk.ListStore(*[TYPE_STRING]*l)
@ -31,13 +31,10 @@ class ListModel:
self.tree.set_model(self.model) self.tree.set_model(self.model)
cnum = 0 cnum = 0
for name in dlist: for name in dlist:
renderer = gtk.CellRendererText() renderer = gtk.CellRendererText()
column = gtk.TreeViewColumn(name[0],renderer,text=cnum) column = gtk.TreeViewColumn(name[0],renderer,text=cnum)
column.set_min_width(name[1]) column.set_min_width(name[2])
if name[2]:
column.set_sort_column_id(name[2])
if name[0] == '': if name[0] == '':
column.set_clickable(gtk.TRUE) column.set_clickable(gtk.TRUE)
column.set_visible(gtk.FALSE) column.set_visible(gtk.FALSE)
@ -48,6 +45,16 @@ class ListModel:
if cnum == 1: if cnum == 1:
column.clicked() column.clicked()
cnum = 0
for name in dlist:
column = tree.get_column(cnum)
column.set_sort_column_id(name[1])
if select_func:
self.selection.connect('changed',select_func)
if event_func:
self.tree.connect('event',event_func)
def clear(self): def clear(self):
self.model.clear() self.model.clear()

View File

@ -96,12 +96,13 @@ startup = 1
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
progName = "GRAMPS" progName = "GRAMPS"
version = "0.9.0-pre3" version = "0.9.0-pre4"
copyright = "© 2001-2002 Donald N. Allingham" copyright = "© 2001-2002 Donald N. Allingham"
authors = ["Donald N. Allingham", "David Hampton","Donald A. Peterson"] authors = ["Donald N. Allingham", "David Hampton","Donald A. Peterson"]
comments = _("GRAMPS (Genealogical Research and Analysis " comments = _("GRAMPS (Genealogical Research and Analysis "
"Management Programming System) is a personal " "Management Programming System) is a personal "
"genealogy program.") "genealogy program.")
documenters = [ 'Don Allingham', 'Lawrence Allingham' ]
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -102,6 +102,7 @@ authors = ["Donald N. Allingham", "David Hampton","Donald A. Peterson"]
comments = _("GRAMPS (Genealogical Research and Analysis " comments = _("GRAMPS (Genealogical Research and Analysis "
"Management Programming System) is a personal " "Management Programming System) is a personal "
"genealogy program.") "genealogy program.")
documenters = { 'Don Allingham', 'Lawrence Allingham' ]
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -1110,25 +1110,648 @@
</child> </child>
<child> <child>
<widget class="GtkScrolledWindow" id="scrolledwindow29"> <widget class="GtkNotebook" id="ptabs">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="show_tabs">True</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="show_border">True</property>
<property name="shadow_type">GTK_SHADOW_NONE</property> <property name="tab_pos">GTK_POS_BOTTOM</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property> <property name="scrollable">False</property>
<property name="tab_hborder">2</property>
<property name="tab_vborder">2</property>
<property name="enable_popup">False</property>
<signal name="switch_page" handler="on_alpha_switch_page" last_modification_time="Sat, 09 Nov 2002 22:11:07 GMT"/>
<child> <child>
<widget class="GtkTreeView" id="person_list"> <widget class="GtkScrolledWindow" id="scrolledwindow29">
<property name="border_width">1</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="headers_visible">True</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="rules_hint">True</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="reorderable">False</property> <property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="enable_search">True</property> <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<signal name="event" handler="on_person_list_button_press" last_modification_time="Thu, 12 Sep 2002 01:52:15 GMT"/>
<child>
<widget class="GtkTreeView" id="pl_ab">
<property name="border_width">1</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<signal name="event" handler="on_person_list_button_press" last_modification_time="Thu, 12 Sep 2002 01:52:15 GMT"/>
</widget>
</child>
</widget> </widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label359">
<property name="visible">True</property>
<property name="label" translatable="yes">AB</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow47">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="pl_cd">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
</widget>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label360">
<property name="visible">True</property>
<property name="label" translatable="yes">CD</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow48">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="pl_ef">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
</widget>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label361">
<property name="visible">True</property>
<property name="label" translatable="yes">EF</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow49">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="pl_gh">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
</widget>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label362">
<property name="visible">True</property>
<property name="label" translatable="yes">GH</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow50">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="pl_ij">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
</widget>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label363">
<property name="visible">True</property>
<property name="label" translatable="yes">Ij</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow51">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="pl_kl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
</widget>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="pl_kllabel">
<property name="visible">True</property>
<property name="label" translatable="yes">KL</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow52">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="pl_mn">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
</widget>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="pl_mnlabel">
<property name="visible">True</property>
<property name="label" translatable="yes">MN</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow53">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="pl_op">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
</widget>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="pl_oplabel">
<property name="visible">True</property>
<property name="label" translatable="yes">OP</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow54">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="pl_qr">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
</widget>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="pl_qrlabel">
<property name="visible">True</property>
<property name="label" translatable="yes">QR</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow55">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="pl_st">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
</widget>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="pl_stlabel">
<property name="visible">True</property>
<property name="label" translatable="yes">ST</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow56">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="pl_uv">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
</widget>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="pl_uvlabel">
<property name="visible">True</property>
<property name="label" translatable="yes">UV</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow57">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="pl_wx">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
</widget>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="pl_wxlabel">
<property name="visible">True</property>
<property name="label" translatable="yes">WX</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow58">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="pl_yz">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
</widget>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="plyzlabel">
<property name="visible">True</property>
<property name="label" translatable="yes">YZ</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow59">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="pl_other">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
</widget>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="pllabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Other</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">tab</property>
</packing>
</child> </child>
</widget> </widget>
<packing> <packing>

View File

@ -72,6 +72,7 @@ import Find
import VersionControl import VersionControl
import ReadXML import ReadXML
import AddSpouse import AddSpouse
import ListModel
from GrampsXML import GrampsXML from GrampsXML import GrampsXML
try: try:
@ -80,6 +81,10 @@ try:
except: except:
zodb_ok = 0 zodb_ok = 0
pl_titles = [ (_('Name'),5,250), (_('ID'),1,50),
(_('Gender'),2,70), (_('Birth Date'),6,150),
(_('Death Date'),7,150), ('',5,0), ('',6,0), ('',7,0) ]
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# Main GRAMPS class # Main GRAMPS class
@ -161,7 +166,72 @@ class Gramps:
self.filter_btn = self.gtop.get_widget("filter1") self.filter_btn = self.gtop.get_widget("filter1")
self.statusbar = self.gtop.get_widget("statusbar") self.statusbar = self.gtop.get_widget("statusbar")
self.topWindow = self.gtop.get_widget("gramps") self.topWindow = self.gtop.get_widget("gramps")
self.person_list = self.gtop.get_widget("person_list")
self.ptabs = self.gtop.get_widget("ptabs")
self.pl_ab = self.gtop.get_widget("pl_ab")
self.pl_cd = self.gtop.get_widget("pl_cd")
self.pl_ef = self.gtop.get_widget("pl_ef")
self.pl_gh = self.gtop.get_widget("pl_gh")
self.pl_ij = self.gtop.get_widget("pl_ij")
self.pl_kl = self.gtop.get_widget("pl_kl")
self.pl_mn = self.gtop.get_widget("pl_mn")
self.pl_op = self.gtop.get_widget("pl_op")
self.pl_qr = self.gtop.get_widget("pl_qr")
self.pl_st = self.gtop.get_widget("pl_st")
self.pl_uv = self.gtop.get_widget("pl_uv")
self.pl_wx = self.gtop.get_widget("pl_wx")
self.pl_yz = self.gtop.get_widget("pl_yz")
self.pl_other = self.gtop.get_widget("pl_other")
self.pl_page = [
ListModel.ListModel(self.pl_ab, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_cd, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_ef, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_gh, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_ij, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_kl, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_mn, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_op, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_qr, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_st, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_uv, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_wx, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_yz, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_other, pl_titles, self.row_changed, self.alpha_event),
]
self.person_list = self.pl_page[0].tree
self.person_selection = self.pl_page[0].selection
self.person_model = self.pl_page[0].model
self.default_list = self.pl_page[-1]
self.alpha_page = {
'a' : self.pl_page[0], 'b' : self.pl_page[0],
'c' : self.pl_page[1], 'd' : self.pl_page[1],
'e' : self.pl_page[2], 'f' : self.pl_page[2],
'g' : self.pl_page[3], 'h' : self.pl_page[3],
'i' : self.pl_page[4], 'j' : self.pl_page[4],
'k' : self.pl_page[5], 'l' : self.pl_page[5],
'm' : self.pl_page[6], 'n' : self.pl_page[6],
'o' : self.pl_page[7], 'p' : self.pl_page[7],
'q' : self.pl_page[8], 'r' : self.pl_page[8],
's' : self.pl_page[9], 't' : self.pl_page[9],
'u' : self.pl_page[10], 'v' : self.pl_page[10],
'w' : self.pl_page[11], 'x' : self.pl_page[11],
'y' : self.pl_page[12], 'z' : self.pl_page[12],
}
self.model2page = {
self.pl_page[0] : 0, self.pl_page[1] : 1,
self.pl_page[2] : 2, self.pl_page[3] : 3,
self.pl_page[4] : 4, self.pl_page[5] : 5,
self.pl_page[6] : 6, self.pl_page[7] : 7,
self.pl_page[8] : 8, self.pl_page[9] : 9,
self.pl_page[10] : 10, self.pl_page[11] : 11,
self.pl_page[12] : 12, self.pl_page[13] : 13,
}
self.filter_list = self.gtop.get_widget("filter_list") self.filter_list = self.gtop.get_widget("filter_list")
self.notebook = self.gtop.get_widget("notebook1") self.notebook = self.gtop.get_widget("notebook1")
self.merge_button= self.gtop.get_widget("merge") self.merge_button= self.gtop.get_widget("merge")
@ -186,47 +256,12 @@ class Gramps:
self.use_filter = GrampsCfg.get_filter() self.use_filter = GrampsCfg.get_filter()
self.filter_btn.set_active(self.use_filter) self.filter_btn.set_active(self.use_filter)
self.person_model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING,
gobject.TYPE_STRING, gobject.TYPE_STRING,
gobject.TYPE_STRING, gobject.TYPE_STRING,
gobject.TYPE_STRING, gobject.TYPE_STRING
)
self.child_model = gtk.ListStore(gobject.TYPE_INT, gobject.TYPE_STRING, self.child_model = gtk.ListStore(gobject.TYPE_INT, gobject.TYPE_STRING,
gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING,
gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING,
gobject.TYPE_STRING, gobject.TYPE_STRING,
) )
self.person_list.set_model(self.person_model)
self.person_selection = self.person_list.get_selection()
self.person_selection.connect('changed',self.list_row_changed)
colno = 0
for title in [ (_('Name'),5,250),
(_('ID'),1,50),
(_('Gender'),2,70),
(_('Birth Date'),6,150),
(_('Death Date'),7,150),
('',5,0),
('',6,0),
('',7,0) ]:
renderer = gtk.CellRendererText ()
column = gtk.TreeViewColumn (title[0], renderer, text=colno)
colno = colno + 1
column.set_clickable (gtk.TRUE)
if title[0] == '':
column.set_clickable(gtk.TRUE)
column.set_visible(gtk.FALSE)
else:
column.set_resizable(gtk.TRUE)
column.set_sort_column_id(title[1])
column.set_min_width(title[2])
self.person_list.append_column (column)
self.person_list.set_search_column(0)
self.person_list.get_column(0).clicked()
self.build_plugin_menus() self.build_plugin_menus()
self.init_filters() self.init_filters()
@ -252,6 +287,7 @@ class Gramps:
"on_editbtn_clicked" : self.edit_button_clicked, "on_editbtn_clicked" : self.edit_button_clicked,
"on_addbtn_clicked" : self.add_button_clicked, "on_addbtn_clicked" : self.add_button_clicked,
"on_removebtn_clicked" : self.remove_button_clicked, "on_removebtn_clicked" : self.remove_button_clicked,
"on_alpha_switch_page" : self.change_alpha_page,
"delete_event" : self.delete_event, "delete_event" : self.delete_event,
"destroy_passed_object" : Utils.destroy_passed_object, "destroy_passed_object" : Utils.destroy_passed_object,
"on_family_up_clicked" : self.family_up_clicked, "on_family_up_clicked" : self.family_up_clicked,
@ -288,7 +324,7 @@ class Gramps:
"on_open_activate" : self.on_open_activate, "on_open_activate" : self.on_open_activate,
"on_pedigree1_activate" : self.on_pedigree1_activate, "on_pedigree1_activate" : self.on_pedigree1_activate,
"on_person_list1_activate" : self.on_person_list1_activate, "on_person_list1_activate" : self.on_person_list1_activate,
"on_person_list_button_press" : self.on_person_list_button_press, "on_person_list_button_press" : self.alpha_event,
"on_main_key_release_event" : self.on_main_key_release_event, "on_main_key_release_event" : self.on_main_key_release_event,
"on_add_media_clicked" : self.media_view.create_add_dialog, "on_add_media_clicked" : self.media_view.create_add_dialog,
"on_media_activate" : self.on_media_activate, "on_media_activate" : self.on_media_activate,
@ -320,6 +356,11 @@ class Gramps:
self.enable_sidebar(self.use_sidebar) self.enable_sidebar(self.use_sidebar)
self.enable_filter(self.use_filter) self.enable_filter(self.use_filter)
def change_alpha_page(self,obj,junk,page):
self.person_list = self.pl_page[page].tree
self.person_selection = self.pl_page[page].selection
self.person_model = self.pl_page[page].model
def edit_button_clicked(self,obj): def edit_button_clicked(self,obj):
cpage = self.notebook.get_current_page() cpage = self.notebook.get_current_page()
if cpage == 0: if cpage == 0:
@ -352,7 +393,7 @@ class Gramps:
self.removebtn.set_sensitive(val) self.removebtn.set_sensitive(val)
self.editbtn.set_sensitive(val) self.editbtn.set_sensitive(val)
def list_row_changed(self,obj): def row_changed(self,obj):
store,iter = obj.get_selected() store,iter = obj.get_selected()
if iter: if iter:
id = store.get_value(iter,1) id = store.get_value(iter,1)
@ -605,7 +646,8 @@ class Gramps:
Utils.clearModified() Utils.clearModified()
Utils.clear_timer() Utils.clear_timer()
self.change_active_person(None) self.change_active_person(None)
self.person_model.clear() for model in self.pl_page:
model.clear()
self.family_view.load_family() self.family_view.load_family()
self.source_view.load_sources() self.source_view.load_sources()
self.place_view.load_places() self.place_view.load_places()
@ -619,7 +661,8 @@ class Gramps:
def full_update(self): def full_update(self):
"""Brute force display update, updating all the pages""" """Brute force display update, updating all the pages"""
self.id2col = {} self.id2col = {}
self.person_model.clear() for model in self.pl_page:
model.clear()
self.apply_filter() self.apply_filter()
self.family_view.load_family() self.family_view.load_family()
self.source_view.load_sources() self.source_view.load_sources()
@ -878,7 +921,8 @@ class Gramps:
del_id = pid del_id = pid
if self.id2col.has_key(del_id): if self.id2col.has_key(del_id):
self.person_model.remove(self.id2col[del_id]) (model,iter,page) = self.id2col[del_id]
model.model.remove(iter)
del self.id2col[del_id] del self.id2col[del_id]
if person == self.active_person: if person == self.active_person:
@ -890,7 +934,7 @@ class Gramps:
self.redisplay_person_list(p1) self.redisplay_person_list(p1)
self.update_display(0) self.update_display(0)
def on_person_list_button_press(self,obj,event): def alpha_event(self,obj,event):
if event.type == gtk.gdk._2BUTTON_PRESS and event.button == 1: if event.type == gtk.gdk._2BUTTON_PRESS and event.button == 1:
self.load_person(self.active_person) self.load_person(self.active_person)
@ -899,11 +943,12 @@ class Gramps:
return return
id = self.active_person.getId() id = self.active_person.getId()
if self.id2col.has_key(id): if self.id2col.has_key(id):
iter = self.id2col[id] (model,iter,page) = self.id2col[id]
self.person_selection.select_iter(iter); self.ptabs.set_current_page(page)
itpath = self.person_model.get_path(iter) model.selection.select_iter(iter);
col = self.person_list.get_column(0) itpath = model.model.get_path(iter)
self.person_list.scroll_to_cell(itpath,col,1,0.5,0.0) col = model.tree.get_column(0)
model.tree.scroll_to_cell(itpath,col,1,0.5,0.0)
def change_active_person(self,person): def change_active_person(self,person):
self.active_person = person self.active_person = person
@ -1195,15 +1240,25 @@ class Gramps:
self.update_display(0) self.update_display(0)
def redisplay_person_list(self,person): def redisplay_person_list(self,person):
key = person.getId()
val = self.db.getPersonDisplay(person.getId())
pg = val[0]
pg = pg[0].lower()
if self.DataFilter.compare(person): if self.DataFilter.compare(person):
iter = self.person_model.append() if pg and self.alpha_page.has_key(pg):
self.id2col[person.getId()] = iter model = self.alpha_page[pg]
val = person.getDisplayInfo() else:
self.person_model.set(iter, 0, val[0], 1, val[1], 2, val[2], model = self.default_list
3, val[3], 4, val[4], 5, val[5], iter = model.model.append()
6, val[6], 7, val[7]) page = self.model2page[model]
self.person_model.sort_column_changed() self.id2col[key] = (model,iter,page)
model.model.set(iter, 0, val[0], 1, val[1], 2, val[2],
3, val[3], 4, val[4], 5, val[5],
6, val[6], 7, val[7])
self.change_active_person(person)
self.goto_active_person()
def load_person(self,person): def load_person(self,person):
if person: if person:
try: try:
@ -1351,19 +1406,29 @@ class Gramps:
for key in self.db.getPersonKeys(): for key in self.db.getPersonKeys():
person = self.db.getPerson(key) person = self.db.getPerson(key)
val = self.db.getPersonDisplay(key)
pg = val[0]
if pg:
pg = pg[0].lower()
if datacomp(person): if datacomp(person):
if self.id2col.has_key(key): if self.id2col.has_key(key):
continue continue
if pg and self.alpha_page.has_key(pg):
model = self.alpha_page[pg]
else:
model = self.default_list
val = self.db.getPersonDisplay(key) iter = model.model.append()
iter = self.person_model.append() page = self.model2page[model]
self.id2col[key] = iter self.id2col[key] = (model,iter,page)
self.person_model.set(iter, 0, val[0], 1, val[1], 2, val[2],
3, val[3], 4, val[4], 5, val[5], model.model.set(iter, 0, val[0], 1, val[1], 2, val[2],
6, val[6], 7, val[7]) 3, val[3], 4, val[4], 5, val[5],
6, val[6], 7, val[7])
else: else:
if self.id2col.has_key(key): if self.id2col.has_key(key):
self.person_model.remove(self.id2col[key]) (model,iter) = self.id2col[key]
model.remove(iter)
def on_home_clicked(self,obj): def on_home_clicked(self,obj):
temp = self.db.getDefaultPerson() temp = self.db.getDefaultPerson()