[Gemrb-commits] gemrb/gemrb/GUIScripts/tob GUICommonWindows.py,1.25,1.26 GUIWORLD.py,1.21,1.22

[Laszlo T. <ave...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/tob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5391/GUIScripts/tob

Modified Files:
	GUICommonWindows.py GUIWORLD.py 
Log Message:
brought bg1 ActionsWindow up to the common level too


Index: GUICommonWindows.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/tob/GUICommonWindows.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** GUICommonWindows.py	4 Dec 2005 21:09:33 -0000	1.25
--- GUICommonWindows.py	4 Dec 2005 23:12:42 -0000	1.26
***************
*** 140,146 ****
  
  def SelectFormationPreset ():
! 	print GemRB.GetVar("Value")
! 	print GemRB.GetVar("Formation")
! 	GemRB.GameSetFormation ( GemRB.GetVar("Value"), GemRB.GetVar("Formation") )
  	GroupControls ()
  	return
--- 140,144 ----
  
  def SelectFormationPreset ():
! 	GemRB.GameSetFormation ( GemRB.GetVar ("Value"), GemRB.GetVar("Formation") )
  	GroupControls ()
  	return
***************
*** 160,166 ****
  
  def SelectFormation ():
! 	GemRB.GameSetFormation ( GemRB.GetVar("Formation") )
! 	print "SelectFormation",GemRB.GetVar("Formation")
! 	#GroupControls ()
  
  def GroupControls ():
--- 158,163 ----
  
  def SelectFormation ():
! 	GemRB.GameSetFormation ( GemRB.GetVar ("Formation") )
! 	return
  
  def GroupControls ():
***************
*** 192,195 ****
--- 189,194 ----
  		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SelectFormation")
  		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "SetupFormation")
+ 		str = GemRB.GetString (4935)
+ 		GemRB.SetTooltip (Window, Button, "F%d - %s"%(8+i,str) )
  	return
  
***************
*** 222,226 ****
  				break
  
- 	print "PC selected: ", pc
  	if pc == 0:
  		EmptyControls ()
--- 221,224 ----

Index: GUIWORLD.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/tob/GUIWORLD.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** GUIWORLD.py	4 Dec 2005 21:09:33 -0000	1.21
--- GUIWORLD.py	4 Dec 2005 23:12:42 -0000	1.22
***************
*** 289,293 ****
  	if RightIndex<0:
  		return
! 	
  	#we need to get the right slot number
  	pc = GemRB.GameGetFirstSelectedPC ()
--- 289,293 ----
  	if RightIndex<0:
  		return
! 
  	#we need to get the right slot number
  	pc = GemRB.GameGetFirstSelectedPC ()
***************
*** 303,307 ****
  	if LeftIndex<0:
  		return
! 	
  	if LeftIndex >= Container['ItemCount']:
  		return
--- 303,307 ----
  	if LeftIndex<0:
  		return
! 
  	if LeftIndex >= Container['ItemCount']:
  		return
***************
*** 394,398 ****
  	if hideflag:
  		GemRB.UnhideGUI ()
! 	GemRB.LeaveParty( GemRB.GetVar("Selected") )
  	OpenReformPartyWindow ()
  	return
--- 394,398 ----
  	if hideflag:
  		GemRB.UnhideGUI ()
! 	GemRB.LeaveParty (GemRB.GetVar("Selected") )
  	OpenReformPartyWindow ()
  	return