New upstream version 0.8.0+dfsg

1 files changed, 8 insertions, 6 deletions

diff --git a/silx/gui/icons.py b/silx/gui/icons.py
index 0108b3a..bd10300 100644
--- a/silx/gui/icons.py
+++ b/silx/gui/icons.py
@@ -29,7 +29,7 @@ Use :func:`getQIcon` to create Qt QIcon from the name identifying an icon.
 
 __authors__ = ["T. Vincent"]
 __license__ = "MIT"
-__date__ = "06/09/2017"
+__date__ = "19/06/2018"
 
 
 import os
@@ -193,10 +193,13 @@ class MultiImageAnimatedIcon(AbstractAnimatedIcon):
         self.__frames = []
         for i in range(100):
             try:
-                pixmap = getQPixmap("%s/%02d" % (filename, i))
+                filename = getQFile("%s/%02d" % (filename, i))
+            except ValueError:
+                break
+            try:
+                icon = qt.QIcon(filename.fileName())
             except ValueError:
                 break
-            icon = qt.QIcon(pixmap)
             self.__frames.append(icon)
 
         if len(self.__frames) == 0:
@@ -328,8 +331,7 @@ def getQIcon(name):
     """
     if name not in _cached_icons:
         qfile = getQFile(name)
-        pixmap = qt.QPixmap(qfile.fileName())
-        icon = qt.QIcon(pixmap)
+        icon = qt.QIcon(qfile.fileName())
         _cached_icons[name] = icon
     else:
         icon = _cached_icons[name]
@@ -392,7 +394,7 @@ def getQFile(name):
     for format_ in _supported_formats:
         format_ = str(format_)
         filename = silx.resources._resource_filename('%s.%s' % (name, format_),
-                                                    default_directory=os.path.join('gui', 'icons'))
+                                                     default_directory=os.path.join('gui', 'icons'))
         qfile = qt.QFile(filename)
         if qfile.exists():
             return qfile