Reorganize custom widgets into a new 'widgets' package.
1. moving existing widget modules under src/widgets/ svn: r10694
This commit is contained in:
@@ -39,7 +39,7 @@ import gtk
|
||||
# GRAMPS modules
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
import GrampsWidgets
|
||||
import widgets
|
||||
import gen.lib
|
||||
|
||||
from Filters.SideBar import SidebarFilter
|
||||
@@ -64,11 +64,11 @@ class EventSidebarFilter(SidebarFilter):
|
||||
self.filter_event.set_type((gen.lib.EventType.CUSTOM, u''))
|
||||
self.etype = gtk.ComboBoxEntry()
|
||||
|
||||
self.event_menu = GrampsWidgets.MonitoredDataType(
|
||||
self.event_menu = widgets.MonitoredDataType(
|
||||
self.etype,
|
||||
self.filter_event.set_type,
|
||||
self.filter_event.get_type)
|
||||
|
||||
|
||||
self.filter_date = gtk.Entry()
|
||||
self.filter_place = gtk.Entry()
|
||||
self.filter_note = gtk.Entry()
|
||||
|
||||
@@ -39,7 +39,7 @@ import gtk
|
||||
# GRAMPS modules
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
import GrampsWidgets
|
||||
import widgets
|
||||
import gen.lib
|
||||
|
||||
from Filters.SideBar import SidebarFilter
|
||||
@@ -74,12 +74,12 @@ class FamilySidebarFilter(SidebarFilter):
|
||||
self.family_stub.set_relationship((gen.lib.FamilyRelType.CUSTOM, u''))
|
||||
self.rtype = gtk.ComboBoxEntry()
|
||||
|
||||
self.event_menu = GrampsWidgets.MonitoredDataType(
|
||||
self.event_menu = widgets.MonitoredDataType(
|
||||
self.etype,
|
||||
self.filter_event.set_type,
|
||||
self.filter_event.get_type)
|
||||
|
||||
self.rel_menu = GrampsWidgets.MonitoredDataType(
|
||||
self.rel_menu = widgets.MonitoredDataType(
|
||||
self.rtype,
|
||||
self.family_stub.set_relationship,
|
||||
self.family_stub.get_relationship)
|
||||
@@ -87,7 +87,7 @@ class FamilySidebarFilter(SidebarFilter):
|
||||
self.filter_marker = gen.lib.Family()
|
||||
self.filter_marker.set_marker((gen.lib.MarkerType.CUSTOM, u''))
|
||||
self.mtype = gtk.ComboBoxEntry()
|
||||
self.marker_menu = GrampsWidgets.MonitoredDataType(
|
||||
self.marker_menu = widgets.MonitoredDataType(
|
||||
self.mtype,
|
||||
self.filter_marker.set_marker,
|
||||
self.filter_marker.get_marker)
|
||||
|
||||
@@ -39,7 +39,7 @@ import gtk
|
||||
# GRAMPS modules
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
import GrampsWidgets
|
||||
import widgets
|
||||
from gen.lib import Note, NoteType
|
||||
|
||||
from Filters.SideBar import SidebarFilter
|
||||
@@ -62,7 +62,7 @@ class NoteSidebarFilter(SidebarFilter):
|
||||
self.note = Note()
|
||||
self.note.set_type((NoteType.CUSTOM,''))
|
||||
self.ntype = gtk.ComboBoxEntry()
|
||||
self.event_menu = GrampsWidgets.MonitoredDataType(
|
||||
self.event_menu = widgets.MonitoredDataType(
|
||||
self.ntype,
|
||||
self.note.set_type,
|
||||
self.note.get_type)
|
||||
|
||||
@@ -39,7 +39,7 @@ import gtk
|
||||
# GRAMPS modules
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
import GrampsWidgets
|
||||
import widgets
|
||||
import gen.lib
|
||||
import DateHandler
|
||||
|
||||
@@ -79,7 +79,7 @@ class PersonSidebarFilter(SidebarFilter):
|
||||
self.filter_event = gen.lib.Event()
|
||||
self.filter_event.set_type((gen.lib.EventType.CUSTOM, u''))
|
||||
self.etype = gtk.ComboBoxEntry()
|
||||
self.event_menu = GrampsWidgets.MonitoredDataType(
|
||||
self.event_menu = widgets.MonitoredDataType(
|
||||
self.etype,
|
||||
self.filter_event.set_type,
|
||||
self.filter_event.get_type)
|
||||
@@ -87,7 +87,7 @@ class PersonSidebarFilter(SidebarFilter):
|
||||
self.filter_marker = gen.lib.Person()
|
||||
self.filter_marker.set_marker((gen.lib.MarkerType.CUSTOM, u''))
|
||||
self.mtype = gtk.ComboBoxEntry()
|
||||
self.marker_menu = GrampsWidgets.MonitoredDataType(
|
||||
self.marker_menu = widgets.MonitoredDataType(
|
||||
self.mtype,
|
||||
self.filter_marker.set_marker,
|
||||
self.filter_marker.get_marker)
|
||||
|
||||
@@ -39,7 +39,7 @@ import gtk
|
||||
# GRAMPS modules
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
import GrampsWidgets
|
||||
import widgets
|
||||
from gen.lib import Repository, RepositoryType
|
||||
|
||||
from Filters.SideBar import SidebarFilter
|
||||
@@ -66,7 +66,7 @@ class RepoSidebarFilter(SidebarFilter):
|
||||
self.repo = Repository()
|
||||
self.repo.set_type((RepositoryType.CUSTOM,''))
|
||||
self.rtype = gtk.ComboBoxEntry()
|
||||
self.event_menu = GrampsWidgets.MonitoredDataType(
|
||||
self.event_menu = widgets.MonitoredDataType(
|
||||
self.rtype,
|
||||
self.repo.set_type,
|
||||
self.repo.get_type)
|
||||
|
||||
@@ -24,7 +24,7 @@ from gettext import gettext as _
|
||||
import gtk
|
||||
import pango
|
||||
|
||||
import GrampsWidgets
|
||||
import widgets
|
||||
import Config
|
||||
|
||||
_RETURN = gtk.gdk.keyval_from_name("Return")
|
||||
@@ -51,7 +51,7 @@ class SidebarFilter:
|
||||
self.dbstate = dbstate
|
||||
|
||||
def _init_interface(self):
|
||||
self.table.attach(GrampsWidgets.MarkupLabel(_('<b>Filter</b>')),
|
||||
self.table.attach(widgets.MarkupLabel(_('<b>Filter</b>')),
|
||||
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)
|
||||
@@ -129,7 +129,7 @@ class SidebarFilter:
|
||||
|
||||
def add_entry(self, name, widget):
|
||||
if name:
|
||||
self.table.attach(GrampsWidgets.BasicLabel(name),
|
||||
self.table.attach(widgets.BasicLabel(name),
|
||||
1, 2, self.position, self.position+1,
|
||||
xoptions=gtk.FILL, yoptions=0)
|
||||
self.table.attach(widget, 2, 4, self.position, self.position+1,
|
||||
|
||||
Reference in New Issue
Block a user