Add date validation to filters
svn: r22903
This commit is contained in:
parent
d40325339b
commit
537b3d7af8
@ -266,6 +266,7 @@ src/gui/views/treemodels/sourcemodel.py
|
|||||||
|
|
||||||
# gui/widgets - the GUI widgets package
|
# gui/widgets - the GUI widgets package
|
||||||
src/gui/widgets/basicentry.py
|
src/gui/widgets/basicentry.py
|
||||||
|
src/gui/widgets/dateentry.py
|
||||||
src/gui/widgets/menutoolbuttonaction.py
|
src/gui/widgets/menutoolbuttonaction.py
|
||||||
src/gui/widgets/styledtextbuffer.py
|
src/gui/widgets/styledtextbuffer.py
|
||||||
src/gui/widgets/undoablestyledbuffer.py
|
src/gui/widgets/undoablestyledbuffer.py
|
||||||
|
@ -40,7 +40,7 @@ import gtk
|
|||||||
# GRAMPS modules
|
# GRAMPS modules
|
||||||
#
|
#
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
from gui.widgets import MonitoredMenu
|
from gui.widgets import MonitoredMenu, DateEntry
|
||||||
import gen.lib
|
import gen.lib
|
||||||
from Filters.SideBar import SidebarFilter
|
from Filters.SideBar import SidebarFilter
|
||||||
from Filters import GenericFilterFactory, build_filter_model, Rules
|
from Filters import GenericFilterFactory, build_filter_model, Rules
|
||||||
@ -60,7 +60,7 @@ class CitationSidebarFilter(SidebarFilter):
|
|||||||
self.clicked_func = clicked
|
self.clicked_func = clicked
|
||||||
self.filter_id = gtk.Entry()
|
self.filter_id = gtk.Entry()
|
||||||
self.filter_page = gtk.Entry()
|
self.filter_page = gtk.Entry()
|
||||||
self.filter_date = gtk.Entry()
|
self.filter_date = DateEntry(uistate, [])
|
||||||
|
|
||||||
self.filter_conf = gtk.ComboBox()
|
self.filter_conf = gtk.ComboBox()
|
||||||
model = gtk.ListStore(str)
|
model = gtk.ListStore(str)
|
||||||
|
@ -70,7 +70,7 @@ class EventSidebarFilter(SidebarFilter):
|
|||||||
self.filter_event.get_type)
|
self.filter_event.get_type)
|
||||||
|
|
||||||
self.filter_mainparts = widgets.BasicEntry()
|
self.filter_mainparts = widgets.BasicEntry()
|
||||||
self.filter_date = widgets.BasicEntry()
|
self.filter_date = widgets.DateEntry(uistate, [])
|
||||||
self.filter_place = widgets.BasicEntry()
|
self.filter_place = widgets.BasicEntry()
|
||||||
self.filter_note = widgets.BasicEntry()
|
self.filter_note = widgets.BasicEntry()
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ class MediaSidebarFilter(SidebarFilter):
|
|||||||
self.filter_title = widgets.BasicEntry()
|
self.filter_title = widgets.BasicEntry()
|
||||||
self.filter_type = widgets.BasicEntry()
|
self.filter_type = widgets.BasicEntry()
|
||||||
self.filter_path = widgets.BasicEntry()
|
self.filter_path = widgets.BasicEntry()
|
||||||
self.filter_date = widgets.BasicEntry()
|
self.filter_date = widgets.DateEntry(uistate, [])
|
||||||
self.filter_note = widgets.BasicEntry()
|
self.filter_note = widgets.BasicEntry()
|
||||||
|
|
||||||
self.filter_regex = gtk.CheckButton(_('Use regular expressions'))
|
self.filter_regex = gtk.CheckButton(_('Use regular expressions'))
|
||||||
|
@ -74,8 +74,8 @@ class PersonSidebarFilter(SidebarFilter):
|
|||||||
self.clicked_func = clicked
|
self.clicked_func = clicked
|
||||||
self.filter_name = widgets.BasicEntry()
|
self.filter_name = widgets.BasicEntry()
|
||||||
self.filter_id = widgets.BasicEntry()
|
self.filter_id = widgets.BasicEntry()
|
||||||
self.filter_birth = widgets.BasicEntry()
|
self.filter_birth = widgets.DateEntry(uistate, [])
|
||||||
self.filter_death = widgets.BasicEntry()
|
self.filter_death = widgets.DateEntry(uistate, [])
|
||||||
self.filter_event = gen.lib.Event()
|
self.filter_event = gen.lib.Event()
|
||||||
self.filter_event.set_type((gen.lib.EventType.CUSTOM, u''))
|
self.filter_event.set_type((gen.lib.EventType.CUSTOM, u''))
|
||||||
self.etype = gtk.ComboBoxEntry()
|
self.etype = gtk.ComboBoxEntry()
|
||||||
|
@ -68,6 +68,7 @@ import AutoComp
|
|||||||
from gui.selectors import SelectorFactory
|
from gui.selectors import SelectorFactory
|
||||||
from gen.display.name import displayer as _nd
|
from gen.display.name import displayer as _nd
|
||||||
import Utils
|
import Utils
|
||||||
|
from gui.widgets import DateEntry
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
@ -552,6 +553,8 @@ class EditRule(ManagedWindow.ManagedWindow):
|
|||||||
elif v == _('Confidence level:'):
|
elif v == _('Confidence level:'):
|
||||||
t = MyList(map(str, range(5)),
|
t = MyList(map(str, range(5)),
|
||||||
[Utils.confidence[i] for i in range(5)])
|
[Utils.confidence[i] for i in range(5)])
|
||||||
|
elif v == _('Date:'):
|
||||||
|
t = DateEntry(self.uistate, self.track)
|
||||||
else:
|
else:
|
||||||
t = MyEntry()
|
t = MyEntry()
|
||||||
tlist.append(t)
|
tlist.append(t)
|
||||||
|
@ -10,6 +10,7 @@ pkgpython_PYTHON = \
|
|||||||
__init__.py \
|
__init__.py \
|
||||||
basicentry.py \
|
basicentry.py \
|
||||||
buttons.py \
|
buttons.py \
|
||||||
|
dateentry.py \
|
||||||
expandcollapsearrow.py \
|
expandcollapsearrow.py \
|
||||||
grampletpane.py \
|
grampletpane.py \
|
||||||
labels.py \
|
labels.py \
|
||||||
|
@ -25,6 +25,7 @@
|
|||||||
|
|
||||||
from basicentry import *
|
from basicentry import *
|
||||||
from buttons import *
|
from buttons import *
|
||||||
|
from dateentry import *
|
||||||
from expandcollapsearrow import *
|
from expandcollapsearrow import *
|
||||||
from labels import *
|
from labels import *
|
||||||
from linkbox import *
|
from linkbox import *
|
||||||
|
75
src/gui/widgets/dateentry.py
Normal file
75
src/gui/widgets/dateentry.py
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
#
|
||||||
|
# Gramps - a GTK+/GNOME based genealogy program
|
||||||
|
#
|
||||||
|
# Copyright (C) 2013 Nick Hall
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 2 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program; if not, write to the Free Software
|
||||||
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
#
|
||||||
|
|
||||||
|
# $Id$
|
||||||
|
|
||||||
|
__all__ = ["DateEntry"]
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# Standard python modules
|
||||||
|
#
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
import logging
|
||||||
|
_LOG = logging.getLogger(".widgets.dateentry")
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# GTK/Gnome modules
|
||||||
|
#
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
import gtk
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# Gramps modules
|
||||||
|
#
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
from gui.widgets.monitoredwidgets import MonitoredDate
|
||||||
|
from gui.widgets.validatedmaskedentry import ValidatableMaskedEntry
|
||||||
|
from gen.lib.date import Date
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# DateEntry class
|
||||||
|
#
|
||||||
|
#-------------------------------------------------------------------------
|
||||||
|
class DateEntry(gtk.HBox):
|
||||||
|
|
||||||
|
def __init__(self, uistate, track):
|
||||||
|
gtk.HBox.__init__(self)
|
||||||
|
self.entry = ValidatableMaskedEntry()
|
||||||
|
self.pack_start(self.entry, True, True, 0)
|
||||||
|
image = gtk.Image()
|
||||||
|
image.set_from_stock('gramps-date-edit', gtk.ICON_SIZE_BUTTON)
|
||||||
|
button = gtk.Button()
|
||||||
|
button.set_image(image)
|
||||||
|
button.set_relief(gtk.RELIEF_NORMAL)
|
||||||
|
self.pack_start(button, False, True, 0)
|
||||||
|
self.date = Date()
|
||||||
|
self.date_entry = MonitoredDate(self.entry, button, self.date,
|
||||||
|
uistate, track)
|
||||||
|
self.show_all()
|
||||||
|
|
||||||
|
def get_text(self):
|
||||||
|
return self.entry.get_text()
|
||||||
|
|
||||||
|
def set_text(self, text):
|
||||||
|
self.entry.set_text(text)
|
Loading…
Reference in New Issue
Block a user