Mixed local changes with remote ones.

Fri, 28 May 2010 19:05:00 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 28 May 2010 19:05:00 +0200
changeset 294
408dbd80e6e6
parent 293
9ecc02b50325 (current diff)
parent 292
77fc8de1a0c5 (diff)
child 296
dd17398ccf12

Mixed local changes with remote ones.

--- a/.issues/.properties	Fri May 28 19:03:58 2010 +0200
+++ b/.issues/.properties	Fri May 28 19:05:00 2010 +0200
@@ -1,19 +1,19 @@
-[Category]
-
-[State]
-new = 
-assigned = 
-investigating = 
-scheduled = 
-testing = 
-closed = 
-
-[Resolution]
-fixed = 
-rejected = 
-duplicate = 
-cannot reproduce = 
-
-[Assigned-To]
-detlev = 
-
+[Category]
+
+[State]
+new = 
+assigned = 
+investigating = 
+scheduled = 
+testing = 
+closed = 
+
+[Resolution]
+fixed = 
+rejected = 
+duplicate = 
+cannot reproduce = 
+
+[Assigned-To]
+detlev = 
+
--- a/QScintilla/APIsManager.py	Fri May 28 19:03:58 2010 +0200
+++ b/QScintilla/APIsManager.py	Fri May 28 19:05:00 2010 +0200
@@ -7,11 +7,14 @@
 Module implementing the APIsManager.
 """
 
+import os
+
 from PyQt4.QtCore import *
 from PyQt4.Qsci import QsciAPIs
 
 from . import Lexers
 import Preferences
+import Utilities
 
 class APIs(QObject):
     """
@@ -160,6 +163,19 @@
         @return list of installed API files (list of strings)
         """
         if self.__apis is not None:
+            if Utilities.isWindowsPlatform():
+                from PyQt4 import pyqtconfig
+                qsciPath = os.path.join(pyqtconfig._pkg_config["pyqt_mod_dir"], "qsci")
+                if os.path.exists(qsciPath):
+                    # it's the installer
+                    apidir = os.path.join(qsciPath, "api", self.__lexer.lexer())
+                    fnames = []
+                    filist = QDir(apidir).entryInfoList(["*.api"], QDir.Files, 
+                                                        QDir.IgnoreCase)
+                    for fi in filist:
+                        fnames.append(fi.absoluteFilePath())
+                    return fnames
+            
             return self.__apis.installedAPIFiles()
         else:
             return []

eric ide

mercurial