[gnome-music/wip/jfelder/views-populate] views: Make all populate calls internal
- From: Jean Felder <jfelder src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/wip/jfelder/views-populate] views: Make all populate calls internal
- Date: Tue, 9 Apr 2019 13:48:57 +0000 (UTC)
commit 67a2a51329b29ef18bddfaed094ff11a0727aad5
Author: Jean Felder <jfelder src gnome org>
Date: Tue Apr 9 15:25:10 2019 +0200
views: Make all populate calls internal
The _populate method in BaseView only calls the populate method. All
main views implement a populate method which is used to query songs
and populate their models. This means that there is no difference
between _populate and populate calls. As all calls are internal,
populate method can be removed.
Replace all populate calls by _populate to avoid any confusion.
gnomemusic/views/albumsview.py | 4 ++--
gnomemusic/views/artistsview.py | 2 +-
gnomemusic/views/baseview.py | 6 +-----
gnomemusic/views/playlistview.py | 2 +-
gnomemusic/views/searchview.py | 2 +-
gnomemusic/views/songsview.py | 4 ++--
6 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/gnomemusic/views/albumsview.py b/gnomemusic/views/albumsview.py
index 33fe4f94..fdee5c68 100644
--- a/gnomemusic/views/albumsview.py
+++ b/gnomemusic/views/albumsview.py
@@ -60,7 +60,7 @@ class AlbumsView(BaseView):
def _on_changes_pending(self, data=None):
if (self._init and not self.props.selection_mode):
self._offset = 0
- self.populate()
+ self._populate()
grilo.changes_pending['Albums'] = False
@log
@@ -119,7 +119,7 @@ class AlbumsView(BaseView):
self._headerbar.props.subtitle = utils.get_artist_name(album)
@log
- def populate(self):
+ def _populate(self, data=None):
self._window.notifications_popup.push_loading()
grilo.populate_albums(self._offset, self._add_item)
self._init = True
diff --git a/gnomemusic/views/artistsview.py b/gnomemusic/views/artistsview.py
index 328424ff..1eb93a01 100644
--- a/gnomemusic/views/artistsview.py
+++ b/gnomemusic/views/artistsview.py
@@ -167,7 +167,7 @@ class ArtistsView(BaseView):
self._sidebar.emit('row-activated', row)
@log
- def populate(self):
+ def _populate(self, data=None):
"""Populates the view"""
self._window.notifications_popup.push_loading()
grilo.populate_artists(self._offset, self._add_item)
diff --git a/gnomemusic/views/baseview.py b/gnomemusic/views/baseview.py
index 25ca9767..c1794c9b 100644
--- a/gnomemusic/views/baseview.py
+++ b/gnomemusic/views/baseview.py
@@ -128,17 +128,13 @@ class BaseView(Gtk.Stack):
@log
def _populate(self, data=None):
- self.populate()
+ pass
@log
def _on_selection_mode_changed(self, widget, data=None):
if not self.props.selection_mode:
self.unselect_all()
- @log
- def populate(self):
- pass
-
@log
def _retrieval_finished(self, klass):
self.model[klass.iter][4] = klass.pixbuf
diff --git a/gnomemusic/views/playlistview.py b/gnomemusic/views/playlistview.py
index e3992cec..f77722fc 100644
--- a/gnomemusic/views/playlistview.py
+++ b/gnomemusic/views/playlistview.py
@@ -777,7 +777,7 @@ class PlaylistView(BaseView):
self._update_songs_count(self._songs_count - 1)
@log
- def populate(self):
+ def _populate(self, data=None):
"""Populate sidebar.
Do not reload playlists already displayed.
"""
diff --git a/gnomemusic/views/searchview.py b/gnomemusic/views/searchview.py
index 247001bf..6cca22e1 100644
--- a/gnomemusic/views/searchview.py
+++ b/gnomemusic/views/searchview.py
@@ -448,7 +448,7 @@ class SearchView(BaseView):
cell.props.visible = False
@log
- def populate(self):
+ def _populate(self, data=None):
self._init = True
self._headerbar.props.state = HeaderBar.State.MAIN
diff --git a/gnomemusic/views/songsview.py b/gnomemusic/views/songsview.py
index c6e432f5..32a8f46d 100644
--- a/gnomemusic/views/songsview.py
+++ b/gnomemusic/views/songsview.py
@@ -173,7 +173,7 @@ class SongsView(BaseView):
and not self.props.selection_mode):
self.model.clear()
self._offset = 0
- self.populate()
+ self._populate()
grilo.changes_pending['Songs'] = False
@log
@@ -276,7 +276,7 @@ class SongsView(BaseView):
[utils.get_media_title(item), artist, item, item.get_favourite()])
@log
- def populate(self):
+ def _populate(self, data=None):
"""Populates the view"""
self._init = True
if grilo.tracker:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]