GNOME.org
 

[gnome-music/wip/mschraal/viewenum: 2/2] Uppercase ArtSize enum member names

commit cd100019bf2b2391a986ffd596afe9bf1651fd9f
Author: Marinus Schraal <mschraal gnome org>
Date:   Wed Dec 27 21:52:42 2017 +0100

    Uppercase ArtSize enum member names
    
    The ArtSize enum member names were mistakenly lowercase, make them
    uppercase.

 gnomemusic/albumartcache.py             | 10 +++++-----
 gnomemusic/player.py                    |  8 ++++----
 gnomemusic/views/albumsview.py          |  6 +++---
 gnomemusic/views/baseview.py            |  2 +-
 gnomemusic/views/initialstateview.py    |  2 +-
 gnomemusic/views/searchview.py          |  8 ++++----
 gnomemusic/widgets/albumwidget.py       |  4 ++--
 gnomemusic/widgets/artistalbumwidget.py |  4 ++--
 8 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/gnomemusic/albumartcache.py b/gnomemusic/albumartcache.py
index f5e0cdb..89a1611 100644
--- a/gnomemusic/albumartcache.py
+++ b/gnomemusic/albumartcache.py
@@ -138,11 +138,11 @@ def _make_icon_frame(pixbuf, art_size=None, scale=1):
 
 class ArtSize(Enum):
     """Enum for icon sizes"""
-    xsmall = (34, 34)
-    small = (48, 48)
-    medium = (128, 128)
-    large = (256, 256)
-    xlarge = (512, 512)
+    XSMALL = (34, 34)
+    SMALL = (48, 48)
+    MEDIUM = (128, 128)
+    LARGE = (256, 256)
+    XLARGE = (512, 512)
 
     def __init__(self, width, height):
         """Intialize width and height"""
diff --git a/gnomemusic/player.py b/gnomemusic/player.py
index a5cfff3..bbc0474 100644
--- a/gnomemusic/player.py
+++ b/gnomemusic/player.py
@@ -114,7 +114,7 @@ class Player(GObject.GObject):
         self.cache = AlbumArtCache(scale)
         self._loading_icon_surface = DefaultIcon(scale).get(
             DefaultIcon.Type.loading,
-            ArtSize.xsmall)
+            ArtSize.XSMALL)
         self._missingPluginMessages = []
 
         Gst.init(None)
@@ -605,7 +605,7 @@ class Player(GObject.GObject):
         self._currentArtist = artist
 
         self.coverImg.set_from_surface(self._loading_icon_surface)
-        self.cache.lookup(media, ArtSize.xsmall, self._on_cache_lookup, None)
+        self.cache.lookup(media, ArtSize.XSMALL, self._on_cache_lookup, None)
 
         self._currentTitle = utils.get_media_title(media)
         self.titleLabel.set_label(self._currentTitle)
@@ -803,8 +803,8 @@ class Player(GObject.GObject):
         self.titleLabel = self._ui.get_object('title')
         self.artistLabel = self._ui.get_object('artist')
         self.coverImg = self._ui.get_object('cover')
-        self.coverImg.set_property("width-request", ArtSize.xsmall.width)
-        self.coverImg.set_property("height-request", ArtSize.xsmall.height)
+        self.coverImg.set_property("width-request", ArtSize.XSMALL.width)
+        self.coverImg.set_property("height-request", ArtSize.XSMALL.height)
 
         self.duration = self._ui.get_object('duration')
         self.repeatBtnImage = self._ui.get_object('playlistRepeat')
diff --git a/gnomemusic/views/albumsview.py b/gnomemusic/views/albumsview.py
index 5288a97..bdd83a7 100644
--- a/gnomemusic/views/albumsview.py
+++ b/gnomemusic/views/albumsview.py
@@ -170,8 +170,8 @@ class AlbumsView(BaseView):
         # In the case of off-sized icons (eg. provided in the soundfile)
         # keep the size request equal to all other icons to get proper
         # alignment with GtkFlowBox.
-        child.image.set_property("width-request", ArtSize.medium.width)
-        child.image.set_property("height-request", ArtSize.medium.height)
+        child.image.set_property("width-request", ArtSize.MEDIUM.width)
+        child.image.set_property("height-request", ArtSize.MEDIUM.height)
 
         child.events.add_events(Gdk.EventMask.TOUCH_MASK)
 
@@ -189,7 +189,7 @@ class AlbumsView(BaseView):
         child.add(builder.get_object('main_box'))
         child.show()
 
-        self._cache.lookup(item, ArtSize.medium, self._on_lookup_ready, child)
+        self._cache.lookup(item, ArtSize.MEDIUM, self._on_lookup_ready, child)
 
         return child
 
diff --git a/gnomemusic/views/baseview.py b/gnomemusic/views/baseview.py
index 42e19a0..7f5489c 100644
--- a/gnomemusic/views/baseview.py
+++ b/gnomemusic/views/baseview.py
@@ -110,7 +110,7 @@ class BaseView(Gtk.Stack):
         scale = self.get_scale_factor()
         self._cache = AlbumArtCache(scale)
         self._loading_icon_surface = DefaultIcon(scale).get(
-            DefaultIcon.Type.loading, ArtSize.medium)
+            DefaultIcon.Type.loading, ArtSize.MEDIUM)
 
         self._init = False
         grilo.connect('ready', self._on_grilo_ready)
