Mercurial Repositories > eric / changeset

--- a/Preferences/ConfigurationPages/EditorAPIsPage.py	Wed Jan 18 18:38:34 2017 +0100
+++ b/Preferences/ConfigurationPages/EditorAPIsPage.py	Wed Jan 18 18:39:45 2017 +0100
@@ -55,7 +55,9 @@
         apiLanguages = sorted(
             [''] + list(QScintilla.Lexers.getSupportedApiLanguages()))
         for lang in apiLanguages:
-            self.apiLanguageComboBox.addItem(lang)
+            self.apiLanguageComboBox.addItem(
+                QScintilla.Lexers.getLanguageIcon(lang, False),
+                lang)
         apiProjectTypes = sorted(
             [("", "")] +
             [(trans, ptype) for ptype, trans in

--- a/Preferences/ConfigurationPages/EditorHighlightersPage.py	Wed Jan 18 18:38:34 2017 +0100
+++ b/Preferences/ConfigurationPages/EditorHighlightersPage.py	Wed Jan 18 18:39:45 2017 +0100
@@ -50,9 +50,13 @@
         except AttributeError:
             self.extsep = "."
         
+        import QScintilla.Lexers
         self.extras = ["-----------", self.tr("Alternative")]
         languages = [''] + sorted(lexers.keys()) + self.extras
-        self.editorLexerCombo.addItems(languages)
+        for lang in languages:
+            self.editorLexerCombo.addItem(
+                QScintilla.Lexers.getLanguageIcon(lang, False),
+                lang)
         
         pygmentsLexers = [''] + sorted([l[0] for l in get_all_lexers()])
         self.pygmentsLexerCombo.addItems(pygmentsLexers)

--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Wed Jan 18 18:38:34 2017 +0100
+++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Wed Jan 18 18:39:45 2017 +0100
@@ -84,8 +84,12 @@
         self.lexers = lexers
         
         # set initial values
+        import QScintilla.Lexers
         languages = sorted([''] + list(self.lexers.keys()))
-        self.lexerLanguageComboBox.addItems(languages)
+        for language in languages:
+            self.lexerLanguageComboBox.addItem(
+                QScintilla.Lexers.getLanguageIcon(language, False),
+                language)
         self.on_lexerLanguageComboBox_activated("")
         
     def save(self):

--- a/Preferences/ConfigurationPages/EditorKeywordsPage.py	Wed Jan 18 18:38:34 2017 +0100
+++ b/Preferences/ConfigurationPages/EditorKeywordsPage.py	Wed Jan 18 18:39:45 2017 +0100
@@ -57,7 +57,9 @@
                         keywords.append(kw)
                 self.__keywords[lang] = keywords
                 self.__maxKeywordSets[lang] = lex.maximumKeywordSet()
-            self.languageCombo.addItem(lang)
+            self.languageCombo.addItem(
+                QScintilla.Lexers.getLanguageIcon(lang, False),
+                lang)
         
         self.currentLanguage = ''
         self.currentSet = 1

--- a/Project/LexerAssociationDialog.py	Wed Jan 18 18:38:34 2017 +0100
+++ b/Project/LexerAssociationDialog.py	Wed Jan 18 18:39:45 2017 +0100
@@ -51,7 +51,10 @@
         languages = [''] + \
             sorted(QScintilla.Lexers.getSupportedLanguages().keys()) + \
             self.extras
-        self.editorLexerCombo.addItems(languages)
+        for lang in languages:
+            self.editorLexerCombo.addItem(
+                QScintilla.Lexers.getLanguageIcon(lang, False),
+                lang)
         
         from pygments.lexers import get_all_lexers
         pygmentsLexers = [''] + sorted([l[0] for l in get_all_lexers()])

--- a/Templates/TemplatePropertiesDialog.py	Wed Jan 18 18:38:34 2017 +0100
+++ b/Templates/TemplatePropertiesDialog.py	Wed Jan 18 18:39:45 2017 +0100
@@ -59,12 +59,11 @@
         
         self.groupMode = groupMode
         if groupMode:
-            langList = []
+            self.groupLabel.setText(self.tr("Language:"))
             for lang, langDisp in self.languages:
-                langList.append(langDisp)
-            
-            self.groupLabel.setText(self.tr("Language:"))
-            self.groupCombo.addItems(langList)
+                self.groupCombo.addItem(
+                    QScintilla.Lexers.getLanguageIcon(lang, False),
+                    langDisp)
             self.templateLabel.setEnabled(False)
             self.templateEdit.setEnabled(False)
             self.templateEdit.setPlainText(self.tr("GROUP"))