--- a/eric6/QScintilla/EditorAssembly.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/QScintilla/EditorAssembly.py Sun Apr 12 19:07:49 2020 +0200 @@ -129,12 +129,12 @@ items = {} for cl in entry.classes.values(): if cl.isPrivate(): - icon = UI.PixmapCache.getIcon("class_private.png") + icon = UI.PixmapCache.getIcon("class_private") elif cl.isProtected(): icon = UI.PixmapCache.getIcon( - "class_protected.png") + "class_protected") else: - icon = UI.PixmapCache.getIcon("class.png") + icon = UI.PixmapCache.getIcon("class") items[cl.name] = (icon, cl.lineno, cl.endlineno) for key in sorted(items.keys()): itm = items[key] @@ -151,15 +151,15 @@ items = {} for meth in entry.methods.values(): if meth.modifier == Function.Static: - icon = UI.PixmapCache.getIcon("method_static.png") + icon = UI.PixmapCache.getIcon("method_static") elif meth.modifier == Function.Class: - icon = UI.PixmapCache.getIcon("method_class.png") + icon = UI.PixmapCache.getIcon("method_class") elif meth.isPrivate(): - icon = UI.PixmapCache.getIcon("method_private.png") + icon = UI.PixmapCache.getIcon("method_private") elif meth.isProtected(): - icon = UI.PixmapCache.getIcon("method_protected.png") + icon = UI.PixmapCache.getIcon("method_protected") else: - icon = UI.PixmapCache.getIcon("method.png") + icon = UI.PixmapCache.getIcon("method") items[meth.name] = (icon, meth.lineno, meth.endlineno) for key in sorted(items.keys()): itm = items[key] @@ -171,12 +171,12 @@ items = {} for attr in entry.attributes.values(): if attr.isPrivate(): - icon = UI.PixmapCache.getIcon("attribute_private.png") + icon = UI.PixmapCache.getIcon("attribute_private") elif attr.isProtected(): icon = UI.PixmapCache.getIcon( - "attribute_protected.png") + "attribute_protected") else: - icon = UI.PixmapCache.getIcon("attribute.png") + icon = UI.PixmapCache.getIcon("attribute") items[attr.name] = (icon, attr.lineno) for key in sorted(items.keys()): itm = items[key] @@ -184,7 +184,7 @@ # step 2.3: add class attributes items = {} - icon = UI.PixmapCache.getIcon("attribute_class.png") + icon = UI.PixmapCache.getIcon("attribute_class") for glob in entry.globals.values(): items[glob.name] = (icon, glob.lineno) for key in sorted(items.keys()): @@ -247,7 +247,7 @@ # step 1: add modules items = {} for module in self.__module.modules.values(): - items[module.name] = (UI.PixmapCache.getIcon("module.png"), + items[module.name] = (UI.PixmapCache.getIcon("module"), module.lineno, module.endlineno) for key in sorted(items.keys()): itm = items[key] @@ -259,11 +259,11 @@ items = {} for cl in self.__module.classes.values(): if cl.isPrivate(): - icon = UI.PixmapCache.getIcon("class_private.png") + icon = UI.PixmapCache.getIcon("class_private") elif cl.isProtected(): - icon = UI.PixmapCache.getIcon("class_protected.png") + icon = UI.PixmapCache.getIcon("class_protected") else: - icon = UI.PixmapCache.getIcon("class.png") + icon = UI.PixmapCache.getIcon("class") items[cl.name] = (icon, cl.lineno, cl.endlineno) for key in sorted(items.keys()): itm = items[key] @@ -275,11 +275,11 @@ items = {} for func in self.__module.functions.values(): if func.isPrivate(): - icon = UI.PixmapCache.getIcon("method_private.png") + icon = UI.PixmapCache.getIcon("method_private") elif func.isProtected(): - icon = UI.PixmapCache.getIcon("method_protected.png") + icon = UI.PixmapCache.getIcon("method_protected") else: - icon = UI.PixmapCache.getIcon("method.png") + icon = UI.PixmapCache.getIcon("method") items[func.name] = (icon, func.lineno, func.endlineno) for key in sorted(items.keys()): itm = items[key] @@ -291,12 +291,12 @@ items = {} for glob in self.__module.globals.values(): if glob.isPrivate(): - icon = UI.PixmapCache.getIcon("attribute_private.png") + icon = UI.PixmapCache.getIcon("attribute_private") elif glob.isProtected(): icon = UI.PixmapCache.getIcon( - "attribute_protected.png") + "attribute_protected") else: - icon = UI.PixmapCache.getIcon("attribute.png") + icon = UI.PixmapCache.getIcon("attribute") items[glob.name] = (icon, glob.lineno) for key in sorted(items.keys()): itm = items[key]