Fixed a few little issues.

Sat, 06 Feb 2016 12:31:51 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 06 Feb 2016 12:31:51 +0100
changeset 4718
9fcb469d81ae
parent 4716
6c8fbcd4d66c
child 4720
7b77980d3255

Fixed a few little issues.

QScintilla/Editor.py file | annotate | diff | comparison | revisions
eric6.e4p file | annotate | diff | comparison | revisions
--- a/QScintilla/Editor.py	Fri Feb 05 18:06:07 2016 +0100
+++ b/QScintilla/Editor.py	Sat Feb 06 12:31:51 2016 +0100
@@ -4992,7 +4992,8 @@
         self.menuActs["TypingAidsEnabled"].setChecked(
             self.completer is not None and self.completer.isEnabled())
         
-        self.menuActs["calltip"].setEnabled(self.acAPI)
+        if not self.isResourcesFile:
+            self.menuActs["calltip"].setEnabled(self.acAPI)
         
         from .SpellChecker import SpellChecker
         spellingAvailable = SpellChecker.isAvailable()
--- a/eric6.e4p	Fri Feb 05 18:06:07 2016 +0100
+++ b/eric6.e4p	Sat Feb 06 12:31:51 2016 +0100
@@ -1915,7 +1915,7 @@
   </Vcs>
   <FiletypeAssociations>
     <FiletypeAssociation pattern="*.idl" type="INTERFACES"/>
-    <FiletypeAssociation pattern="*.js" type="__IGNORE__"/>
+    <FiletypeAssociation pattern="*.js" type="OTHERS"/>
     <FiletypeAssociation pattern="*.py" type="SOURCES"/>
     <FiletypeAssociation pattern="*.py3" type="SOURCES"/>
     <FiletypeAssociation pattern="*.pyw" type="SOURCES"/>

eric ide

mercurial