From: <fu...@us...> - 2009-10-13 16:11:55
|
Revision: 7419 http://gemrb.svn.sourceforge.net/gemrb/?rev=7419&view=rev Author: fuzzie Date: 2009-10-13 16:11:39 +0000 (Tue, 13 Oct 2009) Log Message: ----------- some iwd GUIOPT fixes from nugrud Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd/GUIOPT.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIOPT.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIOPT.py 2009-10-12 22:03:53 UTC (rev 7418) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIOPT.py 2009-10-13 16:11:39 UTC (rev 7419) @@ -42,6 +42,7 @@ from GUICommonWindows import * ################################################### +BackgroundWindow = None GameOptionsWindow = None PortraitWindow = None OldPortraitWindow = None @@ -54,20 +55,20 @@ ################################################### def CloseOptionsWindow (): - global GameOptionsWindow, OptionsWindow, PortraitWindow + global BackgroundWindow, OptionsWindow, PortraitWindow global OldPortraitWindow, OldOptionsWindow - if GameOptionsWindow == None: + if BackgroundWindow == None: return - if GameOptionsWindow: - GameOptionsWindow.Unload () + if BackgroundWindow: + BackgroundWindow.Unload () if OptionsWindow: OptionsWindow.Unload () if PortraitWindow: PortraitWindow.Unload () - GameOptionsWindow = None + BackgroundWindow = None GemRB.SetVar ("OtherWindow", -1) GemRB.SetVisible (0,1) GemRB.UnhideGUI () @@ -79,7 +80,7 @@ def OpenOptionsWindow (): """Open main options window""" - global GameOptionsWindow, OptionsWindow, PortraitWindow + global BackgroundWindow, OptionsWindow, PortraitWindow global OldPortraitWindow, OldOptionsWindow if CloseOtherWindow(OpenOptionsWindow): @@ -90,8 +91,8 @@ GemRB.SetVisible (0,0) GemRB.LoadWindowPack ("GUIOPT", 640, 480) - GameOptionsWindow = Window = GemRB.LoadWindowObject (2) - GemRB.SetVar ("OtherWindow", GameOptionsWindow.ID) + BackgroundWindow = Window = GemRB.LoadWindowObject (2) + GemRB.SetVar ("OtherWindow", BackgroundWindow.ID) #saving the original portrait window if OldPortraitWindow == None: OldOptionsWindow = GUICommonWindows.OptionsWindow @@ -148,19 +149,17 @@ ################################################### def CloseVideoOptionsWindow (): - OpenOptionsWindow () - OpenOptionsWindow () + global GameOptionsWindow - -def OpenVideoOptionsWindow (): - """Open video options window""" - global GameOptionsWindow, HelpTextArea - if GameOptionsWindow: if GameOptionsWindow: GameOptionsWindow.Unload () GameOptionsWindow = None +def OpenVideoOptionsWindow (): + """Open video options window""" + global GameOptionsWindow, HelpTextArea + GameOptionsWindow = Window = GemRB.LoadWindowObject (6) HelpTextArea = OptHelpText ('VideoOptions', Window, 33, 18038) @@ -221,19 +220,17 @@ ################################################### def CloseAudioOptionsWindow (): - OpenOptionsWindow () - OpenOptionsWindow () + global GameOptionsWindow + if GameOptionsWindow: + if GameOptionsWindow: + GameOptionsWindow.Unload () + GameOptionsWindow = None def OpenAudioOptionsWindow (): """Open audio options window""" global GameOptionsWindow, HelpTextArea - if GameOptionsWindow: - if GameOptionsWindow: - GameOptionsWindow.Unload () - GameOptionsWindow = None - GameOptionsWindow = Window = GemRB.LoadWindowObject (7) HelpTextArea = OptHelpText ('AudioOptions', Window, 14, 18040) @@ -251,7 +248,6 @@ OptCheckbox ('CreativeEAX', Window, 26, 28, 'Environmental Audio', 1) Window.ShowModal (MODAL_SHADOW_GRAY) - def DisplayHelpAmbientVolume (): HelpTextArea.SetText (18008) @@ -276,18 +272,17 @@ ################################################### def CloseGameplayOptionsWindow (): - OpenOptionsWindow () - OpenOptionsWindow () + global GameOptionsWindow -def OpenGameplayOptionsWindow (): - """Open gameplay options window""" - global GameOptionsWindow, HelpTextArea - if GameOptionsWindow: if GameOptionsWindow: GameOptionsWindow.Unload () GameOptionsWindow = None - + +def OpenGameplayOptionsWindow (): + """Open gameplay options window""" + global GameOptionsWindow, HelpTextArea + GameOptionsWindow = Window = GemRB.LoadWindowObject (8) HelpTextArea = OptHelpText ('GameOptions', Window, 40, 18042) @@ -482,9 +477,8 @@ if GameOptionsWindow: GameOptionsWindow.Unload () GameOptionsWindow = None - OpenGameplayOptionsWindow () + OpenAudioOptionsWindow () - def OpenCharacterSoundsWindow (): """Open character sounds options window""" global GameOptionsWindow, HelpTextArea @@ -494,7 +488,6 @@ GameOptionsWindow.Unload () GameOptionsWindow = None - GameOptionsWindow = Window = GemRB.LoadWindowObject (12) HelpTextArea = OptHelpText ('CharacterSounds', Window, 16, 18041) @@ -572,7 +565,7 @@ LoadMsgWindow.Unload () LoadMsgWindow = None OptionsWindow.SetVisible (1) - GameOptionsWindow.SetVisible (1) + BackgroundWindow.SetVisible (1) PortraitWindow.SetVisible (1) return @@ -651,7 +644,7 @@ QuitMsgWindow.Unload () QuitMsgWindow = None OptionsWindow.SetVisible (1) - GameOptionsWindow.SetVisible (1) + BackgroundWindow.SetVisible (1) PortraitWindow.SetVisible (1) return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |