Mercurial Repositories > eric / changeset

changeset

Continued with QScintilla 2.6 support.

Mon, 14 Nov 2011 20:09:18 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 14 Nov 2011 20:09:18 +0100
changeset 1446
e2658efcdaf4
parent 1444
552d2d74f5cf
child 1447
715bfc0c02db

Continued with QScintilla 2.6 support.

Preferences/ConfigurationPages/EditorKeywordsPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/EditorPropertiesPage.ui file | annotate | diff | comparison | revisions
i18n/eric5_cs.ts file | annotate | diff | comparison | revisions
i18n/eric5_de.qm file | annotate | diff | comparison | revisions
i18n/eric5_de.ts file | annotate | diff | comparison | revisions
i18n/eric5_en.ts file | annotate | diff | comparison | revisions
i18n/eric5_es.ts file | annotate | diff | comparison | revisions
i18n/eric5_fr.ts file | annotate | diff | comparison | revisions
i18n/eric5_it.ts file | annotate | diff | comparison | revisions
i18n/eric5_ru.ts file | annotate | diff | comparison | revisions
i18n/eric5_tr.ts file | annotate | diff | comparison | revisions
i18n/eric5_zh_CN.GB2312.ts file | annotate | diff | comparison | revisions 
--- a/Preferences/ConfigurationPages/EditorKeywordsPage.py	Sun Nov 13 19:56:47 2011 +0100
+++ b/Preferences/ConfigurationPages/EditorKeywordsPage.py	Mon Nov 14 20:09:18 2011 +0100
@@ -83,6 +83,8 @@
             if self.__keywords[language][kwSet] != "":
                 first = min(first, kwSet)
                 last = max(last, kwSet)
+        if language in ["Python2", "Python3"] and last < 2:
+            last = 2    # support for keyword set 2 as of QScintilla 2.6.0
         self.setSpinBox.setEnabled(language != "" and first < 10)
         self.keywordsEdit.setEnabled(language != "" and first < 10)
         if first < 10:
@@ -108,7 +110,7 @@
         self.__keywords[self.currentLanguage][self.currentSet] = \
             self.keywordsEdit.toPlainText()
         
-        self.currentApiLanguage = language
+        self.currentLanguage = language
         self.currentSet = kwSet
         self.keywordsEdit.setPlainText(self.__keywords[language][kwSet])
 
--- a/Preferences/ConfigurationPages/EditorPropertiesPage.ui	Sun Nov 13 19:56:47 2011 +0100
+++ b/Preferences/ConfigurationPages/EditorPropertiesPage.ui	Mon Nov 14 20:09:18 2011 +0100
@@ -600,7 +600,7 @@
       <item row="2" column="1">
        <widget class="QCheckBox" name="pythonHighlightSubidentifierCheckBox">
         <property name="toolTip">
-         <string>Select to highlight sub-identifiers</string>
+         <string>Select to highlight sub-identifiers defined in keyword set 2</string>
         </property>
         <property name="text">
          <string>Highlight sub-identifiers</string>
--- a/i18n/eric5_cs.ts	Sun Nov 13 19:56:47 2011 +0100
+++ b/i18n/eric5_cs.ts	Mon Nov 14 20:09:18 2011 +0100
@@ -9538,11 +9538,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
-        <source>Select to highlight sub-identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="606"/>
         <source>Highlight sub-identifiers</source>
         <translation type="unfinished"></translation>
@@ -9552,6 +9547,11 @@
         <source>Select to highlight triple quoted strings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
+        <source>Select to highlight sub-identifiers defined in keyword set 2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSearchPage</name>
Binary file i18n/eric5_de.qm has changed
--- a/i18n/eric5_de.ts	Sun Nov 13 19:56:47 2011 +0100
+++ b/i18n/eric5_de.ts	Mon Nov 14 20:09:18 2011 +0100
@@ -9363,11 +9363,6 @@
         <translation>Zeichenketten in dreifachen Anführungszeichen hervorheben</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
-        <source>Select to highlight sub-identifiers</source>
-        <translation>Auswählen, um Unteridentifizierer hervorzuheben</translation>
-    </message>
-    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="606"/>
         <source>Highlight sub-identifiers</source>
         <translation>Unteridentifizierer hervorheben</translation>
@@ -9377,6 +9372,11 @@
         <source>Select to highlight triple quoted strings</source>
         <translation>Auswählen, um Zeichenketten in dreifachen Anführungszeichen hervorzuheben</translation>
     </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
+        <source>Select to highlight sub-identifiers defined in keyword set 2</source>
+        <translation>Auswählen, um in Schlüsselwortgruppe 2 definierte Unteridentifizierer hervorzuheben</translation>
+    </message>
 </context>
 <context>
     <name>EditorSearchPage</name>
--- a/i18n/eric5_en.ts	Sun Nov 13 19:56:47 2011 +0100
+++ b/i18n/eric5_en.ts	Mon Nov 14 20:09:18 2011 +0100
@@ -9292,11 +9292,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
-        <source>Select to highlight sub-identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="606"/>
         <source>Highlight sub-identifiers</source>
         <translation type="unfinished"></translation>
@@ -9306,6 +9301,11 @@
         <source>Select to highlight triple quoted strings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
+        <source>Select to highlight sub-identifiers defined in keyword set 2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSearchPage</name>
--- a/i18n/eric5_es.ts	Sun Nov 13 19:56:47 2011 +0100
+++ b/i18n/eric5_es.ts	Mon Nov 14 20:09:18 2011 +0100
@@ -9432,11 +9432,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
-        <source>Select to highlight sub-identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="606"/>
         <source>Highlight sub-identifiers</source>
         <translation type="unfinished"></translation>
@@ -9446,6 +9441,11 @@
         <source>Select to highlight triple quoted strings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
+        <source>Select to highlight sub-identifiers defined in keyword set 2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSearchPage</name>
--- a/i18n/eric5_fr.ts	Sun Nov 13 19:56:47 2011 +0100
+++ b/i18n/eric5_fr.ts	Mon Nov 14 20:09:18 2011 +0100
@@ -10265,11 +10265,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
-        <source>Select to highlight sub-identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="606"/>
         <source>Highlight sub-identifiers</source>
         <translation type="unfinished"></translation>
@@ -10279,6 +10274,11 @@
         <source>Select to highlight triple quoted strings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
+        <source>Select to highlight sub-identifiers defined in keyword set 2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSearchPage</name>
--- a/i18n/eric5_it.ts	Sun Nov 13 19:56:47 2011 +0100
+++ b/i18n/eric5_it.ts	Mon Nov 14 20:09:18 2011 +0100
@@ -9404,11 +9404,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
-        <source>Select to highlight sub-identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="606"/>
         <source>Highlight sub-identifiers</source>
         <translation type="unfinished"></translation>
@@ -9418,6 +9413,11 @@
         <source>Select to highlight triple quoted strings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
+        <source>Select to highlight sub-identifiers defined in keyword set 2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSearchPage</name>
--- a/i18n/eric5_ru.ts	Sun Nov 13 19:56:47 2011 +0100
+++ b/i18n/eric5_ru.ts	Mon Nov 14 20:09:18 2011 +0100
@@ -9459,11 +9459,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
-        <source>Select to highlight sub-identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="606"/>
         <source>Highlight sub-identifiers</source>
         <translation type="unfinished"></translation>
@@ -9473,6 +9468,11 @@
         <source>Select to highlight triple quoted strings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
+        <source>Select to highlight sub-identifiers defined in keyword set 2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSearchPage</name>
--- a/i18n/eric5_tr.ts	Sun Nov 13 19:56:47 2011 +0100
+++ b/i18n/eric5_tr.ts	Mon Nov 14 20:09:18 2011 +0100
@@ -9546,11 +9546,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
-        <source>Select to highlight sub-identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="606"/>
         <source>Highlight sub-identifiers</source>
         <translation type="unfinished"></translation>
@@ -9560,6 +9555,11 @@
         <source>Select to highlight triple quoted strings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
+        <source>Select to highlight sub-identifiers defined in keyword set 2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSearchPage</name>
--- a/i18n/eric5_zh_CN.GB2312.ts	Sun Nov 13 19:56:47 2011 +0100
+++ b/i18n/eric5_zh_CN.GB2312.ts	Mon Nov 14 20:09:18 2011 +0100
@@ -10222,11 +10222,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
-        <source>Select to highlight sub-identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="606"/>
         <source>Highlight sub-identifiers</source>
         <translation type="unfinished"></translation>
@@ -10236,6 +10231,11 @@
         <source>Select to highlight triple quoted strings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
+        <source>Select to highlight sub-identifiers defined in keyword set 2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSearchPage</name>

Mercurial Repository: eric

eric ide

mercurial