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

Patch from Raphael Ackermann <raphael.ackermann@gmail.com> -- Fix 0001538: tabs and spaces are mixed in some source files

Browse Source 
svn: r9713
This commit is contained in:
Brian Matherly
2008-01-05 20:10:26 +00:00
parent aa8288eddd
commit bf3900f043
57 changed files with 499 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ObjectSelector/_FamilyFilterFrame.py
View File

@@ -36,34 +36,34 @@ class FamilyFilterFrame(FilterFrameBase):
__default_border_width = 5
def __init__(self,filter_spec=None,label="Filter"):
FilterFrameBase.__init__(self,filter_spec,label)
FilterFrameBase.__init__(self,filter_spec,label)
# Gramps ID
self._id_check,self._id_label,self._id_edit = \
self._id_check,self._id_label,self._id_edit = \
self.make_text_widget("Gramps ID")
# Name
self._name_check,self._name_label,self._name_edit = \
self._name_check,self._name_label,self._name_edit = \
self.make_text_widget("Name")
# Mar
self._mar_check, self._m_edit, \
self._mar_check, self._m_edit, \
self._m_before, self._m_after, \
self._m_unknown = self.make_year_widget("Marriage Year")
# Filter
default_filters = []
# don't currently support filters that need an attribute.
filters = [ filter for filter in default_filters if \
# don't currently support filters that need an attribute.
filters = [ filter for filter in default_filters if \
not hasattr(filter,'labels') or len(filter.labels) == 0 ]
self._filter_list = gtk.ListStore(str,object)
for filter in filters:
self._filter_list.append([filter.name,filter])
self._filter_list.append([filter.name,filter])
self._filter_check,self._filter_label,self._filter_combo = \
self._filter_check,self._filter_label,self._filter_combo = \
self.make_combo_widget("Filter",self._filter_list)
self._reset_widgets()

12
src/ObjectSelector/_FamilyPreviewFrame.py
View File

@@ -41,11 +41,9 @@ class FamilyPreviewFrame(PreviewFrameBase):
__default_border_width = 5
def __init__(self,dbstate,label="Preview"):
PreviewFrameBase.__init__(self,label)
PreviewFrameBase.__init__(self,label)
self._dbstate = dbstate
align = gtk.Alignment()
align = gtk.Alignment()
# Image
self._image_l = gtk.Image()
@@ -69,20 +67,18 @@ class FamilyPreviewFrame(PreviewFrameBase):
box = gtk.VBox()
box.pack_start(image_box,False,False)
box.pack_start(label)
# align
align.add(box)
align.add(box)
align.set_padding(self.__class__.__default_border_width,
self.__class__.__default_border_width,
self.__class__.__default_border_width,
self.__class__.__default_border_width)
align.set(0.5,0.5,
1.0,1.0)
self.add(align)
self.add(align)
self.clear_object()

2
src/ObjectSelector/_FamilyTreeFrame.py
View File

@@ -38,7 +38,7 @@ class FamilyTreeFrame(TreeFrameBase):
def __init__(self,dbstate):
TreeFrameBase.__init__(self)
TreeFrameBase.__init__(self)
self._selection = None
self._model = None

3
src/ObjectSelector/_FilterFrameBase.py
View File

@@ -26,7 +26,7 @@ import gobject
from GrampsWidgets import IntEdit
class FilterFrameBase(gtk.Frame):
__gproperties__ = {}
__gsignals__ = {
@@ -235,3 +235,4 @@ class FilterFrameBase(gtk.Frame):
if gtk.pygtk_version < (2,8,0):
gobject.type_register(FilterFrameBase)

39
src/ObjectSelector/_ObjectSelectorWindow.py
View File

@@ -90,7 +90,7 @@ class ObjectSelectorWindow(gtk.Window,ManagedWindow):
ManagedWindow.__init__(self,uistate,track,self)
# Init the Window
gtk.Window.__init__(self)
gtk.Window.__init__(self)
self._dbstate = dbstate
self._uistate = dbstate
@@ -157,25 +157,25 @@ class ObjectSelectorWindow(gtk.Window,ManagedWindow):
try:
person_pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.join(const.IMAGE_DIR,"person.svg"))
flist_pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.join(const.IMAGE_DIR,"flist.svg"))
person_pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.join(const.IMAGE_DIR,"person.svg"))
flist_pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.join(const.IMAGE_DIR,"flist.svg"))
self._tool_list = gtk.ListStore(gtk.gdk.Pixbuf, str,int)
d={ObjectTypes.PERSON: [person_pixbuf,'People',ObjectTypes.PERSON],
ObjectTypes.FAMILY: [flist_pixbuf,'Families',ObjectTypes.FAMILY],
ObjectTypes.EVENT: [person_pixbuf,'Events',ObjectTypes.EVENT]}
self._object_type_column = 2
self._tool_list = gtk.ListStore(gtk.gdk.Pixbuf, str,int)
except gobject.GError:
self._tool_list = gtk.ListStore(str,int)
d={ObjectTypes.PERSON: [person_pixbuf,'People',ObjectTypes.PERSON],
ObjectTypes.FAMILY: [flist_pixbuf,'Families',ObjectTypes.FAMILY],
ObjectTypes.EVENT: [person_pixbuf,'Events',ObjectTypes.EVENT]}
self._object_type_column = 2
except gobject.GError:
self._tool_list = gtk.ListStore(str,int)
d={ObjectTypes.PERSON: ['People',ObjectTypes.PERSON],
d={ObjectTypes.PERSON: ['People',ObjectTypes.PERSON],
ObjectTypes.FAMILY: ['Families',ObjectTypes.FAMILY],
ObjectTypes.EVENT: ['Events',ObjectTypes.EVENT]}
self._object_type_column = 1
self._object_type_column = 1
for object_type in self._object_list:
@@ -288,7 +288,7 @@ class ObjectSelectorWindow(gtk.Window,ManagedWindow):
align.add(box)
align.show()
self.add(align)
self.add(align)
self._set_object_type(default_object_type)
self.set_default_size(700,300)
@@ -313,9 +313,9 @@ class ObjectSelectorWindow(gtk.Window,ManagedWindow):
store = self._tool_list
it = store.get_iter_first()
while it:
if store.get(it, self._object_type_column)[0] == selected_object_type:
break
it = store.iter_next(it)
if store.get(it, self._object_type_column)[0] == selected_object_type:
break
it = store.iter_next(it)
if it != None:
self._tool_combo.set_active_iter(it)
@@ -345,3 +345,4 @@ class ObjectSelectorWindow(gtk.Window,ManagedWindow):
if gtk.pygtk_version < (2,8,0):
gobject.type_register(ObjectSelectorWindow)

32
src/ObjectSelector/_PersonFilterFrame.py
View File

@@ -43,17 +43,17 @@ class PersonFilterFrame(FilterFrameBase):
__default_border_width = 5
def __init__(self,filter_spec=None,label="Filter"):
FilterFrameBase.__init__(self,filter_spec,label)
FilterFrameBase.__init__(self,filter_spec,label)
# Build the filter widgets, the make_* methods are
# in the FilterFrameBase base class.
# Build the filter widgets, the make_* methods are
# in the FilterFrameBase base class.
# Gramps ID
self._id_check,self._id_label,self._id_edit = \
self._id_check,self._id_label,self._id_edit = \
self.make_text_widget("Gramps ID")
# Name
self._name_check,self._name_label,self._name_edit = \
self._name_check,self._name_label,self._name_edit = \
self.make_text_widget("Name")
# Gender
@@ -61,21 +61,21 @@ class PersonFilterFrame(FilterFrameBase):
[_("Female"),gen.lib.Person.FEMALE],
[_("Unknown"),gen.lib.Person.UNKNOWN]]
self._gender_list = gtk.ListStore(str,int)
self._gender_list = gtk.ListStore(str,int)
for entry in genders:
self._gender_list.append(entry)
for entry in genders:
self._gender_list.append(entry)
self._gender_check,self._gender_label, self._gender_combo = \
self._gender_check,self._gender_label, self._gender_combo = \
self.make_combo_widget("Gender",self._gender_list)
# Birth
self._birth_check, self._b_edit, \
self._birth_check, self._b_edit, \
self._b_before, self._b_after, \
self._b_unknown = self.make_year_widget("Birth Year")
# Death
self._death_check, self._d_edit, \
self._death_check, self._d_edit, \
self._d_before, self._d_after, \
self._d_unknown = self.make_year_widget("Death Year")
@@ -106,16 +106,16 @@ class PersonFilterFrame(FilterFrameBase):
Rules.Person.IsFemale,
]
# don't currently support filters that need an attribute.
filters = [ filter for filter in default_filters if \
# don't currently support filters that need an attribute.
filters = [ filter for filter in default_filters if \
not hasattr(filter,'labels') or len(filter.labels) == 0 ]
self._filter_list = gtk.ListStore(str,object)
for filter in filters:
self._filter_list.append([filter.name,filter])
self._filter_list.append([filter.name,filter])
self._filter_check,self._filter_label,self._filter_combo = \
self._filter_check,self._filter_label,self._filter_combo = \
self.make_combo_widget("Filter",self._filter_list)
self._reset_widgets()
@@ -223,7 +223,7 @@ class PersonFilterFrame(FilterFrameBase):
if self._filter_check.get_active():
filter.add_rule(self._filter_list.get_value(self._filter_combo.get_active_iter(),1)([]))
self.emit('apply-filter',filter)
self.emit('apply-filter',filter)
if gtk.pygtk_version < (2,8,0):
gobject.type_register(PersonFilterFrame)

14
src/ObjectSelector/_PersonPreviewFrame.py
View File

@@ -53,11 +53,9 @@ class PersonPreviewFrame(PreviewFrameBase):
__default_border_width = 5
def __init__(self,dbstate,label="Preview"):
PreviewFrameBase.__init__(self,label)
PreviewFrameBase.__init__(self,label)
self._dbstate = dbstate
align = gtk.Alignment()
align = gtk.Alignment()
# Image
self._image = gtk.Image()
@@ -77,10 +75,8 @@ class PersonPreviewFrame(PreviewFrameBase):
box.pack_start(self._image,False,False)
box.pack_start(label)
# align
align.add(box)
align.add(box)
align.set_padding(self.__class__.__default_border_width,
self.__class__.__default_border_width,
self.__class__.__default_border_width,
@@ -88,9 +84,7 @@ class PersonPreviewFrame(PreviewFrameBase):
align.set(0.5,0.5,
1.0,1.0)
self.add(align)
self.add(align)
self._label = label
def _get_text_preview(self,person):

2
src/ObjectSelector/_PersonTreeFrame.py
View File

@@ -54,7 +54,7 @@ class PersonTreeFrame(TreeFrameBase):
def __init__(self,dbstate):
TreeFrameBase.__init__(self)
TreeFrameBase.__init__(self)
self._dbstate = dbstate
self._selection = None