[Gemrb-commits] gemrb/gemrb/GUIScripts/bg2 CharGen2.py,1.1,1.2 CharGen3.py,1.2,1.3 CharGen4.py,1.3,1.4 CharGen5.py,1.3,1.4 CharGen6.py,1.6,1.7 CharGen7.py,1.3,1.4 CharGen8.py,1.2,1.3

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

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

Modified Files:
	CharGen2.py CharGen3.py CharGen4.py CharGen5.py CharGen6.py 
	CharGen7.py CharGen8.py 
Log Message:
Made a few buttons default in the chargen screens of bg2 


Index: CharGen2.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/CharGen2.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CharGen2.py	6 Nov 2003 15:03:04 -0000	1.1
--- CharGen2.py	27 Mar 2004 12:14:52 -0000	1.2
***************
*** 11,15 ****
  
  	GemRB.LoadWindowPack("GUICG")
!         CharGenWindow = GemRB.LoadWindow(0)
  	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
  	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
--- 11,15 ----
  
  	GemRB.LoadWindowPack("GUICG")
! 	CharGenWindow = GemRB.LoadWindow(0)
  	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
  	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
***************
*** 25,28 ****
--- 25,29 ----
  	GemRB.SetText(CharGenWindow,RaceButton, 11957)
  	GemRB.SetButtonState(CharGenWindow,RaceButton,IE_GUI_BUTTON_ENABLED)
+ 	GemRB.SetButtonFlags(CharGenWindow,RaceButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
  
  	ClassButton = GemRB.GetControl(CharGenWindow,2)
***************
*** 62,67 ****
  	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
  
!         CancelButton = GemRB.GetControl(CharGenWindow, 15)
!         GemRB.SetText(CharGenWindow, CancelButton, 8159)
  	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
  
--- 63,68 ----
  	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
  
! 	CancelButton = GemRB.GetControl(CharGenWindow, 15)
! 	GemRB.SetText(CharGenWindow, CancelButton, 8159)
  	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
  
***************
*** 78,99 ****
  		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1051)
  
!         GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
!         GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
!         GemRB.SetEvent(CharGenWindow, RaceButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
  	GemRB.SetVisible(CharGenWindow,1)
  	return
  	
  def NextPress():
!         GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("GUICG8") #race
  	return
  
  def CancelPress():
!         GemRB.UnloadWindow(CharGenWindow)
!         GemRB.SetNextScript("CharGen")
!         return
  
  def BackPress():
!         GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("CharGen") #appearance
  	return
--- 79,100 ----
  		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, 1051)
  
