[GRASS-SVN] r61603 - grass/trunk/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-08-13 14:03:26 -0700 (Wed, 13 Aug 2014)
New Revision: 61603

Modified:
   grass/trunk/gui/wxpython/gui_core/preferences.py
Log:
wxGUI: fix font dialog #2391 - d.font was missing monitor

Modified: grass/trunk/gui/wxpython/gui_core/preferences.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/preferences.py	2014-08-13 21:02:08 UTC (rev 61602)
+++ grass/trunk/gui/wxpython/gui_core/preferences.py	2014-08-13 21:03:26 UTC (rev 61603)
@@ -1651,9 +1651,15 @@
         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