[Openrpg-dev] openrpg1/orpg/gametree gametree.py,1.63,1.64

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/gametree
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22355/orpg/gametree

Modified Files:
	gametree.py 
Log Message:
Fixed a misspelling of Label
Added the ability to use F2 to initiate a label edit for tree nodes

Index: gametree.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/gametree/gametree.py,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** gametree.py	11 Feb 2007 03:49:33 -0000	1.63
--- gametree.py	19 Feb 2007 05:39:32 -0000	1.64
***************
*** 86,104 ****
  TOP_FEATURES = wx.NewId()
  
- class dbl_clk_timer_class(wx.Timer):
-     def __init__(self,tree_ctrl):
-         self.tree_ctrl = tree_ctrl
-         wx.Timer.__init__(self, wx.NewId())
- 
- 
-     def Notify(self):
-         if self.tree_ctrl.rename_flag:
-             self.tree_ctrl.EditLabel(self.item)
- 
-     def Start(self,item):
-         self.item = item
-         wx.Timer.Start(self, 250,1)       #  quarter second and the 1 is for a one-shot event
- 
- 
  class game_tree(wx.TreeCtrl):
      def __init__(self, parent, id, openrpg):
--- 86,89 ----
***************
*** 145,151 ****
          self.root = self.AddRoot("Game Tree",self.icons['gear'])
  
-         # click timer
-         self.dbl_clk_timer = wx.Timer(self, wx.NewId()) #dbl_clk_timer_class(self)
-         self.Bind(wx.EVT_TIMER, self.editLable, self.dbl_clk_timer)
          self.was_labeling = 0
          self.rename_flag = 0
--- 130,133 ----
***************
*** 253,256 ****
--- 235,241 ----
                  except:
                      pass
+         elif key_code == wx.WXK_F2:
+             self.rename_flag = 1
+             self.EditLabel(curSelection)
          evt.Skip()
  
***************
*** 1043,1071 ****
          pt = evt.GetPosition()
          (item, flag) = self.HitTest(pt)
!         if item.IsOk():
!             if self.was_labeling:
!                 self.SelectItem(item)
!                 self.rename_flag = 0
!                 self.was_labeling = 0
!                 evt.Skip()
!             else:
!                 if self.IsSelected(item):
!                     #  this next if tests to ensure that the mouse up occurred over a label, and not the icon
!                     if (flag & wx.TREE_HITTEST_ONITEMLABEL) == wx.TREE_HITTEST_ONITEMLABEL :
!                         self.rename_flag = 1
!                         self.citem = item
!                         self.dbl_clk_timer.Start(10,1)    # derived from wxTimer
!                         evt.Skip()
!                     else:
!                         evt.Skip()
!                 else:
!                     self.SelectItem(item)
!                     evt.Skip()
  
!         self.log.log("Exit game_tree->on_left_down(self, evt)", ORPG_DEBUG)
  
!     def editLable(self, event):
!         if self.rename_flag:
!             self.EditLable(self.citem)
  
      def on_left_up(self, evt):
--- 1028,1045 ----
          pt = evt.GetPosition()
          (item, flag) = self.HitTest(pt)
!         if item.IsOk() and self.was_labeling:
  
!             self.SelectItem(item)
!             self.rename_flag = 0
!             self.was_labeling = 0
!         elif self.IsSelected(item) and (flag & wx.TREE_HITTEST_ONITEMLABEL) == wx.TREE_HITTEST_ONITEMLABEL :
!             #  this next if tests to ensure that the mouse up occurred over a label, and not the icon
!             self.rename_flag = 1
!         else:
!             self.SelectItem(item)
  
!         evt.Skip()
! 
!         self.log.log("Exit game_tree->on_left_down(self, evt)", ORPG_DEBUG)
  
      def on_left_up(self, evt):