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

2007-03-05 Don Allingham <don@gramps-project.org>

Browse Source 
* src/ViewManager.py: support for close button on filter sidebar
	* src/DisplayModels/_BaseModel.py: support for marker coloring
	* src/DisplayModels/_FamilyModel.py: support for marker coloring
	* src/PageView.py: support for marker coloring
	* src/Filters/SideBar/_SidebarFilter.py: provide close button
	* src/Filters/SideBar/_PersonSidebarFilter.py: cleanup



svn: r8272
This commit is contained in:
Don Allingham
2007-03-06 04:13:14 +00:00
parent a88d60ad23
commit 2ca305b204
7 changed files with 116 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Filters/SideBar/_PersonSidebarFilter.py
View File

@@ -54,8 +54,8 @@ from Filters import GenericFilter, build_filter_model, Rules
#-------------------------------------------------------------------------
class PersonSidebarFilter(SidebarFilter):
def __init__(self,uistate,clicked):
SidebarFilter.__init__(self,uistate)
def __init__(self, uistate, clicked):
SidebarFilter.__init__(self, uistate)
self.clicked_func = clicked
def create_widget(self):
@@ -93,14 +93,13 @@ class PersonSidebarFilter(SidebarFilter):
self.generic.add_attribute(cell, 'text', 0)
self.on_filters_changed('Person')
# def set(self, quality, modifier, calendar, value, text=None):
exdate1 = RelLib.Date()
exdate2 = RelLib.Date()
exdate1.set(RelLib.Date.QUAL_NONE, RelLib.Date.MOD_RANGE, RelLib.Date.CAL_GREGORIAN,
(0,0,1800,False,0,0,1900,False))
exdate2.set(RelLib.Date.QUAL_NONE, RelLib.Date.MOD_BEFORE, RelLib.Date.CAL_GREGORIAN,
(0,0,1850,False))
exdate1.set(RelLib.Date.QUAL_NONE, RelLib.Date.MOD_RANGE,
RelLib.Date.CAL_GREGORIAN, (0, 0, 1800, False,
0, 0, 1900, False))
exdate2.set(RelLib.Date.QUAL_NONE, RelLib.Date.MOD_BEFORE,
RelLib.Date.CAL_GREGORIAN, (0, 0, 1850, False))
msg1 = DateHandler.displayer.display(exdate1)
msg2 = DateHandler.displayer.display(exdate2)

26
src/Filters/SideBar/_SidebarFilter.py
View File

@@ -23,15 +23,16 @@
from gettext import gettext as _
import gtk
import GrampsWidgets
import Config
_RETURN = gtk.gdk.keyval_from_name("Return")
_KP_ENTER = gtk.gdk.keyval_from_name("KP_Enter")
class SidebarFilter:
def __init__(self,uistate):
def __init__(self, uistate):
self.position = 1
self.table = gtk.Table(3,11)
self.table = gtk.Table(4,11)
self.table.set_border_width(6)
self.table.set_row_spacings(6)
self.table.set_col_spacing(0,6)
@@ -43,7 +44,18 @@ class SidebarFilter:
def _init_interface(self):
self.table.attach(GrampsWidgets.MarkupLabel(_('<b>Filter</b>')),
0, 3, 0, 1, xoptions=gtk.FILL, yoptions=0)
0, 2, 0, 1, xoptions=gtk.FILL|gtk.EXPAND, yoptions=0)
btn = gtk.Button()
img = gtk.image_new_from_stock(gtk.STOCK_CLOSE, gtk.ICON_SIZE_MENU)
box = gtk.HBox()
btn.set_image(img)
btn.set_relief(gtk.RELIEF_NONE)
btn.set_alignment(1.0, 0.5)
box.pack_start(gtk.Label(''), expand=True, fill=True)
box.pack_end(btn, fill=False, expand=False)
box.show_all()
self.table.attach(box, 2, 4, 0, 1, yoptions=0)
btn.connect('clicked', self.btn_clicked)
self.create_widget()
@@ -70,9 +82,13 @@ class SidebarFilter:
hbox.add(self.apply_btn)
hbox.add(self.clear_btn)
hbox.show()
self.table.attach(hbox, 2, 3, self.position, self.position+1,
self.table.attach(hbox, 2, 4, self.position, self.position+1,
xoptions=gtk.FILL, yoptions=0)
def btn_clicked(self, obj):
Config.set(Config.FILTER, False)
Config.sync()
def get_widget(self):
return self.table
@@ -110,7 +126,7 @@ class SidebarFilter:
self.table.attach(GrampsWidgets.BasicLabel(name),
1, 2, self.position, self.position+1,
xoptions=gtk.FILL, yoptions=0)
self.table.attach(widget, 2, 3, self.position, self.position+1,
self.table.attach(widget, 2, 4, self.position, self.position+1,
xoptions=gtk.FILL, yoptions=0)
self.position += 1