Use Python editor font and size for code editor

qgis · Feb 5, 2015 · f6d6c69 · f6d6c69
1 parent 9de6ae9
commit f6d6c69
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/src/gui/qgscodeeditor.cpp b/src/gui/qgscodeeditor.cpp
@@ -131,25 +131,16 @@ bool QgsCodeEditor::isFixedPitch( const QFont& font )
 
 QFont QgsCodeEditor::getMonospaceFont()
 {
-  QFont font( "monospace" );
-  if ( isFixedPitch( font ) )
-  {
-    return font;
-  }
-  font.setStyleHint( QFont::Monospace );
-  if ( isFixedPitch( font ) )
-  {
-    return font;
-  }
+  QSettings settings;
+  QString loadFont = settings.value( "pythonConsole/fontfamilytextEditor", "Monospace" ).toString();
+  int fontSize = settings.value( "pythonConsole/fontsizeEditor", 10 ).toInt();
+
+  QFont font( loadFont );
+  font.setFixedPitch( true );
+  font.setPointSize( fontSize );
   font.setStyleHint( QFont::TypeWriter );
-  if ( isFixedPitch( font ) )
-  {
-    return font;
-  }
-  font.setFamily( "courier" );
-  if ( isFixedPitch( font ) )
-  {
-    return font;
-  }
+  font.setStretch( QFont::SemiCondensed );
+  font.setLetterSpacing( QFont::PercentageSpacing, 87.0 );
+  font.setBold( false );
   return font;
 }
diff --git a/src/gui/qgscodeeditorpython.cpp b/src/gui/qgscodeeditorpython.cpp
@@ -52,7 +52,6 @@ void QgsCodeEditorPython::setSciLexerPython()
   setWhitespaceVisibility( QsciScintilla::WsVisibleAfterIndent );
 
   QFont font = getMonospaceFont();
-  font.setPointSize( 10 );
 
   QsciLexerPython* pyLexer = new QsciLexerPython();
   pyLexer->setDefaultFont( font );