[gnome-music/roignac/nowplaying_artists: 1/4] Use single-quotes for untranslatable strings
- From: Vadim Rutkovsky <vrutkovsky src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/roignac/nowplaying_artists: 1/4] Use single-quotes for untranslatable strings
- Date: Sun, 11 Aug 2013 09:07:43 +0000 (UTC)
commit 868c20385e9350fbc3edbbc5b7677acefdaaffaa
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date: Mon Aug 5 22:08:28 2013 +0200
Use single-quotes for untranslatable strings
gnomemusic/albumArtCache.py | 18 ++++----
gnomemusic/application.py | 2 +-
gnomemusic/grilo.py | 10 ++--
gnomemusic/mpris.py | 12 +++---
gnomemusic/player.py | 40 ++++++++--------
gnomemusic/query.py | 48 ++++++++++----------
gnomemusic/toolbar.py | 11 +++--
gnomemusic/view.py | 50 ++++++++++----------
gnomemusic/widgets.py | 104 +++++++++++++++++++++---------------------
gnomemusic/window.py | 10 ++--
10 files changed, 153 insertions(+), 152 deletions(-)
---
diff --git a/gnomemusic/albumArtCache.py b/gnomemusic/albumArtCache.py
index 0a7fba8..6ba9099 100644
--- a/gnomemusic/albumArtCache.py
+++ b/gnomemusic/albumArtCache.py
@@ -57,7 +57,7 @@ class LookupRequest:
except Exception as error:
if AlbumArtCache.get_default().logLookupErrors:
- print("ERROR:", error)
+ print('ERROR:', error)
self.key_index += 1
self._try_load()
@@ -82,7 +82,7 @@ class LookupRequest:
return
except Exception as error:
if AlbumArtCache.get_default().logLookupErrors:
- print("ERROR:", error)
+ print('ERROR:', error)
self.key_index += 1
self._try_load()
@@ -207,7 +207,7 @@ class AlbumArtCache:
uri_file = Gio.File.new_for_path(uri)
basename = uri_file.get_basename()
- title = GLib.uri_unescape_string(basename, "")
+ title = GLib.uri_unescape_string(basename, '')
if escaped:
return GLib.markup_escape_text(title)
@@ -216,17 +216,17 @@ class AlbumArtCache:
def __init__(self):
self.logLookupErrors = False
self.requested_uris = {}
- self.cacheDir = os.path.join(GLib.get_user_cache_dir(), "media-art")
+ self.cacheDir = os.path.join(GLib.get_user_cache_dir(), 'media-art')
self.frame_cache = {}
self.frame_lock = threading.Lock()
self._keybuilder_funcs = [
lambda artist, album:
- "album-" + self._normalize_and_hash(artist) +
- "-" + self._normalize_and_hash(album),
+ 'album-%s-%s' % (self._normalize_and_hash(artist),
+ self._normalize_and_hash(album)),
lambda artist, album:
- "album-" + self._normalize_and_hash(album) +
- "-" + self._normalize_and_hash(None)
+ 'album-%s-%s' % (self._normalize_and_hash(album),
+ self._normalize_and_hash(None))
]
try:
@@ -305,7 +305,7 @@ class AlbumArtCache:
request.start()
def _normalize_and_hash(self, input_str):
- normalized = " "
+ normalized = ' '
if input_str and len(input_str) > 0:
normalized = self._strip_invalid_entities(input_str)
diff --git a/gnomemusic/application.py b/gnomemusic/application.py
index a6ffee2..c36b955 100644
--- a/gnomemusic/application.py
+++ b/gnomemusic/application.py
@@ -9,7 +9,7 @@ class Application(Gtk.Application):
Gtk.Application.__init__(self,
application_id='org.gnome.Music',
flags=Gio.ApplicationFlags.FLAGS_NONE)
- GLib.set_application_name(_("Music"))
+ GLib.set_application_name(_('Music'))
cssProviderFile = Gio.File.new_for_uri('resource:///org/gnome/Music/application.css')
cssProvider = Gtk.CssProvider()
diff --git a/gnomemusic/grilo.py b/gnomemusic/grilo.py
index e5e2e12..f430b0a 100644
--- a/gnomemusic/grilo.py
+++ b/gnomemusic/grilo.py
@@ -41,11 +41,11 @@ class Grilo(GObject.GObject):
def _on_source_added(self, pluginRegistry, mediaSource):
id = mediaSource.get_id()
- if id == "grl-tracker-source":
+ if id == 'grl-tracker-source':
ops = mediaSource.supported_operations()
if ops & Grl.SupportedOps.SEARCH:
- print('Detected new source availabe: \'' +
- mediaSource.get_name() + '\' and it supports search')
+ print('Detected new source available: \'%s\' and it supports search' %
+ mediaSource.get_name())
self.sources[id] = mediaSource
self.tracker = mediaSource
@@ -78,12 +78,12 @@ class Grilo(GObject.GObject):
self.tracker.query(query, self.METADATA_KEYS, options, _callback, None)
def _search_callback(self):
- print("yeah")
+ print('yeah')
def search(self, q):
options = self.options.copy()
for source in self.sources:
- print(source.get_name() + " - " + q)
+ print(source.get_name() + ' - ' + q)
source.search(q, [Grl.METADATA_KEY_ID], 0, 10,
options, self._search_callback, source)
diff --git a/gnomemusic/mpris.py b/gnomemusic/mpris.py
index 37362b3..9234e69 100644
--- a/gnomemusic/mpris.py
+++ b/gnomemusic/mpris.py
@@ -16,12 +16,12 @@ class MediaPlayer2Service(dbus.service.Object):
dbus.service.Object.__init__(self, name, '/org/mpris/MediaPlayer2')
self.app = app
self.player = app.get_active_window().player
- self.player.connect("current-changed", self._on_current_changed)
- self.player.connect("playback-status-changed", self._on_playback_status_changed)
- self.player.connect("repeat-mode-changed", self._on_repeat_mode_changed)
- self.player.connect("volume-changed", self._on_volume_changed)
- self.player.connect("prev-next-invalidated", self._on_prev_next_invalidated)
- self.player.connect("seeked", self._on_seeked)
+ self.player.connect('current-changed', self._on_current_changed)
+ self.player.connect('playback-status-changed', self._on_playback_status_changed)
+ self.player.connect('repeat-mode-changed', self._on_repeat_mode_changed)
+ self.player.connect('volume-changed', self._on_volume_changed)
+ self.player.connect('prev-next-invalidated', self._on_prev_next_invalidated)
+ self.player.connect('seeked', self._on_seeked)
def _get_playback_status(self):
state = self.player.get_playback_status()
diff --git a/gnomemusic/player.py b/gnomemusic/player.py
index 2599d1c..f2a1530 100644
--- a/gnomemusic/player.py
+++ b/gnomemusic/player.py
@@ -51,7 +51,7 @@ class Player(GObject.GObject):
Gst.init(None)
self.discoverer = GstPbutils.Discoverer()
- self.player = Gst.ElementFactory.make("playbin", "player")
+ self.player = Gst.ElementFactory.make('playbin', 'player')
self.bus = self.player.get_bus()
self.bus.add_signal_watch()
@@ -59,9 +59,9 @@ class Player(GObject.GObject):
self._settings.connect('changed::repeat', self._on_settings_changed)
self.repeat = self._settings.get_enum('repeat')
- self.bus.connect("message::state-changed", self._on_bus_state_changed)
- self.bus.connect("message::error", self._onBusError)
- self.bus.connect("message::eos", self._on_bus_eos)
+ self.bus.connect('message::state-changed', self._on_bus_state_changed)
+ self.bus.connect('message::error', self._onBusError)
+ self.bus.connect('message::eos', self._on_bus_eos)
self._setup_view()
def _on_settings_changed(self, settings, value):
@@ -82,14 +82,14 @@ class Player(GObject.GObject):
if media is not None:
uri = media.get_url()
else:
- uri = "none"
- print("URI: " + uri)
+ uri = 'none'
+ print('URI: ' + uri)
error, debug = message.parse_error()
debug = debug.split('\n')
debug = [(' ') + line.lstrip() for line in debug]
debug = '\n'.join(debug)
- print("Error from element " + message.src.get_name() + ": " + error.message)
- print("Debugging info:\n" + debug)
+ print('Error from element ' + message.src.get_name() + ': ' + error.message)
+ print('Debugging info:\n' + debug)
self.play_next()
return True
@@ -236,10 +236,10 @@ class Player(GObject.GObject):
self.artistLabel.set_label(_("Unknown Artist"))
url = media.get_url()
- if url != self.player.get_value("current-uri", 0):
- self.player.set_property("uri", url)
+ if url != self.player.get_value('current-uri', 0):
+ self.player.set_property('uri', url)
- self.emit("playlist-item-changed", self.playlist, self.currentTrack)
+ self.emit('playlist-item-changed', self.playlist, self.currentTrack)
self.emit('current-changed')
def _on_cache_lookup(self, pixbuf, path, data=None):
@@ -354,12 +354,12 @@ class Player(GObject.GObject):
self._sync_repeat_image()
- self.prevBtn.connect("clicked", self._on_prev_btn_clicked)
- self.playBtn.connect("clicked", self._on_play_btn_clicked)
- self.nextBtn.connect("clicked", self._on_next_btn_clicked)
- self.progressScale.connect("button-press-event", self._on_progress_scale_event)
- self.progressScale.connect("value-changed", self._on_progress_value_changed)
- self.progressScale.connect("button-release-event", self._on_progress_scale_button_released)
+ self.prevBtn.connect('clicked', self._on_prev_btn_clicked)
+ self.playBtn.connect('clicked', self._on_play_btn_clicked)
+ self.nextBtn.connect('clicked', self._on_next_btn_clicked)
+ self.progressScale.connect('button-press-event', self._on_progress_scale_event)
+ self.progressScale.connect('value-changed', self._on_progress_value_changed)
+ self.progressScale.connect('button-release-event', self._on_progress_scale_button_released)
def _on_progress_scale_button_released(self, scale, data):
self.on_progress_scale_change_value(self.progressScale)
@@ -386,7 +386,7 @@ class Player(GObject.GObject):
minutes = seconds // 60
seconds %= 60
- return "%i:%02i" % (minutes, seconds)
+ return '%i:%02i' % (minutes, seconds)
def _on_play_btn_clicked(self, btn):
if self._get_playing():
@@ -504,6 +504,6 @@ class SelectionToolbar():
def __init__(self):
self._ui = Gtk.Builder()
self._ui.add_from_resource('/org/gnome/Music/SelectionToolbar.ui')
- self.eventbox = self._ui.get_object("eventbox1")
- self._add_to_playlist_button = self._ui.get_object("button1")
+ self.eventbox = self._ui.get_object('eventbox1')
+ self._add_to_playlist_button = self._ui.get_object('button1')
self.eventbox.set_visible(False)
diff --git a/gnomemusic/query.py b/gnomemusic/query.py
index 93e003d..00a801d 100644
--- a/gnomemusic/query.py
+++ b/gnomemusic/query.py
@@ -1,6 +1,6 @@
class Query():
- ALBUMS = """
+ ALBUMS = '''
SELECT DISTINCT
rdf:type(?album)
tracker:id(?album) AS id
@@ -19,7 +19,7 @@ class Query():
SELECT
GROUP_CONCAT(
nmm:artistName(?artist),
- ","
+ ','
)
WHERE {
?album nmm:albumArtist ?artist
@@ -36,7 +36,7 @@ class Query():
}
GROUP BY ?perf
),
- ","
+ ','
) AS album_performer
WHERE {
}
@@ -50,7 +50,7 @@ class Query():
COUNT(?_1)
WHERE {
?_1 nmm:musicAlbum ?album ;
- tracker:available "true"
+ tracker:available 'true'
}
)
)
@@ -61,7 +61,7 @@ class Query():
WHERE {
?_2 nmm:musicAlbum ?album ;
nie:contentCreated ?c ;
- tracker:available "true"
+ tracker:available 'true'
}
LIMIT 1
) AS creation-date
@@ -70,22 +70,22 @@ class Query():
FILTER (
EXISTS {
?_3 nmm:musicAlbum ?album ;
- tracker:available "true"
+ tracker:available 'true'
}
)
}
ORDER BY nie:title(?album) ?author ?albumyear
- """.replace("\n", " ").strip()
+ '''.replace('\n', ' ').strip()
- ALBUMS_COUNT = """
+ ALBUMS_COUNT = '''
SELECT
COUNT(?album) AS childcount
WHERE {
?album a nmm:MusicAlbum
}
- """.replace("\n", " ").strip()
+ '''.replace('\n', ' ').strip()
- ARTISTS = """
+ ARTISTS = '''
SELECT DISTINCT
rdf:type(?album)
tracker:id(?album) AS id
@@ -104,7 +104,7 @@ class Query():
SELECT
GROUP_CONCAT(
nmm:artistName(?artist),
- ","
+ ','
)
WHERE {
?album nmm:albumArtist ?artist
@@ -121,7 +121,7 @@ class Query():
}
GROUP BY ?perf
),
- ","
+ ','
) AS album_performer
WHERE {
}
@@ -135,7 +135,7 @@ class Query():
COUNT(?_1)
WHERE {
?_1 nmm:musicAlbum ?album ;
- tracker:available "true"
+ tracker:available 'true'
}
)
)
@@ -146,7 +146,7 @@ class Query():
WHERE {
?_2 nmm:musicAlbum ?album ;
nie:contentCreated ?c ;
- tracker:available "true"
+ tracker:available 'true'
}
LIMIT 1
) AS creation-date
@@ -155,23 +155,23 @@ class Query():
FILTER (
EXISTS {
?_3 nmm:musicAlbum ?album ;
- tracker:available "true"
+ tracker:available 'true'
}
)
}
ORDER BY ?author ?albumyear nie:title(?album)
- """.replace("\n", " ").strip()
+ '''.replace('\n', ' ').strip()
- ARTISTS_COUNT = """
+ ARTISTS_COUNT = '''
SELECT
COUNT(DISTINCT ?artist)
WHERE {
?artist a nmm:Artist .
?album nmm:performer ?artist
}
- """.replace("\n", " ").strip()
+ '''.replace('\n', ' ').strip()
- SONGS = """
+ SONGS = '''
SELECT DISTINCT
rdf:type(?song)
tracker:id(?song) AS id
@@ -184,19 +184,19 @@ class Query():
?song a nmm:MusicPiece
}
ORDER BY tracker:added(?song)
- """.replace("\n", " ").strip()
+ '''.replace('\n', ' ').strip()
- SONGS_COUNT = """
+ SONGS_COUNT = '''
SELECT
COUNT(?song) AS childcount
WHERE {
?song a nmm:MusicPiece
}
- """.replace("\n", " ").strip()
+ '''.replace('\n', ' ').strip()
@staticmethod
def album_songs(album_id):
- query = """
+ query = '''
SELECT DISTINCT
rdf:type(?song)
tracker:id(?song) AS id
@@ -213,7 +213,7 @@ class Query():
)
}
ORDER BY nmm:trackNumber(?song) tracker:added(?song)
- """.replace("\n", " ").strip() % {'album_id': album_id}
+ '''.replace('\n', ' ').strip() % {'album_id': album_id}
return query
diff --git a/gnomemusic/toolbar.py b/gnomemusic/toolbar.py
index ac21664..32179b2 100644
--- a/gnomemusic/toolbar.py
+++ b/gnomemusic/toolbar.py
@@ -31,12 +31,13 @@ class Toolbar(GObject.GObject):
self._select_button = self._ui.get_object('select-button')
self._cancel_button = self._ui.get_object('done-button')
self._back_button = self._ui.get_object('back-button')
- self._close_separator = self._ui.get_object("close-button-separator")
- self._close_button = self._ui.get_object("close-button")
- self._selection_menu = self._ui.get_object("selection-menu")
- self._selection_menu_button = self._ui.get_object("selection-menu-button")
+ self._close_separator = self._ui.get_object('close-button-separator')
+ self._close_button = self._ui.get_object('close-button')
+ self._selection_menu = self._ui.get_object('selection-menu')
+ self._selection_menu_button = self._ui.get_object('selection-menu-button')
self._selection_menu_button.set_relief(Gtk.ReliefStyle.NONE)
- self._search_button = self._ui.get_object("search-button")
+ self.header_bar.set_custom_title(self._stack_switcher)
+ self._search_button = self._ui.get_object('search-button')
self._back_button.connect('clicked', self.on_back_button_clicked)
self._close_button.connect('clicked', self._close_button_clicked)
if Gtk.get_minor_version() <= 8:
diff --git a/gnomemusic/view.py b/gnomemusic/view.py
index f669a97..96166a0 100644
--- a/gnomemusic/view.py
+++ b/gnomemusic/view.py
@@ -61,16 +61,16 @@ class ViewContainer(Stack):
transition_type=StackTransitionType.SLIDE_RIGHT,
)
dummy = Gtk.Frame(visible=False)
- self.stack.add_named(dummy, "dummy")
- self.stack.add_named(box, "artists")
- self.stack.set_visible_child_name("dummy")
+ self.stack.add_named(dummy, 'dummy')
+ self.stack.add_named(box, 'artists')
+ self.stack.set_visible_child_name('dummy')
self._grid.add(self.stack)
else:
self._grid.add(box)
self._loadMore = Widgets.LoadMoreButton(self._get_remaining_item_count)
box.pack_end(self._loadMore.widget, False, False, 0)
- self._loadMore.widget.connect("clicked", self._populate)
+ self._loadMore.widget.connect('clicked', self._populate)
self.view.connect('item-activated', self._on_item_activated)
self._cursor = None
self.header_bar = header_bar
@@ -166,7 +166,7 @@ class ViewContainer(Stack):
self._loadMore.set_block(not end)
def populate(self):
- print("populate")
+ print('populate')
def _add_item(self, source, param, item):
if not item:
@@ -183,14 +183,14 @@ class ViewContainer(Stack):
self.player.discoverer.discover_uri(item.get_url())
self._model.set(_iter,
[0, 1, 2, 3, 4, 5, 7, 8, 9, 10],
- [str(item.get_id()), "", title,
+ [str(item.get_id()), '', title,
artist, self._symbolicIcon, item,
-1, self.nowPlayingIconName, False, False])
except:
- print("failed to discover url " + item.get_url())
+ print('failed to discover url ' + item.get_url())
self._model.set(_iter,
[0, 1, 2, 3, 4, 5, 7, 8, 9, 10],
- [str(item.get_id()), "", title,
+ [str(item.get_id()), '', title,
artist, self._symbolicIcon, item,
-1, self.errorIconName, False, True])
GLib.idle_add(self._update_album_art, item, _iter)
@@ -285,7 +285,7 @@ class Songs(ViewContainer):
self.iter_to_clean = None
self.view.set_view_type(Gd.MainViewType.LIST)
self.view.get_generic_view().get_style_context()\
- .add_class("songs-list")
+ .add_class('songs-list')
self._iconHeight = 32
self._iconWidth = 32
self.cache = albumArtCache.get_default()
@@ -298,7 +298,7 @@ class Songs(ViewContainer):
def _on_item_activated(self, widget, id, path):
_iter = self._model.get_iter(path)
if self._model.get_value(_iter, 8) != self.errorIconName:
- self.player.set_playlist("Songs", None, self._model, _iter, 5)
+ self.player.set_playlist('Songs', None, self._model, _iter, 5)
self.player.set_playing(True)
def update_model(self, player, playlist, currentIter):
@@ -327,7 +327,7 @@ class Songs(ViewContainer):
item.get_string(Grl.METADATA_KEY_ARTIST),
item, self.nowPlayingIconName, False, False])
except:
- print("failed to discover url " + item.get_url())
+ print('failed to discover url ' + item.get_url())
self._model.set(_iter,
[2, 3, 5, 8, 9, 10],
[albumArtCache.get_media_title(item),
@@ -342,12 +342,12 @@ class Songs(ViewContainer):
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.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)
+ 'visible', 10)
column_now_playing.add_attribute(now_playing_symbol_renderer,
- "icon_name", 8)
+ 'icon_name', 8)
list_widget.insert_column(column_now_playing, 0)
title_renderer = Gtk.CellRendererText(
@@ -406,7 +406,7 @@ class Songs(ViewContainer):
seconds = item.get_duration()
minutes = seconds // 60
seconds %= 60
- cell.set_property("text", "%i:%02i" % (minutes, seconds))
+ cell.set_property('text', '%i:%02i' % (minutes, seconds))
def _on_list_widget_artist_render(self, col, cell, model, _iter, data):
pass
@@ -414,7 +414,7 @@ class Songs(ViewContainer):
def _on_list_widget_type_render(self, coll, cell, model, _iter, data):
item = model.get_value(_iter, 5)
if item:
- cell.set_property("text", item.get_string(Grl.METADATA_KEY_ALBUM))
+ cell.set_property('text', item.get_string(Grl.METADATA_KEY_ALBUM))
def populate(self):
if grilo.tracker:
@@ -440,7 +440,7 @@ class Artists (ViewContainer):
)
self.view.set_view_type(Gd.MainViewType.LIST)
self.view.set_hexpand(False)
- self.view.get_style_context().add_class("artist-panel")
+ self.view.get_style_context().add_class('artist-panel')
self.view.get_generic_view().get_selection().set_mode(
Gtk.SelectionMode.SINGLE)
self._grid.attach(Gtk.Separator(orientation=Gtk.Orientation.VERTICAL),
@@ -450,10 +450,10 @@ class Artists (ViewContainer):
if (Gtk.Settings.get_default().get_property(
'gtk_application_prefer_dark_theme')):
self.view.get_generic_view().get_style_context().\
- add_class("artist-panel-dark")
+ add_class('artist-panel-dark')
else:
self.view.get_generic_view().get_style_context().\
- add_class("artist-panel-white")
+ add_class('artist-panel-white')
self.show_all()
def _populate(self, data=None):
@@ -462,10 +462,10 @@ class Artists (ViewContainer):
self._allIter = self._model.append()
self._last_selection = self._allIter
self._artists[_("All Artists").lower()] =\
- {"iter": self._allIter, "albums": []}
+ {'iter': self._allIter, 'albums': []}
self._model.set(self._allIter, 2, _("All Artists"))
selection.select_path(self._model.get_path(self._allIter))
- self.view.emit('item-activated', "0",
+ self.view.emit('item-activated', '0',
self._model.get_path(self._allIter))
self._init = True
self.populate()
@@ -486,7 +486,7 @@ class Artists (ViewContainer):
)
list_widget.add_renderer(type_renderer, lambda *args: None, None)
cols[0].clear_attributes(type_renderer)
- cols[0].add_attribute(type_renderer, "text", 2)
+ cols[0].add_attribute(type_renderer, 'text', 2)
def _on_item_activated(self, widget, item_id, path):
children = self._artistAlbumsWidget.get_children()
@@ -495,7 +495,7 @@ class Artists (ViewContainer):
_iter = self._model.get_iter(path)
self._last_selection = _iter
artist = self._model.get_value(_iter, 2)
- albums = self._artists[artist.lower()]["albums"]
+ albums = self._artists[artist.lower()]['albums']
self.artistAlbums = None
if (self._model.get_string_from_iter(_iter) ==
self._model.get_string_from_iter(self._allIter)):
@@ -516,10 +516,10 @@ class Artists (ViewContainer):
artist = _("Unknown Artist")
if not artist.lower() in self._artists:
_iter = self._model.append()
- self._artists[artist.lower()] = {"iter": _iter, "albums": []}
+ self._artists[artist.lower()] = {'iter': _iter, 'albums': []}
self._model.set(_iter, [2], [artist])
- self._artists[artist.lower()]["albums"].append(item)
+ self._artists[artist.lower()]['albums'].append(item)
def populate(self):
if grilo.tracker:
diff --git a/gnomemusic/widgets.py b/gnomemusic/widgets.py
index f6e5966..e463763 100644
--- a/gnomemusic/widgets.py
+++ b/gnomemusic/widgets.py
@@ -92,8 +92,8 @@ class AlbumWidget(Gtk.EventBox):
self.album = None
self.view.connect('item-activated', self._on_item_activated)
- view_box = self.ui.get_object("view")
- self.ui.get_object("scrolledWindow").set_placement(Gtk.CornerType.
+ view_box = self.ui.get_object('view')
+ self.ui.get_object('scrolledWindow').set_placement(Gtk.CornerType.
TOP_LEFT)
child_view = self.view.get_children()[0]
child_view.set_margin_top(64)
@@ -101,11 +101,11 @@ class AlbumWidget(Gtk.EventBox):
child_view.set_margin_right(32)
self.view.remove(child_view)
view_box.add(child_view)
- self.add(self.ui.get_object("AlbumWidget"))
+ self.add(self.ui.get_object('AlbumWidget'))
self._add_list_renderers()
# TODO: make this work
- self.get_style_context().add_class("view")
- self.get_style_context().add_class("content-view")
+ self.get_style_context().add_class('view')
+ self.get_style_context().add_class('content-view')
self.show_all()
def _on_item_activated(self, widget, id, path):
@@ -117,7 +117,7 @@ class AlbumWidget(Gtk.EventBox):
self.model.set_value(self.iterToClean, 0, title)
#Hide now playing icon
self.model.set_value(self.iterToClean, 6, False)
- self.player.set_playlist("Album", self.album, self.model, _iter, 5)
+ self.player.set_playlist('Album', self.album, self.model, _iter, 5)
self.player.set_playing(True)
def _add_list_renderers(self):
@@ -138,9 +138,9 @@ class AlbumWidget(Gtk.EventBox):
column_now_playing.set_fixed_width(24)
column_now_playing.pack_start(now_playing_symbol_renderer, False)
column_now_playing.add_attribute(now_playing_symbol_renderer,
- "visible", 9)
+ 'visible', 9)
column_now_playing.add_attribute(now_playing_symbol_renderer,
- "icon_name", 7)
+ 'icon_name', 7)
list_widget.insert_column(column_now_playing, 0)
type_renderer = Gd.StyledTextRenderer(
@@ -150,7 +150,7 @@ class AlbumWidget(Gtk.EventBox):
)
list_widget.add_renderer(type_renderer, lambda *args: None, None)
cols[0].clear_attributes(type_renderer)
- cols[0].add_attribute(type_renderer, "markup", 0)
+ cols[0].add_attribute(type_renderer, 'markup', 0)
durationRenderer = Gd.StyledTextRenderer(
xpad=16,
@@ -160,19 +160,19 @@ class AlbumWidget(Gtk.EventBox):
durationRenderer.add_class('dim-label')
list_widget.add_renderer(durationRenderer, lambda *args: None, None)
cols[0].clear_attributes(durationRenderer)
- cols[0].add_attribute(durationRenderer, "markup", 1)
+ cols[0].add_attribute(durationRenderer, 'markup', 1)
def update(self, artist, album, item, header_bar, selection_toolbar):
self.selection_toolbar = selection_toolbar
self.header_bar = header_bar
self.album = album
- self.ui.get_object("cover").set_from_pixbuf(self.symbolicIcon)
+ self.ui.get_object('cover').set_from_pixbuf(self.symbolicIcon)
ALBUM_ART_CACHE.lookup(item, 256, 256,
self._on_look_up)
# 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)
+ cached_playlist = self.player.running_playlist('Album', album)
if cached_playlist:
self.model = cached_playlist
self.update_model(self.player, cached_playlist,
@@ -200,13 +200,13 @@ class AlbumWidget(Gtk.EventBox):
self.view.set_model(self.model)
escaped_artist = GLib.markup_escape_text(artist)
escaped_album = GLib.markup_escape_text(album)
- self.ui.get_object("artist_label").set_markup(escaped_artist)
- self.ui.get_object("title_label").set_markup(escaped_album)
+ self.ui.get_object('artist_label').set_markup(escaped_artist)
+ self.ui.get_object('title_label').set_markup(escaped_album)
if (item.get_creation_date()):
- self.ui.get_object("released_label_info").set_text(
+ self.ui.get_object('released_label_info').set_text(
str(item.get_creation_date().get_year()))
else:
- self.ui.get_object("released_label_info").set_text("----")
+ self.ui.get_object('released_label_info').set_text('----')
self.player.connect('playlist-item-changed', self.update_model)
#self.emit('loaded')
@@ -248,22 +248,22 @@ class AlbumWidget(Gtk.EventBox):
[escapedTitle,
self.player.seconds_to_string(
track.get_duration()),
- "", "", None, track, NOW_PLAYING_ICON_NAME,
+ '', '', None, track, NOW_PLAYING_ICON_NAME,
False])
except Exception as err:
logging.debug(err.message)
- logging.debug("failed to discover url " + track.get_url())
+ logging.debug('failed to discover url ' + track.get_url())
self.model.set(_iter,
[0, 1, 2, 3, 4, 5, 7, 9],
- [escapedTitle, "", "", "", None,
+ [escapedTitle, '', '', '', None,
track, ERROR_ICON_NAME, True])
- self.ui.get_object("running_length_label_info").set_text(
- "%d min" % (int(self.duration / 60) + 1))
+ self.ui.get_object('running_length_label_info').set_text(
+ '%d min' % (int(self.duration / 60) + 1))
def _on_look_up(self, pixbuf, path, data=None):
_iter = self.iterToClean
if pixbuf:
- self.ui.get_object("cover").set_from_pixbuf(pixbuf)
+ self.ui.get_object('cover').set_from_pixbuf(pixbuf)
if _iter:
self.model.set(_iter, [4], [pixbuf])
@@ -279,14 +279,14 @@ class AlbumWidget(Gtk.EventBox):
escapedTitle = AlbumArtCache.get_media_title(song, True)
if (song == currentSong):
- title = "<b>%s</b>" % escapedTitle
+ title = '<b>%s</b>' % escapedTitle
iconVisible = True
song_passed = True
elif (song_passed):
- title = "<span>%s</span>" % escapedTitle
+ title = '<span>%s</span>' % escapedTitle
iconVisible = False
else:
- title = "<span color='grey'>%s</span>" % escapedTitle
+ title = '<span color='grey'>%s</span>' % escapedTitle
iconVisible = False
playlist.set_value(_iter, 0, title)
if(playlist.get_value(_iter, 7) != ERROR_ICON_NAME):
@@ -304,7 +304,7 @@ class ArtistAlbums(Gtk.VBox):
self.ui = Gtk.Builder()
self.ui.add_from_resource('/org/gnome/Music/ArtistAlbumsWidget.ui')
self.set_border_width(0)
- self.ui.get_object("artist").set_label(self.artist)
+ self.ui.get_object('artist').set_label(self.artist)
self.widgets = []
self.model = Gtk.ListStore(GObject.TYPE_STRING, # title
@@ -364,15 +364,15 @@ class ArtistAlbums(Gtk.VBox):
escapedTitle = AlbumArtCache.get_media_title(song, True)
if (song == currentSong):
song_widget.now_playing_sign.show()
- song_widget.title.set_markup("<b>%s</b>" % escapedTitle)
+ song_widget.title.set_markup('<b>%s</b>' % escapedTitle)
song_passed = True
elif (song_passed):
song_widget.now_playing_sign.hide()
- song_widget.title.set_markup("<span>%s</span>" % escapedTitle)
+ 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)
+ .set_markup('<span color='grey'>%s</span>' % escapedTitle)
itr = playlist.iter_next(itr)
return False
@@ -384,7 +384,7 @@ class ArtistAlbums(Gtk.VBox):
escapedTitle = AlbumArtCache.get_media_title(song, True)
if song_widget.can_be_played:
song_widget.now_playing_sign.hide()
- song_widget.title.set_markup("<span>%s</span>" % escapedTitle)
+ song_widget.title.set_markup('<span>%s</span>' % escapedTitle)
itr = self.model.iter_next(itr)
return False
@@ -397,7 +397,7 @@ class AllArtistsAlbums(ArtistAlbums):
self.countQuery = Query.ALBUMS_COUNT
self._load_more = LoadMoreButton(self._get_remaining_item_count)
self.pack_end(self._load_more.widget, False, False, 0)
- self._load_more.widget.connect("clicked", self._populate)
+ self._load_more.widget.connect('clicked', self._populate)
self._connect_view()
self._populate()
@@ -474,17 +474,17 @@ class ArtistAlbumWidget(Gtk.HBox):
pixbuf = self.cache.make_default_icon(128, 128)
GLib.idle_add(self._update_album_art)
- self.ui.get_object("cover").set_from_pixbuf(pixbuf)
- self.ui.get_object("title").set_label(album.get_title())
+ self.ui.get_object('cover').set_from_pixbuf(pixbuf)
+ self.ui.get_object('title').set_label(album.get_title())
if album.get_creation_date():
- self.ui.get_object("year").set_markup(
- "<span color='grey'>(%s)</span>" %
+ self.ui.get_object('year').set_markup(
+ '<span color='grey'>(%s)</span>' %
str(album.get_creation_date().get_year())
)
self.tracks = []
GLib.idle_add(grilo.populate_album_songs,
album.get_id(), self.get_songs)
- self.pack_start(self.ui.get_object("ArtistAlbumWidget"), True, True, 0)
+ self.pack_start(self.ui.get_object('ArtistAlbumWidget'), True, True, 0)
self.show_all()
def get_songs(self, source, prefs, track):
@@ -494,15 +494,15 @@ class ArtistAlbumWidget(Gtk.HBox):
for i, track in enumerate(self.tracks):
ui = Gtk.Builder()
ui.add_from_resource('/org/gnome/Music/TrackWidget.ui')
- song_widget = ui.get_object("eventbox1")
+ song_widget = ui.get_object('eventbox1')
self.songs.append(song_widget)
- ui.get_object("num")\
- .set_markup("<span color='grey'>%d</span>"
+ ui.get_object('num')\
+ .set_markup('<span color='grey'>%d</span>'
% len(self.songs))
title = AlbumArtCache.get_media_title(track)
- ui.get_object("title").set_text(title)
- ui.get_object("title").set_alignment(0.0, 0.5)
- self.ui.get_object("grid1").attach(
+ ui.get_object('title').set_text(title)
+ ui.get_object('title').set_alignment(0.0, 0.5)
+ self.ui.get_object('grid1').attach(
song_widget,
int(i / (len(self.tracks) / 2)),
int(i % (len(self.tracks) / 2)), 1, 1
@@ -511,46 +511,46 @@ class ArtistAlbumWidget(Gtk.HBox):
itr = self.model.append()
song_widget._iter = itr
song_widget.model = self.model
- song_widget.title = ui.get_object("title")
+ song_widget.title = ui.get_object('title')
try:
self.player.discoverer.discover_uri(str(track.get_url()))
self.model.set(itr,
[0, 1, 2, 3, 4, 5],
- [title, "", "", False,
+ [title, '', '', False,
NOW_PLAYING_ICON_NAME, track])
- song_widget.now_playing_sign = ui.get_object("image1")
+ song_widget.now_playing_sign = ui.get_object('image1')
song_widget.now_playing_sign.set_from_icon_name(
NOW_PLAYING_ICON_NAME,
Gtk.IconSize.SMALL_TOOLBAR)
- song_widget.now_playing_sign.set_no_show_all("True")
+ song_widget.now_playing_sign.set_no_show_all('True')
song_widget.now_playing_sign.set_alignment(0.0, 0.6)
song_widget.can_be_played = True
song_widget.connect('button-release-event',
self.track_selected)
except:
- print("failed to discover url " + str(track.get_url()))
+ print('failed to discover url ' + str(track.get_url()))
self.model.set(itr, [0, 1, 2, 3, 4, 5],
- [title, "", "", True,
+ [title, '', '', True,
ERROR_ICON_NAME, track])
- song_widget.now_playing_sign = ui.get_object("image1")
+ song_widget.now_playing_sign = ui.get_object('image1')
song_widget.now_playing_sign.set_from_icon_name(
ERROR_ICON_NAME,
Gtk.IconSize.SMALL_TOOLBAR)
song_widget.now_playing_sign.set_alignment(0.0, 0.6)
song_widget.can_be_played = False
- self.ui.get_object("grid1").show_all()
+ self.ui.get_object('grid1').show_all()
def _update_album_art(self):
ALBUM_ART_CACHE.lookup(self.album, 128, 128, self._get_album_cover)
def _get_album_cover(self, pixbuf, path, data=None):
if pixbuf:
- self.ui.get_object("cover").set_from_pixbuf(pixbuf)
+ self.ui.get_object('cover').set_from_pixbuf(pixbuf)
def track_selected(self, widget, _iter):
self.player.stop()
- self.player.set_playlist("Artist", self.album,
+ self.player.set_playlist('Artist', self.album,
widget.model, widget._iter, 5)
self.player.set_playing(True)
diff --git a/gnomemusic/window.py b/gnomemusic/window.py
index 397d633..418a0d4 100644
--- a/gnomemusic/window.py
+++ b/gnomemusic/window.py
@@ -18,7 +18,7 @@ class Window(Gtk.ApplicationWindow):
def __init__(self, app):
Gtk.ApplicationWindow.__init__(self,
application=app,
- title=_('Music'))
+ title=_("Music"))
settings = Gio.Settings('org.gnome.Music')
self.add_action(settings.create_action('repeat'))
self.set_size_request(887, 640)
@@ -92,8 +92,8 @@ class Window(Gtk.ApplicationWindow):
self.toolbar.set_stack(self._stack)
- self._on_notify_model_id = self._stack.connect("notify::visible-child", self._on_notify_mode)
- self.connect("destroy", self._notify_mode_disconnect)
+ self._on_notify_model_id = self._stack.connect('notify::visible-child', self._on_notify_mode)
+ self.connect('destroy', self._notify_mode_disconnect)
self.views[0].populate()
#To revert to the No Music View when no songs are found
@@ -113,8 +113,8 @@ class Window(Gtk.ApplicationWindow):
def _on_notify_mode(self, stack, param):
#Slide out artist list on switching to artists view
if stack.get_visible_child() == self.views[1]:
- stack.get_visible_child().stack.set_visible_child_name("dummy")
- stack.get_visible_child().stack.set_visible_child_name("artists")
+ stack.get_visible_child().stack.set_visible_child_name('dummy')
+ stack.get_visible_child().stack.set_visible_child_name('artists')
def _toggle_view(self, btn, i):
self._stack.set_visible_child(self.views[i])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
