[Gemrb-commits] gemrb/gemrb/GUIScripts StartOpt.py,1.3,1.4 Start.py,1.1,1.2 GUIOPT8.py,1.2,1.3 GUIOPT7.py,1.2,1.3 GUIOPT6.py,1.1,1.2 GUIOPT12.py,1.1,1.2

[<bal...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts
In directory sc8-pr-cvs1:/tmp/cvs-serv23171/gemrb/GUIScripts

Modified Files:
	StartOpt.py Start.py GUIOPT8.py GUIOPT7.py GUIOPT6.py 
	GUIOPT12.py 
Log Message:
Fixed some GUI Scripts

Index: StartOpt.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/StartOpt.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StartOpt.py	21 Oct 2003 20:51:08 -0000	1.3
--- StartOpt.py	22 Oct 2003 20:19:29 -0000	1.4
***************
*** 5,24 ****
  def OnLoad():
  	global OptionsWindow
! 	GemRB.LoadWindowPack("START")
! 	OptionsWindow = GemRB.LoadWindow(0)
! 	SoundButton = GemRB.GetControl(OptionsWindow, 0)
! 	Disabled1Button = GemRB.GetControl(OptionsWindow, 3)
! 	GameButton = GemRB.GetControl(OptionsWindow, 4)
! 	GraphicButton = GemRB.GetControl(OptionsWindow, 1)
! 	Disabled2Button = GemRB.GetControl(OptionsWindow, 2)
! 	BackButton = GemRB.GetControl(OptionsWindow, 5)
! 	GemRB.SetControlStatus(OptionsWindow, Disabled1Button, 0x00000003);
! 	GemRB.SetControlStatus(OptionsWindow, Disabled2Button, 0x00000003);
  	GemRB.SetControlStatus(OptionsWindow, SoundButton, 0x00000000);
  	GemRB.SetControlStatus(OptionsWindow, GameButton, 0x00000000);
  	GemRB.SetControlStatus(OptionsWindow, GraphicButton, 0x00000000);
  	GemRB.SetControlStatus(OptionsWindow, BackButton, 0x00000000);
- 	GemRB.SetText(OptionsWindow, Disabled1Button, "")
- 	GemRB.SetText(OptionsWindow, Disabled2Button, "")
  	GemRB.SetText(OptionsWindow, SoundButton, 17164)
  	GemRB.SetText(OptionsWindow, GameButton, 17165)
--- 5,18 ----
  def OnLoad():
  	global OptionsWindow
! 	GemRB.LoadWindowPack("GUIOPT")
! 	OptionsWindow = GemRB.LoadWindow(12)
! 	SoundButton = GemRB.GetControl(OptionsWindow, 8)
! 	GameButton = GemRB.GetControl(OptionsWindow, 9)
! 	GraphicButton = GemRB.GetControl(OptionsWindow, 7)
! 	BackButton = GemRB.GetControl(OptionsWindow, 11)
  	GemRB.SetControlStatus(OptionsWindow, SoundButton, 0x00000000);
  	GemRB.SetControlStatus(OptionsWindow, GameButton, 0x00000000);
  	GemRB.SetControlStatus(OptionsWindow, GraphicButton, 0x00000000);
  	GemRB.SetControlStatus(OptionsWindow, BackButton, 0x00000000);
  	GemRB.SetText(OptionsWindow, SoundButton, 17164)
  	GemRB.SetText(OptionsWindow, GameButton, 17165)
***************
*** 29,34 ****
  	GemRB.SetEvent(OptionsWindow, GraphicButton, 0x00000000, "GraphicPress")
  	GemRB.SetEvent(OptionsWindow, BackButton, 0x00000000, "BackPress")
- 	GemRB.SetEvent(OptionsWindow, Disabled1Button, 0x00000000, "")
- 	GemRB.SetEvent(OptionsWindow, Disabled2Button, 0x00000000, "")
  	GemRB.SetVisible(OptionsWindow, 1)
  	return
--- 23,26 ----
***************
*** 36,39 ****
--- 28,32 ----
  def SoundPress():
  	global OptionsWindow
+ 	GemRB.UnloadWindow(OptionsWindow)
  	GemRB.SetNextScript("GUIOPT7")
  	return
***************
*** 41,44 ****
--- 34,38 ----
  def GamePress():
  	global OptionsWindow
+ 	GemRB.UnloadWindow(OptionsWindow)
  	GemRB.SetNextScript("GUIOPT8")
  	return
***************
*** 46,49 ****
--- 40,44 ----
  def GraphicPress():
  	global OptionsWindow
+ 	GemRB.UnloadWindow(OptionsWindow)
  	GemRB.SetNextScript("GUIOPT6")
  	return
***************
*** 51,54 ****
--- 46,50 ----
  def BackPress():
  	global OptionsWindow
+ 	GemRB.UnloadWindow(OptionsWindow)
  	GemRB.SetNextScript("Start")
  	return

Index: Start.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/Start.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Start.py	21 Oct 2003 15:12:32 -0000	1.1
--- Start.py	22 Oct 2003 20:19:29 -0000	1.2
***************
*** 13,16 ****
--- 13,17 ----
  	MoviesButton = GemRB.GetControl(StartWindow, 2)
  	DisabledButton = GemRB.GetControl(StartWindow, 5)
+ 	GemRB.CreateLabel(OptionsWindow, 0xffff0000, 0,450,640,30, "REALMS", "GemRB Ver 0.0.1", 1);
  	GemRB.SetControlStatus(StartWindow, DisabledButton, 0x00000003);
  	GemRB.SetControlStatus(StartWindow, SinglePlayerButton, 0x00000000);
***************
*** 46,49 ****
--- 47,51 ----
  def OptionsPress():
  	global StartWindow
+ 	GemRB.UnloadWindow(StartWindow)
  	GemRB.SetNextScript("StartOpt")
  	return

Index: GUIOPT8.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/GUIOPT8.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GUIOPT8.py	21 Oct 2003 21:29:52 -0000	1.2
--- GUIOPT8.py	22 Oct 2003 20:19:29 -0000	1.3
***************
*** 109,112 ****
--- 109,113 ----
  	global GamePlayWindow, TextAreaControl
  	GemRB.SetVisible(GamePlayWindow, 0)
+ 	GemRB.UnloadWindow(GamePlayWindow)
  	GemRB.SetNextScript("StartOpt")
  	return
***************
*** 115,118 ****
--- 116,120 ----
  	global GamePlayWindow, TextAreaControl
  	GemRB.SetVisible(GamePlayWindow, 0)
+ 	GemRB.UnloadWindow(GamePlayWindow)
  	GemRB.SetNextScript("StartOpt")
  	return

Index: GUIOPT7.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/GUIOPT7.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GUIOPT7.py	21 Oct 2003 20:50:42 -0000	1.2
--- GUIOPT7.py	22 Oct 2003 20:19:29 -0000	1.3
***************
*** 66,69 ****
--- 66,70 ----
  def CharacterSoundPress():
  	global SoundWindow, TextAreaControl
+ 	GemRB.UnloadWindow(SoundWindow)
  	GemRB.SetNextScript("GUIOPT12")
  	return
***************
*** 71,75 ****
  def OkPress():
  	global SoundWindow, TextAreaControl
! 	GemRB.SetVisible(SoundWindow, 0)
  	GemRB.SetNextScript("StartOpt")
  	return
--- 72,76 ----
  def OkPress():
  	global SoundWindow, TextAreaControl
! 	GemRB.UnloadWindow(SoundWindow)
  	GemRB.SetNextScript("StartOpt")
  	return
***************
*** 77,81 ****
  def CancelPress():
  	global SoundWindow, TextAreaControl
! 	GemRB.SetVisible(SoundWindow, 0)
  	GemRB.SetNextScript("StartOpt")
  	return
--- 78,82 ----
  def CancelPress():
  	global SoundWindow, TextAreaControl
! 	GemRB.UnloadWindow(SoundWindow)
  	GemRB.SetNextScript("StartOpt")
  	return

Index: GUIOPT6.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/GUIOPT6.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GUIOPT6.py	21 Oct 2003 15:12:32 -0000	1.1
--- GUIOPT6.py	22 Oct 2003 20:19:29 -0000	1.2
***************
*** 77,81 ****
  def OkPress():
  	global OptionsWindow, TextAreaControl
! 	GemRB.SetVisible(OptionsWindow, 0)
  	GemRB.SetNextScript("StartOpt")
  	return
--- 77,81 ----
  def OkPress():
  	global OptionsWindow, TextAreaControl
! 	GemRB.UnloadWindow(OptionsWindow)
  	GemRB.SetNextScript("StartOpt")
  	return
***************
*** 83,87 ****
  def CancelPress():
  	global OptionsWindow, TextAreaControl
! 	GemRB.SetVisible(OptionsWindow, 0)
  	GemRB.SetNextScript("StartOpt")
  	return
--- 83,87 ----
  def CancelPress():
  	global OptionsWindow, TextAreaControl
! 	GemRB.UnloadWindow(OptionsWindow)
  	GemRB.SetNextScript("StartOpt")
  	return

Index: GUIOPT12.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/GUIOPT12.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GUIOPT12.py	21 Oct 2003 20:51:38 -0000	1.1
--- GUIOPT12.py	22 Oct 2003 20:19:29 -0000	1.2
***************
*** 56,60 ****
  def OkPress():
  	global SoundWindow, TextAreaControl
! 	GemRB.SetVisible(SoundWindow, 0)
  	GemRB.SetNextScript("GUIOPT7")
  	return
--- 56,60 ----
  def OkPress():
  	global SoundWindow, TextAreaControl
! 	GemRB.UnloadWindow(SoundWindow)
  	GemRB.SetNextScript("GUIOPT7")
  	return
***************
*** 62,66 ****
  def CancelPress():
  	global SoundWindow, TextAreaControl
! 	GemRB.SetVisible(SoundWindow, 0)
  	GemRB.SetNextScript("GUIOPT7")
  	return
--- 62,66 ----
  def CancelPress():
  	global SoundWindow, TextAreaControl
! 	GemRB.UnloadWindow(SoundWindow)
  	GemRB.SetNextScript("GUIOPT7")
  	return