[Gemrb-commits] gemrb/gemrb/GUIScripts/pst GUIJRNL.py,1.13,1.14

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

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

Modified Files:
	GUIJRNL.py 
Log Message:
PST: fixed journal window so it isn't overwritten by animated buttons (other screens must be fixed similarly)


Index: GUIJRNL.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/pst/GUIJRNL.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** GUIJRNL.py	20 Mar 2005 21:28:26 -0000	1.13
--- GUIJRNL.py	13 May 2005 16:34:20 -0000	1.14
***************
*** 38,41 ****
--- 38,43 ----
  BeastsWindow = None
  QuestsWindow = None
+ PortraitWindow = None
+ ActionsWindow = None
  
  # list of all assigned (0) or completed (1) quests
***************
*** 61,65 ****
  ###################################################
  def OpenJournalWindow ():
! 	global JournalWindow, StartTime
  
  	Table = GemRB.LoadTable("YEARS")
--- 63,68 ----
  ###################################################
  def OpenJournalWindow ():
! 	global JournalWindow, PortraitWindow, ActionsWindow
! 	global StartTime
  
  	Table = GemRB.LoadTable("YEARS")
***************
*** 75,80 ****
  		
  		GemRB.UnloadWindow(JournalWindow)
  		JournalWindow = None
- 		GemRB.SetVar("OtherWindow", -1)
  		
  		GemRB.UnhideGUI ()
--- 78,88 ----
  		
  		GemRB.UnloadWindow(JournalWindow)
+ 		#making the portraitwindow visible again
+ 		GemRB.SetVar ("PortraitWindow", PortraitWindow)
+ 		GemRB.SetVar ("ActionsWindow", ActionsWindow)
+ 		GemRB.SetVar ("OtherWindow", -1)
+ 		PortraitWindow = None
+ 		ActionsWindow = None
  		JournalWindow = None
  		
  		GemRB.UnhideGUI ()
***************
*** 84,88 ****
  	GemRB.LoadWindowPack ("GUIJRNL")
  	JournalWindow = GemRB.LoadWindow (0)
! 	GemRB.SetVar("OtherWindow", JournalWindow)
  
  	# Quests
--- 92,100 ----
  	GemRB.LoadWindowPack ("GUIJRNL")
  	JournalWindow = GemRB.LoadWindow (0)
! 	GemRB.SetVar ("OtherWindow", JournalWindow)
! 	PortraitWindow = GemRB.GetVar ("PortraitWindow")
! 	GemRB.SetVar ("PortraitWindow", -1)
! 	ActionsWindow = GemRB.GetVar ("ActionsWindow")
! 	GemRB.SetVar ("ActionsWindow", -1)
  
  	# Quests
***************
*** 121,125 ****
  		QuestsWindow = None
  		
! 		GemRB.SetVar("OtherWindow", JournalWindow)
  		
  		GemRB.UnhideGUI()
--- 133,137 ----
  		QuestsWindow = None
  		
! 		GemRB.SetVar ("OtherWindow", JournalWindow)
  		
  		GemRB.UnhideGUI()
***************
*** 127,131 ****
  	
  	QuestsWindow = Window = GemRB.LoadWindow (1)
! 	GemRB.SetVar("OtherWindow", Window)
  	
  	# Assigned
--- 139,143 ----
  	
  	QuestsWindow = Window = GemRB.LoadWindow (1)
! 	GemRB.SetVar ("OtherWindow", Window)
  	
  	# Assigned
***************
*** 289,293 ****
  		BeastsWindow = None
  		
! 		GemRB.SetVar("OtherWindow", JournalWindow)
  		
  		GemRB.UnhideGUI()
--- 301,305 ----
  		BeastsWindow = None
  		
! 		GemRB.SetVar ("OtherWindow", JournalWindow)
  		
  		GemRB.UnhideGUI()
***************
*** 295,299 ****
  	
  	BeastsWindow = Window = GemRB.LoadWindow (2)
! 	GemRB.SetVar("OtherWindow", BeastsWindow)
  
  	# PC
--- 307,311 ----
  	
  	BeastsWindow = Window = GemRB.LoadWindow (2)
! 	GemRB.SetVar ("OtherWindow", BeastsWindow)
  
  	# PC
***************
*** 397,401 ****
  		LogWindow = None
  		
! 		GemRB.SetVar("OtherWindow", JournalWindow)
  		
  		GemRB.UnhideGUI()
--- 409,413 ----
  		LogWindow = None
  		
! 		GemRB.SetVar ("OtherWindow", JournalWindow)
  		
  		GemRB.UnhideGUI()
***************
*** 403,407 ****
  	
  	LogWindow = Window = GemRB.LoadWindow (3)
! 	GemRB.SetVar("OtherWindow", Window)
  
  	# Back
--- 415,419 ----
  	
  	LogWindow = Window = GemRB.LoadWindow (3)
! 	GemRB.SetVar ("OtherWindow", Window)
  
  	# Back