[GRASS-SVN] r62610 - in grass/branches/releasebranch_7_0: . gui/wxpython/lmgr gui/wxpython/mapdisp

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-11-04 21:09:02 -0800 (Tue, 04 Nov 2014)
New Revision: 62610

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py
   grass/branches/releasebranch_7_0/gui/wxpython/lmgr/layertree.py
   grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py
Log:
wxGUI: fix renaming map displays (merge from trunk, r62609)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:61096,62179-62180,62182,62403,62422,62424,62437,62466,62487,62491,62494,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62570,62573,62575,62597,62603,62606
   + /grass/trunk:61096,62179-62180,62182,62403,62422,62424,62437,62466,62487,62491,62494,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62570,62573,62575,62597,62603,62606,62609

Modified: grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py	2014-11-05 05:07:43 UTC (rev 62609)
+++ grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py	2014-11-05 05:09:02 UTC (rev 62610)
@@ -954,7 +954,7 @@
         
                 dispId = 1
                 for display in self.GetMapDisplay(onlyCurrent = False):
-                    display.SetTitle(dispId) # TODO: signal ?
+                    display.SetTitleNumber(dispId) # TODO: signal ?
                     dispId += 1 
         
     def OnChangeCWD(self, event=None, cmd=None):
@@ -1445,10 +1445,9 @@
             name = dlg.GetValue()
             self.notebookLayers.SetPageText(page = self.currentPageNum, text = name)
             mapdisplay = self.GetMapDisplay()
-            mapdisplay.SetTitle(_("GRASS GIS %(version) Map Display: %(name)s - Location: %(loc)s") % \
-                                    { 'version' : grass.version()['version'],
-                                      'name' : name,
-                                      'loc' : grass.gisenv()["LOCATION_NAME"] })
+            mapdisplay.SetTitle(_("GRASS GIS {version} Map Display: {name} - Location: {loc}").format(
+                                 version=grass.version()['version'], name=name,
+                                 loc=grass.gisenv()["LOCATION_NAME"]))
         dlg.Destroy()
         
     def OnRasterRules(self, event):

Modified: grass/branches/releasebranch_7_0/gui/wxpython/lmgr/layertree.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/lmgr/layertree.py	2014-11-05 05:07:43 UTC (rev 62609)
+++ grass/branches/releasebranch_7_0/gui/wxpython/lmgr/layertree.py	2014-11-05 05:09:02 UTC (rev 62610)
@@ -175,7 +175,7 @@
                                    lmgr = self.lmgr, page = self.treepg,
                                    Map = self.Map)
         
-        self.mapdisplay.SetTitle(self.displayIndex + 1)
+        self.mapdisplay.SetTitleNumber(self.displayIndex + 1)
         
         # show new display
         if showMapDisplay is True:

Modified: grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py	2014-11-05 05:07:43 UTC (rev 62609)
+++ grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py	2014-11-05 05:09:02 UTC (rev 62610)
@@ -241,7 +241,7 @@
     def GetMapWindow(self):
         return self.MapWindow
 
-    def SetTitle(self, displayId = 1):
+    def SetTitleNumber(self, displayId=1):
         """!Set map display title"""
         try:
             grassVersion = grass.version()['version']
@@ -256,7 +256,7 @@
              'loc': gisenv["LOCATION_NAME"],
              'mapset': gisenv["MAPSET"]}
 
-        super(MapFrame, self).SetTitle(title)
+        self.SetTitle(title)
 
     def _addToolbarVDigit(self):
         """!Add vector digitizer toolbar