[GRASS-SVN] r30169 - in grass/trunk/gui/wxpython: . gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-02-15 14:42:37 -0500 (Fri, 15 Feb 2008)
New Revision: 30169

Modified:
   grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
   grass/trunk/gui/wxpython/wxgui.py
Log:
wxGUI: adding map(s) into layer tree simplified

Modified: grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2008-02-15 19:29:15 UTC (rev 30168)
+++ grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2008-02-15 19:42:37 UTC (rev 30169)
@@ -514,9 +514,7 @@
             self.GetPyData(layer)[0]['maplayer'] = maplayer
 
             # run properties dialog if no properties given
-            if len(cmd) > 1:
-                self.PropertiesDialog(layer, show=False)
-            else:
+            if len(cmd) == 0:
                 self.PropertiesDialog(layer, show=True)
 
         else: # group

Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py	2008-02-15 19:29:15 UTC (rev 30168)
+++ grass/trunk/gui/wxpython/wxgui.py	2008-02-15 19:42:37 UTC (rev 30169)
@@ -599,6 +599,10 @@
 
         if dialog.ShowModal() == wx.ID_OK:
             maptree = self.curr_page.maptree
+            busy = wx.BusyInfo(message=_("Please wait, loading map layers into layer tree..."),
+                               parent=self)
+            wx.Yield()
+
             for layerName in dialog.GetMapLayers():
                 if dialog.GetLayerType() == 'raster':
                     cmd = ['d.rast', 'map=%s' % layerName]
@@ -610,8 +614,9 @@
                                            lopacity=1.0,
                                            lcmd=cmd,
                                            lgroup=None)
-                maptree.PropertiesDialog(newItem, show=False)
 
+            busy.Destroy()
+
             # reverse list of map layers
             maptree.Map.ReverseListOfLayers()