David Hampton's merges for dialogs, fix merge traceback

svn: r426
This commit is contained in:
Don Allingham 2001-09-24 00:28:40 +00:00
parent 8b2b833eeb
commit 5486e29baf
22 changed files with 1112 additions and 1032 deletions

View File

@ -1,3 +1,4 @@
Makefile
*.pyc
*.pyo
gramps.strings

View File

@ -13,7 +13,7 @@
</project>
<widget>
<class>GtkWindow</class>
<class>GnomeDialog</class>
<name>editPerson</name>
<has_focus>True</has_focus>
<signal>
@ -23,17 +23,72 @@
</signal>
<title>Gramps - Edit Person</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_CENTER</position>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
<name>vbox4</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>hbuttonbox1</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>2</padding>
<expand>False</expand>
<fill>True</fill>
<pack>GTK_PACK_END</pack>
</child>
<widget>
<class>GtkButton</class>
<name>applyPerson</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_apply_person_clicked</handler>
<object>editPerson</object>
<last_modification_time>Thu, 19 Oct 2000 19:26:54 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button15</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>editPerson</object>
<last_modification_time>Thu, 19 Oct 2000 19:25:50 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
<widget>
<class>GtkLabel</class>
@ -3708,52 +3763,6 @@
<ypad>0</ypad>
</widget>
</widget>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox1</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>2</padding>
<expand>False</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkButton</class>
<name>applyPerson</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_apply_person_clicked</handler>
<object>editPerson</object>
<last_modification_time>Thu, 19 Oct 2000 19:26:54 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button15</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>editPerson</object>
<last_modification_time>Thu, 19 Oct 2000 19:25:50 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
</widget>
</widget>
</widget>
@ -3792,7 +3801,7 @@
</widget>
<widget>
<class>GtkDialog</class>
<class>GnomeDialog</class>
<name>name_edit</name>
<title>Gramps - Alternate Name Editor</title>
<type>GTK_WINDOW_TOPLEVEL</type>
@ -3801,21 +3810,31 @@
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<child_name>GnomeDialog:vbox</child_name>
<name>vbox32</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<child_name>Dialog:action_area</child_name>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>hbox26</name>
<border_width>10</border_width>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
@ -3824,49 +3843,32 @@
</child>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox20</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<class>GtkButton</class>
<name>button118</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_name_edit_ok_clicked</handler>
<object>name_edit</object>
<last_modification_time>Sat, 28 Jul 2001 21:08:16 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button118</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_name_edit_ok_clicked</handler>
<object>name_edit</object>
<last_modification_time>Sat, 28 Jul 2001 21:08:16 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button119</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>name_edit</object>
<last_modification_time>Thu, 26 Jul 2001 19:16:49 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button119</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>name_edit</object>
<last_modification_time>Thu, 26 Jul 2001 19:16:49 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
@ -4285,6 +4287,7 @@ Very High
<class>GtkEntry</class>
<name>alt_given</name>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
@ -4310,7 +4313,7 @@ Very High
</widget>
<widget>
<class>GtkDialog</class>
<class>GnomeDialog</class>
<name>addr_edit</name>
<title>Gramps - Address Editor</title>
<type>GTK_WINDOW_TOPLEVEL</type>
@ -4319,21 +4322,31 @@ Very High
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<child_name>GnomeDialog:vbox</child_name>
<name>vbox34</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<child_name>Dialog:action_area</child_name>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>hbox30</name>
<border_width>10</border_width>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
@ -4342,49 +4355,32 @@ Very High
</child>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox21</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<class>GtkButton</class>
<name>button121</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_addr_edit_ok_clicked</handler>
<object>addr_edit</object>
<last_modification_time>Sat, 28 Jul 2001 22:35:30 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button121</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_addr_edit_ok_clicked</handler>
<object>addr_edit</object>
<last_modification_time>Sat, 28 Jul 2001 22:35:30 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button122</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>addr_edit</object>
<last_modification_time>Thu, 26 Jul 2001 19:16:49 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button122</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>addr_edit</object>
<last_modification_time>Thu, 26 Jul 2001 19:16:49 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
@ -4791,6 +4787,7 @@ Very High
<class>GtkEntry</class>
<name>address_start</name>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
@ -4966,7 +4963,7 @@ Very High
</widget>
<widget>
<class>GtkDialog</class>
<class>GnomeDialog</class>
<name>url_edit</name>
<title>Gramps - Internet Address Editor</title>
<type>GTK_WINDOW_TOPLEVEL</type>
@ -4975,21 +4972,31 @@ Very High
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<child_name>GnomeDialog:vbox</child_name>
<name>vbox36</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<child_name>Dialog:action_area</child_name>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>hbox33</name>
<border_width>10</border_width>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
@ -4998,49 +5005,32 @@ Very High
</child>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox22</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<class>GtkButton</class>
<name>button124</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_url_edit_ok_clicked</handler>
<object>url_edit</object>
<last_modification_time>Sun, 29 Jul 2001 05:41:34 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button124</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_url_edit_ok_clicked</handler>
<object>url_edit</object>
<last_modification_time>Sun, 29 Jul 2001 05:41:34 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button125</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>url_edit</object>
<last_modification_time>Thu, 26 Jul 2001 19:16:49 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button125</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>url_edit</object>
<last_modification_time>Thu, 26 Jul 2001 19:16:49 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
@ -5212,6 +5202,7 @@ Very High
<name>url_addr</name>
<width>400</width>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>

View File

