Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unneeded line continuations and tidy up

Browse Source 
svn: r16481
This commit is contained in:
Gerald Britton
2011-01-26 20:10:22 +00:00
parent bfa5309cd7
commit cc5b37c8bc
13 changed files with 61 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/editors/editchildref.py
+4 -3
View File
@@ -144,7 +144,8 @@ class EditChildRef(EditSecondary):
"""
notebook = gtk.Notebook()
self.srcref_list = SourceEmbedList(self.dbstate,self.uistate,self.track,self.obj)
self.srcref_list = SourceEmbedList(
self.dbstate, self.uistate, self.track, self.obj)
self._add_tab(notebook, self.srcref_list)
self.track_ref_for_deletion("srcref_list")
@@ -201,9 +202,9 @@ class EditChildRef(EditSecondary):
self.close()
def button_activated(event, mouse_button):
if (event.type == gtk.gdk.BUTTON_PRESS and \
if (event.type == gtk.gdk.BUTTON_PRESS and
event.button == mouse_button) or \
(event.type == gtk.gdk.KEY_PRESS and \
(event.type == gtk.gdk.KEY_PRESS and
event.keyval in (_RETURN, _KP_ENTER)):
return True
else:
src/gui/editors/editevent.py
+3 -2
View File
@@ -99,8 +99,9 @@ class EditEvent(EditPrimary):
return dialog_title
def get_custom_events(self):
return self.dbstate.db.get_person_event_types() + \
self.dbstate.db.get_family_event_types()
return (self.dbstate.db.get_person_event_types() +
self.dbstate.db.get_family_event_types()
)
def _local_init(self):
self.width_key = 'interface.event-width'
src/gui/editors/editeventref.py
+1 -1
View File
@@ -263,5 +263,5 @@ class EditFamilyEventRef(EditEventRef):
self.add_event = self.db.add_family_event
def get_custom_events(self):
return [ gen.lib.EventType((gen.lib.EventType.CUSTOM,val)) \
return [gen.lib.EventType((gen.lib.EventType.CUSTOM,val))
for val in self.dbstate.db.get_family_event_types()]
src/gui/editors/editfamily.py
+16 -13
View File
@@ -240,9 +240,9 @@ class ChildEmbedList(EmbeddedList):
def share_button_clicked(self, obj=None):
# it only makes sense to skip those who are already in the family
skip_list = [self.family.get_father_handle(), \
self.family.get_mother_handle()] + \
[x.ref for x in self.family.get_child_ref_list() ]
skip_list = [self.family.get_father_handle(),
self.family.get_mother_handle()]
skip_list.extend(x.ref for x in self.family.get_child_ref_list())
sel = SelectPerson(self.dbstate, self.uistate, self.track,
_("Select Child"), skip=skip_list)
@@ -432,9 +432,11 @@ class EditFamily(EditPrimary):
# look for the scenerio of a child and no parents on a new
# family
if self.added and self.obj.get_father_handle() is None and \
self.obj.get_mother_handle() is None and \
len(self.obj.get_child_ref_list()) == 1:
if (self.added and
not self.obj.get_father_handle() and
not self.obj.get_mother_handle() and
len(self.obj.get_child_ref_list()) == 1):
self.add_parent = True
if not config.get('preferences.family-warn'):
for i in self.hidden:
@@ -689,8 +691,8 @@ class EditFamily(EditPrimary):
mhandle = self.obj.get_mother_handle()
self.update_mother(mhandle)
self.phandles = [mhandle, fhandle] + \
[ x.ref for x in self.obj.get_child_ref_list()]
self.phandles = [mhandle, fhandle]
self.phandles.extend(x.ref for x in self.obj.get_child_ref_list())
self.phandles = filter(None, self.phandles)
@@ -988,9 +990,10 @@ class EditFamily(EditPrimary):
self.db.commit_person(person, trans)
def object_is_empty(self):
return self.obj.get_father_handle() is None and \
self.obj.get_mother_handle() is None and \
len(self.obj.get_child_ref_list()) == 0
return (not self.obj.get_father_handle() and
not self.obj.get_mother_handle() and
len(self.obj.get_child_ref_list()) == 0
)
def save(self, *obj):
try:
@@ -1173,9 +1176,9 @@ class EditFamily(EditPrimary):
return name
def button_activated(event, mouse_button):
if (event.type == gtk.gdk.BUTTON_PRESS and \
if (event.type == gtk.gdk.BUTTON_PRESS and
event.button == mouse_button) or \
(event.type == gtk.gdk.KEY_PRESS and \
(event.type == gtk.gdk.KEY_PRESS and
event.keyval in (_RETURN, _KP_ENTER)):
return True
else:
src/gui/editors/editmedia.py
+10 -10
View File
@@ -344,36 +344,36 @@ class DeleteMediaQuery(object):
for handle in person_list:
person = self.db.get_person_from_handle(handle)
new_list = [ photo for photo in person.get_media_list() \
if photo.get_reference_handle() != self.media_handle ]
new_list = [photo for photo in person.get_media_list()
if photo.get_reference_handle() != self.media_handle]
person.set_media_list(new_list)
self.db.commit_person(person, trans)
for handle in family_list:
family = self.db.get_family_from_handle(handle)
new_list = [ photo for photo in family.get_media_list() \
if photo.get_reference_handle() != self.media_handle ]
new_list = [photo for photo in family.get_media_list()
if photo.get_reference_handle() != self.media_handle]
family.set_media_list(new_list)
self.db.commit_family(family, trans)
for handle in event_list:
event = self.db.get_event_from_handle(handle)
new_list = [ photo for photo in event.get_media_list() \
if photo.get_reference_handle() != self.media_handle ]
new_list = [photo for photo in event.get_media_list()
if photo.get_reference_handle() != self.media_handle]
event.set_media_list(new_list)
self.db.commit_event(event, trans)
for handle in place_list:
place = self.db.get_place_from_handle(handle)
new_list = [ photo for photo in place.get_media_list() \
if photo.get_reference_handle() != self.media_handle ]
new_list = [photo for photo in place.get_media_list()
if photo.get_reference_handle() != self.media_handle]
place.set_media_list(new_list)
self.db.commit_place(place, trans)
for handle in source_list:
source = self.db.get_source_from_handle(handle)
new_list = [ photo for photo in source.get_media_list() \
if photo.get_reference_handle() != self.media_handle ]
new_list = [photo for photo in source.get_media_list()
if photo.get_reference_handle() != self.media_handle]
source.set_media_list(new_list)
self.db.commit_source(source, trans)
src/gui/editors/editperson.py
+4 -4
View File
@@ -685,11 +685,11 @@ class EditPerson(EditPrimary):
"""
Override base class, make inactive home action if not needed.
"""
if self.dbstate.db.get_default_person() and \
self.obj.get_handle() == \
self.dbstate.db.get_default_person().get_handle():
if (self.dbstate.db.get_default_person() and
self.obj.get_handle() ==
self.dbstate.db.get_default_person().get_handle()):
self.home_action.set_sensitive(False)
else :
else:
self.home_action.set_sensitive(True)
def _make_active(self, obj):