From a1de97b26d9c4d0ce765f73c8d2471717e371097 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Sun, 1 Jan 2012 17:57:42 +0000 Subject: [PATCH] 5472: Update gramplets when database changed so that they correctly show if they have data. Also remove superfluous updates. svn: r18678 --- src/gen/plug/_gramplet.py | 4 +++- src/plugins/gramplet/Attributes.py | 4 ---- src/plugins/gramplet/Backlinks.py | 8 -------- src/plugins/gramplet/Children.py | 2 -- src/plugins/gramplet/Events.py | 2 -- src/plugins/gramplet/Gallery.py | 5 ----- src/plugins/gramplet/MediaPreview.py | 1 - src/plugins/gramplet/Notes.py | 7 ------- src/plugins/gramplet/PersonDetails.py | 1 - src/plugins/gramplet/PersonResidence.py | 1 - src/plugins/gramplet/PlaceDetails.py | 1 - src/plugins/gramplet/RepositoryDetails.py | 1 - src/plugins/gramplet/Sources.py | 5 ----- 13 files changed, 3 insertions(+), 39 deletions(-) diff --git a/src/gen/plug/_gramplet.py b/src/gen/plug/_gramplet.py index b14f6207c..8db648421 100644 --- a/src/gen/plug/_gramplet.py +++ b/src/gen/plug/_gramplet.py @@ -67,9 +67,9 @@ class Gramplet(object): self.gui.on_motion) self.connect_signal('Person', self._active_changed) + self._db_changed(self.dbstate.db) active_person = self.get_active('Person') if active_person: # already changed - self._db_changed(self.dbstate.db) self._active_changed(active_person) self.post_init() @@ -284,6 +284,8 @@ class Gramplet(object): if self.dbstate.open: #print " %s is not active" % self.gui.gname self.update_has_data() + else: + self.set_has_data(False) return #print " %s is UPDATING" % self.gui.gname self.dirty = False diff --git a/src/plugins/gramplet/Attributes.py b/src/plugins/gramplet/Attributes.py index 716d9deb2..4b748d2d1 100644 --- a/src/plugins/gramplet/Attributes.py +++ b/src/plugins/gramplet/Attributes.py @@ -84,7 +84,6 @@ class PersonAttributes(Attributes): """ def db_changed(self): self.dbstate.db.connect('person-update', self.update) - self.update() def active_changed(self, handle): self.update() @@ -111,7 +110,6 @@ class EventAttributes(Attributes): def db_changed(self): self.dbstate.db.connect('event-update', self.update) self.connect_signal('Event', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Event') @@ -135,7 +133,6 @@ class FamilyAttributes(Attributes): def db_changed(self): self.dbstate.db.connect('family-update', self.update) self.connect_signal('Family', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Family') @@ -159,7 +156,6 @@ class MediaAttributes(Attributes): def db_changed(self): self.dbstate.db.connect('media-update', self.update) self.connect_signal('Media', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Media') diff --git a/src/plugins/gramplet/Backlinks.py b/src/plugins/gramplet/Backlinks.py index f2b55a80a..56d039d34 100644 --- a/src/plugins/gramplet/Backlinks.py +++ b/src/plugins/gramplet/Backlinks.py @@ -71,7 +71,6 @@ class PersonBacklinks(Backlinks): """ def db_changed(self): self.dbstate.db.connect('person-update', self.update) - self.update() def active_changed(self, handle): self.update() @@ -95,7 +94,6 @@ class EventBacklinks(Backlinks): def db_changed(self): self.dbstate.db.connect('event-update', self.update) self.connect_signal('Event', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Event') @@ -116,7 +114,6 @@ class FamilyBacklinks(Backlinks): def db_changed(self): self.dbstate.db.connect('family-update', self.update) self.connect_signal('Family', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Family') @@ -137,7 +134,6 @@ class PlaceBacklinks(Backlinks): def db_changed(self): self.dbstate.db.connect('place-update', self.update) self.connect_signal('Place', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Place') @@ -158,7 +154,6 @@ class SourceBacklinks(Backlinks): def db_changed(self): self.dbstate.db.connect('source-update', self.update) self.connect_signal('Source', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Source') @@ -179,7 +174,6 @@ class RepositoryBacklinks(Backlinks): def db_changed(self): self.dbstate.db.connect('repository-update', self.update) self.connect_signal('Repository', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Repository') @@ -200,7 +194,6 @@ class MediaBacklinks(Backlinks): def db_changed(self): self.dbstate.db.connect('media-update', self.update) self.connect_signal('Media', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Media') @@ -221,7 +214,6 @@ class NoteBacklinks(Backlinks): def db_changed(self): self.dbstate.db.connect('note-update', self.update) self.connect_signal('Note', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Note') diff --git a/src/plugins/gramplet/Children.py b/src/plugins/gramplet/Children.py index 93aec42dd..4ea13c4f9 100644 --- a/src/plugins/gramplet/Children.py +++ b/src/plugins/gramplet/Children.py @@ -92,7 +92,6 @@ class PersonChildren(Children): def db_changed(self): self.dbstate.db.connect('person-update', self.update) - self.update() def active_changed(self, handle): self.update() @@ -189,7 +188,6 @@ class FamilyChildren(Children): def db_changed(self): self.dbstate.db.connect('family-update', self.update) self.connect_signal('Family', self.update) - self.update() def main(self): active_handle = self.get_active('Family') diff --git a/src/plugins/gramplet/Events.py b/src/plugins/gramplet/Events.py index 079c7d6ce..7f6c42f17 100644 --- a/src/plugins/gramplet/Events.py +++ b/src/plugins/gramplet/Events.py @@ -97,7 +97,6 @@ class PersonEvents(Events): """ def db_changed(self): self.dbstate.db.connect('person-update', self.update) - self.update() def active_changed(self, handle): self.update() @@ -155,7 +154,6 @@ class FamilyEvents(Events): def db_changed(self): self.dbstate.db.connect('family-update', self.update) self.connect_signal('Family', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Family') diff --git a/src/plugins/gramplet/Gallery.py b/src/plugins/gramplet/Gallery.py index 5f7619de5..cadd71e94 100644 --- a/src/plugins/gramplet/Gallery.py +++ b/src/plugins/gramplet/Gallery.py @@ -90,7 +90,6 @@ class PersonGallery(Gallery): """ def db_changed(self): self.dbstate.db.connect('person-update', self.update) - self.update() def active_changed(self, handle): self.update() @@ -117,7 +116,6 @@ class FamilyGallery(Gallery): def db_changed(self): self.dbstate.db.connect('family-update', self.update) self.connect_signal('Family', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Family') @@ -141,7 +139,6 @@ class EventGallery(Gallery): def db_changed(self): self.dbstate.db.connect('event-update', self.update) self.connect_signal('Event', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Event') @@ -165,7 +162,6 @@ class PlaceGallery(Gallery): def db_changed(self): self.dbstate.db.connect('place-update', self.update) self.connect_signal('Place', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Place') @@ -189,7 +185,6 @@ class SourceGallery(Gallery): def db_changed(self): self.dbstate.db.connect('event-update', self.update) self.connect_signal('Source', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Source') diff --git a/src/plugins/gramplet/MediaPreview.py b/src/plugins/gramplet/MediaPreview.py index 0c36d2923..8d00c1ba9 100644 --- a/src/plugins/gramplet/MediaPreview.py +++ b/src/plugins/gramplet/MediaPreview.py @@ -46,7 +46,6 @@ class MediaPreview(Gramplet): def db_changed(self): self.dbstate.db.connect('media-update', self.update) self.connect_signal('Media', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Media') diff --git a/src/plugins/gramplet/Notes.py b/src/plugins/gramplet/Notes.py index d4023e974..5888c1d49 100644 --- a/src/plugins/gramplet/Notes.py +++ b/src/plugins/gramplet/Notes.py @@ -137,7 +137,6 @@ class PersonNotes(Notes): """ def db_changed(self): self.dbstate.db.connect('person-update', self.update) - self.update() def active_changed(self, handle): self.update() @@ -163,7 +162,6 @@ class EventNotes(Notes): def db_changed(self): self.dbstate.db.connect('event-update', self.update) self.connect_signal('Event', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Event') @@ -186,7 +184,6 @@ class FamilyNotes(Notes): def db_changed(self): self.dbstate.db.connect('family-update', self.update) self.connect_signal('Family', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Family') @@ -209,7 +206,6 @@ class PlaceNotes(Notes): def db_changed(self): self.dbstate.db.connect('place-update', self.update) self.connect_signal('Place', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Place') @@ -232,7 +228,6 @@ class SourceNotes(Notes): def db_changed(self): self.dbstate.db.connect('source-update', self.update) self.connect_signal('Source', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Source') @@ -255,7 +250,6 @@ class RepositoryNotes(Notes): def db_changed(self): self.dbstate.db.connect('repository-update', self.update) self.connect_signal('Repository', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Repository') @@ -278,7 +272,6 @@ class MediaNotes(Notes): def db_changed(self): self.dbstate.db.connect('media-update', self.update) self.connect_signal('Media', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Media') diff --git a/src/plugins/gramplet/PersonDetails.py b/src/plugins/gramplet/PersonDetails.py index 2995f6d14..80a1612ae 100644 --- a/src/plugins/gramplet/PersonDetails.py +++ b/src/plugins/gramplet/PersonDetails.py @@ -84,7 +84,6 @@ class PersonDetails(Gramplet): def db_changed(self): self.dbstate.db.connect('person-update', self.update) - self.update() def active_changed(self, handle): self.update() diff --git a/src/plugins/gramplet/PersonResidence.py b/src/plugins/gramplet/PersonResidence.py index 3db32548d..039b0584d 100644 --- a/src/plugins/gramplet/PersonResidence.py +++ b/src/plugins/gramplet/PersonResidence.py @@ -53,7 +53,6 @@ class PersonResidence(Gramplet): def db_changed(self): self.dbstate.db.connect('person-update', self.update) - self.update() def active_changed(self, handle): self.update() diff --git a/src/plugins/gramplet/PlaceDetails.py b/src/plugins/gramplet/PlaceDetails.py index 7c63a2743..9671f9b38 100644 --- a/src/plugins/gramplet/PlaceDetails.py +++ b/src/plugins/gramplet/PlaceDetails.py @@ -81,7 +81,6 @@ class PlaceDetails(Gramplet): def db_changed(self): self.dbstate.db.connect('place-update', self.update) self.connect_signal('Place', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Person') diff --git a/src/plugins/gramplet/RepositoryDetails.py b/src/plugins/gramplet/RepositoryDetails.py index b0685f922..7e44cdd93 100644 --- a/src/plugins/gramplet/RepositoryDetails.py +++ b/src/plugins/gramplet/RepositoryDetails.py @@ -77,7 +77,6 @@ class RepositoryDetails(Gramplet): def db_changed(self): self.dbstate.db.connect('repository-update', self.update) self.connect_signal('Repository', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Person') diff --git a/src/plugins/gramplet/Sources.py b/src/plugins/gramplet/Sources.py index 4f21cfd68..61982e65c 100644 --- a/src/plugins/gramplet/Sources.py +++ b/src/plugins/gramplet/Sources.py @@ -97,7 +97,6 @@ class PersonSources(Sources): """ def db_changed(self): self.dbstate.db.connect('person-update', self.update) - self.update() def active_changed(self, handle): self.update() @@ -124,7 +123,6 @@ class EventSources(Sources): def db_changed(self): self.dbstate.db.connect('event-update', self.update) self.connect_signal('Event', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Event') @@ -148,7 +146,6 @@ class FamilySources(Sources): def db_changed(self): self.dbstate.db.connect('family-update', self.update) self.connect_signal('Family', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Family') @@ -172,7 +169,6 @@ class PlaceSources(Sources): def db_changed(self): self.dbstate.db.connect('place-update', self.update) self.connect_signal('Place', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Place') @@ -196,7 +192,6 @@ class MediaSources(Sources): def db_changed(self): self.dbstate.db.connect('media-update', self.update) self.connect_signal('Media', self.update) - self.update() def update_has_data(self): active_handle = self.get_active('Media')