Mercurial Repositories > eric / file diff

--- a/Documentation/Source/eric6.UI.PixmapCache.html	Fri Feb 15 18:58:49 2019 +0100
+++ b/Documentation/Source/eric6.UI.PixmapCache.html	Fri Feb 15 19:19:20 2019 +0100
@@ -63,7 +63,7 @@
 object
 <h3>Class Attributes</h3>
 <table>
-<tr><td>None</td></tr>
+<tr><td>SupportedExtensions</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -103,18 +103,26 @@
 </dd>
 </dl><a NAME="PixmapCache.getPixmap" ID="PixmapCache.getPixmap"></a>
 <h4>PixmapCache.getPixmap</h4>
-<b>getPixmap</b>(<i>key</i>)
+<b>getPixmap</b>(<i>key, size=None</i>)
 <p>
         Public method to retrieve a pixmap.
 </p><dl>
-<dt><i>key</i></dt>
+<dt><i>key</i> (str)</dt>
 <dd>
-name of the wanted pixmap (string)
+name of the wanted pixmap
+</dd><dt><i>size</i> (QSize)</dt>
+<dd>
+requested size
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-the requested pixmap (QPixmap)
+the requested pixmap
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QPixmap
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
@@ -137,84 +145,116 @@
 <hr /><hr />
 <a NAME="getCombinedIcon" ID="getCombinedIcon"></a>
 <h2>getCombinedIcon</h2>
-<b>getCombinedIcon</b>(<i>keys, cache=pixCache</i>)
+<b>getCombinedIcon</b>(<i>keys, size=None, cache=pixCache</i>)
 <p>
     Module function to retrieve a symbolic link icon.
 </p><dl>
-<dt><i>keys</i></dt>
+<dt><i>keys</i> (list of str)</dt>
+<dd>
+list of names of icons
+</dd><dt><i>size</i> (QSize)</dt>
 <dd>
-list of names of icons (string)
-</dd><dt><i>cache</i></dt>
+requested size of individual icons
+</dd><dt><i>cache</i> (PixmapCache)</dt>
 <dd>
-reference to the pixmap cache object (PixmapCache)
+reference to the pixmap cache object
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-the requested icon (QIcon)
+the requested icon
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QIcon
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
 <a NAME="getIcon" ID="getIcon"></a>
 <h2>getIcon</h2>
-<b>getIcon</b>(<i>key, cache=pixCache</i>)
+<b>getIcon</b>(<i>key, size=None, cache=pixCache</i>)
 <p>
     Module function to retrieve an icon.
 </p><dl>
-<dt><i>key</i></dt>
+<dt><i>key</i> (str)</dt>
+<dd>
+name of the wanted pixmap
+</dd><dt><i>size</i> (QSize)</dt>
 <dd>
-name of the wanted icon (string)
-</dd><dt><i>cache</i></dt>
+requested size
+</dd><dt><i>cache</i> (PixmapCache)</dt>
 <dd>
-reference to the pixmap cache object (PixmapCache)
+reference to the pixmap cache object
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-the requested icon (QIcon)
+the requested icon
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QIcon
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
 <a NAME="getPixmap" ID="getPixmap"></a>
 <h2>getPixmap</h2>
-<b>getPixmap</b>(<i>key, cache=pixCache</i>)
+<b>getPixmap</b>(<i>key, size=None, cache=pixCache</i>)
 <p>
     Module function to retrieve a pixmap.
 </p><dl>
-<dt><i>key</i></dt>
+<dt><i>key</i> (str)</dt>
+<dd>
+name of the wanted pixmap
+</dd><dt><i>size</i> (QSize)</dt>
 <dd>
-name of the wanted pixmap (string)
-</dd><dt><i>cache</i></dt>
+requested size
+</dd><dt><i>cache</i> (PixmapCache)</dt>
 <dd>
-reference to the pixmap cache object (PixmapCache)
+reference to the pixmap cache object
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-the requested pixmap (QPixmap)
+the requested pixmap
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QPixmap
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
 <a NAME="getSymlinkIcon" ID="getSymlinkIcon"></a>
 <h2>getSymlinkIcon</h2>
-<b>getSymlinkIcon</b>(<i>key, cache=pixCache</i>)
+<b>getSymlinkIcon</b>(<i>key, size=None, cache=pixCache</i>)
 <p>
     Module function to retrieve a symbolic link icon.
 </p><dl>
-<dt><i>key</i></dt>
+<dt><i>key</i> (str)</dt>
+<dd>
+name of the wanted pixmap
+</dd><dt><i>size</i> (QSize)</dt>
 <dd>
-name of the wanted icon (string)
-</dd><dt><i>cache</i></dt>
+requested size
+</dd><dt><i>cache</i> (PixmapCache)</dt>
 <dd>
-reference to the pixmap cache object (PixmapCache)
+reference to the pixmap cache object
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-the requested icon (QIcon)
+the requested icon
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QIcon
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>