Mercurial Repositories > eric / changeset

changeset

LexerCPP: some fine tuning and style description harmonizing. sub_styles

Sun, 17 Mar 2019 11:56:51 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 17 Mar 2019 11:56:51 +0100
branch
sub_styles
changeset 6868
212ff174e129
parent 6867
97e86d2426a9
child 6869
82c058196f83
child 6870
3938accc6134

LexerCPP: some fine tuning and style description harmonizing.

QScintilla/Lexers/LexerCPP.py file | annotate | diff | comparison | revisions
i18n/eric6_cs.ts file | annotate | diff | comparison | revisions
i18n/eric6_de.qm file | annotate | diff | comparison | revisions
i18n/eric6_de.ts file | annotate | diff | comparison | revisions
i18n/eric6_empty.ts file | annotate | diff | comparison | revisions
i18n/eric6_en.ts file | annotate | diff | comparison | revisions
i18n/eric6_es.ts file | annotate | diff | comparison | revisions
i18n/eric6_fr.ts file | annotate | diff | comparison | revisions
i18n/eric6_it.ts file | annotate | diff | comparison | revisions
i18n/eric6_pt.ts file | annotate | diff | comparison | revisions
i18n/eric6_ru.ts file | annotate | diff | comparison | revisions
i18n/eric6_tr.ts file | annotate | diff | comparison | revisions
i18n/eric6_zh_CN.ts file | annotate | diff | comparison | revisions 
--- a/QScintilla/Lexers/LexerCPP.py	Sat Mar 16 20:17:06 2019 +0100
+++ b/QScintilla/Lexers/LexerCPP.py	Sun Mar 17 11:56:51 2019 +0100
@@ -9,7 +9,6 @@
 
 from __future__ import unicode_literals
 
-from PyQt5.QtCore import QCoreApplication
 from PyQt5.Qsci import QsciLexerCPP, QsciScintilla
 
 from .SubstyledLexer import SubstyledLexer
@@ -46,14 +45,16 @@
         ## default sub-style definitions
         ##############################################################
         
+        diffToSecondary = 0x40
+        # This may need to be changed to be in line with Scintilla C++ lexer.
+        
         # list of style numbers, that support sub-styling
