--- a/eric6/UI/BrowserModel.py Sun Apr 12 18:46:08 2020 +0200
+++ b/eric6/UI/BrowserModel.py Sun Apr 12 19:07:49 2020 +0200
@@ -826,7 +826,7 @@
self.parentItem = parent
self.itemData = [data]
self.type_ = BrowserItemRoot
- self.icon = UI.PixmapCache.getIcon("empty.png")
+ self.icon = UI.PixmapCache.getIcon("empty")
self._populated = True
self._lazyPopulation = False
self.symlink = False
@@ -1006,9 +1006,9 @@
os.path.islink(self._dirName)
):
self.symlink = True
- self.icon = UI.PixmapCache.getSymlinkIcon("dirClosed.png")
+ self.icon = UI.PixmapCache.getSymlinkIcon("dirClosed")
else:
- self.icon = UI.PixmapCache.getIcon("dirClosed.png")
+ self.icon = UI.PixmapCache.getIcon("dirClosed")
self._populated = False
self._lazyPopulation = True
@@ -1072,7 +1072,7 @@
BrowserItem.__init__(self, parent, "sys.path")
self.type_ = BrowserItemSysPath
- self.icon = UI.PixmapCache.getIcon("filePython.png")
+ self.icon = UI.PixmapCache.getIcon("filePython")
self._populated = False
self._lazyPopulation = True
@@ -1111,58 +1111,58 @@
pixName = ""
if self.isPython2File():
if self.fileext == '.py':
- pixName = "filePython.png"
+ pixName = "filePython"
else:
- pixName = "filePython2.png"
+ pixName = "filePython2"
self._populated = False
self._lazyPopulation = True
self._moduleName = os.path.basename(finfo)
elif self.isPython3File():
- pixName = "filePython.png"
+ pixName = "filePython"
self._populated = False
self._lazyPopulation = True
self._moduleName = os.path.basename(finfo)
elif self.isRubyFile():
- pixName = "fileRuby.png"
+ pixName = "fileRuby"
self._populated = False
self._lazyPopulation = True
self._moduleName = os.path.basename(finfo)
elif self.isDesignerFile():
- pixName = "fileDesigner.png"
+ pixName = "fileDesigner"
elif self.isLinguistFile():
if self.fileext == '.ts':
- pixName = "fileLinguist.png"
+ pixName = "fileLinguist"
else:
- pixName = "fileLinguist2.png"
+ pixName = "fileLinguist2"
elif self.isResourcesFile():
- pixName = "fileResource.png"
+ pixName = "fileResource"
elif self.isProjectFile():
- pixName = "fileProject.png"
+ pixName = "fileProject"
elif self.isMultiProjectFile():
- pixName = "fileMultiProject.png"
+ pixName = "fileMultiProject"
elif self.isIdlFile():
- pixName = "fileIDL.png"
+ pixName = "fileIDL"
self._populated = False
self._lazyPopulation = True
self._moduleName = os.path.basename(finfo)
elif self.isProtobufFile():
- pixName = "protobuf.png"
+ pixName = "protobuf"
self._populated = False
self._lazyPopulation = True
self._moduleName = os.path.basename(finfo)
elif self.isSvgFile():
- pixName = "fileSvg.png"
+ pixName = "fileSvg"
elif self.isPixmapFile():
- pixName = "filePixmap.png"
+ pixName = "filePixmap"
elif self.isDFile():
- pixName = "fileD.png"
+ pixName = "fileD"
elif self.isJavaScriptFile():
- pixName = "fileJavascript.png"
+ pixName = "fileJavascript"
self._populated = False
self._lazyPopulation = True
self._moduleName = os.path.basename(finfo)
else:
- pixName = "fileMisc.png"
+ pixName = "fileMisc"
if os.path.lexists(self._filename) and os.path.islink(self._filename):
self.symlink = True
@@ -1424,11 +1424,11 @@
Utilities.ClassBrowsers.ClbrBaseClasses.Enum)
if self.isfunction:
if cl.isPrivate():
- self.icon = UI.PixmapCache.getIcon("method_private.png")
+ self.icon = UI.PixmapCache.getIcon("method_private")
elif cl.isProtected():
- self.icon = UI.PixmapCache.getIcon("method_protected.png")
+ self.icon = UI.PixmapCache.getIcon("method_protected")
else:
- self.icon = UI.PixmapCache.getIcon("method.png")
+ self.icon = UI.PixmapCache.getIcon("method")
self.itemData[0] = "{0}({1})".format(
name, ", ".join(self._classObject.parameters))
if self._classObject.annotation:
@@ -1439,16 +1439,16 @@
## ", ".join([e.split('=')[0].strip() \
## for e in self._classObject.parameters]))
elif self.ismodule:
- self.icon = UI.PixmapCache.getIcon("module.png")
+ self.icon = UI.PixmapCache.getIcon("module")
elif self.isenum:
- self.icon = UI.PixmapCache.getIcon("attribute.png")
+ self.icon = UI.PixmapCache.getIcon("attribute")
else:
if cl.isPrivate():
- self.icon = UI.PixmapCache.getIcon("class_private.png")
+ self.icon = UI.PixmapCache.getIcon("class_private")
elif cl.isProtected():
- self.icon = UI.PixmapCache.getIcon("class_protected.png")
+ self.icon = UI.PixmapCache.getIcon("class_protected")
else:
- self.icon = UI.PixmapCache.getIcon("class.png")
+ self.icon = UI.PixmapCache.getIcon("class")
if (
self._classObject and
(self._classObject.methods or
@@ -1557,18 +1557,18 @@
self._functionObject.modifier ==
Utilities.ClassBrowsers.ClbrBaseClasses.Function.Static
):
- self.icon = UI.PixmapCache.getIcon("method_static.png")
+ self.icon = UI.PixmapCache.getIcon("method_static")
elif (
self._functionObject.modifier ==
Utilities.ClassBrowsers.ClbrBaseClasses.Function.Class
):
- self.icon = UI.PixmapCache.getIcon("method_class.png")
+ self.icon = UI.PixmapCache.getIcon("method_class")
elif self._functionObject.isPrivate():
- self.icon = UI.PixmapCache.getIcon("method_private.png")
+ self.icon = UI.PixmapCache.getIcon("method_private")
elif self._functionObject.isProtected():
- self.icon = UI.PixmapCache.getIcon("method_protected.png")
+ self.icon = UI.PixmapCache.getIcon("method_protected")
else:
- self.icon = UI.PixmapCache.getIcon("method.png")
+ self.icon = UI.PixmapCache.getIcon("method")
self.itemData[0] = "{0}({1})".format(
name, ", ".join(self._functionObject.parameters))
if self._functionObject.annotation:
@@ -1682,9 +1682,9 @@
self._populated = False
self._lazyPopulation = True
if isClass:
- self.icon = UI.PixmapCache.getIcon("attributes_class.png")
+ self.icon = UI.PixmapCache.getIcon("attributes_class")
else:
- self.icon = UI.PixmapCache.getIcon("attributes.png")
+ self.icon = UI.PixmapCache.getIcon("attributes")
self.__isClass = isClass
def name(self):
@@ -1749,13 +1749,13 @@
self._attributeObject = attribute
self.__public = attribute.isPublic()
if isClass:
- self.icon = UI.PixmapCache.getIcon("attribute_class.png")
+ self.icon = UI.PixmapCache.getIcon("attribute_class")
elif attribute.isPrivate():
- self.icon = UI.PixmapCache.getIcon("attribute_private.png")
+ self.icon = UI.PixmapCache.getIcon("attribute_private")
elif attribute.isProtected():
- self.icon = UI.PixmapCache.getIcon("attribute_protected.png")
+ self.icon = UI.PixmapCache.getIcon("attribute_protected")
else:
- self.icon = UI.PixmapCache.getIcon("attribute.png")
+ self.icon = UI.PixmapCache.getIcon("attribute")
def isPublic(self):
"""
@@ -1847,7 +1847,7 @@
BrowserItem.__init__(self, parent, text)
self.type_ = BrowserItemCoding
- self.icon = UI.PixmapCache.getIcon("textencoding.png")
+ self.icon = UI.PixmapCache.getIcon("textencoding")
def lessThan(self, other, column, order):
"""
@@ -1881,7 +1881,7 @@
BrowserItem.__init__(self, parent, text)
self.type_ = BrowserItemImports
- self.icon = UI.PixmapCache.getIcon("imports.png")
+ self.icon = UI.PixmapCache.getIcon("imports")
def lessThan(self, other, column, order):
"""
@@ -1924,9 +1924,9 @@
self.type_ = BrowserItemImport
if isModule:
- self.icon = UI.PixmapCache.getIcon("importedModule.png")
+ self.icon = UI.PixmapCache.getIcon("importedModule")
else:
- self.icon = UI.PixmapCache.getIcon("importedName.png")
+ self.icon = UI.PixmapCache.getIcon("importedName")
def fileName(self):
"""
