Add support for prepared API file

- Prepared API file supports Python 2.7, PyQGIS master, PyQt4.7.4, QScintilla2 2.4.5, osgeo 1.9.1 - Set point size larger (should be setting in app) - Remove extra spacing between toolbar and console edit widget - Remove space from Qt object name - With many more API lines, autocompletion should start at least on second character, if not third
qgis · Sep 11, 2012 · 9db9ef8 · 9db9ef8
1 parent 02b6873
commit 9db9ef8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/python/api/pyqgis_master.pap b/python/api/pyqgis_master.pap
diff --git a/python/console.py b/python/console.py
@@ -69,7 +69,7 @@ def flush(self):
 class PythonConsole(QDockWidget):
     def __init__(self, parent=None):
         QDockWidget.__init__(self, parent)
-        self.setObjectName("Python Console")
+        self.setObjectName("PythonConsole")
         #self.setAllowedAreas(Qt.BottomDockWidgetArea)
 
         self.widgetButton = QWidget()
@@ -93,6 +93,7 @@ def __init__(self, parent=None):
         self.e = QHBoxLayout(self.widgetEdit)
 
         self.e.setMargin(0)
+        self.e.setSpacing(0)
         self.b.setMargin(0)
 
         ## Action for Clear button

diff --git a/python/console_sci.py b/python/console_sci.py
@@ -87,8 +87,8 @@ def __init__(self, parent=None):
         #self.setTabIndents(True)
         #self.setBackspaceUnindents(True)
         #self.setTabWidth(4)
-        
-        self.setAutoCompletionThreshold(1)
+
+        self.setAutoCompletionThreshold(2)
         self.setAutoCompletionSource(self.AcsAPIs)
 
         # Don't want to see the horizontal scrollbar at all
@@ -147,7 +147,7 @@ def setLexers(self, lexer):
             font = QFont()
             font.setFamily('Courier New') ## Courier New
             font.setFixedPitch(True)
-            font.setPointSize(10)
+            font.setPointSize(13)
             self.setFont(font)
             self.setMarginsFont(font)
             self.lexer = QsciLexerPython()
@@ -161,15 +161,16 @@ def setLexers(self, lexer):
             self.lexer.setFont(font, 3)
             self.lexer.setFont(font, 4)
             self.api = QsciAPIs(self.lexer)
-            self.api.load(os.path.dirname(__file__) + "/api/PyQGIS_1.8.api")
-            self.api.load(os.path.dirname(__file__) + "/api/osgeo_gdal-ogr_1.9.1-1.api")
+            self.api.loadPrepared(QString(os.path.dirname(__file__) + "/api/pyqgis_master.pap"))
+#            self.api.load(os.path.dirname(__file__) + "/api/PyQGIS_1.8.api")
+#            self.api.load(os.path.dirname(__file__) + "/api/osgeo_gdal-ogr_1.9.1-1.api")
 #            self.api.load("qgis.networkanalysis.api")
 #            self.api.load("qgis.gui.api")
 #            self.api.load("qgis.core.api")
 #            self.api.load("qgis.analysis.api")
-            
-            self.api.prepare()
-            self.lexer.setAPIs(self.api)
+
+#            self.api.prepare()
+#            self.lexer.setAPIs(self.api)
             self.setLexer(self.lexer)
 
      ## TODO: show completion list for file and directory