-        self.baseStyles = [11, 17, 75, 81]
+        self.baseStyles = [11, 17, 11 + diffToSecondary, 17 + diffToSecondary]
         
         self.defaultSubStyles = {
             11: {
                 0: {
-                    "Description": QCoreApplication.translate(
-                        "LexerCPP", "Extra Identifiers"),
+                    "Description": self.tr("Additional Identifier"),
                     "Words": "std map string vector",
                     "Style": {
                         "fore": 0xEE00AA,
@@ -62,28 +63,26 @@
             },
             17: {
                 0: {
-                    "Description": QCoreApplication.translate(
-                        "LexerCPP", "Extra Doc Comment Keywords"),
+                    "Description": self.tr("Additional JavaDoc keyword"),
                     "Words": "check",
                     "Style": {
                         "fore": 0x00AAEE,
                     }
                 },
             },
-            75: {
+            11 + diffToSecondary: {
                 0: {
-                    "Description": QCoreApplication.translate(
-                        "LexerCPP", "Inactive Extra Identifiers"),
+                    "Description": self.tr("Inactive additional identifier"),
                     "Words": "std map string vector",
                     "Style": {
                         "fore": 0xBB6666,
                     }
                 },
             },
-            81: {
+            17 + diffToSecondary: {
                 0: {
-                    "Description": QCoreApplication.translate(
-                        "LexerCPP", "Inactive Extra Doc Comment Keywords"),
+                    "Description": self.tr(
+                        "Inactive additional JavaDoc keyword"),
                     "Words": "check",
                     "Style": {
                         "fore": 0x6699AA,
--- a/i18n/eric6_cs.ts	Sat Mar 16 20:17:06 2019 +0100
+++ b/i18n/eric6_cs.ts	Sun Mar 17 11:56:51 2019 +0100
@@ -43986,23 +43986,23 @@
 <context>
     <name>LexerCPP</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="55"/>
-        <source>Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="65"/>
-        <source>Extra Doc Comment Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerCPP.py" line="75"/>
-        <source>Inactive Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="85"/>
-        <source>Inactive Extra Doc Comment Keywords</source>
+        <source>Inactive additional identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="57"/>
+        <source>Additional Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="66"/>
+        <source>Additional JavaDoc keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="84"/>
+        <source>Inactive additional JavaDoc keyword</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Sat Mar 16 20:17:06 2019 +0100
+++ b/i18n/eric6_de.ts	Sun Mar 17 11:56:51 2019 +0100
@@ -44060,24 +44060,24 @@
 <context>
     <name>LexerCPP</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="55"/>
-        <source>Extra Identifiers</source>
-        <translation>Zusätzliche Bezeichner</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="65"/>
-        <source>Extra Doc Comment Keywords</source>
-        <translation>Zusätzliche Schlüsselworte für Dok Kommentare</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerCPP.py" line="75"/>
-        <source>Inactive Extra Identifiers</source>
-        <translation>Inaktive Zusätzliche Bezeichner</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="85"/>
-        <source>Inactive Extra Doc Comment Keywords</source>
-        <translation>Inaktive Zusätzliche Schlüsselworte für Dok Kommentare</translation>
+        <source>Inactive additional identifier</source>
+        <translation>Inaktiver zusätzlicher Bezeichner</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="57"/>
+        <source>Additional Identifier</source>
+        <translation>Zusätzlicher Bezeichner</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="66"/>
+        <source>Additional JavaDoc keyword</source>
+        <translation>Zusätzliches JavaDoc Schlüsselwort</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="84"/>
+        <source>Inactive additional JavaDoc keyword</source>
+        <translation>Inaktives zusätzliches JavaDoc Schlüsselwort</translation>
     </message>
 </context>
 <context>
--- a/i18n/eric6_empty.ts	Sat Mar 16 20:17:06 2019 +0100
+++ b/i18n/eric6_empty.ts	Sun Mar 17 11:56:51 2019 +0100
@@ -43818,23 +43818,23 @@
 <context>
     <name>LexerCPP</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="55"/>
-        <source>Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="65"/>
-        <source>Extra Doc Comment Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerCPP.py" line="75"/>
-        <source>Inactive Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="85"/>
-        <source>Inactive Extra Doc Comment Keywords</source>
+        <source>Inactive additional identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="57"/>
+        <source>Additional Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="66"/>
+        <source>Additional JavaDoc keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="84"/>
+        <source>Inactive additional JavaDoc keyword</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
--- a/i18n/eric6_en.ts	Sat Mar 16 20:17:06 2019 +0100
+++ b/i18n/eric6_en.ts	Sun Mar 17 11:56:51 2019 +0100
@@ -43863,23 +43863,23 @@
 <context>
     <name>LexerCPP</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="55"/>
-        <source>Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="65"/>
-        <source>Extra Doc Comment Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerCPP.py" line="75"/>
-        <source>Inactive Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="85"/>
-        <source>Inactive Extra Doc Comment Keywords</source>
+        <source>Inactive additional identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="57"/>
+        <source>Additional Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="66"/>
+        <source>Additional JavaDoc keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="84"/>
+        <source>Inactive additional JavaDoc keyword</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
--- a/i18n/eric6_es.ts	Sat Mar 16 20:17:06 2019 +0100
+++ b/i18n/eric6_es.ts	Sun Mar 17 11:56:51 2019 +0100
@@ -44119,23 +44119,23 @@
 <context>
     <name>LexerCPP</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="55"/>
-        <source>Extra Identifiers</source>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="75"/>
+        <source>Inactive additional identifier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="65"/>
-        <source>Extra Doc Comment Keywords</source>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="57"/>
+        <source>Additional Identifier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="75"/>
-        <source>Inactive Extra Identifiers</source>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="66"/>
+        <source>Additional JavaDoc keyword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="85"/>
-        <source>Inactive Extra Doc Comment Keywords</source>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="84"/>
+        <source>Inactive additional JavaDoc keyword</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
--- a/i18n/eric6_fr.ts	Sat Mar 16 20:17:06 2019 +0100
+++ b/i18n/eric6_fr.ts	Sun Mar 17 11:56:51 2019 +0100
@@ -43985,23 +43985,23 @@
 <context>
     <name>LexerCPP</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="55"/>
-        <source>Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="65"/>
-        <source>Extra Doc Comment Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerCPP.py" line="75"/>
-        <source>Inactive Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="85"/>
-        <source>Inactive Extra Doc Comment Keywords</source>
+        <source>Inactive additional identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="57"/>
+        <source>Additional Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="66"/>
+        <source>Additional JavaDoc keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="84"/>
+        <source>Inactive additional JavaDoc keyword</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
--- a/i18n/eric6_it.ts	Sat Mar 16 20:17:06 2019 +0100
+++ b/i18n/eric6_it.ts	Sun Mar 17 11:56:51 2019 +0100
@@ -44032,23 +44032,23 @@
 <context>
     <name>LexerCPP</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="55"/>
-        <source>Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="65"/>
-        <source>Extra Doc Comment Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerCPP.py" line="75"/>
-        <source>Inactive Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="85"/>
-        <source>Inactive Extra Doc Comment Keywords</source>
+        <source>Inactive additional identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="57"/>
+        <source>Additional Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="66"/>
+        <source>Additional JavaDoc keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="84"/>
+        <source>Inactive additional JavaDoc keyword</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
--- a/i18n/eric6_pt.ts	Sat Mar 16 20:17:06 2019 +0100
+++ b/i18n/eric6_pt.ts	Sun Mar 17 11:56:51 2019 +0100
@@ -44043,23 +44043,23 @@
 <context>
     <name>LexerCPP</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="55"/>
-        <source>Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="65"/>
-        <source>Extra Doc Comment Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerCPP.py" line="75"/>
-        <source>Inactive Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="85"/>
-        <source>Inactive Extra Doc Comment Keywords</source>
+        <source>Inactive additional identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="57"/>
+        <source>Additional Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="66"/>
+        <source>Additional JavaDoc keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="84"/>
+        <source>Inactive additional JavaDoc keyword</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
--- a/i18n/eric6_ru.ts	Sat Mar 16 20:17:06 2019 +0100
+++ b/i18n/eric6_ru.ts	Sun Mar 17 11:56:51 2019 +0100
@@ -44195,23 +44195,23 @@
 <context>
     <name>LexerCPP</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="55"/>
-        <source>Extra Identifiers</source>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="75"/>
+        <source>Inactive additional identifier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="65"/>
-        <source>Extra Doc Comment Keywords</source>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="57"/>
+        <source>Additional Identifier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="75"/>
-        <source>Inactive Extra Identifiers</source>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="66"/>
+        <source>Additional JavaDoc keyword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="85"/>
-        <source>Inactive Extra Doc Comment Keywords</source>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="84"/>
+        <source>Inactive additional JavaDoc keyword</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
--- a/i18n/eric6_tr.ts	Sat Mar 16 20:17:06 2019 +0100
+++ b/i18n/eric6_tr.ts	Sun Mar 17 11:56:51 2019 +0100
@@ -43959,23 +43959,23 @@
 <context>
     <name>LexerCPP</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="55"/>
-        <source>Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="65"/>
-        <source>Extra Doc Comment Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerCPP.py" line="75"/>
-        <source>Inactive Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="85"/>
-        <source>Inactive Extra Doc Comment Keywords</source>
+        <source>Inactive additional identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="57"/>
+        <source>Additional Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="66"/>
+        <source>Additional JavaDoc keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="84"/>
+        <source>Inactive additional JavaDoc keyword</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
--- a/i18n/eric6_zh_CN.ts	Sat Mar 16 20:17:06 2019 +0100
+++ b/i18n/eric6_zh_CN.ts	Sun Mar 17 11:56:51 2019 +0100
@@ -43936,23 +43936,23 @@
 <context>
     <name>LexerCPP</name>
     <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="55"/>
-        <source>Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="65"/>
-        <source>Extra Doc Comment Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/LexerCPP.py" line="75"/>
-        <source>Inactive Extra Identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/LexerCPP.py" line="85"/>
-        <source>Inactive Extra Doc Comment Keywords</source>
+        <source>Inactive additional identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="57"/>
+        <source>Additional Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="66"/>
+        <source>Additional JavaDoc keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/LexerCPP.py" line="84"/>
+        <source>Inactive additional JavaDoc keyword</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

Mercurial Repository: eric

eric ide

mercurial