Merged with Tobias changes.

Sat, 07 Oct 2017 10:49:15 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 07 Oct 2017 10:49:15 +0200
changeset 5895
7fd049b97081
parent 5893
f45f7f5551c9 (current diff)
parent 5894
0d4431926611 (diff)
child 5897
ae17b1ae12bb

Merged with Tobias changes.

diff -r f45f7f5551c9 -r 7fd049b97081 QScintilla/Editor.py
--- a/QScintilla/Editor.py	Sat Oct 07 10:39:42 2017 +0200
+++ b/QScintilla/Editor.py	Sat Oct 07 10:49:15 2017 +0200
@@ -127,6 +127,8 @@
     AttributeProtectedID = 8
     AttributePrivateID = 9
     EnumID = 10
+    KeywordsID = 11
+    ModuleID = 12
     
     FromDocumentID = 99
     
@@ -520,6 +522,10 @@
                            UI.PixmapCache.getPixmap("attribute_private.png"))
         self.registerImage(self.EnumID,
                            UI.PixmapCache.getPixmap("enum.png"))
+        self.registerImage(self.KeywordsID,
+                           UI.PixmapCache.getPixmap("keywords.png"))
+        self.registerImage(self.ModuleID,
+                           UI.PixmapCache.getPixmap("module.png"))
         
         self.registerImage(self.FromDocumentID,
                            UI.PixmapCache.getPixmap("editor.png"))
diff -r f45f7f5551c9 -r 7fd049b97081 icons/default/keywords.png
Binary file icons/default/keywords.png has changed

eric ide

mercurial