! 	GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
! 	GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
! 	GemRB.SetEvent(CharGenWindow, RaceButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
  	GemRB.SetVisible(CharGenWindow,1)
  	return
  	
  def NextPress():
! 	GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("GUICG8") #race
  	return
  
  def CancelPress():
! 	GemRB.UnloadWindow(CharGenWindow)
! 	GemRB.SetNextScript("CharGen")
! 	return
  
  def BackPress():
! 	GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("CharGen") #appearance
  	return

Index: CharGen8.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/CharGen8.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CharGen8.py	19 Nov 2003 19:41:16 -0000	1.2
--- CharGen8.py	27 Mar 2004 12:14:52 -0000	1.3
***************
*** 9,13 ****
  
  	GemRB.LoadWindowPack("GUICG")
!         CharGenWindow = GemRB.LoadWindow(0)
  	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
  	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
--- 9,13 ----
  
  	GemRB.LoadWindowPack("GUICG")
! 	CharGenWindow = GemRB.LoadWindow(0)
  	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
  	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
***************
*** 53,56 ****
--- 53,57 ----
  	GemRB.SetText(CharGenWindow,NameButton, 11963)
  	GemRB.SetButtonState(CharGenWindow,NameButton,IE_GUI_BUTTON_ENABLED)
+ 	GemRB.SetButtonFlags(CharGenWindow,NameButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
  
  	BackButton = GemRB.GetControl(CharGenWindow, 11)
***************
*** 66,71 ****
  	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
  
!         CancelButton = GemRB.GetControl(CharGenWindow, 15)
!         GemRB.SetText(CharGenWindow, CancelButton, 8159)
  	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
  
--- 67,72 ----
  	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
  
! 	CancelButton = GemRB.GetControl(CharGenWindow, 15)
! 	GemRB.SetText(CharGenWindow, CancelButton, 8159)
  	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
  
***************
*** 99,120 ****
  		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": "+str(GemRB.GetVar("Ability "+str(i))))
  
!         GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
!         GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
!         GemRB.SetEvent(CharGenWindow, NameButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
  	GemRB.SetVisible(CharGenWindow,1)
  	return
  	
  def NextPress():
!         GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("GUICG5") #name
  	return
  
  def CancelPress():
!         GemRB.UnloadWindow(CharGenWindow)
!         GemRB.SetNextScript("CharGen")
!         return
  
  def BackPress():
!         GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("CharGen7") #appearance
  	return
--- 100,121 ----
  		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": "+str(GemRB.GetVar("Ability "+str(i))))
  
! 	GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
! 	GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
! 	GemRB.SetEvent(CharGenWindow, NameButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
  	GemRB.SetVisible(CharGenWindow,1)
  	return
  	
  def NextPress():
! 	GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("GUICG5") #name
  	return
  
  def CancelPress():
! 	GemRB.UnloadWindow(CharGenWindow)
! 	GemRB.SetNextScript("CharGen")
! 	return
  
  def BackPress():
! 	GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("CharGen7") #appearance
  	return

Index: CharGen7.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/CharGen7.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CharGen7.py	19 Nov 2003 19:41:16 -0000	1.3
--- CharGen7.py	27 Mar 2004 12:14:52 -0000	1.4
***************
*** 12,16 ****
  
  	GemRB.LoadWindowPack("GUICG")
!         CharGenWindow = GemRB.LoadWindow(0)
  	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
  	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
--- 12,16 ----
  
  	GemRB.LoadWindowPack("GUICG")
! 	CharGenWindow = GemRB.LoadWindow(0)
  	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
  	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
***************
*** 52,55 ****
--- 52,56 ----
  	GemRB.SetText(CharGenWindow,AppearanceButton, 11961)
  	GemRB.SetButtonState(CharGenWindow,AppearanceButton,IE_GUI_BUTTON_ENABLED)
+ 	GemRB.SetButtonFlags(CharGenWindow,AppearanceButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
  
  	NameButton = GemRB.GetControl(CharGenWindow,7)
***************
*** 69,74 ****
  	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
  
!         CancelButton = GemRB.GetControl(CharGenWindow, 15)
!         GemRB.SetText(CharGenWindow, CancelButton, 8159)
  	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
  
--- 70,75 ----
  	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
  
! 	CancelButton = GemRB.GetControl(CharGenWindow, 15)
! 	GemRB.SetText(CharGenWindow, CancelButton, 8159)
  	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
  
***************
*** 102,123 ****
  		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": "+str(GemRB.GetVar("Ability "+str(i))))
  
!         GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
!         GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
!         GemRB.SetEvent(CharGenWindow, AppearanceButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
  	GemRB.SetVisible(CharGenWindow,1)
  	return
  	
  def NextPress():
!         GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("GUICG13") #colors
  	return
  
  def CancelPress():
!         GemRB.UnloadWindow(CharGenWindow)
!         GemRB.SetNextScript("CharGen")
!         return
  
  def BackPress():
!         GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("CharGen6") #skills
  	return
--- 103,124 ----
  		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": "+str(GemRB.GetVar("Ability "+str(i))))
  
! 	GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
! 	GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
! 	GemRB.SetEvent(CharGenWindow, AppearanceButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
  	GemRB.SetVisible(CharGenWindow,1)
  	return
  	
  def NextPress():
! 	GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("GUICG13") #colors
  	return
  
  def CancelPress():
! 	GemRB.UnloadWindow(CharGenWindow)
! 	GemRB.SetNextScript("CharGen")
! 	return
  
  def BackPress():
! 	GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("CharGen6") #skills
  	return

Index: CharGen4.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/CharGen4.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CharGen4.py	18 Nov 2003 22:28:15 -0000	1.3
--- CharGen4.py	27 Mar 2004 12:14:52 -0000	1.4
***************
*** 11,15 ****
  
  	GemRB.LoadWindowPack("GUICG")
!         CharGenWindow = GemRB.LoadWindow(0)
  	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
  	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
--- 11,15 ----
  
  	GemRB.LoadWindowPack("GUICG")
! 	CharGenWindow = GemRB.LoadWindow(0)
  	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
  	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
***************
*** 37,40 ****
--- 37,41 ----
  	GemRB.SetText(CharGenWindow,AlignmentButton, 11958)
  	GemRB.SetButtonState(CharGenWindow,AlignmentButton,IE_GUI_BUTTON_ENABLED)
+ 	GemRB.SetButtonFlags(CharGenWindow,AlignmentButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
  
  	AbilitiesButton = GemRB.GetControl(CharGenWindow,4)
***************
*** 66,71 ****
  	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
  
!         CancelButton = GemRB.GetControl(CharGenWindow, 15)
!         GemRB.SetText(CharGenWindow, CancelButton, 8159)
  	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
  
--- 67,72 ----
  	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
  
! 	CancelButton = GemRB.GetControl(CharGenWindow, 15)
! 	GemRB.SetText(CharGenWindow, CancelButton, 8159)
  	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
  
***************
*** 85,89 ****
  	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,12136, -1)
  	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
!         KitIndex = GemRB.GetVar("Class Kit")
  	if KitIndex == 0:
  		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(ClassTable,GemRB.GetVar("Class")-1,2))
--- 86,90 ----
  	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,12136, -1)
  	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
! 	KitIndex = GemRB.GetVar("Class Kit")
  	if KitIndex == 0:
  		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(ClassTable,GemRB.GetVar("Class")-1,2))
