[GRASS-SVN] r54021 - grass/trunk/gui/wxpython/lmgr

[svn_grass at osgeo.org]

Author: annakrat
Date: 2012-11-25 01:43:17 -0800 (Sun, 25 Nov 2012)
New Revision: 54021

Modified:
   grass/trunk/gui/wxpython/lmgr/layertree.py
Log:
wxGUI: remove redundant code, fix icons for group

Modified: grass/trunk/gui/wxpython/lmgr/layertree.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/layertree.py	2012-11-25 07:25:59 UTC (rev 54020)
+++ grass/trunk/gui/wxpython/lmgr/layertree.py	2012-11-25 09:43:17 UTC (rev 54021)
@@ -174,7 +174,7 @@
         # create image list to use with layer tree
         il = wx.ImageList(16, 16, mask = False)
         
-        trart = wx.ArtProvider.GetBitmap(wx.ART_FOLDER_OPEN, wx.ART_OTHER, (16, 16))
+        trart = wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_OTHER, (16, 16))
         self.folder_open = il.Add(trart)
         trart = wx.ArtProvider.GetBitmap(wx.ART_FOLDER, wx.ART_OTHER, (16, 16))
         self.folder = il.Add(trart)
@@ -226,9 +226,7 @@
         self.cmd_icon = il.Add(trgif)
         
         self.AssignImageList(il)
-        
-        self.Bind(wx.EVT_TREE_ITEM_EXPANDING,   self.OnExpandNode)
-        self.Bind(wx.EVT_TREE_ITEM_COLLAPSED,   self.OnCollapseNode)
+
         self.Bind(wx.EVT_TREE_ITEM_ACTIVATED,   self.OnActivateLayer)
         self.Bind(wx.EVT_TREE_SEL_CHANGED,      self.OnChangeSel)
         self.Bind(wx.EVT_TREE_SEL_CHANGING,     self.OnChangingSel)
@@ -944,7 +942,8 @@
         elif ltype == 'command':
             self.SetItemImage(layer, self.cmd_icon)
         elif ltype == 'group':
-            self.SetItemImage(layer, self.folder)
+            self.SetItemImage(layer, self.folder, CT.TreeItemIcon_Normal)
+            self.SetItemImage(layer, self.folder_open, CT.TreeItemIcon_Expanded)
             self.SetItemText(layer, grouptext)
         
         self.first = False
@@ -1311,26 +1310,9 @@
                 self._setGradient()
         else:
             self._setGradient()
-        
-        try:
-            if self.IsSelected(oldlayer):
-                self.SetItemWindowEnabled(oldlayer, True)
-            else:
-                self.SetItemWindowEnabled(oldlayer, False)
 
-            if self.IsSelected(layer):
-                self.SetItemWindowEnabled(layer, True)
-            else:
-                self.SetItemWindowEnabled(layer, False)
-        except:
-            pass
+        self.RefreshLine(layer)
         
-        try:
-            self.RefreshLine(oldlayer)
-            self.RefreshLine(layer)
-        except:
-            pass
-        
         # update statusbar -> show command string
         if self.GetLayerInfo(layer, key = 'maplayer'):
             cmd = self.GetLayerInfo(layer, key = 'maplayer').GetCmd(string = True)
@@ -1361,19 +1343,7 @@
                 elif type == '3d-raster':
                     self.lmgr.nviz.UpdatePage('volume')
                     self.lmgr.nviz.SetPage('volume')
-        
-    def OnCollapseNode(self, event):
-        """!Collapse node
-        """
-        if self.GetLayerInfo(self.layer_selected, key = 'type') == 'group':
-            self.SetItemImage(self.layer_selected, self.folder)
 
-    def OnExpandNode(self, event):
-        """!Expand node
-        """
-        if self.GetLayerInfo(self.layer_selected, key = 'type') == 'group':
-            self.SetItemImage(self.layer_selected, self.folder_open)
-    
     def OnEndDrag(self, event):
         self.StopDragging()
         dropTarget = event.GetItem()