Bläddra i källkod

wxGUI: fix font dialog https://trac.osgeo.org/grass/ticket/2391 - d.font was missing monitor (merge from trunk, https://trac.osgeo.org/grass/changeset/61603)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@61677 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 10 år sedan
förälder
incheckning
37fe4fa798
1 ändrade filer med 9 tillägg och 3 borttagningar
  1. 9 3
      gui/wxpython/gui_core/preferences.py

+ 9 - 3
gui/wxpython/gui_core/preferences.py

@@ -1650,9 +1650,15 @@ class DefaultFontDialog(wx.Dialog):
         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