Add Platform icons

gogwindow.py

@@ -59,7 +59,7 @@ class GogWindow(Gtk.Window):
 
         for platform in game['worksOn']:
             if game['worksOn'][platform]:
-                icon_path = os.path.join(datapath.get(), 'media/platforms/{}.png'.format(platform.lower()))
+                icon_path = os.path.join(datapath.get(), 'media/platform_icons/{}.png'.format(platform.lower()))
                 icon_box.pack_start(Gtk.Image.new_from_file(icon_path), False, False, 2)
 
         install_button = Gtk.Button.new_from_icon_name("browser-download", Gtk.IconSize.BUTTON)

lutris/gui/runnersdialog.py

@@ -3,7 +3,7 @@ from gi.repository import Gtk, GObject, Gdk
 
 from lutris import runners
 from lutris import settings
-from lutris.gui.widgets.utils import get_runner_icon
+from lutris.gui.widgets.utils import get_icon
 from lutris.gui.dialogs import ErrorDialog
 from lutris.gui.config_dialogs import RunnerConfigDialog
 from lutris.gui.runnerinstalldialog import RunnerInstallDialog
@@ -81,7 +81,7 @@ class RunnersDialog(Gtk.Dialog):
         hbox = Gtk.Box()
         hbox.show()
         # Icon
-        icon = get_runner_icon(runner_name)
+        icon = get_icon(runner_name)
         icon.show()
         icon.set_alignment(0.5, 0.1)
         hbox.pack_start(icon, False, False, 10)

lutris/gui/sidebar.py

@@ -6,7 +6,9 @@ from lutris import pga
 from lutris.gui.runnerinstalldialog import RunnerInstallDialog
 from lutris.gui.config_dialogs import RunnerConfigDialog
 from lutris.gui.runnersdialog import RunnersDialog
-from lutris.gui.widgets.utils import get_runner_icon
+from lutris.gui.widgets.utils import get_icon
+
+from pprint import pprint
 
 TYPE = 0
 SLUG = 1
@@ -116,13 +118,14 @@ class SidebarListBox(Gtk.ListBox):
         self.add(all_row)
         self.select_row(all_row)
         for runner in self.runners:
-            icon = get_runner_icon(runner, format='pixbuf', size=(16, 16))
+            icon = get_icon(runner, format='pixbuf', size=(16, 16))
             name = runners.import_runner(runner).human_name
             self.add(SidebarRow(runner, 'runner', name, icon))
 
         self.add(SidebarRow(None, 'platform', 'All', None))
         for platform in self.platforms:
-            self.add(SidebarRow(platform, 'platform', platform, None))
+            icon = get_icon(platform, format='pixbuf', size=(16, 16), icon_type='platform')
+            self.add(SidebarRow(platform, 'platform', platform, icon))
 
         self.set_filter_func(self._filter_func)
         self.set_header_func(self._header_func)

lutris/gui/sync.py

@@ -1,5 +1,5 @@
 from gi.repository import Gtk, GLib, Gio
-from lutris.gui.widgets.utils import get_runner_icon
+from lutris.gui.widgets.utils import get_icon
 from lutris.gui.dialogs import NoticeDialog
 from lutris.services import get_services
 from lutris.settings import read_setting, write_setting
@@ -15,7 +15,7 @@ class ServiceSyncRow(Gtk.Box):
         self.identifier = service.__name__.split('.')[-1]
         name = service.NAME
 
-        icon = get_runner_icon(self.identifier)
+        icon = get_icon(self.identifier)
         self.pack_start(icon, False, False, 0)
 
         label = Gtk.Label(xalign=0)

lutris/gui/widgets/utils.py

@@ -39,11 +39,19 @@ def get_pixbuf(image, size, fallback=None):
     return pixbuf
 
 
-def get_runner_icon(runner_name, format='image', size=None):
-    icon_path = os.path.join(datapath.get(), 'media/runner_icons',
-                             runner_name + '.png')
+def get_icon(icon_name, format='image', size=None, icon_type='runner'):
+    """Return an icon based on the given name, format, size and type.
+
+    Keyword arguments:
+    icon_name -- The name of the icon to retrieve
+    format -- The format of the icon, which should be either 'image' or 'pixbuf' (default 'image')
+    size -- The size for the desired image (default None)
+    icon_type -- Retrieve either a 'runner' or 'platform' icon (default 'runner')
+    """
+    filename = icon_name.lower().replace(' ', '') + '.png'
+    icon_path = os.path.join(datapath.get(), 'media/' + icon_type + '_icons', filename)
     if not os.path.exists(icon_path):
-        logger.error("Unable to find icon '%s'", icon_path)
+        # The icon doesn't exist, so return nothing.
         return
     if format == 'image':
         icon = Gtk.Image()