From 1f2d3dee8a37ec9c3834c5301e6cdb2525b0a161 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sat, 18 Aug 2001 04:27:31 +0000 Subject: [PATCH] Display place information svn: r340 --- src/gramps.glade | 71 +++++++++++++++++++++++++++++++++++++++++----- src/gramps_main.py | 54 +++++++++++++++++++++++++++++++++-- 2 files changed, 115 insertions(+), 10 deletions(-) diff --git a/src/gramps.glade b/src/gramps.glade index e1b90535a..df9724f11 100644 --- a/src/gramps.glade +++ b/src/gramps.glade @@ -510,6 +510,11 @@ GtkButton Toolbar:button button111 + + clicked + on_places_activate + Fri, 17 Aug 2001 22:56:32 GMT + @@ -2833,16 +2838,16 @@ True select_row - on_source_list_select_row - Tue, 29 May 2001 21:23:02 GMT + on_place_list_select_row + Fri, 17 Aug 2001 23:00:12 GMT button_press_event - on_source_list_button_press_event - Thu, 31 May 2001 17:22:45 GMT + on_place_list_button_press_event + Fri, 17 Aug 2001 23:00:19 GMT - 2 - 427,80 + 6 + 236,47,102,88,77,80 GTK_SELECTION_SINGLE True GTK_SHADOW_IN @@ -2863,7 +2868,59 @@ GtkLabel CList:title - label233 + label233a + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + label233b + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + label233c + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + label233d + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + label233e GTK_JUSTIFY_CENTER False diff --git a/src/gramps_main.py b/src/gramps_main.py index a81608828..3e0080cc6 100755 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -101,6 +101,7 @@ statusbar = None gtop = None person_list = None source_list = None +place_list = None database = None family_window = None queryTop = None @@ -805,8 +806,10 @@ def update_display(changed): load_family() elif page == 3: load_sources() - else: + elif page == 4: load_tree() + else: + load_places() #------------------------------------------------------------------------- # @@ -1697,6 +1700,10 @@ def on_sources_activate(obj): notebk = gtop.get_widget(NOTEBOOK) notebk.set_page(3) +def on_places_activate(obj): + notebk = gtop.get_widget(NOTEBOOK) + notebk.set_page(4) + #------------------------------------------------------------------------- # # Load the appropriate page after a notebook switch @@ -1713,7 +1720,46 @@ def on_notebook1_switch_page(obj,junk,page): load_tree() elif page == 3: load_sources() - + elif page == 4: + load_places() + +#------------------------------------------------------------------------- +# +# +# +#------------------------------------------------------------------------- +def load_places(): + place_list.freeze() + place_list.clear() + + color_clist = ListColors.ColorList(place_list,1) + + current_row = place_list.get_data("i") + if current_row == None: + current_row = -1 + + index = 0 + for src in database.getPlaceMap().values(): + title = src.get_title() + id = src.getId() + mloc = src.get_main_location() + city = mloc.get_city() + county = mloc.get_county() + state = mloc.get_state() + country = mloc.get_country() + place_list.append([title,id,city,county,state,country]) + place_list.set_row_data(index,src) + index = index + 1 + + if index > 0: + if current_row == -1: + current_row = 0 + place_list.select_row(current_row,0) + place_list.moveto(current_row) + + place_list.set_data("i",current_row) + place_list.thaw() + #------------------------------------------------------------------------- # # @@ -2632,7 +2678,7 @@ def menu_tools(obj,task): def main(arg): global database, gtop global statusbar - global person_list, source_list, pv + global person_list, source_list, place_list,pv global topWindow import ReadXML @@ -2658,6 +2704,7 @@ def main(arg): topWindow = gtop.get_widget("gramps") person_list = gtop.get_widget("person_list") source_list = gtop.get_widget("source_list") + place_list = gtop.get_widget("place_list") filter_list = gtop.get_widget("filter_list") person_list.set_column_visibility(5,0) @@ -2692,6 +2739,7 @@ def main(arg): "on_person_list1_activate": on_person_list1_activate, "on_family1_activate" : on_family1_activate, "on_sources_activate" : on_sources_activate, + "on_places_activate" : on_places_activate, "on_pedegree1_activate" : on_pedegree1_activate, "on_notebook1_switch_page": on_notebook1_switch_page, "on_ok_button1_clicked": on_ok_button1_clicked,