[GRASS-SVN] r35147 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-01-01 13:10:55 -0500 (Thu, 01 Jan 2009)
New Revision: 35147

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py
Log:
wxGUI: revert some recent decoration changes. Dialogs for barscale and
legend cannot be shown as modal - in the result d.barscale and
d.legend are not selectable.
         (merge from relbr64, r35133)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py	2009-01-01 17:45:42 UTC (rev 35146)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py	2009-01-01 18:10:55 UTC (rev 35147)
@@ -354,9 +354,10 @@
             if mapName:
                 # enable 'OK' button
                 self.btnOK.Enable()
-                # set title
-                self.SetTitle(_('Legend of raster map <%s>') % \
-                              mapName)
+                if name == 'legend':
+                    # set title
+                    self.SetTitle(_('Legend of raster map <%s>') % \
+                                      mapName)
         
     def _CreateOverlay(self):
         if not self.parent.Map.GetOverlay(self.ovlId):

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py	2009-01-01 17:45:42 UTC (rev 35146)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py	2009-01-01 18:10:55 UTC (rev 35147)
@@ -3894,7 +3894,9 @@
                                       ctrltxt = _("scale object"))
 
         self.dialogs['barscale'].CentreOnParent()
-        self.dialogs['barscale'].ShowModal()
+        ### dialog cannot be show as modal - in the result d.barscale is not selectable
+        ### self.dialogs['barscale'].ShowModal()
+        self.dialogs['barscale'].Show()
         self.MapWindow.mouse['use'] = 'pointer'        
 
     def OnAddLegend(self, event):
@@ -3922,8 +3924,10 @@
                                       checktxt = _("Show/hide legend"),
                                       ctrltxt = _("legend object")) 
 
-        self.dialogs['legend'].CentreOnParent()
-        self.dialogs['legend'].ShowModal()
+        self.dialogs['legend'].CentreOnParent() 
+        ### dialog cannot be show as modal - in the result d.legend is not selectable
+        ### self.dialogs['legend'].ShowModal()
+        self.dialogs['legend'].Show()
         self.MapWindow.mouse['use'] = 'pointer'
 
     def OnAddText(self, event):