From a610d32de270f223da993b6a4a02f548be9eb0f7 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sun, 4 Nov 2001 20:41:49 +0000 Subject: [PATCH] Fixed source selection svn: r549 --- src/EditPerson.glade | 25 +++++++++++++++++++++++++ src/EditPerson.py | 29 ++++++++++++++++++++++++++++- src/NameEdit.py | 2 +- src/Sources.py | 4 ++-- src/gramps.glade | 2 +- 5 files changed, 57 insertions(+), 5 deletions(-) diff --git a/src/EditPerson.glade b/src/EditPerson.glade index 1e5aa78e2..192e2dd7b 100644 --- a/src/EditPerson.glade +++ b/src/EditPerson.glade @@ -1638,6 +1638,11 @@ on_name_list_select_row Mon, 18 Dec 2000 22:29:26 GMT + + button_press_event + on_name_button_press + Sun, 04 Nov 2001 15:40:59 GMT + 2 450,50 GTK_SELECTION_SINGLE @@ -2201,6 +2206,11 @@ on_event_select_row Fri, 01 Dec 2000 02:58:20 GMT + + button_press_event + on_event_button_press + Sun, 04 Nov 2001 15:29:48 GMT + 4 125,150,200,50 GTK_SELECTION_SINGLE @@ -2559,6 +2569,11 @@ on_attr_list_select_row Tue, 01 May 2001 17:24:40 GMT + + button_press_event + on_attr_button_press + Sun, 04 Nov 2001 15:42:49 GMT + 3 200,250,50 GTK_SELECTION_SINGLE @@ -3294,6 +3309,11 @@ on_address_list_select_row Wed, 23 May 2001 18:42:16 GMT + + button_press_event + on_addr_button_press + Sun, 04 Nov 2001 15:53:05 GMT + 3 150,350,50 GTK_SELECTION_SINGLE @@ -3814,6 +3834,11 @@ on_web_list_select_row Tue, 24 Apr 2001 14:12:50 GMT + + button_press_event + on_web_button_press + Sun, 04 Nov 2001 15:44:20 GMT + 2 273,80 GTK_SELECTION_SINGLE diff --git a/src/EditPerson.py b/src/EditPerson.py index 21d450e5e..d965749e7 100644 --- a/src/EditPerson.py +++ b/src/EditPerson.py @@ -33,6 +33,7 @@ import string from gnome.ui import GnomeErrorDialog, GnomeWarningDialog, GnomeQuestionDialog import libglade import GdkImlib +import GDK #------------------------------------------------------------------------- # @@ -83,11 +84,14 @@ class EditPerson: "on_add_aka_clicked" : self.on_add_aka_clicked, "on_add_attr_clicked" : self.on_add_attr_clicked, "on_add_url_clicked" : self.on_add_url_clicked, + "on_addr_button_press" : self.addr_double_click, + "on_web_button_press" : self.url_double_click, "on_addphoto_clicked" : self.gallery.on_add_photo_clicked, "on_address_list_select_row": self.on_addr_list_select_row, "on_aka_delete_clicked" : self.on_aka_delete_clicked, "on_aka_update_clicked" : self.on_aka_update_clicked, "on_apply_person_clicked" : self.on_apply_person_clicked, + "on_attr_button_press" : self.attr_double_click, "on_attr_list_select_row" : self.on_attr_list_select_row, "on_combo_insert_text" : utils.combo_insert_text, "on_edit_birth_clicked" : self.on_edit_birth_clicked, @@ -100,9 +104,11 @@ class EditPerson: "on_edit_properties_clicked": self.gallery.popup_change_description, "on_editperson_switch_page" : self.on_switch_page, "on_event_add_clicked" : self.on_event_add_clicked, + "on_event_button_press" : self.event_double_click, "on_event_delete_clicked" : self.on_event_delete_clicked, "on_event_select_row" : self.on_event_select_row, "on_event_update_clicked" : self.on_event_update_clicked, + "on_name_button_press" : self.aka_double_click, "on_name_list_select_row" : self.on_name_list_select_row, "on_name_note_clicked" : self.on_name_note_clicked, "on_name_source_clicked" : self.on_primary_name_source_clicked, @@ -240,6 +246,7 @@ class EditPerson: self.notes_field.insert_defaults(person.getNote()) self.notes_field.set_word_wrap(1) + # draw lists self.redraw_event_list() self.redraw_attr_list() @@ -502,6 +509,10 @@ class EditPerson: self.bplace.set_position(0) self.dplace.set_position(0) + def attr_double_click(self,obj,event): + if event.button == 1 and event.type == GDK._2BUTTON_PRESS: + self.on_update_attr_clicked(obj) + def on_update_attr_clicked(self,obj): import AttrEdit if len(obj.selection) <= 0: @@ -510,11 +521,19 @@ class EditPerson: pname = self.person.getPrimaryName().getName() AttrEdit.AttributeEditor(self,attr,pname,const.personalAttributes) + def addr_double_click(self,obj,event): + if event.button == 1 and event.type == GDK._2BUTTON_PRESS: + self.on_update_addr_clicked(obj) + def on_update_addr_clicked(self,obj): import AddrEdit if len(obj.selection) > 0: AddrEdit.AddressEditor(self,obj.get_row_data(obj.selection[0])) + def url_double_click(self,obj,event): + if event.button == 1 and event.type == GDK._2BUTTON_PRESS: + self.on_update_url_clicked(obj) + def on_update_url_clicked(self,obj): import UrlEdit if len(obj.selection) <= 0: @@ -523,6 +542,10 @@ class EditPerson: url = obj.get_row_data(obj.selection[0]) UrlEdit.UrlEditor(self,pname,url) + def event_double_click(self,obj,event): + if event.button == 1 and event.type == GDK._2BUTTON_PRESS: + self.on_event_update_clicked(obj) + def on_event_update_clicked(self,obj): import EventEdit if len(obj.selection) <= 0: @@ -583,9 +606,13 @@ class EditPerson: self.attr_value.set_text(attr.getValue()) self.attr_details_field.set_text(utils.get_detail_text(attr)) + def aka_double_click(self,obj,event): + if event.button == 1 and event.type == GDK._2BUTTON_PRESS: + self.on_aka_update_clicked(obj) + def on_aka_update_clicked(self,obj): import NameEdit - if len(obj.selection) >= 0: + if len(obj.selection) > 0: NameEdit.NameEditor(self,obj.get_row_data(obj.selection[0])) def load_photo(self,photo): diff --git a/src/NameEdit.py b/src/NameEdit.py index 168a21699..ecf50ab68 100644 --- a/src/NameEdit.py +++ b/src/NameEdit.py @@ -35,7 +35,7 @@ import utils from RelLib import * from intl import gettext -_ = intl.gettext +_ = gettext #------------------------------------------------------------------------- # diff --git a/src/Sources.py b/src/Sources.py index 13e82b6d1..c4145856a 100644 --- a/src/Sources.py +++ b/src/Sources.py @@ -191,11 +191,11 @@ class SourceEditor: c.set_data("s",src) c.show() list.append(c) - if self.active_source == None: - self.active_source = src + if self.active_source == src: sel_child = c self.title_menu.list.append_items(list) + if sel_child != None: self.title_menu.list.select_child(sel_child) diff --git a/src/gramps.glade b/src/gramps.glade index fef712146..c4f6fe29a 100644 --- a/src/gramps.glade +++ b/src/gramps.glade @@ -2824,7 +2824,7 @@ GtkLabel CList:title label284p - + GTK_JUSTIFY_CENTER False 0.5