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

2008-01-09 Raphael Ackermann <raphael.ackermann@gmail.com> * src/ObjectSelector/_FilterFrameBase.py: indentation and tabs/spaces fix

Browse Source 
svn: r9763
This commit is contained in:
Raphael Ackermann 2008-01-09 14:36:24 +00:00
parent b7c7952058
commit 87e152e0b7
2 changed files with 136 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2008-01-09 Raphael Ackermann <raphael.ackermann@gmail.com>
* src/ObjectSelector/_FilterFrameBase.py: indentation and tabs/spaces fix
2008-01-09 Raphael Ackermann <raphael.ackermann@gmail.com> 2008-01-09 Raphael Ackermann <raphael.ackermann@gmail.com>
* src/ViewManager.py: delete unneded method import_pkg * src/ViewManager.py: delete unneded method import_pkg
* src/ArgHandler.py: fix import CompressionError instead of CompressError * src/ArgHandler.py: fix import CompressionError instead of CompressError

53
src/ObjectSelector/_FilterFrameBase.py
View File

@ -125,12 +125,14 @@ class FilterFrameBase(gtk.Frame):
check.connect('toggled',lambda b: edit.set_sensitive(check.get_active())) check.connect('toggled',lambda b: edit.set_sensitive(check.get_active()))
self._table.attach(check,check_col,check_col+1, self._table.attach(check,check_col,check_col+1, self._current_row,
self._current_row,self._current_row+1,xoptions=False,yoptions=False) self._current_row+1,xoptions=False,yoptions=False)
self._table.attach(label,label_col,label_col+1, self._table.attach(label,label_col,label_col+1, self._current_row,
self._current_row,self._current_row+1,xoptions=gtk.FILL,yoptions=False) self._current_row+1,xoptions=gtk.FILL,
self._table.attach(edit,control_col,control_col+1, yoptions=False)
self._current_row,self._current_row+1,xoptions=gtk.EXPAND|gtk.FILL,yoptions=False) self._table.attach(edit,control_col,control_col+1, self._current_row,
self._current_row+1,xoptions=gtk.EXPAND|gtk.FILL,
yoptions=False)
self._current_row += 1 self._current_row += 1
return(check,label,edit) return(check,label,edit)
@ -158,13 +160,15 @@ class FilterFrameBase(gtk.Frame):
check.connect('toggled',lambda b: combo.set_sensitive(check.get_active())) check.connect('toggled',lambda b: combo.set_sensitive(check.get_active()))
self._table.attach(check,check_col,check_col+1, self._table.attach(check,check_col,check_col+1,
self._current_row,self._current_row+1,xoptions=False,yoptions=False) self._current_row,self._current_row+1,
self._table.attach(label,label_col,label_col+1, xoptions=False,yoptions=False)
self._current_row,self._current_row+1,xoptions=gtk.FILL,yoptions=False) self._table.attach(label,label_col,label_col+1, self._current_row,
self._table.attach(combo,control_col,control_col+1, self._current_row+1,xoptions=gtk.FILL,
self._current_row,self._current_row+1,xoptions=gtk.EXPAND|gtk.FILL,yoptions=False) yoptions=False)
self._table.attach(combo,control_col,control_col+1, self._current_row,
self._current_row+1,xoptions=gtk.EXPAND|gtk.FILL,
yoptions=False)
self._current_row += 1 self._current_row += 1
return (check,label,combo) return (check,label,combo)
@ -207,28 +211,33 @@ class FilterFrameBase(gtk.Frame):
inner_box.pack_start(after) inner_box.pack_start(after)
self._table.attach(check,check_col,check_col+1, self._table.attach(check,check_col,check_col+1, self._current_row,
self._current_row,self._current_row+1,xoptions=False,yoptions=False) self._current_row+1,xoptions=False,yoptions=False)
self._table.attach(label,label_col,label_col+1, self._table.attach(label,label_col,label_col+1, self._current_row,
self._current_row,self._current_row+1,xoptions=gtk.FILL,yoptions=False) self._current_row+1,xoptions=gtk.FILL,
self._table.attach(edit,control_col,control_col+1, yoptions=False)
self._current_row,self._current_row+1,xoptions=gtk.EXPAND|gtk.FILL,yoptions=False) self._table.attach(edit,control_col,control_col+1, self._current_row,
self._current_row+1,xoptions=gtk.EXPAND|gtk.FILL,
yoptions=False)
self._current_row +=1 self._current_row +=1
self._table.attach(inner_box,control_col,control_col+1, self._table.attach(inner_box,control_col,control_col+1,
self._current_row,self._current_row+1,xoptions=gtk.EXPAND|gtk.FILL,yoptions=False) self._current_row,self._current_row+1,
xoptions=gtk.EXPAND|gtk.FILL,yoptions=False)
self._current_row +=1 self._current_row +=1
self._table.attach(unknown,control_col,control_col+1, self._table.attach(unknown,control_col,control_col+1,
self._current_row,self._current_row+1,xoptions=gtk.EXPAND|gtk.FILL,yoptions=False) self._current_row,self._current_row+1,
xoptions=gtk.EXPAND|gtk.FILL,yoptions=False)
self._current_row +=1 self._current_row +=1
return (check, edit, before, after, unknown) return (check, edit, before, after, unknown)
def on_apply(self,button): def on_apply(self,button):
"""Build a GenericFilter object from the settings in the filter controls and """Build a GenericFilter object from the settings in the filter
emit a 'apply-filter' signal with the GenericFilter object as the parameter.""" controls and emit a 'apply-filter' signal with the GenericFilter object
as the parameter."""
raise NotImplementedError("subclass of FilterFrameBase must implement on_apply") raise NotImplementedError("subclass of FilterFrameBase must implement on_apply")