From 7d3f6cc3362c20a60a6e14eaa0ca58ef920e5ee0 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Thu, 13 Dec 2001 16:24:30 +0000 Subject: [PATCH] Added navigation buttons for lists, Fixed translation problem svn: r613 --- gramps/src/EditPerson.glade | 3502 +++++++++++++++++++---------------- gramps/src/EditPerson.py | 82 +- gramps/src/EditPlace.py | 3 +- gramps/src/EditSource.py | 3 +- gramps/src/ImageSelect.py | 40 +- gramps/src/Marriage.py | 19 +- gramps/src/PlaceView.py | 5 +- gramps/src/gramps.py | 1 - gramps/src/imagesel.glade | 768 +++++--- gramps/src/marriage.glade | 1230 ++++++------ 10 files changed, 3207 insertions(+), 2446 deletions(-) diff --git a/gramps/src/EditPerson.glade b/gramps/src/EditPerson.glade index 897cefcca..e0c6860f8 100644 --- a/gramps/src/EditPerson.glade +++ b/gramps/src/EditPerson.glade @@ -1281,12 +1281,10 @@ 0 - GtkFrame - name_frame - 5 - - 0 - GTK_SHADOW_ETCHED_IN + GtkHBox + hbox37 + False + 0 5 False @@ -1294,324 +1292,404 @@ - GtkTable - table10 - 4 - 3 - False - 0 - 0 + GtkFrame + name_frame + 5 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + - GtkLabel - label121 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - + GtkTable + table10 + 4 + 3 + False + 0 + 0 - - GtkLabel - label120 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label129 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - alt_given - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 0 - 1 - 3 + + GtkLabel + label121 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - True - False - False - False - True - False - - + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - alt_last - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 1 - 2 - 3 + + GtkLabel + label120 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - False - False - False - False - True - False - - + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - alt_suffix - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 2 - 3 - 3 + + GtkLabel + label129 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - False - False - False - False - True - False - - + + 0 + 1 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - label168 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 3 - 4 + + GtkLabel + alt_given + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 0 0 - False - False - False - False - True - False - - + + 2 + 3 + 0 + 1 + 3 + 3 + True + False + False + False + True + False + + - - GtkLabel - name_details - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 3 - 4 - 3 + + GtkLabel + alt_last + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 1 + 2 + 3 + 3 + False + False + False + False + True + False + + + + + GtkLabel + alt_suffix + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 2 + 3 + 3 + 3 + False + False + False + False + True + False + + + + + GtkLabel + label168 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - False - False - False - False - True - False - + + 0 + 1 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + name_details + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 3 + 4 + 3 + 3 + False + False + False + False + True + False + + + + + GtkLabel + label236 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label237 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label238 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label239 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + + + GtkVButtonBox + vbuttonbox1 + GTK_BUTTONBOX_DEFAULT_STYLE + 2 + 1 + 1 + 0 + 0 + + 0 + False + True + + + + GtkButton + nameup + True + True + + clicked + on_up_clicked + nameList + Thu, 13 Dec 2001 14:31:04 GMT + + GTK_RELIEF_NORMAL + + + GtkArrow + arrow1 + GTK_ARROW_UP + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + - GtkLabel - label236 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + GtkButton + namedown + True + True + + clicked + on_down_clicked + nameList + Thu, 13 Dec 2001 14:31:12 GMT + + GTK_RELIEF_NORMAL - - GtkLabel - label237 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 1 - 2 + + GtkArrow + arrow2 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 0 0 - False - False - False - False - True - False - - - - - GtkLabel - label238 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label239 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - + @@ -1770,12 +1848,10 @@ - GtkFrame - eventName - 5 - - 0 - GTK_SHADOW_ETCHED_IN + GtkHBox + hbox38 + False + 0 5 False @@ -1783,402 +1859,482 @@ - GtkTable - table7 - 5 - 3 - False - 0 - 0 + GtkFrame + eventName + 5 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + - GtkLabel - label103 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + GtkTable + table7 + 5 + 3 + False + 0 + 0 - - GtkLabel - label106 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label105 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - eventDate - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 0 - 1 - 3 + + GtkLabel + label103 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - True - False - False - False - True - False - - + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - eventPlace - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 1 - 2 - 3 + + GtkLabel + label106 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - True - False - False - False - True - False - - + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - eventDescription - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 3 - 4 - 3 + + GtkLabel + label105 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - True - False - False - False - True - False - - + + 0 + 1 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - label164 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 4 - 5 + + GtkLabel + eventDate + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 0 0 - False - False - False - False - True - False - - + + 2 + 3 + 0 + 1 + 3 + 3 + True + False + False + False + True + False + + - - GtkLabel - event_details - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 4 - 5 - 3 + + GtkLabel + eventPlace + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 1 + 2 + 3 + 3 + True + False + False + False + True + False + + + + + GtkLabel + eventDescription + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 3 + 4 + 3 + 3 + True + False + False + False + True + False + + + + + GtkLabel + label164 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - True - False - False - False - True - False - - + + 0 + 1 + 4 + 5 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - label232 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 0 - 1 + + GtkLabel + event_details + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 0 0 - False - False - False - False - True - False - - + + 2 + 3 + 4 + 5 + 3 + 3 + True + False + False + False + True + False + + - - GtkLabel - label233 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 1 - 2 + + GtkLabel + label232 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label234 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label235 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 4 - 5 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label241 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label242 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - eventCause - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 2 - 3 - 3 3 - True - False - False - False - True - False - + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label233 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label234 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label235 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 4 + 5 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label241 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 3 + + 0 + 1 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label242 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + eventCause + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 2 + 3 + 3 + 3 + True + False + False + False + True + False + + + + + + + GtkVButtonBox + vbuttonbox2 + GTK_BUTTONBOX_DEFAULT_STYLE + 2 + 1 + 1 + 0 + 0 + + 0 + False + True + + + + GtkButton + eventup + True + True + + clicked + on_up_clicked + eventList + Thu, 13 Dec 2001 14:30:31 GMT + + GTK_RELIEF_NORMAL + + + GtkArrow + arrow3 + GTK_ARROW_UP + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + + + + + GtkButton + eventdown + True + True + + clicked + on_down_clicked + eventList + Thu, 13 Dec 2001 14:30:53 GMT + + GTK_RELIEF_NORMAL + + + GtkArrow + arrow4 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + @@ -2369,12 +2525,10 @@ - GtkFrame - attr_type - 5 - - 0 - GTK_SHADOW_ETCHED_IN + GtkHBox + hbox39 + False + 0 5 False @@ -2382,168 +2536,248 @@ - GtkTable - table24 - 2 - 3 - False - 0 - 0 + GtkFrame + attr_type + 5 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + - GtkLabel - label196 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + GtkTable + table24 + 2 + 3 + False + 0 + 0 - - GtkLabel - attr_value - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 0 - 1 - 3 + + GtkLabel + label196 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - True - False - False - False - True - False - - + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - label201 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 1 - 2 + + GtkLabel + attr_value + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 0 0 - False - False - False - False - True - False - - + + 2 + 3 + 0 + 1 + 3 + 3 + True + False + False + False + True + False + + - - GtkLabel - attr_details - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 1 - 2 - 3 + + GtkLabel + label201 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - False - False - False - False - True - False - + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + attr_details + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 1 + 2 + 3 + 3 + False + False + False + False + True + False + + + + + GtkLabel + label230 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label231 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + + + GtkVButtonBox + vbuttonbox3 + GTK_BUTTONBOX_DEFAULT_STYLE + 2 + 1 + 1 + 0 + 0 + + 0 + False + True + + + + GtkButton + attrup + True + True + + clicked + on_up_clicked + attr_list + Thu, 13 Dec 2001 14:29:59 GMT + + GTK_RELIEF_NORMAL + + + GtkArrow + arrow5 + GTK_ARROW_UP + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + - GtkLabel - label230 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + GtkButton + attrdown + True + True + + clicked + on_down_clicked + attr_list + Thu, 13 Dec 2001 14:30:09 GMT + + GTK_RELIEF_NORMAL - - GtkLabel - label231 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 1 - 2 + + GtkArrow + arrow6 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 0 0 - False - False - False - False - True - False - + @@ -2708,12 +2942,10 @@ 0 - GtkFrame - address_label - 5 - - 0 - GTK_SHADOW_ETCHED_IN + GtkHBox + hbox40 + False + 0 5 False @@ -2721,558 +2953,638 @@ - GtkTable - table20 - 5 - 6 - False - 0 - 0 + GtkFrame + address_label + 5 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + - GtkLabel - label142 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 3 - 4 + GtkTable + table20 + 5 + 6 + False + 0 + 0 + + + GtkLabel + label142 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 3 + + 0 + 1 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label143 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 3 + + 0 + 1 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label141 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 3 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label140 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 3 + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label148 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 3 + + 3 + 4 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label149 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 3 + + 3 + 4 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + city + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 0 0 - False - False - False - False - True - False - - + + 2 + 3 + 2 + 3 + 3 + 3 + True + False + False + False + True + False + + - - GtkLabel - label143 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label141 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label140 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label148 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 3 - 4 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label149 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 3 - 4 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - city - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 2 - 3 + + GtkLabel + postal + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 3 3 - True - False - False - False - True - False - - + + 5 + 6 + 3 + 4 + 0 + 0 + True + False + False + False + True + False + + - - GtkLabel - postal - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 3 - 3 - - 5 - 6 - 3 - 4 - 0 - 0 - True - False - False - False - True - False - - - - - GtkLabel - state - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 3 - 3 - - 5 - 6 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - - - - - GtkLabel - label193 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 4 - 5 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - country - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 3 - 4 + + GtkLabel + state + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 3 3 - False - False - False - False - True - False - - + + 5 + 6 + 2 + 3 + 0 + 0 + True + False + False + False + True + False + + - - GtkLabel - label223 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label224 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label225 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label226 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label227 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 4 - 5 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label228 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 4 - 5 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label229 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 4 - 5 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - address_start - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 2 - 6 - 0 - 1 - 3 + + GtkLabel + label193 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - True - False - False - False - True - False - + + 0 + 1 + 4 + 5 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + country + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 3 + 4 + 3 + 3 + False + False + False + False + True + False + + + + + GtkLabel + label223 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label224 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label225 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label226 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label227 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 4 + 5 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label228 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 4 + 5 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label229 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 4 + 5 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + address_start + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 2 + 6 + 0 + 1 + 3 + 3 + True + False + False + False + True + False + + + + + GtkLabel + street + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 2 + 6 + 1 + 2 + 3 + 3 + True + False + False + False + True + False + + + + + GtkLabel + addr_details + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 2 + 6 + 4 + 5 + 3 + 3 + False + False + False + False + True + False + + + + + + + GtkVButtonBox + vbuttonbox4 + GTK_BUTTONBOX_DEFAULT_STYLE + 2 + 1 + 1 + 0 + 0 + + 0 + False + True + + + + GtkButton + addrup + True + True + + clicked + on_up_clicked + addr_list + Thu, 13 Dec 2001 14:29:36 GMT + + GTK_RELIEF_NORMAL + + + GtkArrow + arrow7 + GTK_ARROW_UP + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + - GtkLabel - street - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 2 - 6 - 1 - 2 - 3 - 3 - True - False - False - False - True - False - - + GtkButton + addrdown + True + True + + clicked + on_down_clicked + addr_list + Thu, 13 Dec 2001 14:29:48 GMT + + GTK_RELIEF_NORMAL - - GtkLabel - addr_details - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 2 - 6 - 4 - 5 - 3 - 3 - False - False - False - False - True - False - + + GtkArrow + arrow8 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + @@ -3603,12 +3915,10 @@ 0 - GtkFrame - frame10 - 5 - - 0 - GTK_SHADOW_ETCHED_IN + GtkHBox + hbox41 + False + 0 5 False @@ -3616,199 +3926,279 @@ - GtkTable - table25 - 2 - 3 - False - 0 - 0 + GtkFrame + frame10 + 5 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + - GtkLabel - label203 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label204 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - url_des - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 1 - 2 - 3 - 3 - False - False - False - False - True - False - - - - - GtkHBox - hbox29 + GtkTable + table25 + 2 + 3 False - 0 - - 2 - 3 - 0 - 1 - 3 - 3 - True - False - False - False - True - True - + 0 + 0 GtkLabel - web_url - + label203 + GTK_JUSTIFY_CENTER False + 1 + 0.5 + 5 + 3 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label204 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 3 + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + url_des + + GTK_JUSTIFY_LEFT + False 0 0.5 0 0 - 0 - True - True + 2 + 3 + 1 + 2 + 3 + 3 + False + False + False + False + True + False - GtkButton - web_go - True - - clicked - on_web_go_clicked - web_url - Sat, 08 Sep 2001 20:48:58 GMT - - - GTK_RELIEF_NORMAL + GtkHBox + hbox29 + False + 0 - 0 - False - False + 2 + 3 + 0 + 1 + 3 + 3 + True + False + False + False + True + True + + + GtkLabel + web_url + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + True + True + + + + + GtkButton + web_go + True + + clicked + on_web_go_clicked + web_url + Sat, 08 Sep 2001 20:48:58 GMT + + + GTK_RELIEF_NORMAL + + 0 + False + False + + + + + + GtkLabel + label221 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label222 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + + + GtkVButtonBox + vbuttonbox5 + GTK_BUTTONBOX_DEFAULT_STYLE + 2 + 1 + 1 + 0 + 0 + + 0 + False + True + + + + GtkButton + urlup + True + True + + clicked + on_up_clicked + web_list + Thu, 13 Dec 2001 14:29:17 GMT + + GTK_RELIEF_NORMAL + + + GtkArrow + arrow9 + GTK_ARROW_UP + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 - GtkLabel - label221 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + GtkButton + urldown + True + True + + clicked + on_down_clicked + web_list + Thu, 13 Dec 2001 14:28:46 GMT + + GTK_RELIEF_NORMAL - - GtkLabel - label222 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 1 - 2 + + GtkArrow + arrow10 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 0 0 - False - False - False - False - True - False - + diff --git a/gramps/src/EditPerson.py b/gramps/src/EditPerson.py index fb805e688..93e2ec9a0 100644 --- a/gramps/src/EditPerson.py +++ b/gramps/src/EditPerson.py @@ -35,7 +35,7 @@ import gtk from gnome.ui import GnomeErrorDialog, GnomeWarningDialog, GnomeQuestionDialog import libglade import GdkImlib -import GDK +from GDK import ACTION_COPY, BUTTON1_MASK, _2BUTTON_PRESS #------------------------------------------------------------------------- # @@ -84,14 +84,15 @@ class EditPerson: self.lists_changed = 0 self.update_birth = 0 self.update_death = 0 - pid = "i%s" % person.getId() self.load_obj = None self.top = libglade.GladeXML(const.editPersonFile, "editPerson") - self.gallery_widget = self.top.get_widget("photolist") - self.gallery = ImageSelect.Gallery(person, self.path, pid, self.gallery_widget, self.db) + gwidget = self.top.get_widget("photolist") + self.gallery = ImageSelect.Gallery(person, self.path, gwidget, self.db) self.top.signal_autoconnect({ "destroy_passed_object" : self.on_cancel_edit, + "on_up_clicked" : self.on_up_clicked, + "on_down_clicked" : self.on_down_clicked, "on_add_address_clicked" : self.on_add_addr_clicked, "on_add_aka_clicked" : self.on_add_aka_clicked, "on_add_attr_clicked" : self.on_add_attr_clicked, @@ -343,25 +344,25 @@ class EditPerson: self.ldsseal_fam.set_menu(myMenu) self.ldsseal_fam.set_history(hist) - self.event_list.drag_dest_set(gtk.DEST_DEFAULT_ALL,pycode_tgts,GDK.ACTION_COPY) - self.event_list.drag_source_set(GDK.BUTTON1_MASK, pycode_tgts, GDK.ACTION_COPY) - self.event_list.connect('drag_data_get', self.ev_source_drag_data_get) - self.event_list.connect('drag_data_received', self.ev_dest_drag_data_received) + self.event_list.drag_dest_set(gtk.DEST_DEFAULT_ALL,pycode_tgts,ACTION_COPY) + self.event_list.drag_source_set(BUTTON1_MASK, pycode_tgts, ACTION_COPY) + self.event_list.connect('drag_data_get', self.ev_drag_data_get) + self.event_list.connect('drag_data_received', self.ev_drag_data_received) - self.web_list.drag_dest_set(gtk.DEST_DEFAULT_ALL,pycode_tgts,GDK.ACTION_COPY) - self.web_list.drag_source_set(GDK.BUTTON1_MASK, pycode_tgts, GDK.ACTION_COPY) - self.web_list.connect('drag_data_get', self.url_source_drag_data_get) - self.web_list.connect('drag_data_received', self.url_dest_drag_data_received) + self.web_list.drag_dest_set(gtk.DEST_DEFAULT_ALL,pycode_tgts,ACTION_COPY) + self.web_list.drag_source_set(BUTTON1_MASK, pycode_tgts, ACTION_COPY) + self.web_list.connect('drag_data_get', self.url_drag_data_get) + self.web_list.connect('drag_data_received', self.url_drag_data_received) - self.attr_list.drag_dest_set(gtk.DEST_DEFAULT_ALL,pycode_tgts,GDK.ACTION_COPY) - self.attr_list.drag_source_set(GDK.BUTTON1_MASK, pycode_tgts, GDK.ACTION_COPY) - self.attr_list.connect('drag_data_get', self.at_source_drag_data_get) - self.attr_list.connect('drag_data_received', self.at_dest_drag_data_received) + self.attr_list.drag_dest_set(gtk.DEST_DEFAULT_ALL,pycode_tgts,ACTION_COPY) + self.attr_list.drag_source_set(BUTTON1_MASK, pycode_tgts, ACTION_COPY) + self.attr_list.connect('drag_data_get', self.at_drag_data_get) + self.attr_list.connect('drag_data_received', self.at_drag_data_received) - self.addr_list.drag_dest_set(gtk.DEST_DEFAULT_ALL,pycode_tgts,GDK.ACTION_COPY) - self.addr_list.drag_source_set(GDK.BUTTON1_MASK, pycode_tgts, GDK.ACTION_COPY) - self.addr_list.connect('drag_data_get', self.ad_source_drag_data_get) - self.addr_list.connect('drag_data_received', self.ad_dest_drag_data_received) + self.addr_list.drag_dest_set(gtk.DEST_DEFAULT_ALL,pycode_tgts,ACTION_COPY) + self.addr_list.drag_source_set(BUTTON1_MASK, pycode_tgts, ACTION_COPY) + self.addr_list.connect('drag_data_get', self.ad_drag_data_get) + self.addr_list.connect('drag_data_received', self.ad_drag_data_received) # draw lists self.redraw_event_list() @@ -371,7 +372,7 @@ class EditPerson: self.redraw_url_list() self.window.show() - def ev_dest_drag_data_received(self,widget,context,x,y,selection_data,info,time): + def ev_drag_data_received(self,widget,context,x,y,selection_data,info,time): if selection_data and selection_data.data: exec 'data = %s' % selection_data.data exec 'mytype = "%s"' % data[0] @@ -390,7 +391,7 @@ class EditPerson: self.lists_changed = 1 self.redraw_event_list() - def ev_source_drag_data_get(self,widget, context, selection_data, info, time): + def ev_drag_data_get(self,widget, context, selection_data, info, time): ev = widget.get_row_data(widget.focus_row) bits_per = 8; # we're going to pass a string @@ -398,7 +399,7 @@ class EditPerson: data = str(('pevent',self.person.getId(),pickled)); selection_data.set(selection_data.target, bits_per, data) - def url_dest_drag_data_received(self,widget,context,x,y,selection_data,info,time): + def url_drag_data_received(self,widget,context,x,y,selection_data,info,time): if selection_data and selection_data.data: exec 'data = %s' % selection_data.data exec 'mytype = "%s"' % data[0] @@ -410,7 +411,7 @@ class EditPerson: self.lists_changed = 1 self.redraw_url_list() - def url_source_drag_data_get(self,widget, context, selection_data, info, time): + def url_drag_data_get(self,widget, context, selection_data, info, time): ev = widget.get_row_data(widget.focus_row) bits_per = 8; # we're going to pass a string @@ -418,7 +419,7 @@ class EditPerson: data = str(('url',self.person.getId(),pickled)); selection_data.set(selection_data.target, bits_per, data) - def at_dest_drag_data_received(self,widget,context,x,y,selection_data,info,time): + def at_drag_data_received(self,widget,context,x,y,selection_data,info,time): if selection_data and selection_data.data: exec 'data = %s' % selection_data.data exec 'mytype = "%s"' % data[0] @@ -434,7 +435,7 @@ class EditPerson: self.lists_changed = 1 self.redraw_attr_list() - def at_source_drag_data_get(self,widget, context, selection_data, info, time): + def at_drag_data_get(self,widget, context, selection_data, info, time): ev = widget.get_row_data(widget.focus_row) bits_per = 8; # we're going to pass a string @@ -442,7 +443,7 @@ class EditPerson: data = str(('pattr',self.person.getId(),pickled)); selection_data.set(selection_data.target, bits_per, data) - def ad_dest_drag_data_received(self,widget,context,x,y,selection_data,info,time): + def ad_drag_data_received(self,widget,context,x,y,selection_data,info,time): if selection_data and selection_data.data: exec 'data = %s' % selection_data.data exec 'mytype = "%s"' % data[0] @@ -458,7 +459,7 @@ class EditPerson: self.lists_changed = 1 self.redraw_addr_list() - def ad_source_drag_data_get(self,widget, context, selection_data, info, time): + def ad_drag_data_get(self,widget, context, selection_data, info, time): ev = widget.get_row_data(widget.focus_row) bits_per = 8; # we're going to pass a string @@ -555,6 +556,20 @@ class EditPerson: pname = self.person.getPrimaryName().getName() AttrEdit.AttributeEditor(self,None,pname,const.personalAttributes) + def on_up_clicked(self,obj): + if len(obj.selection) == 0: + return + row = obj.selection[0] + if row != 0: + obj.select_row(row-1,0) + + def on_down_clicked(self,obj): + if len(obj.selection) == 0: + return + row = obj.selection[0] + if row != obj.rows-1: + obj.select_row(row+1,0) + def on_event_add_clicked(self,obj): """Brings up the EventEditor for a new event""" import EventEdit @@ -781,7 +796,7 @@ class EditPerson: self.dplace.set_position(0) def attr_double_click(self,obj,event): - if event.button == 1 and event.type == GDK._2BUTTON_PRESS: + if event.button == 1 and event.type == _2BUTTON_PRESS: self.on_update_attr_clicked(obj) def on_update_attr_clicked(self,obj): @@ -793,7 +808,7 @@ class EditPerson: AttrEdit.AttributeEditor(self,attr,pname,const.personalAttributes) def addr_double_click(self,obj,event): - if event.button == 1 and event.type == GDK._2BUTTON_PRESS: + if event.button == 1 and event.type == _2BUTTON_PRESS: self.on_update_addr_clicked(obj) def on_update_addr_clicked(self,obj): @@ -802,7 +817,7 @@ class EditPerson: 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: + if event.button == 1 and event.type == _2BUTTON_PRESS: self.on_update_url_clicked(obj) def on_update_url_clicked(self,obj): @@ -814,7 +829,7 @@ class EditPerson: UrlEdit.UrlEditor(self,pname,url) def event_double_click(self,obj,event): - if event.button == 1 and event.type == GDK._2BUTTON_PRESS: + if event.button == 1 and event.type == _2BUTTON_PRESS: self.on_event_update_clicked(obj) def on_event_update_clicked(self,obj): @@ -878,7 +893,7 @@ class EditPerson: 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: + if event.button == 1 and event.type == _2BUTTON_PRESS: self.on_aka_update_clicked(obj) def on_aka_update_clicked(self,obj): @@ -1127,6 +1142,7 @@ class EditPerson: self.not_loaded = 0 self.gallery.load_images() + def update_ord(func,ord,date,temple): if not ord: if (date or temple): diff --git a/gramps/src/EditPlace.py b/gramps/src/EditPlace.py index 8e301c06f..57304c07b 100644 --- a/gramps/src/EditPlace.py +++ b/gramps/src/EditPlace.py @@ -67,9 +67,8 @@ class EditPlace: self.srcreflist = [] self.top_window = libglade.GladeXML(const.placesFile,"placeEditor") - idval = "p%s" % place.getId() plwidget = self.top_window.get_widget("photolist") - self.gallery = ImageSelect.Gallery(place, self.path, idval, plwidget, db) + self.gallery = ImageSelect.Gallery(place, self.path, plwidget, db) self.title = self.top_window.get_widget("place_title") self.city = self.top_window.get_widget("city") self.parish = self.top_window.get_widget("parish") diff --git a/gramps/src/EditSource.py b/gramps/src/EditSource.py index ee85527f7..329ce91ff 100644 --- a/gramps/src/EditSource.py +++ b/gramps/src/EditSource.py @@ -57,9 +57,8 @@ class EditSource: self.ref_not_loaded = 1 self.top_window = libglade.GladeXML(const.gladeFile,"sourceEditor") - sid = "s%s" % source.getId() plwidget = self.top_window.get_widget("photolist") - self.gallery = ImageSelect.Gallery(source, self.path, sid, plwidget, db) + self.gallery = ImageSelect.Gallery(source, self.path, plwidget, db) self.title = self.top_window.get_widget("source_title") self.author = self.top_window.get_widget("author") self.pubinfo = self.top_window.get_widget("pubinfo") diff --git a/gramps/src/ImageSelect.py b/gramps/src/ImageSelect.py index d5baf4a80..cad4851d5 100644 --- a/gramps/src/ImageSelect.py +++ b/gramps/src/ImageSelect.py @@ -69,10 +69,9 @@ class ImageSelect: # window. # #--------------------------------------------------------------------- - def __init__(self, path, prefix, db): + def __init__(self, path, db): self.path = path; self.db = db - self.prefix = prefix; #------------------------------------------------------------------------- # @@ -187,8 +186,8 @@ class ImageSelect: # #------------------------------------------------------------------------- class Gallery(ImageSelect): - def __init__(self, dataobj, path, prefix, icon_list, db): - ImageSelect.__init__(self, path, prefix, db) + def __init__(self, dataobj, path, icon_list, db): + ImageSelect.__init__(self, path, db) t = [ ('STRING', 0, 0), @@ -210,7 +209,6 @@ class Gallery(ImageSelect): # Remember arguments self.path = path; - self.prefix = prefix; self.dataobj = dataobj; self.icon_list = icon_list; @@ -500,6 +498,8 @@ class LocalMediaProperties: self.change_dialog.get_widget("notes").insert_defaults(photo.getNote()) self.change_dialog.signal_autoconnect({ "on_cancel_clicked" : utils.destroy_passed_object, + "on_up_clicked" : self.on_up_clicked, + "on_down_clicked" : self.on_down_clicked, "on_ok_clicked" : self.on_ok_clicked, "on_apply_clicked" : self.on_apply_clicked, "on_attr_list_select_row" : self.on_attr_list_select_row, @@ -509,6 +509,20 @@ class LocalMediaProperties: }) self.redraw_attr_list() + def on_up_clicked(self,obj): + if len(obj.selection) == 0: + return + row = obj.selection[0] + if row != 0: + obj.select_row(row-1,0) + + def on_down_clicked(self,obj): + if len(obj.selection) == 0: + return + row = obj.selection[0] + if row != obj.rows-1: + obj.select_row(row+1,0) + def redraw_attr_list(self): utils.redraw_list(self.alist,self.attr_list,disp_attr) @@ -588,6 +602,8 @@ class GlobalMediaProperties: self.notes.insert_defaults(object.getNote()) self.change_dialog.signal_autoconnect({ "on_cancel_clicked" : utils.destroy_passed_object, + "on_up_clicked" : self.on_up_clicked, + "on_down_clicked" : self.on_down_clicked, "on_ok_clicked" : self.on_ok_clicked, "on_apply_clicked" : self.on_apply_clicked, "on_attr_list_select_row": self.on_attr_list_select_row, @@ -599,6 +615,20 @@ class GlobalMediaProperties: }) self.redraw_attr_list() + def on_up_clicked(self,obj): + if len(obj.selection) == 0: + return + row = obj.selection[0] + if row != 0: + obj.select_row(row-1,0) + + def on_down_clicked(self,obj): + if len(obj.selection) == 0: + return + row = obj.selection[0] + if row != obj.rows-1: + obj.select_row(row+1,0) + def update_info(self): fname = self.object.getPath() if self.object.getLocal(): diff --git a/gramps/src/Marriage.py b/gramps/src/Marriage.py index 4908d65f9..6cddc2366 100644 --- a/gramps/src/Marriage.py +++ b/gramps/src/Marriage.py @@ -67,11 +67,12 @@ class Marriage: self.top = libglade.GladeXML(const.marriageFile,"marriageEditor") top_window = self.get_widget("marriageEditor") - fid = family.getId() plwidget = self.top.get_widget("photolist") - self.gallery = ImageSelect.Gallery(family, self.path, fid, plwidget, db) + self.gallery = ImageSelect.Gallery(family, self.path, plwidget, db) self.top.signal_autoconnect({ "destroy_passed_object" : self.on_cancel_edit, + "on_up_clicked" : self.on_up_clicked, + "on_down_clicked" : self.on_down_clicked, "on_add_attr_clicked" : self.on_add_attr_clicked, "on_addphoto_clicked" : self.gallery.on_add_photo_clicked, "on_attr_list_select_row" : self.on_attr_list_select_row, @@ -165,6 +166,20 @@ class Marriage: self.redraw_attr_list() top_window.show() + def on_up_clicked(self,obj): + if len(obj.selection) == 0: + return + row = obj.selection[0] + if row != 0: + obj.select_row(row-1,0) + + def on_down_clicked(self,obj): + if len(obj.selection) == 0: + return + row = obj.selection[0] + if row != obj.rows-1: + obj.select_row(row+1,0) + def ev_dest_drag_data_received(self,widget,context,x,y,selection_data,info,time): if selection_data and selection_data.data: exec 'data = %s' % selection_data.data diff --git a/gramps/src/PlaceView.py b/gramps/src/PlaceView.py index 8144535e9..b164f1de6 100644 --- a/gramps/src/PlaceView.py +++ b/gramps/src/PlaceView.py @@ -45,8 +45,9 @@ class PlaceView: self.country_arrow = glade.get_widget("country_arrow") self.update_display= update - self.sort_arrow = [ self.place_arrow, self.place_id_arrow, self.parish_arrow, - self.city_arrow, self.county_arrow, self.state_arrow, + self.sort_arrow = [ self.place_arrow, self.place_id_arrow, + self.parish_arrow, self.city_arrow, + self.county_arrow, self.state_arrow, self.country_arrow ] self.place_list.set_column_visibility(7,0) diff --git a/gramps/src/gramps.py b/gramps/src/gramps.py index b1d975e61..174eec8d0 100755 --- a/gramps/src/gramps.py +++ b/gramps/src/gramps.py @@ -5,7 +5,6 @@ import intl import os import gtk import gnome.ui -import const intl.textdomain("gramps") diff --git a/gramps/src/imagesel.glade b/gramps/src/imagesel.glade index 1e2fa5bfc..fdf89db72 100644 --- a/gramps/src/imagesel.glade +++ b/gramps/src/imagesel.glade @@ -895,12 +895,10 @@ 0 - GtkFrame - attr_type - 5 - - 0 - GTK_SHADOW_ETCHED_IN + GtkHBox + hbox6 + False + 0 5 False @@ -908,168 +906,248 @@ - GtkTable - table3 - 2 - 3 - False - 0 - 0 + GtkFrame + attr_type + 5 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + - GtkLabel - label138 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + GtkTable + table3 + 2 + 3 + False + 0 + 0 - - GtkLabel - attr_value - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 0 - 1 - 3 + + GtkLabel + label138 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - True - False - False - False - True - False - - + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - attrlabel - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 1 - 2 + + GtkLabel + attr_value + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 0 0 - False - False - False - False - True - False - - + + 2 + 3 + 0 + 1 + 3 + 3 + True + False + False + False + True + False + + - - GtkLabel - attr_details - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 1 - 2 - 3 + + GtkLabel + attrlabel + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - False - False - False - False - True - False - + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + attr_details + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 1 + 2 + 3 + 3 + False + False + False + False + True + False + + + + + GtkLabel + label142 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label143 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + + + GtkVButtonBox + vbuttonbox1 + GTK_BUTTONBOX_DEFAULT_STYLE + 2 + 1 + 1 + 0 + 0 + + 0 + False + True + + + + GtkButton + button96 + True + True + + clicked + on_up_clicked + attr_list + Thu, 13 Dec 2001 14:29:59 GMT + + GTK_RELIEF_NORMAL + + + GtkArrow + arrow1 + GTK_ARROW_UP + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + - GtkLabel - label142 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + GtkButton + button97 + True + True + + clicked + on_down_clicked + attr_list + Thu, 13 Dec 2001 14:30:09 GMT + + GTK_RELIEF_NORMAL - - GtkLabel - label143 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 1 - 2 + + GtkArrow + arrow2 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 0 0 - False - False - False - False - True - False - + @@ -1816,12 +1894,10 @@ 0 - GtkFrame - attr_type - 5 - - 0 - GTK_SHADOW_ETCHED_IN + GtkHBox + hbox7 + False + 0 5 False @@ -1829,168 +1905,248 @@ - GtkTable - table5 - 2 - 3 - False - 0 - 0 + GtkFrame + attr_type + 5 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + - GtkLabel - label161 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + GtkTable + table5 + 2 + 3 + False + 0 + 0 - - GtkLabel - attr_value - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 0 - 1 - 3 + + GtkLabel + label161 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - True - False - False - False - True - False - - + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - label163 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 1 - 2 + + GtkLabel + attr_value + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 0 0 - False - False - False - False - True - False - - + + 2 + 3 + 0 + 1 + 3 + 3 + True + False + False + False + True + False + + - - GtkLabel - attr_details - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 1 - 2 - 3 + + GtkLabel + label163 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - False - False - False - False - True - False - + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + attr_details + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 1 + 2 + 3 + 3 + False + False + False + False + True + False + + + + + GtkLabel + label165 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label166 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 3 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + + + GtkVButtonBox + vbuttonbox2 + GTK_BUTTONBOX_DEFAULT_STYLE + 2 + 1 + 1 + 0 + 0 + + 0 + False + True + + + + GtkButton + button98 + True + True + + clicked + on_up_clicked + attr_list + Thu, 13 Dec 2001 14:29:59 GMT + + GTK_RELIEF_NORMAL + + + GtkArrow + arrow3 + GTK_ARROW_UP + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + - GtkLabel - label165 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + GtkButton + button99 + True + True + + clicked + on_down_clicked + attr_list + Thu, 13 Dec 2001 14:30:09 GMT + + GTK_RELIEF_NORMAL - - GtkLabel - label166 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 3 - - 1 - 2 - 1 - 2 + + GtkArrow + arrow4 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 0 0 - False - False - False - False - True - False - + diff --git a/gramps/src/marriage.glade b/gramps/src/marriage.glade index 0ea773259..174695e81 100644 --- a/gramps/src/marriage.glade +++ b/gramps/src/marriage.glade @@ -287,7 +287,7 @@ GtkNotebook notebook4 - 550 + 600 True True True @@ -309,12 +309,10 @@ 0 - GtkFrame - marriageEventName - 5 - - 0 - GTK_SHADOW_ETCHED_IN + GtkHBox + hbox18 + False + 0 0 True @@ -322,402 +320,482 @@ - GtkTable - table8 - 5 - 3 - False - 0 - 0 + GtkFrame + marriageEventName + 5 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + - GtkLabel - label212 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + GtkTable + table8 + 5 + 3 + False + 0 + 0 - - GtkLabel - label213 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label214 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - marriageDate - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 0 - 1 - 3 + + GtkLabel + label212 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - True - False - False - False - True - False - - + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - marriagePlace - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 1 - 2 - 3 + + GtkLabel + label213 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - True - False - False - False - True - False - - + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - marriageDescription - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 3 - 4 - 3 + + GtkLabel + label214 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - True - False - False - False - True - False - - + + 0 + 1 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - label218 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 4 - 5 + + GtkLabel + marriageDate + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 0 0 - False - False - False - False - True - False - - + + 2 + 3 + 0 + 1 + 3 + 3 + True + False + False + False + True + False + + - - GtkLabel - event_details - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 4 - 5 - 3 + + GtkLabel + marriagePlace + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 1 + 2 + 3 + 3 + True + False + False + False + True + False + + + + + GtkLabel + marriageDescription + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 3 + 4 + 3 + 3 + True + False + False + False + True + False + + + + + GtkLabel + label218 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - True - False - False - False - True - False - + + 0 + 1 + 4 + 5 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + event_details + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 4 + 5 + 3 + 3 + True + False + False + False + True + False + + + + + GtkLabel + label223 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label224 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label225 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label226 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 4 + 5 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label230 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 3 + + 0 + 1 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label231 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + marriageCause + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + + + GtkVButtonBox + vbuttonbox2 + GTK_BUTTONBOX_DEFAULT_STYLE + 2 + 1 + 1 + 0 + 0 + + 0 + False + True + + + + GtkButton + button112 + True + True + + clicked + on_up_clicked + marriageEventList + Thu, 13 Dec 2001 14:29:59 GMT + + GTK_RELIEF_NORMAL + + + GtkArrow + arrow3 + GTK_ARROW_UP + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + - GtkLabel - label223 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + GtkButton + button113 + True + True + + clicked + on_down_clicked + marriageEventList + Thu, 13 Dec 2001 14:30:09 GMT + + GTK_RELIEF_NORMAL - - GtkLabel - label224 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 1 - 2 - 1 - 2 + + GtkArrow + arrow4 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 0 0 - False - False - False - False - True - False - - - - - GtkLabel - label225 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 1 - 2 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label226 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 1 - 2 - 4 - 5 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label230 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label231 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 1 - 2 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - marriageCause - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - + @@ -878,12 +956,10 @@ 0 - GtkFrame - attr_type - 5 - - 0 - GTK_SHADOW_ETCHED_IN + GtkHBox + hbox17 + False + 0 0 False @@ -891,168 +967,248 @@ - GtkTable - table9 - 2 - 3 - False - 0 - 0 + GtkFrame + attr_type + 5 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + - GtkLabel - label220 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + GtkTable + table9 + 2 + 3 + False + 0 + 0 - - GtkLabel - attr_value - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 0 - 1 - 3 + + GtkLabel + label220 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - True - False - False - False - True - False - - + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - label222 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 3 - - 0 - 1 - 1 - 2 + + GtkLabel + attr_value + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 0 0 - False - False - False - False - True - False - - + + 2 + 3 + 0 + 1 + 3 + 3 + True + False + False + False + True + False + + - - GtkLabel - attr_details - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 1 - 2 - 3 + + GtkLabel + label222 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 3 - False - False - False - False - True - False - + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + attr_details + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 1 + 2 + 3 + 3 + False + False + False + False + True + False + + + + + GtkLabel + label227 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label228 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + + + GtkVButtonBox + vbuttonbox1 + GTK_BUTTONBOX_DEFAULT_STYLE + 2 + 1 + 1 + 0 + 0 + + 0 + False + True + + + + GtkButton + button110 + True + True + + clicked + on_up_clicked + attr_list + Thu, 13 Dec 2001 14:29:59 GMT + + GTK_RELIEF_NORMAL + + + GtkArrow + arrow1 + GTK_ARROW_UP + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + - GtkLabel - label227 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + GtkButton + button111 + True + True + + clicked + on_down_clicked + attr_list + Thu, 13 Dec 2001 14:30:09 GMT + + GTK_RELIEF_NORMAL - - GtkLabel - label228 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 1 - 2 - 1 - 2 + + GtkArrow + arrow2 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 0 0 - False - False - False - False - True - False - +