***************
*** 91,112 ****
  		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, GemRB.GetTableValue(KitTable, KitIndex,2) )
   
!         GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
!         GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
!         GemRB.SetEvent(CharGenWindow, AlignmentButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
  	GemRB.SetVisible(CharGenWindow,1)
  	return
  	
  def NextPress():
!         GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("GUICG3") #alignment
  	return
  
  def CancelPress():
!         GemRB.UnloadWindow(CharGenWindow)
!         GemRB.SetNextScript("CharGen")
!         return
  
  def BackPress():
!         GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("CharGen3") #appearance
  	return
--- 92,113 ----
  		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, GemRB.GetTableValue(KitTable, KitIndex,2) )
   
! 	GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
! 	GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
! 	GemRB.SetEvent(CharGenWindow, AlignmentButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
  	GemRB.SetVisible(CharGenWindow,1)
  	return
  	
  def NextPress():
! 	GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("GUICG3") #alignment
  	return
  
  def CancelPress():
! 	GemRB.UnloadWindow(CharGenWindow)
! 	GemRB.SetNextScript("CharGen")
! 	return
  
  def BackPress():
! 	GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("CharGen3") #appearance
  	return

Index: CharGen3.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/CharGen3.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CharGen3.py	8 Nov 2003 22:49:41 -0000	1.2
--- CharGen3.py	27 Mar 2004 12:14:52 -0000	1.3
***************
*** 12,16 ****
  
  	GemRB.LoadWindowPack("GUICG")
!         CharGenWindow = GemRB.LoadWindow(0)
  	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
  	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
--- 12,16 ----
  
  	GemRB.LoadWindowPack("GUICG")
! 	CharGenWindow = GemRB.LoadWindow(0)
  	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
  	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
***************
*** 32,35 ****
--- 32,36 ----
  	GemRB.SetText(CharGenWindow,ClassButton, 11959)
  	GemRB.SetButtonState(CharGenWindow,ClassButton,IE_GUI_BUTTON_ENABLED)
+ 	GemRB.SetButtonFlags(CharGenWindow,ClassButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
  
  	AlignmentButton = GemRB.GetControl(CharGenWindow,3)
***************
*** 65,70 ****
  	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
  
!         CancelButton = GemRB.GetControl(CharGenWindow, 15)
!         GemRB.SetText(CharGenWindow, CancelButton, 8159)
  	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
  
--- 66,71 ----
  	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
  
! 	CancelButton = GemRB.GetControl(CharGenWindow, 15)
! 	GemRB.SetText(CharGenWindow, CancelButton, 8159)
  	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
  
***************
*** 84,105 ****
  	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(RaceTable,GemRB.GetVar("Race")-1,2))
  
!         GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
!         GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
!         GemRB.SetEvent(CharGenWindow, ClassButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
  	GemRB.SetVisible(CharGenWindow,1)
  	return
  	
  def NextPress():
!         GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("GUICG2") #class
  	return
  
  def CancelPress():
!         GemRB.UnloadWindow(CharGenWindow)
!         GemRB.SetNextScript("CharGen")
!         return
  
  def BackPress():
!         GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("CharGen2") #appearance
  	return
--- 85,106 ----
  	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(RaceTable,GemRB.GetVar("Race")-1,2))
  
! 	GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
! 	GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
! 	GemRB.SetEvent(CharGenWindow, ClassButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
  	GemRB.SetVisible(CharGenWindow,1)
  	return
  	
  def NextPress():
! 	GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("GUICG2") #class
  	return
  
  def CancelPress():
! 	GemRB.UnloadWindow(CharGenWindow)
! 	GemRB.SetNextScript("CharGen")
! 	return
  
  def BackPress():
! 	GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("CharGen2") #appearance
  	return

Index: CharGen6.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/CharGen6.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CharGen6.py	23 Nov 2003 15:29:44 -0000	1.6
--- CharGen6.py	27 Mar 2004 12:14:52 -0000	1.7
***************
*** 14,18 ****
  
  	GemRB.LoadWindowPack("GUICG")
!         CharGenWindow = GemRB.LoadWindow(0)
  	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
  	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
--- 14,18 ----
  
  	GemRB.LoadWindowPack("GUICG")
! 	CharGenWindow = GemRB.LoadWindow(0)
  	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
  	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
***************
*** 50,53 ****
--- 50,54 ----
  	GemRB.SetText(CharGenWindow,SkillButton, 17372)
  	GemRB.SetButtonState(CharGenWindow,SkillButton,IE_GUI_BUTTON_ENABLED)
+ 	GemRB.SetButtonFlags(CharGenWindow,SkillButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
  
  	AppearanceButton = GemRB.GetControl(CharGenWindow,6)
***************
*** 71,76 ****
  	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
  
!         CancelButton = GemRB.GetControl(CharGenWindow, 15)
!         GemRB.SetText(CharGenWindow, CancelButton, 8159)
  	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
  
--- 72,77 ----
  	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
  
! 	CancelButton = GemRB.GetControl(CharGenWindow, 15)
! 	GemRB.SetText(CharGenWindow, CancelButton, 8159)
  	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
  
***************
*** 104,125 ****
  		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": "+str(GemRB.GetVar("Ability "+str(i))))
  
!         GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
!         GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
!         GemRB.SetEvent(CharGenWindow, SkillButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
  	GemRB.SetVisible(CharGenWindow,1)
  	return
  	
  def NextPress():
!         GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("GUICG15") #skills (haterace)
  	return
  
  def CancelPress():
!         GemRB.UnloadWindow(CharGenWindow)
!         GemRB.SetNextScript("CharGen")
!         return
  
  def BackPress():
!         GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("CharGen5") #abilities
  	return
--- 105,126 ----
  		GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": "+str(GemRB.GetVar("Ability "+str(i))))
  
! 	GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
! 	GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
! 	GemRB.SetEvent(CharGenWindow, SkillButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
  	GemRB.SetVisible(CharGenWindow,1)
  	return
  	
  def NextPress():
! 	GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("GUICG15") #skills (haterace)
  	return
  
  def CancelPress():
! 	GemRB.UnloadWindow(CharGenWindow)
! 	GemRB.SetNextScript("CharGen")
! 	return
  
  def BackPress():
! 	GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("CharGen5") #abilities
  	return

Index: CharGen5.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/CharGen5.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CharGen5.py	9 Nov 2003 20:12:17 -0000	1.3
--- CharGen5.py	27 Mar 2004 12:14:52 -0000	1.4
***************
*** 12,16 ****
  
  	GemRB.LoadWindowPack("GUICG")
!         CharGenWindow = GemRB.LoadWindow(0)
  	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
  	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
--- 12,16 ----
  
  	GemRB.LoadWindowPack("GUICG")
! 	CharGenWindow = GemRB.LoadWindow(0)
  	PortraitButton = GemRB.GetControl(CharGenWindow, 12)
  	GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
***************
*** 43,46 ****
--- 43,47 ----
  	GemRB.SetText(CharGenWindow,AbilitiesButton, 11960)
  	GemRB.SetButtonState(CharGenWindow,AbilitiesButton,IE_GUI_BUTTON_ENABLED)
+ 	GemRB.SetButtonFlags(CharGenWindow,AbilitiesButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
  
  	SkillButton = GemRB.GetControl(CharGenWindow,5)
***************
*** 68,73 ****
  	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
  
!         CancelButton = GemRB.GetControl(CharGenWindow, 15)
!         GemRB.SetText(CharGenWindow, CancelButton, 8159)
  	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
  
--- 69,74 ----
  	GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
  
! 	CancelButton = GemRB.GetControl(CharGenWindow, 15)
! 	GemRB.SetText(CharGenWindow, CancelButton, 8159)
  	GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
  
***************
*** 96,117 ****
  	v = GemRB.FindTableValue(AlignmentTable,3,GemRB.GetVar("Alignment"))
  	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(AlignmentTable,v,2))
!         GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
!         GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
!         GemRB.SetEvent(CharGenWindow, AbilitiesButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
  	GemRB.SetVisible(CharGenWindow,1)
  	return
  	
  def NextPress():
!         GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("GUICG4") #abilities
  	return
  
  def CancelPress():
!         GemRB.UnloadWindow(CharGenWindow)
!         GemRB.SetNextScript("CharGen")
!         return
  
  def BackPress():
!         GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("CharGen4") #alignment
  	return
--- 97,118 ----
  	v = GemRB.FindTableValue(AlignmentTable,3,GemRB.GetVar("Alignment"))
  	GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(AlignmentTable,v,2))
! 	GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
! 	GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
! 	GemRB.SetEvent(CharGenWindow, AbilitiesButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
  	GemRB.SetVisible(CharGenWindow,1)
  	return
  	
  def NextPress():
! 	GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("GUICG4") #abilities
  	return
  
  def CancelPress():
! 	GemRB.UnloadWindow(CharGenWindow)
! 	GemRB.SetNextScript("CharGen")
! 	return
  
  def BackPress():
! 	GemRB.UnloadWindow(CharGenWindow)
  	GemRB.SetNextScript("CharGen4") #alignment
  	return