Refinements on statusbar update; only updated when really necessary; fixed bug in updating when db is closed
svn: r14141
This commit is contained in:
@@ -265,12 +265,13 @@ class Gramplet(object):
|
|||||||
"""
|
"""
|
||||||
import gobject
|
import gobject
|
||||||
if ((not self.active or
|
if ((not self.active or
|
||||||
self.gui.state in ["closed", "minimized"]) and
|
self.gui.state in ["closed", "minimized"] or
|
||||||
|
not self.dbstate.open) and
|
||||||
not self.gui.force_update):
|
not self.gui.force_update):
|
||||||
self.dirty = True
|
self.dirty = True
|
||||||
#print " %s is not active" % self.gui.title
|
#print " %s is not active" % self.gui.title
|
||||||
return
|
return
|
||||||
#print " %s is UPDATING" % self.gui.title
|
#print " %s is UPDATING" % self.gui.title
|
||||||
self.dirty = False
|
self.dirty = False
|
||||||
self.uistate.push_message(self.dbstate,
|
self.uistate.push_message(self.dbstate,
|
||||||
_("Gramplet %s is running") % self.gui.title)
|
_("Gramplet %s is running") % self.gui.title)
|
||||||
@@ -287,16 +288,22 @@ class Gramplet(object):
|
|||||||
"""
|
"""
|
||||||
if not isinstance(self._generator, types.GeneratorType):
|
if not isinstance(self._generator, types.GeneratorType):
|
||||||
self._idle_id = 0
|
self._idle_id = 0
|
||||||
|
self.uistate.push_message(self.dbstate,
|
||||||
|
_("Gramplet %s updated") % self.gui.title)
|
||||||
return False
|
return False
|
||||||
try:
|
try:
|
||||||
retval = self._generator.next()
|
retval = self._generator.next()
|
||||||
if not retval:
|
if not retval:
|
||||||
self._idle_id = 0
|
self._idle_id = 0
|
||||||
if self._pause:
|
if self._pause:
|
||||||
|
self.uistate.push_message(self.dbstate,
|
||||||
|
_("Gramplet %s updated") % self.gui.title)
|
||||||
return False
|
return False
|
||||||
return retval
|
return retval
|
||||||
except StopIteration:
|
except StopIteration:
|
||||||
self._idle_id = 0
|
self._idle_id = 0
|
||||||
|
self.uistate.push_message(self.dbstate,
|
||||||
|
_("Gramplet %s updated") % self.gui.title)
|
||||||
return False
|
return False
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
import traceback
|
import traceback
|
||||||
@@ -304,6 +311,8 @@ class Gramplet(object):
|
|||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
print "Continuing after gramplet error..."
|
print "Continuing after gramplet error..."
|
||||||
self._idle_id = 0
|
self._idle_id = 0
|
||||||
|
self.uistate.push_message(self.dbstate,
|
||||||
|
_("Gramplet %s caused an error") % self.gui.title)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def pause(self, *args):
|
def pause(self, *args):
|
||||||
|
|||||||
@@ -422,7 +422,8 @@ class GuiGramplet(object):
|
|||||||
padding,
|
padding,
|
||||||
pack)
|
pack)
|
||||||
if oldstate is "minimized" and self.pui:
|
if oldstate is "minimized" and self.pui:
|
||||||
self.pui.update()
|
if self.pui.dirty:
|
||||||
|
self.pui.update()
|
||||||
|
|
||||||
def change_state(self, obj):
|
def change_state(self, obj):
|
||||||
"""
|
"""
|
||||||
|
|||||||
Reference in New Issue
Block a user