[GRASS-SVN] r74106 - in grass/trunk/gui/wxpython: lmgr mapdisp

[svn_grass at osgeo.org]

Author: annakrat
Date: 2019-02-18 20:38:14 -0800 (Mon, 18 Feb 2019)
New Revision: 74106

Modified:
   grass/trunk/gui/wxpython/lmgr/frame.py
   grass/trunk/gui/wxpython/lmgr/layertree.py
   grass/trunk/gui/wxpython/mapdisp/frame.py
Log:
wxGUI: fix setting non-ascii display name

Modified: grass/trunk/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/frame.py	2019-02-19 04:24:36 UTC (rev 74105)
+++ grass/trunk/gui/wxpython/lmgr/frame.py	2019-02-19 04:38:14 UTC (rev 74106)
@@ -1117,7 +1117,7 @@
             # renamed (it just uses the numbers)
             dispId = 1
             for display in self.GetMapDisplay(onlyCurrent=False):
-                display.SetTitleWithName(dispId)  # TODO: signal ?
+                display.SetTitleWithName(str(dispId))  # TODO: signal ?
                 dispId += 1
 
     def OnChangeCWD(self, event=None, cmd=None):

Modified: grass/trunk/gui/wxpython/lmgr/layertree.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/layertree.py	2019-02-19 04:24:36 UTC (rev 74105)
+++ grass/trunk/gui/wxpython/lmgr/layertree.py	2019-02-19 04:38:14 UTC (rev 74106)
@@ -204,7 +204,7 @@
 
         # here (with initial auto-generated names) we use just the
         # number, not the whole name for simplicity
-        self.mapdisplay.SetTitleWithName(self.displayIndex + 1)
+        self.mapdisplay.SetTitleWithName(str(self.displayIndex + 1))
 
         # show new display
         if showMapDisplay is True:

Modified: grass/trunk/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/frame.py	2019-02-19 04:24:36 UTC (rev 74105)
+++ grass/trunk/gui/wxpython/mapdisp/frame.py	2019-02-19 04:38:14 UTC (rev 74106)
@@ -257,7 +257,7 @@
         """
         gisenv = grass.gisenv()
         title = _("GRASS GIS Map Display: %(name)s - %(loc)s/%(mapset)s") % {
-            'name': str(name),
+            'name': name,
             'loc': gisenv["LOCATION_NAME"],
             'mapset': gisenv["MAPSET"]}