Python and SQL(Expression) code editors, always use monospace

And use a different color for fields in the expression editor
qgis · Apr 19, 2016 · 69153ab · 69153ab
1 parent 7379223
commit 69153ab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/gui/qgscodeeditorpython.cpp b/src/gui/qgscodeeditorpython.cpp
@@ -55,13 +55,10 @@ void QgsCodeEditorPython::setSciLexerPython()
 
   QsciLexerPython* pyLexer = new QsciLexerPython( this );
   pyLexer->setDefaultFont( font );
-  pyLexer->setFont( font, 1 ); // comment
-  pyLexer->setFont( font, 3 ); // singlequotes
-  pyLexer->setFont( font, 4 ); // doublequotes
-  pyLexer->setFont( font, 6 ); // triplequotes
-  pyLexer->setColor( Qt::red, 1 ); // comment color
-  pyLexer->setColor( Qt::darkGreen, 5 ); // keyword color
-  pyLexer->setColor( Qt::darkBlue, 15 ); // decorator color
+  pyLexer->setFont( font, -1 );
+  pyLexer->setColor( Qt::red, QsciLexerPython::Comment );
+  pyLexer->setColor( Qt::darkGreen, QsciLexerPython::Keyword );
+  pyLexer->setColor( Qt::darkBlue, QsciLexerPython::Decorator );
 
   QsciAPIs* apis = new QsciAPIs( pyLexer );
 

diff --git a/src/gui/qgscodeeditorsql.cpp b/src/gui/qgscodeeditorsql.cpp
@@ -41,8 +41,14 @@ QgsCodeEditorSQL::~QgsCodeEditorSQL()
 
 void QgsCodeEditorSQL::setSciLexerSQL()
 {
+  QFont font = getMonospaceFont();
+
   QsciLexerSQL* sqlLexer = new QsciLexerSQL( this );
-  sqlLexer->setDefaultFont( QFont( "Sans", 10 ) );
+  sqlLexer->setDefaultFont( font );
+  sqlLexer->setFont( font, -1 );
+  font.setBold( true );
+  sqlLexer->setFont( font, QsciLexerSQL::Keyword );
+  sqlLexer->setColor( Qt::darkYellow, QsciLexerSQL::DoubleQuotedString ); // fields
 
   setLexer( sqlLexer );
 }