diff --git a/gnomemusic/views/initialstateview.py b/gnomemusic/views/initialstateview.py
index 3c1d02f..d005537 100644
--- a/gnomemusic/views/initialstateview.py
+++ b/gnomemusic/views/initialstateview.py
@@ -43,7 +43,7 @@ class InitialStateView(EmptyView):
         icon.set_margin_bottom(32)
         icon.set_opacity(1)
         icon.set_from_resource('/org/gnome/Music/initial-state.png')
-        icon.set_size_request(ArtSize.large.width, ArtSize.large.height)
+        icon.set_size_request(ArtSize.LARGE.width, ArtSize.LARGE.height)
 
         # Update label
         label = self.builder.get_object('label')
diff --git a/gnomemusic/views/searchview.py b/gnomemusic/views/searchview.py
index bde6be9..004bf79 100644
--- a/gnomemusic/views/searchview.py
+++ b/gnomemusic/views/searchview.py
@@ -56,7 +56,7 @@ class SearchView(BaseView):
 
         scale = self.get_scale_factor()
         loading_icon_surface = DefaultIcon(scale).get(
-            DefaultIcon.Type.loading, ArtSize.small)
+            DefaultIcon.Type.loading, ArtSize.SMALL)
         self._loading_icon = Gdk.pixbuf_get_from_surface(
             loading_icon_surface, 0, 0, loading_icon_surface.get_width(),
             loading_icon_surface.get_height())
@@ -252,7 +252,7 @@ class SearchView(BaseView):
                 [str(item.get_id()), title, artist, self._loading_icon, item,
                  2, category, composer])
             self._cache.lookup(
-                item, ArtSize.small, self._on_lookup_ready, _iter)
+                item, ArtSize.SMALL, self._on_lookup_ready, _iter)
         elif category == 'song':
             # FIXME: source specific hack
             if source.get_id() != 'grl-tracker-source':
@@ -264,7 +264,7 @@ class SearchView(BaseView):
                 [str(item.get_id()), title, artist, self._loading_icon, item,
                  fav, category, composer])
             self._cache.lookup(
-                item, ArtSize.small, self._on_lookup_ready, _iter)
+                item, ArtSize.SMALL, self._on_lookup_ready, _iter)
         else:
             if not artist.casefold() in self._artists:
                 _iter = self.model.insert_with_values(
@@ -272,7 +272,7 @@ class SearchView(BaseView):
                     [str(item.get_id()), artist, self._loading_icon, item, 2,
                      category, composer])
                 self._cache.lookup(
-                    item, ArtSize.small, self._on_lookup_ready, _iter)
+                    item, ArtSize.SMALL, self._on_lookup_ready, _iter)
                 self._artists[artist.casefold()] = {
                     'iter': _iter,
                     'albums': []
diff --git a/gnomemusic/widgets/albumwidget.py b/gnomemusic/widgets/albumwidget.py
index 9df8b5a..5f6841c 100644
--- a/gnomemusic/widgets/albumwidget.py
+++ b/gnomemusic/widgets/albumwidget.py
@@ -59,7 +59,7 @@ class AlbumWidget(Gtk.EventBox):
         self._cache = AlbumArtCache(scale)
         self._loading_icon_surface = DefaultIcon(scale).get(
             DefaultIcon.Type.loading,
-            ArtSize.large)
+            ArtSize.LARGE)
 
         self._player = player
         self._iter_to_clean = None
@@ -145,7 +145,7 @@ class AlbumWidget(Gtk.EventBox):
         self._album = album
         self._builder.get_object('cover').set_from_surface(
             self._loading_icon_surface)
-        self._cache.lookup(item, ArtSize.large, self._on_lookup, None)
+        self._cache.lookup(item, ArtSize.LARGE, self._on_lookup, None)
         self._duration = 0
 
         GLib.idle_add(grilo.populate_album_songs, item, self.add_item)
diff --git a/gnomemusic/widgets/artistalbumwidget.py b/gnomemusic/widgets/artistalbumwidget.py
index 1917694..71bc01b 100644
--- a/gnomemusic/widgets/artistalbumwidget.py
+++ b/gnomemusic/widgets/artistalbumwidget.py
@@ -52,7 +52,7 @@ class ArtistAlbumWidget(Gtk.Box):
         self._cache = AlbumArtCache(scale)
         self._loading_icon_surface = DefaultIcon(scale).get(
             DefaultIcon.Type.loading,
-            ArtSize.medium)
+            ArtSize.MEDIUM)
 
         self._media = media
         self._player = player
@@ -161,7 +161,7 @@ class ArtistAlbumWidget(Gtk.Box):
 
     @log
     def _update_album_art(self):
-        self._cache.lookup(self._media, ArtSize.medium, self._get_album_cover,
+        self._cache.lookup(self._media, ArtSize.MEDIUM, self._get_album_cover,
                            None)
 
     @log
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]