From: <ave...@us...> - 2009-02-07 13:23:15
|
Revision: 5664 http://gemrb.svn.sourceforge.net/gemrb/?rev=5664&view=rev Author: avenger_teambg Date: 2009-02-07 13:23:11 +0000 (Sat, 07 Feb 2009) Log Message: ----------- fixed MoveText Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/how/MessageWindow.py Modified: gemrb/trunk/gemrb/GUIScripts/how/MessageWindow.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/MessageWindow.py 2009-02-07 13:22:31 UTC (rev 5663) +++ gemrb/trunk/gemrb/GUIScripts/how/MessageWindow.py 2009-02-07 13:23:11 UTC (rev 5664) @@ -47,61 +47,61 @@ def OnLoad(): global PortraitWindow, OptionsWindow - GemRB.GameSetPartySize(PARTY_SIZE) - GemRB.GameSetProtagonistMode(2) - GemRB.LoadWindowPack(GetWindowPack()) + GemRB.GameSetPartySize (PARTY_SIZE) + GemRB.GameSetProtagonistMode (2) + GemRB.LoadWindowPack (GetWindowPack()) GUICommonWindows.PortraitWindow = None GUICommonWindows.ActionsWindow = None GUICommonWindows.OptionsWindow = None #this is different in IWD (0) and HoW (25) - OptionsWindow = GemRB.LoadWindowObject(25) + OptionsWindow = GemRB.LoadWindowObject (25) SetupMenuWindowControls (OptionsWindow, 1, "ReturnToGame") - PortraitWindow = OpenPortraitWindow(1) + PortraitWindow = OpenPortraitWindow (1) - ActionsWindow = GemRB.LoadWindowObject(3) + ActionsWindow = GemRB.LoadWindowObject (3) OpenActionsWindowControls (ActionsWindow) - GemRB.SetVar("PortraitWindow", PortraitWindow.ID) - GemRB.SetVar("ActionsWindow", ActionsWindow.ID) - GemRB.SetVar("OptionsWindow", OptionsWindow.ID) - GemRB.SetVar("TopWindow", -1) - GemRB.SetVar("OtherWindow", -1) - GemRB.SetVar("FloatWindow", -1) - GemRB.SetVar("PortraitPosition", 2) #Right - GemRB.SetVar("ActionsPosition", 4) #BottomAdded - GemRB.SetVar("OptionsPosition", 0) #Left - GemRB.SetVar("MessagePosition", 4) #BottomAdded - GemRB.SetVar("OtherPosition", 5) #Inactivating - GemRB.SetVar("TopPosition", 5) #Inactivating + GemRB.SetVar ("PortraitWindow", PortraitWindow.ID) + GemRB.SetVar ("ActionsWindow", ActionsWindow.ID) + GemRB.SetVar ("OptionsWindow", OptionsWindow.ID) + GemRB.SetVar ("TopWindow", -1) + GemRB.SetVar ("OtherWindow", -1) + GemRB.SetVar ("FloatWindow", -1) + GemRB.SetVar ("PortraitPosition", 2) #Right + GemRB.SetVar ("ActionsPosition", 4) #BottomAdded + GemRB.SetVar ("OptionsPosition", 0) #Left + GemRB.SetVar ("MessagePosition", 4) #BottomAdded + GemRB.SetVar ("OtherPosition", 5) #Inactivating + GemRB.SetVar ("TopPosition", 5) #Inactivating - UpdateControlStatus() + UpdateControlStatus () -def OnIncreaseSize(): - GSFlags = GemRB.GetMessageWindowSize() +def OnIncreaseSize (): + GSFlags = GemRB.GetMessageWindowSize () Expand = GSFlags&GS_DIALOGMASK GSFlags = GSFlags-Expand if Expand>2: return Expand = (Expand + 1)*2 - GemRB.GameSetScreenFlags(Expand + GSFlags, OP_SET) + GemRB.GameSetScreenFlags (Expand + GSFlags, OP_SET) -def OnDecreaseSize(): - GSFlags = GemRB.GetMessageWindowSize() +def OnDecreaseSize (): + GSFlags = GemRB.GetMessageWindowSize () Expand = GSFlags&GS_DIALOGMASK GSFlags = GSFlags-Expand if Expand<2: return Expand = Expand/2 - 1 # 6->2, 2->0 - GemRB.GameSetScreenFlags(Expand + GSFlags, OP_SET) + GemRB.GameSetScreenFlags (Expand + GSFlags, OP_SET) -def UpdateControlStatus(): +def UpdateControlStatus (): global MessageWindow, ExpandButton, ContractButton TMessageWindow = 0 TMessageTA = 0 - GSFlags = GemRB.GetMessageWindowSize() + GSFlags = GemRB.GetMessageWindowSize () Expand = GSFlags&GS_DIALOGMASK Override = GSFlags&GS_DIALOG GSFlags = GSFlags-Expand @@ -109,45 +109,45 @@ if Override: Expand = GS_LARGEDIALOG - MessageWindow = GemRB.GetVar("MessageWindow") + MessageWindow = GemRB.GetVar ("MessageWindow") - GemRB.LoadWindowPack(GetWindowPack()) + GemRB.LoadWindowPack (GetWindowPack()) if Expand == GS_MEDIUMDIALOG: - TMessageWindow = GemRB.LoadWindowObject(12) - TMessageTA = TMessageWindow.GetControl(1) - ExpandButton = TMessageWindow.GetControl(0) - ExpandButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "OnIncreaseSize") - ContractButton = TMessageWindow.GetControl(3) - ContractButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "OnDecreaseSize") + TMessageWindow = GemRB.LoadWindowObject (12) + TMessageTA = TMessageWindow.GetControl (1) + ExpandButton = TMessageWindow.GetControl (0) + ExpandButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnIncreaseSize") + ContractButton = TMessageWindow.GetControl (3) + ContractButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnDecreaseSize") elif Expand == GS_LARGEDIALOG: - TMessageWindow = GemRB.LoadWindowObject(7) - TMessageTA = TMessageWindow.GetControl(1) - ContractButton = TMessageWindow.GetControl(0) - ContractButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "OnDecreaseSize") + TMessageWindow = GemRB.LoadWindowObject (7) + TMessageTA = TMessageWindow.GetControl (1) + ContractButton = TMessageWindow.GetControl (0) + ContractButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnDecreaseSize") else: - TMessageWindow = GemRB.LoadWindowObject(4) - TMessageTA = TMessageWindow.GetControl(3) - ExpandButton = TMessageWindow.GetControl(2) - ExpandButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "OnIncreaseSize") + TMessageWindow = GemRB.LoadWindowObject (4) + TMessageTA = TMessageWindow.GetControl (3) + ExpandButton = TMessageWindow.GetControl (2) + ExpandButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnIncreaseSize") - TMessageTA.SetFlags(IE_GUI_TEXTAREA_AUTOSCROLL) - TMessageTA.SetHistory(100) + TMessageTA.SetFlags (IE_GUI_TEXTAREA_AUTOSCROLL) + TMessageTA.SetHistory (100) - hideflag = GemRB.HideGUI() - MessageTA = GTextArea(MessageWindow,GemRB.GetVar("MessageTextArea")) + hideflag = GemRB.HideGUI () + MessageTA = GTextArea (MessageWindow,GemRB.GetVar ("MessageTextArea")) if MessageWindow>0 and MessageWindow!=TMessageWindow.ID: - MessageTA.MoveText(TMessageWindow, TMessageTA) - GemRB.UnloadWindow(MessageWindow) + MessageTA.MoveText (TMessageTA) + GemRB.UnloadWindow (MessageWindow) - GemRB.SetVar("MessageWindow", TMessageWindow.ID) - GemRB.SetVar("MessageTextArea", TMessageTA.ID) + GemRB.SetVar ("MessageWindow", TMessageWindow.ID) + GemRB.SetVar ("MessageTextArea", TMessageTA.ID) if Override: TMessageTA.SetStatus (IE_GUI_CONTROL_FOCUSED) else: GemRB.SetControlStatus (0,0,IE_GUI_CONTROL_FOCUSED) if hideflag: - GemRB.UnhideGUI() + GemRB.UnhideGUI () This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |