beckermj/gramps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Editperson opens and editfamily, popup fixes

Browse Source 
svn: r19960
This commit is contained in:
Benny Malengier 2012-07-07 22:33:21 +00:00
parent 49445e948d
commit fbe91910dc
33 changed files with 265 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/clipboard.py
View File

@ -1466,7 +1466,7 @@ class MultiTreeView(Gtk.TreeView):
popup.append(menu_item)
menu_item.show()
# Show the popup menu:
popup.popup(None, None, None, 3, event.time)
popup.popup(None, None, None, None, 3, event.time)
return True
elif event.type == Gdk.EventType._2BUTTON_PRESS and event.button == 1:
model, paths = self.get_selection().get_selected_rows()

8
src/gui/editors/displaytabs/embeddedlist.py
View File

@ -152,7 +152,10 @@ class EmbeddedList(ButtonTab):
img.set_from_stock(img_stock, Gtk.IconSize.MENU)
item.set_image(img)
else:
item = Gtk.ImageMenuItem(stock_id=title)
item = Gtk.ImageMenuItem('')
img = Gtk.Image()
img.set_from_stock(title, Gtk.IconSize.MENU)
item.set_image(img)
else:
item = Gtk.MenuItem(label=title)
item.connect('activate', func)
@ -160,7 +163,8 @@ class EmbeddedList(ButtonTab):
item.set_sensitive(False)
item.show()
menu.append(item)
menu.popup(None, None, None, event.button, event.time)
menu.popup(None, None, None, None, event.button, event.time)
return True
def find_index(self, obj):
"""

2
src/gui/editors/displaytabs/eventrefmodel.py
View File

@ -95,7 +95,7 @@ class EventRefModel(Gtk.TreeStore):
"""
self.start_date = kwargs.get("start_date", None)
typeobjs = (x[1] for x in self.COLS)
GObject.GObject.__init__(self, *typeobjs)
Gtk.TreeStore.__init__(self, *typeobjs)
self.db = db
self.groups = groups
for index, group in enumerate(event_list):

2
src/gui/editors/displaytabs/gallerytab.py
View File

@ -162,7 +162,7 @@ class GalleryTab(ButtonTab, DbGUIElement):
item.set_sensitive(False)
item.show()
menu.append(item)
menu.popup(None, None, None, event.button, event.time)
menu.popup(None, None, None, None, event.button, event.time)
def get_icon_name(self):
return 'gramps-media'

1
src/gui/editors/displaytabs/groupembeddedlist.py
View File

@ -33,6 +33,7 @@ import cPickle as pickle
# GTK libraries
#
#-------------------------------------------------------------------------
from gi.repository import Gdk
from gi.repository import Gtk
from gi.repository import Pango
from gi.repository import GObject

2
src/gui/editors/displaytabs/namemodel.py
View File

@ -87,7 +87,7 @@ class NameModel(Gtk.TreeStore):
that might be used. name is the name for the group.
"""
typeobjs = (x[1] for x in self.COLS)
GObject.GObject.__init__(self, *typeobjs)
Gtk.TreeStore.__init__(self, *typeobjs)
self.db = db
self.groups = groups
for index, group in enumerate(obj_list):

12
src/gui/editors/displaytabs/surnametab.py
View File

@ -341,17 +341,17 @@ class SurnameTab(EmbeddedList):
"""
(model, node) = self.selection.get_selected()
if node:
path = int(self.model.get_path(node)[0])
path = self.model.get_path(node).get_indices()[0]
nccol = self.curr_col+1
if nccol < 4:
self.tree.set_cursor_on_cell(path,
self.tree.set_cursor_on_cell(Gtk.TreePath((path,)),
focus_column=self.columns[nccol],
focus_cell=None,
start_editing=True)
elif nccol == 4:
#go to next line if there is one
if path < len(self.obj.get_surname_list()):
newpath = (path+1,)
newpath = Gtk.TreePath((path+1,))
self.selection.select_path(newpath)
self.tree.set_cursor_on_cell(newpath,
focus_column=self.columns[0],
@ -370,16 +370,16 @@ class SurnameTab(EmbeddedList):
"""
(model, node) = self.selection.get_selected()
if node:
path = int(self.model.get_path(node)[0])
path = self.model.get_path(node).get_indices()[0]
if self.curr_col > 0:
self.tree.set_cursor_on_cell(path,
self.tree.set_cursor_on_cell(Gtk.TreePath((path,)),
focus_column=self.columns[self.curr_col-1],
focus_cell=None,
start_editing=True)
elif self.curr_col == 0:
#go to prev line if there is one
if path > 0:
newpath = (path-1,)
newpath = Gtk.TreePath((path-1,))
self.selection.select_path(newpath)
self.tree.set_cursor_on_cell(newpath,
focus_column=self.columns[-2],

2
src/gui/editors/editfamily.py
View File

@ -676,7 +676,7 @@ class EditFamily(EditPrimary):
notebook.show_all()
self.hidden = (notebook, self.top.get_object('info'))
self.top.get_object('vbox').pack_start(notebook, True)
self.top.get_object('vbox').pack_start(notebook, True, True, 0)
def update_father(self, handle):
self.load_parent(handle, self.fname, self.fbirth, self.fbirth_label,

12
src/gui/editors/editperson.py
View File

@ -216,7 +216,7 @@ class EditPerson(EditPrimary):
self.multsurnfr.show_all()
self.singlesurn_active = False
else:
self.multsurnfr.hide_all()
self.multsurnfr.hide()
self.singsurnfr.show_all()
self.singlesurn_active = True
#if self.pname.get_surname() and not self.pname.get_first_name():
@ -524,7 +524,7 @@ class EditPerson(EditPrimary):
self._setup_notebook_tabs(notebook)
notebook.show_all()
self.top.get_object('vbox').pack_start(notebook, True)
self.top.get_object('vbox').pack_start(notebook, True, True, 0)
def _changed_name(self, *obj):
"""
@ -568,7 +568,7 @@ class EditPerson(EditPrimary):
else:
self.singlesurn_active = False
if self.singlesurn_active:
self.multsurnfr.hide_all()
self.multsurnfr.hide()
self.singsurnfr.show_all()
else:
self.singsurnfr.hide_all()
@ -626,7 +626,7 @@ class EditPerson(EditPrimary):
self._popup_view_photo)
add_menuitem(menu, _("Edit Object Properties"), photo,
self._popup_change_description)
menu.popup(None, None, None, event.button, event.time)
menu.popup(None, None, None, None, event.button, event.time)
def _popup_view_photo(self, obj):
"""
@ -891,7 +891,7 @@ class EditPerson(EditPrimary):
else:
self.singlesurn_active = False
if self.singlesurn_active:
self.multsurnfr.hide_all()
self.multsurnfr.hide()
self.singsurnfr.show_all()
else:
@ -934,7 +934,7 @@ class EditPerson(EditPrimary):
self.load_photo(ref, obj)
else:
self.obj_photo.hide()
self.frame_photo.hide_all()
self.frame_photo.hide()
def load_photo(self, ref, obj):
"""

4
src/gui/editors/editprimary.py
View File

@ -277,7 +277,7 @@ class EditPrimary(ManagedWindow, DbGUIElement):
self.contexteventbox = eventbox
self.contexteventbox.connect('button-press-event',
self._contextmenu_button_press)
def _contextmenu_button_press(self, obj, event) :
"""
Button press event that is caught when a mousebutton has been
@ -295,7 +295,7 @@ class EditPrimary(ManagedWindow, DbGUIElement):
menu = self.popupmanager.get_widget('/Popup')
if menu:
menu.popup(None, None, None, event.button, event.time)
menu.popup(None, None, None, None, event.button, event.time)
return True
return False

317
src/gui/glade/editfamily.glade
View File

@ -1,28 +1,106 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 2.12 -->
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires grampswidgets 0.0 -->
<!-- interface-naming-policy project-wide -->
<object class="GtkDialog" id="editfamily">
<property name="can_focus">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox17">
<object class="GtkBox" id="dialog-vbox17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Abandon changes and close window</property>
<property name="tooltip_text" translatable="yes">Abandon changes and close window</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Accept changes and close window</property>
<property name="tooltip_text" translatable="yes">Accept changes and close window</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button119">
<property name="label">gtk-help</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkEventBox" id="eventboxtop">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkVBox" id="vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
<property name="spacing">4</property>
<child>
<object class="GtkHBox" id="hbox121">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkTable" id="ftable">
<property name="width_request">132</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
@ -31,6 +109,7 @@
<child>
<object class="GtkLabel" id="label577">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Name:</property>
</object>
@ -45,6 +124,7 @@
<child>
<object class="GtkLabel" id="label578">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Birth:</property>
</object>
@ -59,6 +139,7 @@
<child>
<object class="GtkLabel" id="label579">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Death:</property>
</object>
@ -73,9 +154,11 @@
<child>
<object class="GtkHBox" id="hbox146">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label589">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Father&lt;/b&gt;</property>
<property name="use_markup">True</property>
@ -88,9 +171,11 @@
</child>
<child>
<object class="GtkButton" id="fbutton_index">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="relief">none</property>
<child internal-child="accessible">
<object class="AtkObject" id="fbutton_index-atkobject">
@ -100,6 +185,7 @@
<child>
<object class="GtkImage" id="image2671">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-index</property>
<child internal-child="accessible">
<object class="AtkObject" id="image2671-atkobject">
@ -118,9 +204,11 @@
</child>
<child>
<object class="GtkButton" id="fbutton_add">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="relief">none</property>
<child internal-child="accessible">
<object class="AtkObject" id="fbutton_add-atkobject">
@ -130,6 +218,7 @@
<child>
<object class="GtkImage" id="image2697">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
<child internal-child="accessible">
<object class="AtkObject" id="image2697-atkobject">
@ -147,9 +236,11 @@
</child>
<child>
<object class="GtkButton" id="fbutton_del">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="relief">none</property>
<child internal-child="accessible">
<object class="AtkObject" id="fbutton_del-atkobject">
@ -159,6 +250,7 @@
<child>
<object class="GtkImage" id="image2724">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-remove</property>
<child internal-child="accessible">
<object class="AtkObject" id="image2724-atkobject">
@ -176,9 +268,11 @@
</child>
<child>
<object class="GtkButton" id="fbutton_edit">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="relief">none</property>
<accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<child internal-child="accessible">
@ -189,6 +283,7 @@
<child>
<object class="GtkImage" id="image2725">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-edit</property>
<child internal-child="accessible">
<object class="AtkObject" id="image2725-atkobject">
@ -208,11 +303,13 @@
<packing>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="fbirth">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
@ -227,6 +324,7 @@
<child>
<object class="GtkLabel" id="fdeath">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
@ -241,6 +339,7 @@
<child>
<object class="GtkLabel" id="fname">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="ellipsize">end</property>
</object>
@ -249,47 +348,24 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox144">
<property name="visible">True</property>
<child>
<object class="GtkLabel" id="label719">
<property name="visible">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVSeparator" id="vseparator1">
<property name="visible">True</property>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
<property name="y_options"></property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkTable" id="mtable">
<property name="width_request">132</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
@ -298,6 +374,7 @@
<child>
<object class="GtkLabel" id="label565">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Name:</property>
</object>
@ -312,6 +389,7 @@
<child>
<object class="GtkLabel" id="label567">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Birth:</property>
</object>
@ -326,6 +404,7 @@
<child>
<object class="GtkLabel" id="label568">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Death:</property>
</object>
@ -340,6 +419,7 @@
<child>
<object class="GtkLabel" id="mdeath">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
@ -354,6 +434,7 @@
<child>
<object class="GtkLabel" id="mbirth">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
@ -368,9 +449,11 @@
<child>
<object class="GtkHBox" id="hbox147">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label574">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Mother&lt;/b&gt;</property>
<property name="use_markup">True</property>
@ -383,9 +466,11 @@
</child>
<child>
<object class="GtkButton" id="mbutton_index">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="relief">none</property>
<child internal-child="accessible">
<object class="AtkObject" id="mbutton_index-atkobject">
@ -395,6 +480,7 @@
<child>
<object class="GtkImage" id="image2670">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-index</property>
<child internal-child="accessible">
<object class="AtkObject" id="image2670-atkobject">
@ -412,9 +498,11 @@
</child>
<child>
<object class="GtkButton" id="mbutton_add">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="relief">none</property>
<child internal-child="accessible">
<object class="AtkObject" id="mbutton_add-atkobject">
@ -424,6 +512,7 @@
<child>
<object class="GtkImage" id="image2698">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
<child internal-child="accessible">
<object class="AtkObject" id="image2698-atkobject">
@ -440,10 +529,44 @@
</packing>
</child>
<child>
<object class="GtkButton" id="mbutton_del">
<object class="GtkToggleButton" id="private">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Indicates if the record is private</property>
<property name="tooltip_text" translatable="yes">Indicates if the record is private</property>
<property name="use_action_appearance">False</property>
<property name="relief">none</property>
<accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<child>
<object class="GtkImage" id="image2672">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">gtk-dialog-authentication</property>
<child internal-child="accessible">
<object class="AtkObject" id="image2672-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Privacy</property>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkButton" id="mbutton_del">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="relief">none</property>
<child internal-child="accessible">
<object class="AtkObject" id="mbutton_del-atkobject">
@ -453,6 +576,7 @@
<child>
<object class="GtkImage" id="image2726">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-remove</property>
<child internal-child="accessible">
<object class="AtkObject" id="image2726-atkobject">
@ -470,9 +594,11 @@
</child>
<child>
<object class="GtkButton" id="mbutton_edit">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="relief">none</property>
<accelerator key="m" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<child internal-child="accessible">
@ -483,6 +609,7 @@
<child>
<object class="GtkImage" id="image2727">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-edit</property>
<child internal-child="accessible">
<object class="AtkObject" id="image2727-atkobject">
@ -498,44 +625,17 @@
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="private">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Indicates if the record is private</property>
<property name="tooltip_text" translatable="yes">Indicates if the record is private</property>
<property name="relief">none</property>
<accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<child>
<object class="GtkImage" id="image2672">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-authentication</property>
<child internal-child="accessible">
<object class="AtkObject" id="image2672-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Privacy</property>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="mname">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="ellipsize">end</property>
</object>
@ -544,23 +644,27 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkTable" id="info">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="n_rows">3</property>
<property name="n_columns">4</property>
@ -569,6 +673,7 @@
<child>
<object class="GtkLabel" id="label542">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Relationship Information&lt;/b&gt;</property>
<property name="use_markup">True</property>
@ -582,6 +687,7 @@
<child>
<object class="GtkLabel" id="label229">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_ID:</property>
<property name="use_underline">True</property>
@ -614,6 +720,7 @@
<child>
<object class="GtkLabel" id="label202">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Type:</property>
<property name="use_underline">True</property>
@ -632,12 +739,13 @@
<child>
<object class="GtkComboBox" id="marriage_type">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">The relationship type, eg 'Married' or 'Unmarried'. Use Events for more details.</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry" id="marriage_type-entry">
<property name="can_focus">True</property>
<property name="overwrite_mode">True</property>
<property name="can_focus">True</property>
<property name="overwrite_mode">True</property>
</object>
</child>
</object>
@ -652,6 +760,7 @@
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Tags:</property>
<property name="use_underline">True</property>
@ -668,20 +777,26 @@
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="tag_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="tag_button">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Edit the tag list</property>
<property name="use_action_appearance">False</property>
<accessibility>
<relation type="labelled-by" target="label1"/>
</accessibility>
@ -706,11 +821,13 @@
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@ -718,73 +835,11 @@
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area17">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Abandon changes and close window</property>
<property name="tooltip_text" translatable="yes">Abandon changes and close window</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Accept changes and close window</property>
<property name="tooltip_text" translatable="yes">Accept changes and close window</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button119">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
<action-widgets>

25
src/gui/glade/editperson.glade
View File

@ -11,11 +11,13 @@
<object class="GtkBox" id="vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button15">
@ -76,7 +78,7 @@
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
@ -85,15 +87,18 @@
<object class="GtkEventBox" id="eventboxtop">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">3</property>
<child>
<object class="GtkTable" id="table3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="n_rows">8</property>
<property name="n_columns">9</property>
<child>
@ -345,8 +350,8 @@
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry" id="ntype-entry">
<property name="can_focus">True</property>
<property name="overwrite_mode">True</property>
<property name="can_focus">True</property>
<property name="overwrite_mode">True</property>
</object>
</child>
</object>
@ -377,6 +382,7 @@
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="x_padding">3</property>
<property name="y_padding">3</property>
</packing>
@ -423,7 +429,7 @@ Indicate that the surname consists of different parts. Every surname has its own
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@ -645,8 +651,8 @@ Indicate that the surname consists of different parts. Every surname has its own
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry" id="cmborigin-entry">
<property name="can_focus">True</property>
<property name="overwrite_mode">True</property>
<property name="can_focus">True</property>
<property name="overwrite_mode">True</property>
</object>
</child>
</object>
@ -808,15 +814,12 @@ Indicate that the surname consists of different parts. Every surname has its own
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">2</property>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
</object>

4
src/gui/grampsbar.py
View File

@ -319,7 +319,7 @@ class GrampsBar(Gtk.Notebook):
height = min(int(self.uistate.screen_height() * 0.20), 400)
gramplet.set_size_request(width, height)
page_num = self.append_page(gramplet)
page_num = self.append_page(gramplet, Gtk.Label(label=msg))
return page_num
def __create_tab_label(self, gramplet):
@ -444,7 +444,7 @@ class GrampsBar(Gtk.Notebook):
rd_menu.show()
menu.append(rd_menu)
menu.popup(None, None, None, 1, event.time)
menu.popup(None, None, None, None, 1, event.time)
return True
return False

4
src/gui/navigator.py
View File

@ -132,8 +132,8 @@ class Navigator(object):
button.grab_focus()
button.set_active(True)
self.menu.popup(None, None, cb_menu_position, event.button,
event.time, button)
self.menu.popup(None, None, cb_menu_position, button, event.button,
event.time)
def cb_menu_activate(self, menu, index):
"""

2
src/gui/plug/quick/_quicktable.py
View File

@ -150,7 +150,7 @@ class QuickTable(SimpleTable):
popup.append(menu_item)
menu_item.show()
# Show the popup menu:
popup.popup(None, None, func, button_code, event_time)
popup.popup(None, None, func, None, button_code, event_time)
return True
return False

2
src/gui/views/tags.py
View File

@ -233,7 +233,7 @@ class Tags(DbGUIElement):
"""
menu = self.uistate.uimanager.get_widget('/TagPopup')
button = self.uistate.uimanager.get_widget('/ToolBar/TagTool/TagButton')
menu.popup(None, None, cb_menu_position, 0, 0, button)
menu.popup(None, None, cb_menu_position, button, 0, 0)
def cb_organize_tags(self, action):
"""

8
src/gui/views/treemodels/flatbasemodel.py
View File

@ -645,7 +645,7 @@ class FlatBaseModel(GObject.Object, Gtk.TreeModel):
insert_path = self.node_map.insert(insert_val)
if insert_path is not None:
node = self.do_get_iter(insert_path)
node = self.do_get_iter(insert_path)[1]
self.row_inserted(insert_path, node)
else:
self.node_map.insert(insert_val, allkeyonly=True)
@ -749,7 +749,11 @@ class FlatBaseModel(GObject.Object, Gtk.TreeModel):
#print 'do_get_val', iter, iter.user_data, col,
handle = iter.user_data
if handle != self.prev_handle:
self.prev_data = self.map(str(handle))
data = self.map(str(handle))
if data is None:
#object is no longer present
return u''
self.prev_data = data
self.prev_handle = handle
val = self.fmap[col](self.prev_data)
#print 'val is', val, type(val)

2
src/gui/widgets/grampletpane.py
View File

@ -1406,7 +1406,7 @@ class GrampletPane(Gtk.ScrolledWindow):
rg_menu.set_submenu(qr_menu)
menu = uiman.get_widget('/GrampletPopup')
if menu:
menu.popup(None, None, None, 1, event.time)
menu.popup(None, None, None, None, 1, event.time)
return True
return False

2
src/gui/widgets/monitoredwidgets.py
View File

@ -139,7 +139,7 @@ class MonitoredEntry(object):
self.obj.connect(signal, callback, *data)
def _on_change(self, obj):
self.set_val(unicode(obj.get_text()))
self.set_val(unicode(obj.get_text(), 'utf-8'))
if self.changed:
self.changed(obj)

4
src/gui/widgets/undoableentry.py
View File

@ -56,7 +56,7 @@ class UndoableInsertEntry(object):
self.offset = position
self.text = str(text)
#unicode char can have length > 1 as it points in the buffer
charlength = len(unicode(text))
charlength = len(unicode(text, 'utf-8'))
self.length = charlength
if charlength > 1 or self.text in ("\r", "\n", " "):
self.mergeable = False
@ -66,7 +66,7 @@ class UndoableInsertEntry(object):
class UndoableDeleteEntry(object):
"""something that has been deleted from our textbuffer"""
def __init__(self, editable, start, end):
self.text = str(editable.get_chars(start, end))
self.text = editable.get_chars(start, end).encode('utf-8')
self.start = start
self.end = end
# need to find out if backspace or delete key has been used

4
src/plugins/bookreport.py
View File

@ -1014,7 +1014,7 @@ class BookReportSelector(ManagedWindow):
item.set_sensitive(sensitivity)
item.show()
menu.append(item)
menu.popup(None, None, None, event.button, event.time)
menu.popup(None, None, None, None, event.button, event.time)
def build_avail_context_menu(self, event):
"""Builds the menu with the single Add option."""
@ -1037,7 +1037,7 @@ class BookReportSelector(ManagedWindow):
item.set_sensitive(sensitivity)
item.show()
menu.append(item)
menu.popup(None, None, None, event.button, event.time)
menu.popup(None, None, None, None, event.button, event.time)
def on_book_ok_clicked(self, obj):
"""

2
src/plugins/gramplet/fanchartgramplet.py
View File

@ -903,5 +903,5 @@ class FanChartGramplet(Gramplet):
item.set_sensitive(0)
item.show()
menu.append(item)
menu.popup(None,None,None,event.button,event.time)
menu.popup(None, None, None, None, event.button, event.time)
return 1

2
src/plugins/lib/maps/geography.py
View File

@ -294,7 +294,7 @@ class GeoGraphyView(OsmGps, NavigationView):
changemapitem.show()
changemapitem.connect("activate", self.change_map, map)
changemap.append(changemapitem)
menu.popup(None, None, None, 0, event.time)
menu.popup(None, None, None, None, 0, event.time)
return 1
def add_specific_menu(self, menu, event, lat, lon):

2
src/plugins/tool/ownereditor.py
View File

@ -156,7 +156,7 @@ class OwnerEditor(tool.Tool, ManagedWindow):
def on_button_press_event(self, obj, event):
"""Shows popup-menu for db <-> preferences copying"""
if gui.utils.is_right_click(event):
self.menu.popup(None,None,None,0,0)
self.menu.popup(None, None, None, None, 0, 0)
def build_menu_names(self, obj):
return (_('Main window'), _("Edit database owner information"))

2
src/plugins/view/fanchartview.py
View File

@ -975,5 +975,5 @@ class FanChartView(NavigationView):
item.set_sensitive(0)
item.show()
menu.append(item)
menu.popup(None,None,None,event.button,event.time)
menu.popup(None, None, None, None, event.button, event.time)
return 1

2
src/plugins/view/geoclose.py
View File

@ -476,7 +476,7 @@ class GeoClose(GeoGraphyView):
event, lat, lon, prevmark)
itemoption.append(center)
menu.show()
menu.popup(None, None, None, 0, event.time)
menu.popup(None, None, None, None, 0, event.time)
return 0
def add_specific_menu(self, menu, event, lat, lon):

5
src/plugins/view/geoevents.py
View File

@ -36,7 +36,8 @@ import sys
import urlparse
import operator
import locale
from Gdk.KEY_import Tab as KEY_TAB
from gi.repository import Gdk
KEY_TAB = Gdk.KEY_Tab
import socket
from gi.repository import Gtk
@ -351,7 +352,7 @@ class GeoEvents(GeoGraphyView):
center.show()
center.connect("activate", self.center_here, event, lat, lon, prevmark)
itemoption.append(center)
menu.popup(None, None, None, 0, event.time)
menu.popup(None, None, None, None, 0, event.time)
return 1
def add_specific_menu(self, menu, event, lat, lon):

2
src/plugins/view/geofamclose.py
View File

@ -665,7 +665,7 @@ class GeoFamClose(GeoGraphyView):
event, lat, lon, prevmark)
itemoption.append(center)
menu.show()
menu.popup(None, None, None, 0, event.time)
menu.popup(None, None, None, None, 0, event.time)
return 0
def add_specific_menu(self, menu, event, lat, lon):

5
src/plugins/view/geofamily.py
View File

@ -36,7 +36,8 @@ import sys
import urlparse
import operator
import locale
from Gdk.KEY_import Tab as KEY_TAB
from gi.repository import Gdk
KEY_TAB = Gdk.KEY_Tab
import socket
from gi.repository import Gtk
@ -444,7 +445,7 @@ class GeoFamily(GeoGraphyView):
add_item.show()
menu.append(add_item)
self.add_event_bubble_message(event, lat, lon, prevmark, add_item)
menu.popup(None, None, None, 0, event.time)
menu.popup(None, None, None, None, 0, event.time)
return 1
def add_specific_menu(self, menu, event, lat, lon):

2
src/plugins/view/geomoves.py
View File

@ -607,7 +607,7 @@ class GeoMoves(GeoGraphyView):
event, lat, lon, prevmark)
itemoption.append(center)
menu.show()
menu.popup(None, None, None, 0, event.time)
menu.popup(None, None, None, None, 0, event.time)
return 1
def add_specific_menu(self, menu, event, lat, lon):

5
src/plugins/view/geoperson.py
View File

@ -36,7 +36,8 @@ import sys
import urlparse
import operator
import locale
from Gdk.KEY_import Tab as KEY_TAB
from gi.repository import Gdk
KEY_TAB = Gdk.KEY_Tab
import socket
from gi.repository import Gtk
import glib
@ -479,7 +480,7 @@ class GeoPerson(GeoGraphyView):
center.connect("activate", self.center_here, event, lat, lon, prevmark)
itemoption.append(center)
menu.show()
menu.popup(None, None, None, 0, event.time)
menu.popup(None, None, None, None, 0, event.time)
return 1
def add_specific_menu(self, menu, event, lat, lon):

5
src/plugins/view/geoplaces.py
View File

@ -37,7 +37,8 @@ import time
import urlparse
import operator
import locale
from Gdk.KEY_import Tab as KEY_TAB
from gi.repository import Gdk
KEY_TAB = Gdk.KEY_Tab
import socket
from gi.repository import Gtk
@ -342,7 +343,7 @@ class GeoPlaces(GeoGraphyView):
center.show()
center.connect("activate", self.center_here, event, lat, lon, prevmark)
itemoption.append(center)
menu.popup(None, None, None, 0, event.time)
menu.popup(None, None, None, None, 0, event.time)
return 1
def add_specific_menu(self, menu, event, lat, lon):

4
src/plugins/view/relview.py
View File

@ -1052,7 +1052,7 @@ class RelationshipView(NavigationView):
if self.show_details:
value = self.info_string(handle)
if value:
vbox.pack_start(widgets.MarkupLabel(value, True, True, 0))
vbox.pack_start(widgets.MarkupLabel(value), True, True, 0)
eventbox = Gtk.EventBox()
if self.use_shade:
@ -1217,7 +1217,7 @@ class RelationshipView(NavigationView):
elif button_activated(event, _RIGHT_BUTTON):
myMenu = Gtk.Menu()
myMenu.append(self.build_menu_item(handle))
myMenu.popup(None, None, None, event.button, event.time)
myMenu.popup(None, None, None, None, event.button, event.time)
def build_menu_item(self, handle):
person = self.dbstate.db.get_person_from_handle(handle)