@ -94,9 +94,10 @@ class EditPerson:
self.not_loaded = 1
self.lists_changed = 0
self.top_window = libglade.GladeXML(const.editPersonFile, "editPerson")
self.top = libglade.GladeXML(const.editPersonFile, "editPerson")
# widgets
self.window = self.get_widget("editPerson")
self.notes_field = self.get_widget("personNotes")
self.event_name_field = self.get_widget("eventName")
self.event_place_field = self.get_widget("eventPlace")
@ -160,8 +161,20 @@ class EditPerson:
self.birth = Event(person.getBirth())
self.pname = Name(person.getPrimaryName())
self.selected_icon = -1
# Typing CR selects OK button
self.window.editable_enters(self.notes_field);
self.window.editable_enters(self.given);
self.window.editable_enters(self.surname_field);
self.window.editable_enters(self.suffix);
self.window.editable_enters(self.title);
self.window.editable_enters(self.nick);
self.window.editable_enters(self.bdate);
self.window.editable_enters(self.bplace);
self.window.editable_enters(self.ddate);
self.window.editable_enters(self.dplace);
self.top_window.signal_autoconnect({
self.top.signal_autoconnect({
"destroy_passed_object" : on_cancel_edit,
"on_add_address_clicked" : on_add_addr_clicked,
"on_add_aka_clicked" : on_add_aka_clicked,
@ -285,7 +298,7 @@ class EditPerson:
#
#---------------------------------------------------------------------
def get_widget(self,str):
return self.top_window.get_widget(str)
return self.top.get_widget(str)
#---------------------------------------------------------------------
#
@ -1065,6 +1078,7 @@ def on_add_photo_clicked(obj):
edit_person = obj.get_data(EDITPERSON)
image_select = libglade.GladeXML(const.imageselFile,"imageSelect")
edit_person.isel = image_select
window = image_select.get_widget("imageSelect")
image_select.signal_autoconnect({
"on_savephoto_clicked" : on_savephoto_clicked,
@ -1075,8 +1089,9 @@ def on_add_photo_clicked(obj):
edit_person.fname = image_select.get_widget("fname")
edit_person.add_image = image_select.get_widget("image")
edit_person.external = image_select.get_widget("private")
image_select.get_widget("imageSelect").set_data(EDITPERSON,edit_person)
image_select.get_widget("imageSelect").show()
window.editable_enters(image_select.get_widget("photoDescription"))
window.set_data(EDITPERSON,edit_person)
window.show()
#-------------------------------------------------------------------------
#
@ -1279,6 +1294,7 @@ def display_note(obj,data):
en_obj = editnote.get_widget("editnote")
en_obj.set_data(NOTEOBJ,data)
en_obj.set_data(TEXTOBJ,textobj)
en_obj.editable_enters(textobj);
textobj.set_point(0)
textobj.insert_defaults(data.getNote())
@ -1423,6 +1439,7 @@ def on_change_description(obj):
window.get_widget("dialog1").set_data(PHOTO,photo)
window.get_widget("dialog1").set_data(TEXT,text)
window.get_widget("dialog1").set_data(OBJECT,obj.get_data(OBJECT))
window.get_widget("dialog1").editable_enters(text)
window.signal_autoconnect({
"on_cancel_clicked" : utils.destroy_passed_object,
"on_ok_clicked" : on_ok_clicked,
@ -1483,6 +1500,12 @@ class EventEditor:
self.top.get_widget("eventTitle").set_text(title)
self.event_menu.set_popdown_strings(const.personalEvents)
# Typing CR selects OK button
self.window.editable_enters(self.name_field);
self.window.editable_enters(self.place_field);
self.window.editable_enters(self.date_field);
self.window.editable_enters(self.descr_field);
utils.build_confidence_menu(self.conf_menu)
values = self.parent.db.getPlaceMap().values()
@ -1587,6 +1610,10 @@ class AttributeEditor:
else:
self.srcref = SourceRef()
# Typing CR selects OK button
self.window.editable_enters(self.type_field);
self.window.editable_enters(self.value_field);
name = parent.person.getPrimaryName().getName()
self.top.get_widget("attrTitle").set_text(_("Attribute Editor for %s") % name)
@ -1696,6 +1723,11 @@ class NameEditor:
self.top.get_widget("altTitle").set_text(
_("Alternate Name Editor for %s") % full_name)
# Typing CR selects OK button
self.window.editable_enters(self.given_field);
self.window.editable_enters(self.surname_field);
self.window.editable_enters(self.suffix_field);
utils.build_confidence_menu(self.conf_menu)
if name != None:
@ -1792,6 +1824,16 @@ class AddressEditor:
text = _("Address Editor for %s") % name
self.top.get_widget("addrTitle").set_text(text)
# Typing CR selects OK button
self.window.editable_enters(self.addr_start);
self.window.editable_enters(self.street);
self.window.editable_enters(self.city);
self.window.editable_enters(self.state);
self.window.editable_enters(self.country);
self.window.editable_enters(self.postal);
self.window.editable_enters(self.source_field);
self.window.editable_enters(self.note_field);
utils.build_confidence_menu(self.conf_menu)
if addr != None:
@ -1883,6 +1925,9 @@ class UrlEditor:
title = _("Internet Address Editor for %s") % name
self.top.get_widget("urlTitle").set_text(title)
self.window.editable_enters(self.url_addr);
self.window.editable_enters(self.url_des);
if url != None:
self.des.set_text(url.get_description())
self.addr.set_text(url.get_path())

View File

@ -140,6 +140,15 @@ class EditPlace:
self.top = self.top_window.get_widget("placeEditor")
self.top.set_data(_PLACE,self)
# Typing CR selects OK button
self.top.editable_enters(self.title);
self.top.editable_enters(self.city);
self.top.editable_enters(self.county);
self.top.editable_enters(self.state);
self.top.editable_enters(self.country);
self.top.editable_enters(self.longitude);
self.top.editable_enters(self.latitude);
if self.place.getId() == "":
self.top_window.get_widget("add_photo").set_sensitive(0)
self.top_window.get_widget("delete_photo").set_sensitive(0)
@ -331,8 +340,10 @@ def on_add_photo_clicked(obj):
edit_place.fname = image_select.get_widget("fname")
edit_place.add_image = image_select.get_widget("image")
edit_place.external = image_select.get_widget("private")
image_select.get_widget("imageSelect").set_data(_PLACE,edit_place)
image_select.get_widget("imageSelect").show()
window = image_select.get_widget("imageSelect")
window.editable_enters(image_select.get_widget("photoDescription"))
window.set_data(_PLACE,edit_place)
window.show()
#-------------------------------------------------------------------------
#
@ -452,6 +463,7 @@ def on_change_description(obj):
window.get_widget("dialog1").set_data("p",photo)
window.get_widget("dialog1").set_data("t",text)
window.get_widget("dialog1").set_data("m",obj.get_data("m"))
window.get_widget("dialog1").editable_enters(text)
window.signal_autoconnect({
"on_cancel_clicked" : utils.destroy_passed_object,
"on_ok_clicked" : on_ok_clicked,
@ -730,6 +742,12 @@ class LocationEditor:
self.county = self.top.get_widget("county")
self.country = self.top.get_widget("country")
# Typing CR selects OK button
self.window.editable_enters(self.city);
self.window.editable_enters(self.county);
self.window.editable_enters(self.state);
self.window.editable_enters(self.country);
if parent.place:
name = _("Location Editor for %s") % parent.place.get_title()
else:

View File

@ -100,6 +100,10 @@ class EditSource:
self.top_window.get_widget("add_photo").set_sensitive(0)
self.top_window.get_widget("delete_photo").set_sensitive(0)
self.top.editable_enters(self.title);
self.top.editable_enters(self.author);
self.top.editable_enters(self.pubinfo);
#-------------------------------------------------------------------------
#
# add_thumbnail - Scale the image and add it to the IconList.
@ -212,8 +216,10 @@ def on_add_photo_clicked(obj):
edit_source.fname = image_select.get_widget("fname")
edit_source.add_image = image_select.get_widget("image")
edit_source.external = image_select.get_widget("private")
image_select.get_widget("imageSelect").set_data(SOURCE,edit_source)
image_select.get_widget("imageSelect").show()
window = image_select.get_widget("imageSelect")
window.editable_enters(image_select.get_widget("photoDescription"))
window.set_data(SOURCE,edit_source)
window.show()
#-------------------------------------------------------------------------
#
@ -333,6 +339,7 @@ def on_change_description(obj):
window.get_widget("dialog1").set_data("p",photo)
window.get_widget("dialog1").set_data("t",text)
window.get_widget("dialog1").set_data("m",obj.get_data("m"))
window.get_widget("dialog1").editable_enters(text)
window.signal_autoconnect({
"on_cancel_clicked" : utils.destroy_passed_object,
"on_ok_clicked" : on_ok_clicked,

View File

@ -52,6 +52,7 @@ class Find:
self.top = self.xml.get_widget("find")
self.top.set_data(_OBJECT,self)
self.entry = self.xml.get_widget("entry1")
self.top.editable_enters(self.entry)
def find_next(self):
"""Advances to the next person that matches the dialog text"""

View File

@ -139,6 +139,10 @@ class Marriage:
self.notes_field.insert_defaults(family.getNote())
self.notes_field.set_word_wrap(1)
# Typing CR selects OK button
top_window.editable_enters(self.notes_field);
top_window.editable_enters(self.get_widget("combo-entry1"));
self.redraw_events()
self.redraw_attr_list()
top_window.show()
@ -524,21 +528,22 @@ def on_delete_photo_clicked(obj):
def on_add_photo_clicked(obj):
marriage_obj = obj.get_data(MARRIAGE)
imageSelect = libglade.GladeXML(const.imageselFile,"imageSelect")
marriage_obj.imageSelect = imageSelect
imageSelect.signal_autoconnect({
"on_savephoto_clicked" : on_savephoto_clicked,
"on_name_changed" : on_name_changed,
"destroy_passed_object" : utils.destroy_passed_object
})
imageSelect.get_widget("imageSelect").set_data(MARRIAGE,marriage_obj)
imageSelect.get_widget("imageSelect").show()
marriage_obj.fname = image_select.get_widget("fname")
marriage_obj.add_image = image_select.get_widget("image")
marriage_obj.external = image_select.get_widget("private")
marriage_obj.imageSelect = imageSelect
window = imageSelect.get_widget("imageSelect")
window.editable_enters(image_select.get_widget("photoDescription"))
window.set_data(MARRIAGE,marriage_obj)
window.show()
#-------------------------------------------------------------------------
#
@ -614,6 +619,7 @@ def on_change_description(obj):
window.get_widget("dialog1").set_data("p",photo)
window.get_widget("dialog1").set_data("t",text)
window.get_widget("dialog1").set_data("m",obj.get_data("m"))
window.get_widget("dialog1").editable_enters(text)
window.signal_autoconnect({
"on_cancel_clicked" : utils.destroy_passed_object,
"on_ok_clicked" : on_ok_clicked,
@ -729,6 +735,12 @@ class EventEditor:
self.top.get_widget("eventTitle").set_text(name)
self.event_menu.set_popdown_strings(const.marriageEvents)
# Typing CR selects OK button
self.window.editable_enters(self.name_field);
self.window.editable_enters(self.place_field);
self.window.editable_enters(self.date_field);
self.window.editable_enters(self.descr_field);
utils.build_confidence_menu(self.conf_menu)
values = self.parent.db.getPlaceMap().values()
@ -833,6 +845,10 @@ class AttributeEditor:
else:
self.srcref = SourceRef()
# Typing CR selects OK button
self.window.editable_enters(self.type_field);
self.window.editable_enters(self.value_field);
father = parent.family.getFather()
mother = parent.family.getMother()
if father and mother:

View File

@ -78,6 +78,10 @@ class SourceEditor:
self.author_field = self.get_widget("sauthor")
self.pub_field = self.get_widget("spubinfo")
# Typing CR selects OK button
self.sourceDisplay.editable_enters(self.get_widget("spage"))
self.sourceDisplay.editable_enters(self.get_widget("sdate"))
if self.source_ref:
self.active_source = self.source_ref.getBase()
else:

View File

@ -150,6 +150,11 @@ class StyleEditor:
self.window.set_data("obj",self)
self.pnames = self.top.get_widget("name")
# Typing CR selects OK button
self.window.editable_enters(self.top.get_widget("rmargin"))
self.window.editable_enters(self.top.get_widget("lmargin"))
self.window.editable_enters(self.top.get_widget("pad"))
self.top.get_widget("style_name").set_text(name)
myMenu = gtk.GtkMenu()
first = 0

View File

@ -13,7 +13,7 @@
</project>
<widget>
<class>GtkDialog</class>
<class>GnomeDialog</class>
<name>top</name>
<title>Gramps - Edit Bookmarks</title>
<type>GTK_WINDOW_TOPLEVEL</type>
@ -22,21 +22,31 @@
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox1</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<child_name>Dialog:action_area</child_name>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area1</name>
<border_width>10</border_width>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
@ -45,47 +55,32 @@
</child>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox1</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<class>GtkButton</class>
<name>ok</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_ok_clicked</handler>
<object>top</object>
<last_modification_time>Wed, 14 Feb 2001 20:10:00 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>ok</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_ok_clicked</handler>
<object>top</object>
<last_modification_time>Wed, 14 Feb 2001 20:10:00 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>cancel</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_cancel_clicked</handler>
<object>top</object>
<last_modification_time>Wed, 14 Feb 2001 20:10:25 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>cancel</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_cancel_clicked</handler>
<object>top</object>
<last_modification_time>Wed, 14 Feb 2001 20:10:25 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
@ -210,6 +205,7 @@
<last_modification_time>Wed, 14 Feb 2001 20:09:13 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_UP</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
@ -224,6 +220,7 @@
<last_modification_time>Wed, 14 Feb 2001 20:09:23 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_DOWN</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
@ -238,6 +235,7 @@
<last_modification_time>Wed, 14 Feb 2001 20:09:35 GMT</last_modification_time>
</signal>
<label>Delete</label>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
</widget>
</widget>

View File

@ -32,7 +32,7 @@
<last_modification_time>Wed, 22 Aug 2001 02:13:46 GMT</last_modification_time>
</signal>
<title>Gramps - Preferences</title>
<position>GTK_WIN_POS_CENTER</position>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>False</allow_grow>
@ -1791,7 +1791,7 @@ AbiWord
<name>initDruid</name>
<title>Gramps Startup Druid</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_CENTER</position>
<position>GTK_WIN_POS_NONE</position>
<modal>True</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>True</allow_grow>

View File

@ -13,30 +13,40 @@
</project>
<widget>
<class>GtkDialog</class>
<class>GnomeDialog</class>
<name>event_edit</name>
<title>Gramps - Event Editor</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_CENTER</position>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox1</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<child_name>Dialog:action_area</child_name>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area1</name>
<border_width>10</border_width>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
@ -45,49 +55,32 @@
</child>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox18</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<class>GtkButton</class>
<name>button111</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_event_edit_ok_clicked</handler>
<object>event_edit</object>
<last_modification_time>Thu, 26 Jul 2001 20:29:11 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button111</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_event_edit_ok_clicked</handler>
<object>event_edit</object>
<last_modification_time>Thu, 26 Jul 2001 20:29:11 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button113</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>event_edit</object>
<last_modification_time>Thu, 26 Jul 2001 19:16:49 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button113</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>event_edit</object>
<last_modification_time>Thu, 26 Jul 2001 19:16:49 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
@ -370,6 +363,7 @@
<child_name>GtkCombo:entry</child_name>
<name>eventName</name>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
@ -601,30 +595,40 @@ Very High
</widget>
<widget>
<class>GtkDialog</class>
<class>GnomeDialog</class>
<name>attr_edit</name>
<title>Gramps - Attribute Editor</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_CENTER</position>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<child_name>GnomeDialog:vbox</child_name>
<name>vbox30</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<child_name>Dialog:action_area</child_name>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>hbox22</name>
<border_width>10</border_width>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
@ -633,49 +637,32 @@ Very High
</child>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox19</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<class>GtkButton</class>
<name>button115</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_attr_edit_ok_clicked</handler>
<object>attr_edit</object>
<last_modification_time>Sat, 28 Jul 2001 16:26:27 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button115</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_attr_edit_ok_clicked</handler>
<object>attr_edit</object>
<last_modification_time>Sat, 28 Jul 2001 16:26:27 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button116</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>attr_edit</object>
<last_modification_time>Thu, 26 Jul 2001 19:16:49 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button116</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>attr_edit</object>
<last_modification_time>Thu, 26 Jul 2001 19:16:49 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
@ -838,6 +825,7 @@ Very High
<child_name>GtkCombo:entry</child_name>
<name>attr_type</name>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
@ -1069,30 +1057,40 @@ Very High
</widget>
<widget>
<class>GtkDialog</class>
<class>GnomeDialog</class>
<name>loc_edit</name>
<title>Gramps - Event Editor</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_CENTER</position>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<child_name>GnomeDialog:vbox</child_name>
<name>vbox32</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<child_name>Dialog:action_area</child_name>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>hbox26</name>
<border_width>10</border_width>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
@ -1101,49 +1099,32 @@ Very High
</child>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox20</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<class>GtkButton</class>
<name>button118</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_loc_edit_ok_clicked</handler>
<object>loc_edit</object>
<last_modification_time>Mon, 20 Aug 2001 01:50:00 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button118</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_loc_edit_ok_clicked</handler>
<object>loc_edit</object>
<last_modification_time>Mon, 20 Aug 2001 01:50:00 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button119</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>loc_edit</object>
<last_modification_time>Thu, 26 Jul 2001 19:16:49 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button119</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>loc_edit</object>
<last_modification_time>Thu, 26 Jul 2001 19:16:49 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
@ -1332,6 +1313,7 @@ Very High
<class>GtkEntry</class>
<name>city</name>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>

View File

@ -13,7 +13,7 @@
</project>
<widget>
<class>GtkDialog</class>
<class>GnomeDialog</class>
<name>editnote</name>
<title>Gramps - Edit Note</title>
<type>GTK_WINDOW_TOPLEVEL</type>
@ -22,21 +22,31 @@
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox1</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<child_name>Dialog:action_area</child_name>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area1</name>
<border_width>10</border_width>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
@ -45,49 +55,31 @@
</child>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox18</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<class>GtkButton</class>
<name>button99</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_save_note_clicked</handler>
<object>editnote</object>
<last_modification_time>Tue, 29 May 2001 15:06:53 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button99</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_save_note_clicked</handler>
<object>editnote</object>
<last_modification_time>Tue, 29 May 2001 15:06:53 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button100</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>editnote</object>
<last_modification_time>Tue, 29 May 2001 15:06:38 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button100</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>editnote</object>
<last_modification_time>Tue, 29 May 2001 15:06:38 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
@ -148,6 +140,7 @@
<class>GtkText</class>
<name>notetext</name>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<editable>True</editable>
<text></text>
</widget>

View File

@ -2429,7 +2429,7 @@
<border_width>10</border_width>
<title>Gramps - Select File</title>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_CENTER</position>
<position>GTK_WIN_POS_NONE</position>
<modal>True</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>True</allow_grow>
@ -2470,21 +2470,89 @@
</widget>
<widget>
<class>GtkWindow</class>
<class>GnomeDialog</class>
<name>spouseDialog</name>
<title>Gramps - Choose Spouse</title>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_CENTER</position>
<position>GTK_WIN_POS_NONE</position>
<modal>True</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
<name>vbox11</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>hbuttonbox6</name>
<layout_style>GTK_BUTTONBOX_SPREAD</layout_style>
<spacing>0</spacing>
<child_min_width>0</child_min_width>
<child_min_height>0</child_min_height>
<child_ipad_x>0</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>10</padding>
<expand>False</expand>
<fill>True</fill>
<pack>GTK_PACK_END</pack>
</child>
<widget>
<class>GtkButton</class>
<name>spouseNewPerson</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_new_spouse_clicked</handler>
<object>spouseDialog</object>
<last_modification_time>Thu, 23 Aug 2001 21:21:10 GMT</last_modification_time>
</signal>
<label>Add new person</label>
</widget>
<widget>
<class>GtkButton</class>
<name>spouseExistingPerson</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_select_spouse_clicked</handler>
<object>spouseDialog</object>
<last_modification_time>Thu, 23 Aug 2001 21:21:01 GMT</last_modification_time>
</signal>
<label>Select existing person</label>
</widget>
<widget>
<class>GtkButton</class>
<name>button117</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>spouseDialog</object>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
<widget>
<class>GtkLabel</class>
@ -2659,6 +2727,13 @@
<class>GtkEntry</class>
<name>given</name>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<signal>
<name>activate</name>
<handler>on_given_activate</handler>
<object>spouseDialog</object>
<last_modification_time>Sat, 22 Sep 2001 04:20:27 GMT</last_modification_time>
</signal>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
@ -2683,6 +2758,12 @@
<class>GtkEntry</class>
<name>surname</name>
<can_focus>True</can_focus>
<signal>
<name>activate</name>
<handler>on_surname_activate</handler>
<object>spouseDialog</object>
<last_modification_time>Sat, 22 Sep 2001 04:20:48 GMT</last_modification_time>
</signal>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
@ -2775,61 +2856,6 @@
</widget>
</widget>
</widget>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox6</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>10</padding>
<expand>False</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkButton</class>
<name>button36</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_new_spouse_clicked</handler>
<object>spouseDialog</object>
<last_modification_time>Thu, 23 Aug 2001 21:21:10 GMT</last_modification_time>
</signal>
<label>Add new person</label>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button37</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_select_spouse_clicked</handler>
<object>spouseDialog</object>
<last_modification_time>Thu, 23 Aug 2001 21:21:01 GMT</last_modification_time>
</signal>
<label>Select existing person</label>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button117</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
</widget>
</widget>
</widget>
@ -2879,6 +2905,7 @@
<class>GtkButton</class>
<name>button42</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
@ -2975,6 +3002,7 @@
<class>GtkEntry</class>
<name>motherName</name>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
@ -3360,7 +3388,7 @@ Unknown
<name>selectChild</name>
<title>Gramps - Add Child</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_CENTER</position>
<position>GTK_WIN_POS_NONE</position>
<modal>True</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>False</allow_grow>
@ -3401,6 +3429,7 @@ Unknown
<class>GtkButton</class>
<name>button48</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
@ -3728,7 +3757,7 @@ Unknown
<name>marriageQuery</name>
<title>Gramps - Marriage Editor</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_CENTER</position>
<position>GTK_WIN_POS_NONE</position>
<modal>True</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>False</allow_grow>
@ -3769,6 +3798,7 @@ Unknown
<class>GtkButton</class>
<name>button52</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
@ -3885,10 +3915,10 @@ Unknown
<name>sourceEditor</name>
<title>Gramps - Source Editor</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_CENTER</position>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>False</allow_grow>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
@ -3926,6 +3956,7 @@ Unknown
<class>GtkButton</class>
<name>button88</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
@ -4110,6 +4141,7 @@ Unknown
<class>GtkEntry</class>
<name>source_title</name>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
@ -4338,22 +4370,30 @@ Unknown
</widget>
<widget>
<class>GtkWindow</class>
<class>GnomeDialog</class>
<name>sourceDisplay</name>
<title>Gramps - Source Information</title>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_CENTER</position>
<position>GTK_WIN_POS_NONE</position>
<modal>True</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
<name>vbox27</name>
<border_width>2</border_width>
<homogeneous>False</homogeneous>
<spacing>8</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHButtonBox</class>
@ -4376,6 +4416,7 @@ Unknown
<class>GtkButton</class>
<name>button94</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
@ -4642,6 +4683,7 @@ Unknown
<child_name>GtkCombo:entry</child_name>
<name>combo-entry1</name>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<signal>
<name>changed</name>
<handler>on_source_changed</handler>
@ -4892,81 +4934,74 @@ Unknown
</widget>
<widget>
<class>GtkDialog</class>
<class>GnomeDialog</class>
<name>addChild</name>
<title>Gramps - Add New Child</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_CENTER</position>
<position>GTK_WIN_POS_NONE</position>
<modal>True</modal>
<allow_shrink>True</allow_shrink>
<allow_shrink>False</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox12</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<child_name>Dialog:action_area</child_name>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area12</name>
<border_width>10</border_width>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
<expand>True</expand>
<fill>True</fill>
<pack>GTK_PACK_END</pack>
</child>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox19</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<class>GtkButton</class>
<name>button98</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_addchild_ok_clicked</handler>
<object>addChild</object>
<last_modification_time>Wed, 14 Feb 2001 02:53:44 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button98</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_addchild_ok_clicked</handler>
<object>addChild</object>
<last_modification_time>Wed, 14 Feb 2001 02:53:44 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button99</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>addChild</object>
<last_modification_time>Wed, 14 Feb 2001 02:53:18 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button99</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>addChild</object>
<last_modification_time>Wed, 14 Feb 2001 02:53:18 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
@ -5352,30 +5387,40 @@ Unknown
</widget>
<widget>
<class>GtkDialog</class>
<class>GnomeDialog</class>
<name>place_query</name>
<title>Gramps - Delete a currently used Place</title>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_CENTER</position>
<position>GTK_WIN_POS_NONE</position>
<modal>True</modal>
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox13</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<child_name>Dialog:action_area</child_name>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area13</name>
<border_width>10</border_width>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
@ -5384,49 +5429,31 @@ Unknown
</child>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox25</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<class>GtkButton</class>
<name>force_delete</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_force_delete_clicked</handler>
<object>place_query</object>
<last_modification_time>Tue, 21 Aug 2001 15:30:46 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_YES</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>force_delete</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_force_delete_clicked</handler>
<object>place_query</object>
<last_modification_time>Tue, 21 Aug 2001 15:30:46 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_YES</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button116</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>place_query</object>
<last_modification_time>Tue, 21 Aug 2001 15:33:25 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_NO</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button116</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>place_query</object>
<last_modification_time>Tue, 21 Aug 2001 15:33:25 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_NO</stock_button>
</widget>
</widget>
@ -5513,7 +5540,7 @@ Unknown
</widget>
<widget>
<class>GtkDialog</class>
<class>GnomeDialog</class>
<name>find</name>
<title>Gramps - Find person</title>
<type>GTK_WINDOW_TOPLEVEL</type>
@ -5524,21 +5551,31 @@ Unknown
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox14</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<child_name>Dialog:action_area</child_name>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area14</name>
<border_width>10</border_width>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<layout_style>GTK_BUTTONBOX_SPREAD</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
@ -5547,64 +5584,46 @@ Unknown
</child>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox26</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>15</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>3</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<class>GtkButton</class>
<name>prev</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_prev_clicked</handler>
<object>find</object>
<last_modification_time>Wed, 05 Sep 2001 02:55:37 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_PREV</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>prev</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_prev_clicked</handler>
<object>find</object>
<last_modification_time>Wed, 05 Sep 2001 02:55:37 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_PREV</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>next</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_next_clicked</handler>
<object>find</object>
<last_modification_time>Wed, 05 Sep 2001 02:55:23 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_NEXT</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>next</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_next_clicked</handler>
<object>find</object>
<last_modification_time>Wed, 05 Sep 2001 02:55:23 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_NEXT</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button120</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>find</object>
<last_modification_time>Wed, 05 Sep 2001 02:55:07 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button120</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>find</object>
<last_modification_time>Wed, 05 Sep 2001 02:55:07 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
</widget>
</widget>

View File

@ -305,6 +305,10 @@ def on_add_sp_clicked(obj):
top.set_data(GIVEN,dialog.get_widget("given"))
top.set_data(SURNAME,dialog.get_widget("surname"))
# Typing CR selects 'Add Existing' button
top.editable_enters(dialog.get_widget("given"))
top.editable_enters(dialog.get_widget("surname"))
dialog.signal_autoconnect({
"on_spouseList_select_row" : on_spouse_list_select_row,
"on_select_spouse_clicked" : on_select_spouse_clicked,
@ -532,6 +536,13 @@ def on_add_new_child_clicked(obj):
new_child_win.get_widget("mrel").set_text(_("Birth"))
new_child_win.get_widget("frel").set_text(_("Birth"))
# Typing CR selects OK button
window = new_child_win.get_widget("addChild")
window.editable_enters(new_child_win.get_widget("childGiven"))
window.editable_enters(new_child_win.get_widget("childSurname"))
window.editable_enters(new_child_win.get_widget("mrel"))
window.editable_enters(new_child_win.get_widget("frel"))
#-------------------------------------------------------------------------
#
#

View File

@ -2,8 +2,8 @@
<GTK-Interface>
<project>
<name>Marriage</name>
<program_name>marriage</program_name>
<name>Gramps</name>
<program_name>gramps</program_name>
<directory></directory>
<source_directory>src</source_directory>
<pixmaps_directory></pixmaps_directory>
@ -16,8 +16,8 @@
<class>GnomeDialog</class>
<name>imageSelect</name>
<title>Gramps - Select a picture</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_CENTER</position>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<default_width>400</default_width>
<allow_shrink>False</allow_shrink>
@ -59,6 +59,7 @@
<class>GtkButton</class>
<name>button79</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
@ -330,6 +331,7 @@
<child_name>GnomeEntry:entry</child_name>
<name>fname</name>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<signal>
<name>changed</name>
<handler>on_name_changed</handler>
@ -342,6 +344,7 @@
<text></text>
</widget>
</widget>
</widget>
</widget>
</widget>
@ -350,6 +353,7 @@
<widget>
<class>GnomeDialog</class>
<name>dialog1</name>
<title>Gramps - Change image description</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>True</modal>
@ -392,6 +396,7 @@
<class>GtkButton</class>
<name>button82</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
@ -484,6 +489,7 @@
<name>text</name>
<width>300</width>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>

View File

@ -20,6 +20,8 @@
import cStringIO
ANSEL_ERROR = "ANSEL Error"
_s1 = {
0xEA : { ord('A') : 0xC5, ord('a') : 0xE5 },
0xE8 : { ord('A') : 0xC4, ord('E') : 0xCB, ord('I') : 0xCF, ord('O') : 0xD6,
@ -79,8 +81,6 @@ def ansel_to_latin(s):
try:
head,s = ansel_to_code(s)
except Exception:
from traceback import print_exc
print_exc()
head = s[0]
s = s[1:0]
buff.write(head)

View File

@ -13,7 +13,7 @@
</project>
<widget>
<class>GtkDialog</class>
<class>GnomeDialog</class>
<name>marriageEditor</name>
<signal>
<name>delete_event</name>
@ -27,21 +27,32 @@
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox6</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<child_name>Dialog:action_area</child_name>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area6</name>
<border_width>10</border_width>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
@ -50,49 +61,32 @@
</child>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox22</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<class>GtkButton</class>
<name>button107</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_close_marriage_editor</handler>
<object>marriageEditor</object>
<last_modification_time>Tue, 31 Jul 2001 15:50:12 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button107</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_close_marriage_editor</handler>
<object>marriageEditor</object>
<last_modification_time>Tue, 31 Jul 2001 15:50:12 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button108</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>marriageEditor</object>
<last_modification_time>Tue, 31 Jul 2001 15:49:42 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button108</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>marriageEditor</object>
<last_modification_time>Tue, 31 Jul 2001 15:49:42 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
@ -182,6 +176,7 @@
<child_name>GtkCombo:entry</child_name>
<name>combo-entry1</name>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>

View File

@ -15,30 +15,40 @@
</project>
<widget>
<class>GtkDialog</class>
<class>GnomeDialog</class>
<name>placeEditor</name>
<title>Gramps - Place Editor</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox12</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<child_name>Dialog:action_area</child_name>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area12</name>
<border_width>10</border_width>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
@ -47,49 +57,32 @@
</child>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox25</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<class>GtkButton</class>
<name>button126</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_apply_clicked</handler>
<object>placeEditor</object>
<last_modification_time>Sat, 18 Aug 2001 17:26:41 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button126</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_apply_clicked</handler>
<object>placeEditor</object>
<last_modification_time>Sat, 18 Aug 2001 17:26:41 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button127</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>placeEditor</object>
<last_modification_time>Thu, 18 Jan 2001 02:52:48 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button127</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>placeEditor</object>
<last_modification_time>Thu, 18 Jan 2001 02:52:48 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
@ -130,9 +123,9 @@
<class>GtkHSeparator</class>
<name>hseparator13</name>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
<padding>5</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
@ -406,6 +399,7 @@
<class>GtkEntry</class>
<name>place_title</name>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>

View File

@ -13,7 +13,7 @@
</project>
<widget>
<class>GtkWindow</class>
<class>GnomeDialog</class>
<name>pluginsel</name>
<title>Gramps - Plugin Selection</title>
<type>GTK_WINDOW_DIALOG</type>
@ -22,13 +22,80 @@
<allow_shrink>False</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
<name>vbox33</name>
<border_width>10</border_width>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>hbuttonbox20</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
<pack>GTK_PACK_END</pack>
</child>
<widget>
<class>GtkButton</class>
<name>button101</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_ok_clicked</handler>
<object>pluginsel</object>
<last_modification_time>Sun, 11 Mar 2001 22:54:53 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button102</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_apply_clicked</handler>
<object>pluginsel</object>
<last_modification_time>Sun, 11 Mar 2001 22:54:34 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button103</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>pluginsel</object>
<last_modification_time>Sun, 11 Mar 2001 22:54:19 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
<widget>
<class>GtkHPaned</class>
@ -158,79 +225,11 @@
</widget>
</widget>
</widget>
<widget>
<class>GtkHSeparator</class>
<name>hseparator17</name>
<child>
<padding>4</padding>
<expand>False</expand>
<fill>True</fill>
</child>
</widget>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox20</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkButton</class>
<name>button101</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_ok_clicked</handler>
<object>pluginsel</object>
<last_modification_time>Sun, 11 Mar 2001 22:54:53 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button102</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_apply_clicked</handler>
<object>pluginsel</object>
<last_modification_time>Sun, 11 Mar 2001 22:54:34 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button103</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>pluginsel</object>
<last_modification_time>Sun, 11 Mar 2001 22:54:19 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
</widget>
</widget>
<widget>
<class>GtkWindow</class>
<class>GnomeDialog</class>
<name>report</name>
<title>Gramps - Report Selection</title>
<type>GTK_WINDOW_DIALOG</type>
@ -239,13 +238,80 @@
<allow_shrink>False</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
<name>vbox35</name>
<border_width>10</border_width>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>hbuttonbox21</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
<pack>GTK_PACK_END</pack>
</child>
<widget>
<class>GtkButton</class>
<name>button104</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_report_ok_clicked</handler>
<object>report</object>
<last_modification_time>Thu, 22 Mar 2001 21:28:02 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button105</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_report_apply_clicked</handler>
<object>report</object>
<last_modification_time>Thu, 22 Mar 2001 21:28:11 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button106</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>report</object>
<last_modification_time>Sun, 11 Mar 2001 22:54:19 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
<widget>
<class>GtkHPaned</class>
@ -375,74 +441,6 @@
</widget>
</widget>
</widget>
<widget>
<class>GtkHSeparator</class>
<name>hseparator20</name>
<child>
<padding>4</padding>
<expand>False</expand>
<fill>True</fill>
</child>
</widget>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox21</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkButton</class>
<name>button104</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_report_ok_clicked</handler>
<object>report</object>
<last_modification_time>Thu, 22 Mar 2001 21:28:02 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button105</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_report_apply_clicked</handler>
<object>report</object>
<last_modification_time>Thu, 22 Mar 2001 21:28:11 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button106</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>report</object>
<last_modification_time>Sun, 11 Mar 2001 22:54:19 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
</widget>
</widget>

View File

@ -772,8 +772,17 @@ class Merge:
#
#
#---------------------------------------------------------------------
def place_match(self,name1,name2):
def place_match(self,p1,p2):
if p1 == None:
name1 = ""
else:
name1 = p1.get_title()
if p2 == None:
name2 = ""
else:
name2 = p2.get_title()
if name1 == "" or name2 == "":
return 0
if name1 == name2:

View File

@ -16,7 +16,7 @@
</project>
<widget>
<class>GtkDialog</class>
<class>GnomeDialog</class>
<name>styles</name>
<title>Gramps - Document Styles</title>
<type>GTK_WINDOW_TOPLEVEL</type>
@ -25,23 +25,33 @@
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox1</name>
<width>300</width>
<height>250</height>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<child_name>Dialog:action_area</child_name>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area1</name>
<border_width>10</border_width>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
@ -50,49 +60,32 @@
</child>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox1</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<class>GtkButton</class>
<name>button1</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_ok_clicked</handler>
<object>styles</object>
<last_modification_time>Tue, 05 Jun 2001 13:12:07 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button1</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_ok_clicked</handler>
<object>styles</object>
<last_modification_time>Tue, 05 Jun 2001 13:12:07 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button2</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>styles</object>
<last_modification_time>Tue, 05 Jun 2001 13:11:44 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button2</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>styles</object>
<last_modification_time>Tue, 05 Jun 2001 13:11:44 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
@ -261,7 +254,7 @@
</widget>
<widget>
<class>GtkDialog</class>
<class>GnomeDialog</class>
<name>editor</name>
<title>Gramps - Style Editor</title>
<type>GTK_WINDOW_TOPLEVEL</type>
@ -270,22 +263,32 @@
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox2</name>
<width>600</width>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<child_name>Dialog:action_area</child_name>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area2</name>
<border_width>10</border_width>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
@ -294,49 +297,32 @@
</child>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox2</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<class>GtkButton</class>
<name>button7</name>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_save_style_clicked</handler>
<object>editor</object>
<last_modification_time>Tue, 05 Jun 2001 18:48:01 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button7</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_save_style_clicked</handler>
<object>editor</object>
<last_modification_time>Tue, 05 Jun 2001 18:48:01 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button8</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>editor</object>
<last_modification_time>Tue, 05 Jun 2001 18:47:41 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button8</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>destroy_passed_object</handler>
<object>editor</object>
<last_modification_time>Tue, 05 Jun 2001 18:47:41 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
@ -410,6 +396,7 @@
<class>GtkEntry</class>
<name>style_name</name>
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>