[GRASS-SVN] r61677 - grass/branches/releasebranch_7_0/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-08-18 09:57:22 -0700 (Mon, 18 Aug 2014)
New Revision: 61677

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/gui_core/preferences.py
Log:
wxGUI: fix font dialog #2391 - d.font was missing monitor (merge from trunk, r61603)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/preferences.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/preferences.py	2014-08-18 15:30:57 UTC (rev 61676)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/preferences.py	2014-08-18 16:57:22 UTC (rev 61677)
@@ -1650,9 +1650,15 @@
         parses fonts directory or fretypecap file to get a list of fonts for the listbox
         """
         fontlist = []
-        ret = RunCommand('d.font',
-                         read = True,
-                         flags = 'l')
+        env = os.environ.copy()
+        driver = UserSettings.Get(group='display', key='driver', subkey='type')
+        if driver == 'png':
+            env['GRASS_RENDER_IMMEDIATE'] = 'png'
+        else:
+            env['GRASS_RENDER_IMMEDIATE'] = 'cairo'
+        ret = RunCommand('d.fontlist',
+                         read=True,
+                         env=env)
         if not ret:
             return fontlist