[gnome-music/wip/merge: 239/343] Fix renderer properties for all views and conitnue un-CamelCasing and pep8 compatiblity
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/wip/merge: 239/343] Fix renderer properties for all views and conitnue un-CamelCasing and pep8 compatiblity
- Date: Thu, 25 Jul 2013 11:32:54 +0000 (UTC)
commit 0ce0db3f74a248b1526c15f78a24eb7a648dd540
Author: Seif Lotfy <seif lotfy com>
Date: Wed Jul 17 21:24:51 2013 +0200
Fix renderer properties for all views and conitnue un-CamelCasing
and pep8 compatiblity
gnomemusic/view.py | 109 ++++++++++++++++++++++++++----------------------
gnomemusic/widgets.py | 86 ++++++++++++++++++++-------------------
2 files changed, 103 insertions(+), 92 deletions(-)
---
diff --git a/gnomemusic/view.py b/gnomemusic/view.py
index 68f4d63..ff10702 100644
--- a/gnomemusic/view.py
+++ b/gnomemusic/view.py
@@ -124,7 +124,8 @@ class ViewContainer(Gtk.Stack):
def _on_view_selection_changed(self, widget):
items = self.view.get_selection()
- self.selection_toolbar._add_to_playlist_button.set_sensitive(len(items) > 0)
+ self.selection_toolbar\
+ ._add_to_playlist_button.set_sensitive(len(items) > 0)
def _populate(self, data=None):
self._init = True
@@ -320,56 +321,64 @@ class Songs(ViewContainer):
[item, self.errorIconName, False, True])
def _add_list_renderers(self):
- listWidget = self.view.get_generic_view()
- cols = listWidget.get_columns()
+ list_widget = self.view.get_generic_view()
+ cols = list_widget.get_columns()
cells = cols[0].get_cells()
- cells[2].visible = False
- nowPlayingSymbolRenderer = Gtk.CellRendererPixbuf()
- columnNowPlaying = Gtk.TreeViewColumn()
- nowPlayingSymbolRenderer.xalign = 1.0
- columnNowPlaying.pack_start(nowPlayingSymbolRenderer, False)
- columnNowPlaying.fixed_width = 24
- columnNowPlaying.add_attribute(nowPlayingSymbolRenderer,
- "visible", 10)
- columnNowPlaying.add_attribute(nowPlayingSymbolRenderer,
- "icon_name", 8)
- listWidget.insert_column(columnNowPlaying, 0)
-
- titleRenderer = Gtk.CellRendererText(xpad=0)
- listWidget.add_renderer(titleRenderer,
- self._on_list_widget_title_render, None)
- starRenderer = Gtk.CellRendererPixbuf(xpad=32)
- listWidget.add_renderer(starRenderer,
- self._on_list_widget_star_render, None)
- durationRenderer = Gd.StyledTextRenderer(xpad=32)
- durationRenderer.add_class('dim-label')
- listWidget.add_renderer(durationRenderer,
- self._on_list_widget_duration_render, None)
- artistRenderer = Gd.StyledTextRenderer(xpad=32)
- artistRenderer.add_class('dim-label')
- artistRenderer.ellipsize = Pango.EllipsizeMode.END
- listWidget.add_renderer(artistRenderer,
- self._on_list_widget_artist_render, None)
- typeRenderer = Gd.StyledTextRenderer(xpad=32)
- typeRenderer.add_class('dim-label')
- typeRenderer.ellipsize = Pango.EllipsizeMode.END
- listWidget.add_renderer(typeRenderer,
- self._on_list_widget_type_render, None)
+ cells[2].set_visible(False)
+ now_playing_symbol_renderer = Gtk.CellRendererPixbuf(xalign=1.0)
+
+ column_now_playing = Gtk.TreeViewColumn()
+ column_now_playing.set_property("fixed_width", 24)
+ column_now_playing.pack_start(now_playing_symbol_renderer, False)
+ column_now_playing.add_attribute(now_playing_symbol_renderer,
+ "visible", 10)
+ column_now_playing.add_attribute(now_playing_symbol_renderer,
+ "icon_name", 8)
+ list_widget.insert_column(column_now_playing, 0)
+
+ title_renderer = Gtk.CellRendererText(xpad=0)
+ list_widget.add_renderer(title_renderer,
+ self._on_list_widget_title_render, None)
+
+ star_renderer = Gtk.CellRendererPixbuf(xpad=32)
+ list_widget.add_renderer(star_renderer,
+ self._on_list_widget_star_render, None)
+
+ duration_renderer = Gd.StyledTextRenderer(xpad=32)
+ duration_renderer.add_class('dim-label')
+ list_widget.add_renderer(duration_renderer,
+ self._on_list_widget_duration_render, None)
+
+ artist_renderer = Gd.StyledTextRenderer(
+ xpad=32,
+ ellipsize=Pango.EllipsizeMode.END
+ )
+ artist_renderer.add_class('dim-label')
+ list_widget.add_renderer(artist_renderer,
+ self._on_list_widget_artist_render, None)
+
+ type_renderer = Gd.StyledTextRenderer(
+ xpad=32,
+ ellipsize=Pango.EllipsizeMode.END
+ )
+ type_renderer.add_class('dim-label')
+ list_widget.add_renderer(type_renderer,
+ self._on_list_widget_type_render, None)
def _on_list_widget_title_render(self, col, cell, model, itr, data):
item = model.get_value(itr, 5)
- cell.xalign = 0.0
- cell.yalign = 0.5
- cell.height = 48
- cell.ellipsize = Pango.EllipsizeMode.END
- cell.text = item.get_title()
+ cell.set_property("xalign", 0.0)
+ cell.set_property("yalign", 0.5)
+ cell.set_property("height", 48)
+ cell.set_property("ellipsize", Pango.EllipsizeMode.END)
+ cell.set_property("text", item.get_title())
def _on_list_widget_star_render(self, col, cell, model, itr, data):
showstar = model.get_value(itr, 9)
if(showstar):
- cell.icon_name = self.starIconName
+ cell.set_property("icon_name", self.starIconName)
else:
- cell.pixbuf = None
+ cell.set_property("pixbuf", None)
def _on_list_widget_duration_render(self, col, cell, model, itr, data):
item = model.get_value(itr, 5)
@@ -377,20 +386,20 @@ class Songs(ViewContainer):
duration = item.get_duration()
minutes = int(duration / 60)
seconds = duration % 60
- cell.xalign = 1.0
- cell.text = "%i:%02i" % (minutes, seconds)
+ cell.set_property("xalign", 1.0)
+ cell.set_property("text", "%i:%02i" % (minutes, seconds))
def _on_list_widget_artist_render(self, col, cell, model, itr, data):
item = model.get_value(itr, 5)
if item:
- cell.ellipsize = Pango.EllipsizeMode.END
- cell.text = item.get_string(Grl.METADATA_KEY_ARTIST)
+ cell.set_property("ellipsize", Pango.EllipsizeMode.END)
+ cell.set_property("text", item.get_string(Grl.METADATA_KEY_ARTIST))
def _on_list_widget_type_render(self, coll, cell, model, itr, data):
item = model.get_value(itr, 5)
if item:
- cell.ellipsize = Pango.EllipsizeMode.END
- cell.text = item.get_string(Grl.METADATA_KEY_ALBUM)
+ cell.set_property("ellipsize", Pango.EllipsizeMode.END)
+ cell.set_property("text", item.get_string(Grl.METADATA_KEY_ALBUM))
def populate(self):
if grilo.tracker is not None:
@@ -446,9 +455,9 @@ class Artists (ViewContainer):
self.populate()
def _add_list_renderers(self):
- listWidget = self.view.get_generic_view()
+ list_widget = self.view.get_generic_view()
- cols = listWidget.get_columns()
+ cols = list_widget.get_columns()
cells = cols[0].get_cells()
cells[2].set_alignment(xalign=0, yalign=0.5)
cells[2].set_fixed_size(width=220, height=48)
diff --git a/gnomemusic/widgets.py b/gnomemusic/widgets.py
index 6d20f7b..eeccfb1 100644
--- a/gnomemusic/widgets.py
+++ b/gnomemusic/widgets.py
@@ -64,7 +64,6 @@ class AlbumWidget(Gtk.EventBox):
def __init__(self, player):
super(Gtk.EventBox, self).__init__()
self.player = player
- self.hbox = Gtk.HBox()
self.iterToClean = None
self.cache = AlbumArtCache.get_default()
self._symbolicIcon = self.cache.make_default_icon(256, 256)
@@ -140,35 +139,38 @@ class AlbumWidget(Gtk.EventBox):
"icon_name", 7)
list_widget.insert_column(column_now_playing, 0)
- type_renderer = Gd.StyledTextRenderer(xpad=16,
- ellipsize=Pango.EllipsizeMode.END,
- xalign=0.0)
+ type_renderer = Gd.StyledTextRenderer(
+ xpad=16,
+ ellipsize=Pango.EllipsizeMode.END,
+ xalign=0.0
+ )
list_widget.add_renderer(type_renderer, self._type_renderer_text, None)
cols[0].clear_attributes(type_renderer)
cols[0].add_attribute(type_renderer, "markup", 0)
- durationRenderer = Gd.StyledTextRenderer(xpad=16,
- ellipsize=Pango.EllipsizeMode.END,
- xalign=1.0)
+ durationRenderer = Gd.StyledTextRenderer(
+ xpad=16,
+ ellipsize=Pango.EllipsizeMode.END,
+ xalign=1.0
+ )
durationRenderer.add_class('dim-label')
list_widget.add_renderer(durationRenderer,
self._duration_renderer_text, None)
- def _type_renderer_text(self, col, cell, model, iter, data):
+ def _type_renderer_text(self, col, cell, model, itr, data):
pass
- def _duration_renderer_text(self, col, widget, model, iter, data):
- item = self.model.get_value(iter, 5)
- duration = item.get_duration()
- if item is None:
- return
- widget.text = self.player.seconds_to_string(duration)
+ def _duration_renderer_text(self, col, cell, model, itr, data):
+ item = self.model.get_value(itr, 5)
+ if item:
+ duration = item.get_duration()
+ cell.set_property("text", self.player.seconds_to_string(duration))
def update(self, artist, album, item, header_bar, selection_toolbar):
self.selection_toolbar = selection_toolbar
self.header_bar = header_bar
released_date = item.get_publication_date()
- if released_date is not None:
+ if released_date:
self.ui.get_object("released_label_info").set_text(
str(released_date.get_year()))
self.album = album
@@ -180,7 +182,7 @@ class AlbumWidget(Gtk.EventBox):
# if the active queue has been set by self album,
# use it as model, otherwise build the liststore
cached_playlist = self.player.running_playlist("Album", album)
- if cached_playlist is not None:
+ if cached_playlist:
self.model = cached_playlist
self.update_model(self.player, cached_playlist,
self.player.currentTrack)
@@ -218,7 +220,8 @@ class AlbumWidget(Gtk.EventBox):
def _on_view_selection_changed(self, widget):
items = self.view.get_selection()
- self.selection_toolbar._add_to_playlist_button.set_sensitive(len(items) > 0)
+ self.selection_toolbar\
+ ._add_to_playlist_button.set_sensitive(len(items) > 0)
def _on_header_cancel_button_clicked(self, button):
self.view.set_selection_mode(False)
@@ -241,7 +244,7 @@ class AlbumWidget(Gtk.EventBox):
self.player.eventBox.set_visible(True)
def _on_get_album_songs(self, source, prefs, track, a, b, c):
- if track is not None:
+ if track:
self.tracks.append(track)
self.duration = self.duration + track.get_duration()
iter = self.model.append()
@@ -264,7 +267,7 @@ class AlbumWidget(Gtk.EventBox):
"%d min" % (int(self.duration / 60) + 1))
def _on_look_up(self, pixbuf, path):
- if pixbuf is not None:
+ if pixbuf:
self.ui.get_object("cover").set_from_pixbuf(pixbuf)
self.model.set(iter, [4], [pixbuf])
@@ -275,7 +278,7 @@ class AlbumWidget(Gtk.EventBox):
currentSong = playlist.get_value(currentIter, 5)
song_passed = False
iter = playlist.get_iter_first()
- while iter is not None:
+ while iter:
song = playlist.get_value(iter, 5)
escapedTitle = GLib.markup_escape_text(song.get_title(), -1)
@@ -329,8 +332,7 @@ class ArtistAlbums(Gtk.VBox):
self._hbox.pack_start(self._albumBox, False, False, 16)
self.pack_start(self._scrolledWindow, True, True, 0)
- for album in albums:
- self.add_album(album)
+ map(self.add_album, albums)
self.show_all()
self.player.connect('playlist-item-changed', self.update_model)
@@ -353,7 +355,7 @@ class ArtistAlbums(Gtk.VBox):
song_passed = False
itr = playlist.get_iter_first()
- while itr is not None:
+ while itr:
song = playlist.get_value(itr, 5)
song_widget = song.song_widget
@@ -370,17 +372,18 @@ class ArtistAlbums(Gtk.VBox):
song_widget.title.set_markup("<span>%s</span>" % escapedTitle)
else:
song_widget.now_playing_sign.hide()
- song_widget.title.set_markup("<span color='grey'>%s</span>" % escapedTitle)
+ song_widget.title\
+ .set_markup("<span color='grey'>%s</span>" % escapedTitle)
itr = playlist.iter_next(itr)
return False
def clean_model(self):
itr = self.model.get_iter_first()
- while itr is not None:
+ while itr:
song = self.model.get_value(itr, 5)
song_widget = song.song_widget
escapedTitle = GLib.markup_escape_text(song.get_title(), -1)
- if song_widget.can_be_played is not None:
+ if song_widget.can_be_played:
song_widget.now_playing_sign.hide()
song_widget.title.set_markup("<span>%s</span>" % escapedTitle)
itr = self.model.iter_next(itr)
@@ -429,31 +432,29 @@ class AllArtistsAlbums(ArtistAlbums):
upper = adjustment.get_upper()
page_size = adjustment.get_page_size()
end = False
+
# special case self values which happen at construction
- if (value == 0) and (upper == 1) and (page_size == 1):
- end = False
- else:
+ if (((value != 0) or (upper != 1) or (page_size != 1))
+ and self._get_remaining_item_count() > 0):
end = not (value < (upper - page_size - revealAreaHeight))
- if self._get_remaining_item_count() <= 0:
- end = False
self._load_more.set_block(not end)
def _populate(self, data=None):
- if grilo.tracker is not None:
+ if grilo.tracker:
grilo.populate_albums(self._offset, self.add_item, 5)
def add_item(self, source, param, item):
- if item is not None:
+ if item:
self._offset += 1
self.add_album(item)
def _get_remaining_item_count(self):
count = -1
- if self.countQuery is not None:
+ if self.countQuery:
cursor = tracker.query(self.countQuery, None)
- if cursor is not None and cursor.next(None):
+ if cursor and cursor.next(None):
count = cursor.get_integer(0)
- return (count - self._offset)
+ return count - self._offset
class ArtistAlbumWidget(Gtk.HBox):
@@ -475,7 +476,7 @@ class ArtistAlbumWidget(Gtk.HBox):
self.ui.get_object("cover").set_from_pixbuf(pixbuf)
self.ui.get_object("title").set_label(album.get_title())
- if album.get_creation_date() is not None:
+ if album.get_creation_date():
self.ui.get_object("year").set_markup(
"<span color='grey'>(%s)</span>" %
str(album.get_creation_date().get_year()))
@@ -485,7 +486,7 @@ class ArtistAlbumWidget(Gtk.HBox):
self.show_all()
def get_songs(self, source, prefs, track, unknown, data, error):
- if track is not None:
+ if track:
self.tracks.append(track)
else:
for i, track in enumerate(self.tracks):
@@ -493,9 +494,10 @@ class ArtistAlbumWidget(Gtk.HBox):
ui.add_from_resource('/org/gnome/music/TrackWidget.ui')
song_widget = ui.get_object("eventbox1")
self.songs.append(song_widget)
- ui.get_object("num").set_markup("<span color='grey'>%d</span>" %
- len(self.songs))
- if track.get_title() is not None:
+ ui.get_object("num")\
+ .set_markup("<span color='grey'>%d</span>"
+ % len(self.songs))
+ if track.get_title():
ui.get_object("title").set_text(track.get_title())
ui.get_object("title").set_alignment(0.0, 0.5)
self.ui.get_object("grid1").attach(
@@ -543,7 +545,7 @@ class ArtistAlbumWidget(Gtk.HBox):
self.album.get_title(), self.get_album_cover)
def get_album_cover(self, pixbuf, path):
- if pixbuf is not None:
+ if pixbuf:
self.ui.get_object("cover").set_from_pixbuf(pixbuf)
else:
options = Grl.OperationOptions.new(None)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
