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

In .:

Browse Source 
2006-07-31  Alex Roitman  <shura@gramps-project.org>
	* src/Filters/_SearchBar.py (SearchBar.__init__): Take dbstate as
	a constructor argument; (SearchBar.apply_filter): pass dbstate.
	* src/PageView.py (BookMarkView.add_bookmark,
	PersonNavView.jumpto, PersonNavView.fwd_clicked,
	PersonNavView.back_clicked, ListView.build_widget): Pass dbstate.
	* src/Navigation.py (BaseNavigation.__init__,
	PersonNavigation.__init__): Take dbstate as a constructor argument;
	(PersonNavigation.build_item_name): properly access dbstate.
	* src/DisplayState.py (__init__): Do not take dbstate as a
	constructor argument; Do not connect dbstate signal here (moved to
	ViewManager);
	(display_relationship,push_message,modify_statusbar): Make dbstate
	an argument.
	* src/plugins/Checkpoint.py (run_tool): Pass dbstate.
	* src/ViewManager.py (_build_main_window): Do not pass dbstate to
	uistate DisplayState constructor; connect dbstate signal handler;
	pass dbstate to Navigation; (keypress): Pass dbstate;
	(statusbar_key_update): Pass dbstate;
	(do_load_plugins): Pass dbstate;
	(ViewManager.add_bookmark): Pass dbstate.
	* src/DataViews/_RelationView.py (shade_update): Pass dbstate.
	* src/DataViews/_PersonView.py (build_widget,_goto,
	key_goto_home_person, key_edit_selected_person): Pass dbstate.
	* src/Filters/Makefile.am (pkgdata_PYTHON): Remove obsolete file.
	* src/Filters/__init__.py: Remove importing obsolete module.
	* src/Filters/_FilterWidget.py: Remove obsolete module.

In po:
2006-07-31  Alex Roitman  <shura@gramps-project.org>
	* POTFILES.in: Remove obsolete file.



svn: r7104
This commit is contained in:
Alex Roitman
2006-08-01 04:31:10 +00:00
parent ed76c8b5b1
commit 36d13d0bff
14 changed files with 82 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gramps2/src/DisplayState.py
View File

@ -250,9 +250,8 @@ class DisplayState(GrampsDb.GrampsDBCallback):
__signals__ = {
}
def __init__(self, window, status, progress, warnbtn, uimanager, dbstate):
def __init__(self, window, status, progress, warnbtn, uimanager):
self.dbstate = dbstate
self.uimanager = uimanager
self.window = window
GrampsDb.GrampsDBCallback.__init__(self)
@ -270,15 +269,17 @@ class DisplayState(GrampsDb.GrampsDBCallback):
self.log = logging.getLogger()
self.log.setLevel(logging.WARN)
self.log.addHandler(self.rh)
self.dbstate.connect('database-changed', self.db_changed)
# This call has been moved one level up,
# but this connection is still made!
# self.dbstate.connect('database-changed', self.db_changed)
def db_changed(self, db):
from PluginUtils import _PluginMgr
self.relationship = _PluginMgr.relationship_class(db)
def display_relationship(self):
default_person = self.dbstate.db.get_default_person()
active = self.dbstate.get_active_person()
def display_relationship(self,dbstate):
default_person = dbstate.db.get_default_person()
active = dbstate.get_active_person()
if default_person == None or active == None:
return u''
@ -311,22 +312,22 @@ class DisplayState(GrampsDb.GrampsDBCallback):
def set_open_recent_menu(self,menu):
self.widget.set_menu(menu)
def push_message(self, text):
def push_message(self, dbstate, text):
self.status_text(text)
gobject.timeout_add(5000,self.modify_statusbar)
gobject.timeout_add(5000,self.modify_statusbar,dbstate)
def modify_statusbar(self,active=None):
def modify_statusbar(self,dbstate,active=None):
self.status.pop(self.status_id)
if self.dbstate.active == None:
if dbstate.active == None:
self.status.push(self.status_id,"")
else:
person = self.dbstate.get_active_person()
person = dbstate.get_active_person()
if person:
pname = NameDisplay.displayer.display(person)
name = "[%s] %s" % (person.get_gramps_id(),pname)
if Config.get(Config.STATUSBAR) > 1:
if person.handle != self.dbstate.db.get_default_handle():
msg = self.display_relationship()
if person.handle != dbstate.db.get_default_handle():
msg = self.display_relationship(dbstate)
if msg:
name = "%s (%s)" % (name,msg.strip())
else: