Menu
▾
▴
[Gemrb-commits] gemrb: branch master updated. e8dc2c6f7871b1bb2f0d7c9e17d820b23c36b2a8
|
From: Jaka K. <lyn...@us...> - 2010-06-24 11:40:23
|
gemrb: Infinity Engine emulator
The branch master has been updated
via e8dc2c6f7871b1bb2f0d7c9e17d820b23c36b2a8 (commit)
via 6c952652b5f5d098dd65de28ef7b7b50c315df38 (commit)
Summary of changes:
gemrb/GUIScripts/GUICommon.py | 6 +-
gemrb/GUIScripts/pst/FloatMenuWindow.py | 40 +++++-----
gemrb/GUIScripts/pst/GUICommonWindows.py | 76 ++++++++++-------
gemrb/GUIScripts/pst/GUIINV.py | 72 ++++++++--------
gemrb/GUIScripts/pst/GUIJRNL.py | 42 +++++-----
gemrb/GUIScripts/pst/GUILOAD.py | 18 ++--
gemrb/GUIScripts/pst/GUIMA.py | 22 +++---
gemrb/GUIScripts/pst/GUIMG.py | 32 ++++----
gemrb/GUIScripts/pst/GUIOPT.py | 134 +++++++++++++++---------------
gemrb/GUIScripts/pst/GUIPR.py | 32 ++++----
gemrb/GUIScripts/pst/GUIREC.py | 85 +++++++++----------
gemrb/GUIScripts/pst/GUISAVE.py | 31 ++++----
gemrb/GUIScripts/pst/GUISTORE.py | 46 +++++------
gemrb/GUIScripts/pst/GUIWORLD.py | 67 +++++++--------
gemrb/GUIScripts/pst/LoadScreen.py | 2 +-
gemrb/GUIScripts/pst/MessageWindow.py | 45 ++++-------
gemrb/GUIScripts/pst/NewLife.py | 83 +++++++++---------
gemrb/GUIScripts/pst/QuitGame.py | 8 +-
gemrb/GUIScripts/pst/Start.py | 12 ++--
gemrb/core/GameControl.cpp | 2 +-
20 files changed, 426 insertions(+), 429 deletions(-)
from 941487de7be740d7495d66d8c11ae958b4d957e4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=e8dc2c6f7871b1bb2f0d7c9e17d820b23c36b2a8
commit e8dc2c6f7871b1bb2f0d7c9e17d820b23c36b2a8
Author: Jaka Kranjc <lyn...@us...>
Date: Thu Jun 24 13:39:02 2010 +0200
call the pst version of OpenFloatMenuWindow from GUICommon, so all can be
accessed from the same module
diff --git a/gemrb/GUIScripts/GUICommon.py b/gemrb/GUIScripts/GUICommon.py
index d020023..e9b9b10 100644
--- a/gemrb/GUIScripts/GUICommon.py
+++ b/gemrb/GUIScripts/GUICommon.py
@@ -89,7 +89,11 @@ def SelectFormation ():
return
def OpenFloatMenuWindow ():
- GemRB.GameControlSetTargetMode (TARGET_MODE_NONE)
+ if GameIsPST():
+ import FloatMenuWindow
+ FloatMenuWindow.OpenFloatMenuWindow()
+ else:
+ GemRB.GameControlSetTargetMode (TARGET_MODE_NONE)
def GetActorPaperDoll (actor):
anim_id = GemRB.GetPlayerStat (actor, IE_ANIMATION_ID)
diff --git a/gemrb/core/GameControl.cpp b/gemrb/core/GameControl.cpp
index d1be30a..37b8f7c 100644
--- a/gemrb/core/GameControl.cpp
+++ b/gemrb/core/GameControl.cpp
@@ -1755,7 +1755,7 @@ void GameControl::OnMouseUp(unsigned short x, unsigned short y, unsigned short B
}
core->GetDictionary()->SetAt( "MenuX", x );
core->GetDictionary()->SetAt( "MenuY", y );
- core->GetGUIScriptEngine()->RunFunction( "OpenFloatMenuWindow" );
+ core->GetGUIScriptEngine()->RunFunction( "GUICommon", "OpenFloatMenuWindow" );
return;
}
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=6c952652b5f5d098dd65de28ef7b7b50c315df38
commit 6c952652b5f5d098dd65de28ef7b7b50c315df38
Author: Jaka Kranjc <lyn...@us...>
Date: Thu Jun 24 11:23:33 2010 +0200
pst: clean up imports and switch to using direct python fallbacks
diff --git a/gemrb/GUIScripts/pst/FloatMenuWindow.py b/gemrb/GUIScripts/pst/FloatMenuWindow.py
index 331c2f7..57cd766 100644
--- a/gemrb/GUIScripts/pst/FloatMenuWindow.py
+++ b/gemrb/GUIScripts/pst/FloatMenuWindow.py
@@ -22,9 +22,9 @@
###################################################
import GemRB
+import GUICommon
+import GUICommonWindows
from GUIDefines import *
-from GUICommonWindows import GetActorPortrait, SetSelectionChangeMultiHandler
-from GUICommon import ClassSkillsTable
from ie_stats import *
FloatMenuWindow = None
@@ -72,7 +72,7 @@ def OpenFloatMenuWindow ():
#FIXME: UnpauseGameTimer
GemRB.GamePause (False, 0)
GemRB.SetVar ("FloatWindow", -1)
- SetSelectionChangeMultiHandler (None)
+ GUICommonWindows.SetSelectionChangeMultiHandler (None)
GemRB.UnhideGUI ()
if float_menu_selected==None:
@@ -108,54 +108,54 @@ def OpenFloatMenuWindow ():
# portrait button
Button = Window.GetControl (0)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "FloatMenuSelectNextPC")
- Button.SetEventByName (IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenFloatMenuWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, FloatMenuSelectNextPC)
+ Button.SetEvent (IE_GUI_BUTTON_ON_RIGHT_PRESS, GUICommon.OpenFloatMenuWindow)
# Initiate Dialogue
Button = Window.GetControl (1)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "FloatMenuSelectDialog")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, FloatMenuSelectDialog)
Button.SetTooltip (8191)
# Attack/Select Weapon
Button = Window.GetControl (2)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "FloatMenuSelectWeapons")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, FloatMenuSelectWeapons)
Button.SetTooltip (8192)
# Cast spell
Button = Window.GetControl (3)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "FloatMenuSelectSpells")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, FloatMenuSelectSpells)
Button.SetTooltip (8193)
# Use Item
Button = Window.GetControl (4)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "FloatMenuSelectItems")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, FloatMenuSelectItems)
Button.SetTooltip (8194)
# Use Special Ability
Button = Window.GetControl (5)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "FloatMenuSelectAbilities")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, FloatMenuSelectAbilities)
Button.SetTooltip (8195)
# Menu Anchors/Handles
Button = Window.GetControl (11)
Button.SetTooltip (8199)
Button.SetFlags (IE_GUI_BUTTON_DRAGGABLE, OP_OR)
- Button.SetEventByName (IE_GUI_BUTTON_ON_DRAG, "FloatMenuDrag")
+ Button.SetEvent (IE_GUI_BUTTON_ON_DRAG, FloatMenuDrag)
Button = Window.GetControl (12)
Button.SetTooltip (8199)
Button.SetFlags (IE_GUI_BUTTON_DRAGGABLE, OP_OR)
- Button.SetEventByName (IE_GUI_BUTTON_ON_DRAG, "FloatMenuDrag")
+ Button.SetEvent (IE_GUI_BUTTON_ON_DRAG, FloatMenuDrag)
# Rotate Items left (to begin)
Button = Window.GetControl (13)
Button.SetTooltip (8197)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "FloatMenuPreviousItem")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, FloatMenuPreviousItem)
# Rotate Items right (to end)
Button = Window.GetControl (14)
Button.SetTooltip (8198)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "FloatMenuNextItem")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, FloatMenuNextItem)
# 6 - 10 - items/spells/other
for i in range (6, 11):
@@ -203,7 +203,7 @@ def OpenFloatMenuWindow ():
float_menu_index = 0
- SetSelectionChangeMultiHandler (FloatMenuSelectAnotherPC)
+ GUICommonWindows.SetSelectionChangeMultiHandler (FloatMenuSelectAnotherPC)
UpdateFloatMenuWindow ()
GemRB.UnhideGUI ()
@@ -215,7 +215,7 @@ def UpdateFloatMenuWindow ():
pc = GemRB.GameGetFirstSelectedPC ()
Button = Window.GetControl (0)
- Button.SetSprites (GetActorPortrait (pc, 'FMENU'), 0, 0, 1, 2, 3)
+ Button.SetSprites (GUICommonWindows.GetActorPortrait (pc, 'FMENU'), 0, 0, 1, 2, 3)
Button = Window.GetControl (13)
Button.SetState (IE_GUI_BUTTON_LOCKED)
Button = Window.GetControl (14)
@@ -303,7 +303,7 @@ def RefreshSpellList(pc, innate):
if innate:
type = IE_SPELL_TYPE_INNATE
else:
- if (ClassSkillsTable.GetValue (GemRB.GetPlayerStat( pc, IE_CLASS), 1)=="*"):
+ if (GUICommon.ClassSkillsTable.GetValue (GemRB.GetPlayerStat( pc, IE_CLASS), 1)=="*"):
type = IE_SPELL_TYPE_WIZARD
else:
type = IE_SPELL_TYPE_PRIEST
@@ -364,7 +364,7 @@ def UpdateFloatMenuItem (pc, i, weapons):
else:
Button.SetTooltip (item['ItemNameIdentified'])
Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "SelectItem")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, SelectItem)
Button.SetVarAssoc ('ItemButton', i)
return
@@ -403,7 +403,7 @@ def UpdateFloatMenuSpell (pc, i):
spell = GemRB.GetSpell (SpellResRef)
Button.SetTooltip (spell['SpellName'])
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "SelectItem")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, SelectItem)
Button.SetVarAssoc ('ItemButton', i)
Button.SetState (IE_GUI_BUTTON_ENABLED)
else:
@@ -416,7 +416,7 @@ def UpdateFloatMenuSpell (pc, i):
def FloatMenuSelectNextPC ():
sel = GemRB.GameGetFirstSelectedPC ()
if sel == 0:
- OpenFloatMenuWindow ()
+ GUICommon.OpenFloatMenuWindow ()
return
GemRB.GameSelectPC (sel % GemRB.GetPartySize () + 1, 1, SELECT_REPLACE)
diff --git a/gemrb/GUIScripts/pst/GUICommonWindows.py b/gemrb/GUIScripts/pst/GUICommonWindows.py
index 322bf41..6daf1de 100644
--- a/gemrb/GUIScripts/pst/GUICommonWindows.py
+++ b/gemrb/GUIScripts/pst/GUICommonWindows.py
@@ -17,17 +17,23 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
-
# GUICommonWindows.py - functions to open common windows in lower part of the screen
import GemRB
from GUIDefines import *
from ie_stats import *
from ie_action import *
-from GUIClasses import GWindow
-from GUICommon import GearsClicked, RestPress, OpenFloatMenuWindow
-from LUCommon import CanLevelUp
+import GUIClasses
import GUICommon
+import LUCommon
+
+import GUIJRNL
+import GUIMA
+import GUIMG
+import GUIINV
+import GUIOPT
+import GUIPR
+import GUIREC
FRAME_PC_SELECTED = 0
FRAME_PC_TARGET = 1
@@ -69,17 +75,17 @@ def OpenCommonWindows ():
# Can't Reach ???
Button = Window.GetControl (0)
Button.SetState (IE_GUI_BUTTON_DISABLED)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "CntReachPress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, None) #TODO: CntReachPress
# AI
Button = Window.GetControl (4)
Button.SetState (IE_GUI_BUTTON_DISABLED)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "AIPress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, AIPress)
# Message popup
Button = Window.GetControl (10)
Button.SetState (IE_GUI_BUTTON_DISABLED)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "TxtePress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, TxtePress)
SetupMenuWindowControls (Window)
@@ -113,52 +119,52 @@ def SetupMenuWindowControls (Window):
# Inventory
Button = Window.GetControl (1)
Button.SetTooltip (41601)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenInventoryWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, GUIINV.OpenInventoryWindow)
# Map
Button = Window.GetControl (2)
Button.SetTooltip (41625)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenMapWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, GUIMA.OpenMapWindow)
# Mage
Button = Window.GetControl (3)
Button.SetTooltip (41624)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenMageWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, GUIMG.OpenMageWindow)
# Stats
Button = Window.GetControl (5)
Button.SetTooltip (4707)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenRecordsWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, GUIREC.OpenRecordsWindow)
# Journal
Button = Window.GetControl (6)
Button.SetTooltip (41623)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenJournalWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, GUIJRNL.OpenJournalWindow)
# Priest
Button = Window.GetControl (7)
Button.SetTooltip (4709)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenPriestWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, GUIPR.OpenPriestWindow)
# Options
Button = Window.GetControl (8)
Button.SetTooltip (41626)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenOptionsWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, GUIOPT.OpenOptionsWindow)
# Rest
Button = Window.GetControl (9)
Button.SetTooltip (41628)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "RestPress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, GUICommon.RestPress)
# AI
Button = Window.GetControl (4)
Button.SetTooltip (41631) # or 41646 Activate ...
- #Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenFloatMenuWindow")
+ #Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, GUICommon.OpenFloatMenuWindow)
# (Un)Lock view on character
Button = Window.GetControl (0)
Button.SetTooltip (41647) # or 41648 Unlock ...
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OnLockViewPress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OnLockViewPress)
# Message popup
Button = Window.GetControl (10)
@@ -180,8 +186,8 @@ def SetupActionsWindowControls (Window):
Button = Window.GetControl (0)
Button.SetAnimation ("WMTIME")
Button.SetFlags (IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_ANIMATED, OP_SET)
- Button.SetEventByName(IE_GUI_BUTTON_ON_PRESS, "GearsClicked")
- Button.SetEventByName(IE_GUI_MOUSE_ENTER_BUTTON, "UpdateClock")
+ Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, GUICommon.GearsClicked)
+ Button.SetEvent(IE_GUI_MOUSE_ENTER_BUTTON, UpdateClock)
# 41627 - Return to the Game World
Button = Window.GetControl (2)
@@ -283,19 +289,19 @@ def OpenPortraitWindow (needcontrols):
for i in range (PARTY_SIZE):
Button = Window.GetControl (i)
Button.SetVarAssoc ('PressedPortrait', i)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "PortraitButtonOnPress")
- Button.SetEventByName (IE_GUI_BUTTON_ON_SHIFT_PRESS, "PortraitButtonOnShiftPress")
- Button.SetEventByName (IE_GUI_BUTTON_ON_DRAG_DROP, "OnDropItemToPC")
- Button.SetEventByName (IE_GUI_BUTTON_ON_DRAG, "PortraitButtonOnDrag")
- Button.SetEventByName (IE_GUI_MOUSE_ENTER_BUTTON, "PortraitButtonOnMouseEnter")
- Button.SetEventByName (IE_GUI_MOUSE_LEAVE_BUTTON, "PortraitButtonOnMouseLeave")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, PortraitButtonOnPress)
+ Button.SetEvent (IE_GUI_BUTTON_ON_SHIFT_PRESS, PortraitButtonOnShiftPress)
+ Button.SetEvent (IE_GUI_BUTTON_ON_DRAG_DROP, GUIINV.OnDropItemToPC)
+ Button.SetEvent (IE_GUI_BUTTON_ON_DRAG, PortraitButtonOnDrag)
+ Button.SetEvent (IE_GUI_MOUSE_ENTER_BUTTON, PortraitButtonOnMouseEnter)
+ Button.SetEvent (IE_GUI_MOUSE_LEAVE_BUTTON, PortraitButtonOnMouseLeave)
Button.SetBorder (FRAME_PC_SELECTED, 1, 1, 2, 2, 0, 255, 0, 255)
Button.SetBorder (FRAME_PC_TARGET, 3, 3, 4, 4, 255, 255, 0, 255)
ButtonHP = Window.GetControl (6 + i)
ButtonHP.SetVarAssoc ('PressedPortraitHP', i)
- ButtonHP.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "PortraitButtonHPOnPress")
+ ButtonHP.SetEvent (IE_GUI_BUTTON_ON_PRESS, PortraitButtonHPOnPress)
portrait_hp_numeric[i] = 0
@@ -471,9 +477,9 @@ def PortraitButtonOnMouseLeave ():
def DisableAnimatedWindows ():
global ActionsWindow, OptionsWindow
GemRB.SetVar ("PortraitWindow", -1)
- ActionsWindow = GWindow( GemRB.GetVar ("ActionsWindow") )
+ ActionsWindow = GUIClasses.GWindow( GemRB.GetVar ("ActionsWindow") )
GemRB.SetVar ("ActionsWindow", -1)
- OptionsWindow = GWindow( GemRB.GetVar ("OptionsWindow") )
+ OptionsWindow = GUIClasses.GWindow( GemRB.GetVar ("OptionsWindow") )
GemRB.SetVar ("OptionsWindow", -1)
GemRB.GamePause (1,1)
@@ -505,10 +511,10 @@ def SetItemButton (Window, Button, Slot, PressHandler, RightPressHandler):
#Button.SetFlags (IE_GUI_BUTTON_PICTURE, OP_OR)
#Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, PressHandler)
- Button.SetEventByName (IE_GUI_BUTTON_ON_RIGHT_PRESS, RightPressHandler)
- #Button.SetEventByName (IE_GUI_BUTTON_ON_SHIFT_PRESS, ShiftPressHandler)
- #Button.SetEventByName (IE_GUI_BUTTON_ON_DRAG_DROP, DragDropHandler)
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, PressHandler)
+ Button.SetEvent (IE_GUI_BUTTON_ON_RIGHT_PRESS, RightPressHandler)
+ #Button.SetEvent (IE_GUI_BUTTON_ON_SHIFT_PRESS, ShiftPressHandler)
+ #Button.SetEvent (IE_GUI_BUTTON_ON_DRAG_DROP, DragDropHandler)
else:
#Button.SetVarAssoc ("LeftIndex", -1)
@@ -589,6 +595,10 @@ def UpdateClock():
SetPSTGamedaysAndHourToken ()
Button.SetTooltip (65027)
+def UpdateActionsWindow():
+ # pst doesn't need this, but it is one of the core callbacks, so it has to be defined
+ return
+
def ActionStopPressed ():
for i in range (PARTY_SIZE):
if GemRB.GameIsPCSelected (i + 1):
@@ -608,4 +618,4 @@ def ActionThievingPressed ():
GemRB.GameControlSetTargetMode (TARGET_MODE_PICK, GA_NO_DEAD|GA_NO_SELF|GA_NO_ENEMY|GA_NO_HIDDEN)
def CheckLevelUp(pc):
- GemRB.SetVar ("CheckLevelUp"+str(pc), CanLevelUp (pc))
+ GemRB.SetVar ("CheckLevelUp"+str(pc), LUCommon.CanLevelUp (pc))
diff --git a/gemrb/GUIScripts/pst/GUIINV.py b/gemrb/GUIScripts/pst/GUIINV.py
index 92a7add..eb44e08 100644
--- a/gemrb/GUIScripts/pst/GUIINV.py
+++ b/gemrb/GUIScripts/pst/GUIINV.py
@@ -26,8 +26,8 @@ from GUIDefines import *
from ie_stats import *
from ie_slots import *
import GemRB
-from GUICommon import CloseOtherWindow, ClassTable, SetEncumbranceLabels
-from GUICommonWindows import GetActorPortrait, SetSelectionChangeHandler
+import GUICommon
+import GUICommonWindows
InventoryWindow = None
@@ -64,14 +64,14 @@ def OpenInventoryWindow ():
AvSlotsTable = GemRB.LoadTable ('avslots')
- if CloseOtherWindow (OpenInventoryWindow):
+ if GUICommon.CloseOtherWindow (OpenInventoryWindow):
GemRB.HideGUI ()
if InventoryWindow:
InventoryWindow.Unload ()
InventoryWindow = None
GemRB.SetVar ("OtherWindow", -1)
GemRB.SetVar ("MessageLabel", -1)
- SetSelectionChangeHandler (None)
+ GUICommonWindows.SetSelectionChangeHandler (None)
GemRB.UnhideGUI ()
return
@@ -89,8 +89,8 @@ def OpenInventoryWindow ():
Button.SetVarAssoc ("ItemButton", i)
Button.SetBorder (0,0,0,0,0,128,128,255,64,0,1)
Button.SetBorder (1,0,0,0,0,255,128,128,64,0,1)
- Button.SetEventByName (IE_GUI_MOUSE_ENTER_BUTTON, "MouseEnterSlot")
- Button.SetEventByName (IE_GUI_MOUSE_LEAVE_BUTTON, "MouseLeaveSlot")
+ Button.SetEvent (IE_GUI_MOUSE_ENTER_BUTTON, MouseEnterSlot)
+ Button.SetEvent (IE_GUI_MOUSE_LEAVE_BUTTON, MouseLeaveSlot)
# Ground Item
for i in range (10):
@@ -100,11 +100,11 @@ def OpenInventoryWindow ():
Button.SetFont ("NUMBER2")
Button.SetBorder (0,0,0,0,0,128,128,255,64,0,1)
Button.SetBorder (1,0,0,0,0,255,128,128,64,0,1)
- Button.SetEventByName (IE_GUI_MOUSE_ENTER_BUTTON, "MouseEnterGround")
- Button.SetEventByName (IE_GUI_MOUSE_LEAVE_BUTTON, "MouseLeaveGround")
+ Button.SetEvent (IE_GUI_MOUSE_ENTER_BUTTON, MouseEnterGround)
+ Button.SetEvent (IE_GUI_MOUSE_LEAVE_BUTTON, MouseLeaveGround)
ScrollBar = Window.GetControl (45)
- ScrollBar.SetEventByName (IE_GUI_SCROLLBAR_ON_CHANGE, "RefreshInventoryWindow")
+ ScrollBar.SetEvent (IE_GUI_SCROLLBAR_ON_CHANGE, RefreshInventoryWindow)
for i in range (57, 64):
Label = Window.GetControl (0x10000000 + i)
@@ -114,7 +114,7 @@ def OpenInventoryWindow ():
Button = Window.GetControl (44)
Button.SetState (IE_GUI_BUTTON_LOCKED)
Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE | IE_GUI_BUTTON_PICTURE, OP_SET)
- Button.SetEventByName (IE_GUI_BUTTON_ON_DRAG_DROP, "OnAutoEquip")
+ Button.SetEvent (IE_GUI_BUTTON_ON_DRAG_DROP, OnAutoEquip)
# encumbrance
Button = Window.GetControl (46)
@@ -139,7 +139,7 @@ def OpenInventoryWindow ():
Label.SetTextColor(255, 255, 255)
Label.SetText ("")
GemRB.SetVar ("TopIndex", 0)
- SetSelectionChangeHandler (UpdateInventoryWindow)
+ GUICommonWindows.SetSelectionChangeHandler (UpdateInventoryWindow)
UpdateInventoryWindow ()
GemRB.UnhideGUI()
@@ -151,7 +151,7 @@ def UpdateInventoryWindow ():
Window = InventoryWindow
- GemRB.RunEventHandler("UpdateAnimation")
+ GUICommonWindows.UpdateAnimation ()
pc = GemRB.GameGetSelectedPCSingle ()
@@ -185,9 +185,9 @@ def RefreshInventoryWindow ():
# portrait
Button = Window.GetControl (44)
- Button.SetPicture (GetActorPortrait (pc, 'INVENTORY'))
+ Button.SetPicture (GUICommonWindows.GetActorPortrait (pc, 'INVENTORY'))
- SetEncumbranceLabels (Window, 46, None, pc)
+ GUICommon.SetEncumbranceLabels (Window, 46, None, pc)
# armor class
ac = GemRB.GetPlayerStat (pc, IE_ARMORCLASS)
@@ -210,7 +210,7 @@ def RefreshInventoryWindow ():
Label.SetText (str (GemRB.GameGetPartyGold ()))
# class
- text = ClassTable.GetValue (GemRB.GetPlayerStat (pc, IE_CLASS) - 1, 0)
+ text = GUICommon.ClassTable.GetValue (GemRB.GetPlayerStat (pc, IE_CLASS) - 1, 0)
Label = Window.GetControl (0x1000003f)
Label.SetText (text)
@@ -224,7 +224,7 @@ def RefreshInventoryWindow ():
Button.SetState (IE_GUI_BUTTON_SECOND)
else:
Button.SetState (IE_GUI_BUTTON_ENABLED)
- Button.SetEventByName (IE_GUI_BUTTON_ON_DRAG_DROP, "OnDragItemGround")
+ Button.SetEvent (IE_GUI_BUTTON_ON_DRAG_DROP, OnDragItemGround)
Slot = GemRB.GetContainerItem (pc, i+TopIndex)
if Slot != None:
item = GemRB.GetItem (Slot['ItemResRef'])
@@ -238,8 +238,8 @@ def RefreshInventoryWindow ():
else:
Button.SetTooltip (item["ItemNameIdentified"])
Button.EnableBorder (0, 0)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OnDragItemGround")
- Button.SetEventByName (IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenGroundItemInfoWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OnDragItemGround)
+ Button.SetEvent (IE_GUI_BUTTON_ON_RIGHT_PRESS, OpenGroundItemInfoWindow)
Button.SetEvent (IE_GUI_BUTTON_ON_SHIFT_PRESS, None) #TODO: implement OpenGroundItemAmountWindow
else:
@@ -304,10 +304,10 @@ def UpdateSlot (pc, i):
Button.EnableBorder (1, 1)
Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OnDragItem")
- Button.SetEventByName (IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenItemInfoWindow")
- Button.SetEventByName (IE_GUI_BUTTON_ON_SHIFT_PRESS, "OpenItemAmountWindow")
- Button.SetEventByName (IE_GUI_BUTTON_ON_DRAG_DROP, "OnDragItem")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OnDragItem)
+ Button.SetEvent (IE_GUI_BUTTON_ON_RIGHT_PRESS, OpenItemInfoWindow)
+ Button.SetEvent (IE_GUI_BUTTON_ON_SHIFT_PRESS, OpenItemAmountWindow)
+ Button.SetEvent (IE_GUI_BUTTON_ON_DRAG_DROP, OnDragItem)
else:
Button.SetItemIcon ('')
Button.SetText ('')
@@ -315,7 +315,7 @@ def UpdateSlot (pc, i):
if slot_list[i]>=0:
Button.SetSprites (SlotType["ResRef"], 0, 0, 1, 2, 3)
Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
- Button.SetEventByName (IE_GUI_BUTTON_ON_DRAG_DROP, "OnDragItem")
+ Button.SetEvent (IE_GUI_BUTTON_ON_DRAG_DROP, OnDragItem)
Button.SetTooltip (SlotType["Tip"])
else:
Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_OR)
@@ -452,13 +452,13 @@ def OpenItemAmountWindow ():
# Done
Button = Window.GetControl (2)
Button.SetText (1403)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "DragItemAmount")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, DragItemAmount)
Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR)
# Cancel
Button = Window.GetControl (1)
Button.SetText (4196)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenItemAmountWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenItemAmountWindow)
Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR)
# 0 bmp
@@ -594,19 +594,19 @@ def IdentifyItemWindow ():
Button.SetText (4259)
if not GemRB.HasSpecialSpell (pc, 1, 0):
Button.SetState (IE_GUI_BUTTON_DISABLED)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "IdentifyUseSpell")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, IdentifyUseSpell)
# Scroll
Button = Window.GetControl (1)
Button.SetText (4260)
if not GemRB.HasSpecialItem (pc, 1, 0):
Button.SetState (IE_GUI_BUTTON_DISABLED)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "IdentifyUseScroll")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, IdentifyUseScroll)
# Cancel
Button = Window.GetControl (2)
Button.SetText (4196)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "CloseIdentifyItemWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, CloseIdentifyItemWindow)
Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR)
Window.ShowModal (MODAL_SHADOW_GRAY)
@@ -627,13 +627,13 @@ def DisplayItem (itemresref, type):
# Done
Button = Window.GetControl (4)
Button.SetText (1403)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "CloseItemInfoWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, CloseItemInfoWindow)
# Identify
Button = Window.GetControl (8)
if type&2:
Button.SetText (4256)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "IdentifyItemWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, IdentifyItemWindow)
else:
Button.SetState (IE_GUI_BUTTON_LOCKED)
Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_SET)
@@ -650,17 +650,17 @@ def DisplayItem (itemresref, type):
if drink:
#no drink/food in PST, this is the closest strref in stock pst
Button.SetText (4251)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "DrinkItemWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, DrinkItemWindow)
elif read:
Button.SetText (4252)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "ReadItemWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, ReadItemWindow)
elif container:
#no containers in PST, this is the closest strref in stock pst
Button.SetText (52399)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenItemWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenItemWindow)
elif dialog:
Button.SetText (4254)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "DialogItemWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, DialogItemWindow)
else:
Button.SetText ('')
Button.SetState (IE_GUI_BUTTON_LOCKED)
@@ -695,11 +695,11 @@ def DisplayItem (itemresref, type):
#left scroll
Button = Window.GetControl (13)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "LeftItemScroll")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, LeftItemScroll)
#right scroll
Button = Window.GetControl (14)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "RightItemScroll")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, RightItemScroll)
Window.ShowModal (MODAL_SHADOW_GRAY)
return
diff --git a/gemrb/GUIScripts/pst/GUIJRNL.py b/gemrb/GUIScripts/pst/GUIJRNL.py
index 1ffc748..5e5d3f3 100644
--- a/gemrb/GUIScripts/pst/GUIJRNL.py
+++ b/gemrb/GUIScripts/pst/GUIJRNL.py
@@ -28,9 +28,9 @@
###################################################
import GemRB
+import GUICommon
+import GUICommonWindows
from GUIDefines import *
-from GUICommon import CloseOtherWindow
-from GUICommonWindows import EnableAnimatedWindows, DisableAnimatedWindows
###################################################
JournalWindow = None
@@ -66,7 +66,7 @@ def OpenJournalWindow ():
Table = GemRB.LoadTable("YEARS")
StartTime = Table.GetValue("STARTTIME", "VALUE")
- if CloseOtherWindow (OpenJournalWindow):
+ if GUICommon.CloseOtherWindow (OpenJournalWindow):
if LogWindow: OpenLogWindow()
if BeastsWindow: OpenBeastsWindow()
if QuestsWindow: OpenQuestsWindow()
@@ -76,7 +76,7 @@ def OpenJournalWindow ():
if JournalWindow:
JournalWindow.Unload()
#making the portraitwindow visible again
- EnableAnimatedWindows ()
+ GUICommonWindows.EnableAnimatedWindows ()
GemRB.SetVar ("OtherWindow", -1)
PortraitWindow = None
ActionsWindow = None
@@ -89,27 +89,27 @@ def OpenJournalWindow ():
GemRB.LoadWindowPack ("GUIJRNL")
JournalWindow = GemRB.LoadWindow (0)
GemRB.SetVar ("OtherWindow", JournalWindow.ID)
- DisableAnimatedWindows ()
+ GUICommonWindows.DisableAnimatedWindows ()
# Quests
Button = JournalWindow.GetControl (0)
Button.SetText (20430)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenQuestsWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenQuestsWindow)
# Beasts
Button = JournalWindow.GetControl (1)
Button.SetText (20634)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenBeastsWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenBeastsWindow)
# Journal
Button = JournalWindow.GetControl (2)
Button.SetText (20635)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenLogWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenLogWindow)
# Done
Button = JournalWindow.GetControl (3)
Button.SetText (20636)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenJournalWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenJournalWindow)
#JournalWindow.SetVisible (WINDOW_VISIBLE)
GemRB.UnhideGUI()
@@ -138,27 +138,27 @@ def OpenQuestsWindow ():
# Assigned
Button = Window.GetControl (8)
Button.SetText (39433)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OnJournalAssignedPress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OnJournalAssignedPress)
# Completed
Button = Window.GetControl (9)
Button.SetText (39434)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OnJournalCompletedPress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OnJournalCompletedPress)
# Back
Button = Window.GetControl (5)
Button.SetText (46677)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenQuestsWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenQuestsWindow)
# Done
Button = Window.GetControl (0)
Button.SetText (20636)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenJournalWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenJournalWindow)
QuestsList = List = Window.GetControl (1)
List.SetFlags (IE_GUI_TEXTAREA_SELECTABLE)
List.SetVarAssoc ('SelectedQuest', -1)
- List.SetEventByName (IE_GUI_TEXTAREA_ON_CHANGE, "OnJournalQuestSelect")
+ List.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, OnJournalQuestSelect)
QuestDesc = Window.GetControl (3)
@@ -307,27 +307,27 @@ def OpenBeastsWindow ():
# PC
Button = BeastsWindow.GetControl (5)
Button.SetText (20637)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OnJournalPCPress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OnJournalPCPress)
# NPC
Button = BeastsWindow.GetControl (6)
Button.SetText (20638)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OnJournalNPCPress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OnJournalNPCPress)
# Back
Button = BeastsWindow.GetControl (7)
Button.SetText (46677)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenBeastsWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenBeastsWindow)
# Done
Button = BeastsWindow.GetControl (4)
Button.SetText (20636)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenJournalWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenJournalWindow)
BeastsList = List = Window.GetControl (0)
List.SetFlags (IE_GUI_TEXTAREA_SELECTABLE)
List.SetVarAssoc ('SelectedBeast', -1)
- List.SetEventByName(IE_GUI_TEXTAREA_ON_CHANGE, "OnJournalBeastSelect")
+ List.SetEvent(IE_GUI_TEXTAREA_ON_CHANGE, OnJournalBeastSelect)
Window.CreateButton (8, 19, 19, 281, 441)
BeastImage = Window.GetControl (8)
@@ -416,12 +416,12 @@ def OpenLogWindow ():
# Back
Button = Window.GetControl (1)
Button.SetText (46677)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenLogWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenLogWindow)
# Done
Button = Window.GetControl (0)
Button.SetText (20636)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenJournalWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenJournalWindow)
# text area
Text = Window.GetControl (2)
diff --git a/gemrb/GUIScripts/pst/GUILOAD.py b/gemrb/GUIScripts/pst/GUILOAD.py
index 23fe2c2..1fb9bf2 100644
--- a/gemrb/GUIScripts/pst/GUILOAD.py
+++ b/gemrb/GUIScripts/pst/GUILOAD.py
@@ -22,8 +22,8 @@
###################################################
import GemRB
-from LoadScreen import *
-from GUICommonWindows import OpenWaitForDiscWindow
+import LoadScreen
+from GUIDefines import *
LoadWindow = 0
TextAreaControl = 0
@@ -37,7 +37,7 @@ def OnLoad ():
LoadWindow = GemRB.LoadWindow (0)
CancelButton=LoadWindow.GetControl (46)
CancelButton.SetText (4196)
- CancelButton.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "CancelPress")
+ CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, CancelPress)
CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL,OP_OR)
GemRB.SetVar ("LoadIdx",0)
@@ -45,13 +45,13 @@ def OnLoad ():
for i in range (4):
Button = LoadWindow.GetControl (14+i)
Button.SetText (28648)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "LoadGamePress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, LoadGamePress)
Button.SetState (IE_GUI_BUTTON_DISABLED)
Button.SetVarAssoc ("LoadIdx",i)
Button = LoadWindow.GetControl (18+i)
Button.SetText (28640)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "DeleteGamePress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, DeleteGamePress)
Button.SetState (IE_GUI_BUTTON_DISABLED)
Button.SetVarAssoc ("LoadIdx",i)
@@ -67,7 +67,7 @@ def OnLoad ():
Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET)
ScrollBar=LoadWindow.GetControl (13)
- ScrollBar.SetEventByName (IE_GUI_SCROLLBAR_ON_CHANGE, "ScrollBarPress")
+ ScrollBar.SetEvent (IE_GUI_SCROLLBAR_ON_CHANGE, ScrollBarPress)
Games=GemRB.GetSaveGames () #count of games in save folder?
if len(Games)>3:
TopIndex = len(Games)-4
@@ -125,7 +125,7 @@ def LoadGamePress ():
if LoadWindow:
LoadWindow.Unload ()
Pos = GemRB.GetVar ("TopIndex")+GemRB.GetVar ("LoadIdx")
- StartLoadScreen ()
+ LoadScreen.StartLoadScreen ()
GemRB.LoadGame(Games[Pos]) # load & start game
GemRB.EnterGame ()
return
@@ -163,12 +163,12 @@ def DeleteGamePress ():
DeleteButton=ConfirmWindow.GetControl (1)
DeleteButton.SetText (28640)
- DeleteButton.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "DeleteGameConfirm")
+ DeleteButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, DeleteGameConfirm)
DeleteButton.SetFlags (IE_GUI_BUTTON_DEFAULT,OP_OR)
CancelButton=ConfirmWindow.GetControl (2)
CancelButton.SetText (4196)
- CancelButton.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel")
+ CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, DeleteGameCancel)
CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL,OP_OR)
ConfirmWindow.SetVisible (WINDOW_VISIBLE)
return
diff --git a/gemrb/GUIScripts/pst/GUIMA.py b/gemrb/GUIScripts/pst/GUIMA.py
index 752e37d..4ed550c 100644
--- a/gemrb/GUIScripts/pst/GUIMA.py
+++ b/gemrb/GUIScripts/pst/GUIMA.py
@@ -23,9 +23,9 @@
###################################################
import GemRB
+import GUICommon
+import GUICommonWindows
from GUIDefines import *
-from GUICommon import CloseOtherWindow
-from GUICommonWindows import EnableAnimatedWindows, DisableAnimatedWindows
MapWindow = None
WorldMapWindow = None
@@ -36,7 +36,7 @@ PosY = 0
def OpenMapWindow ():
global MapWindow
- if CloseOtherWindow (OpenMapWindow):
+ if GUICommon.CloseOtherWindow (OpenMapWindow):
GemRB.HideGUI ()
if WorldMapWindow: OpenWorldMapWindowInside ()
@@ -56,7 +56,7 @@ def OpenMapWindow ():
# World Map
Button = Window.GetControl (0)
Button.SetText (20429)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenWorldMapWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenWorldMapWindow)
# Add Note
Button = Window.GetControl (1)
@@ -77,7 +77,7 @@ def OpenMapWindow ():
GemRB.SetVar ("x",IE_GUI_MAP_VIEW_NOTES)
Map.SetVarAssoc ("x", IE_GUI_MAP_VIEW_NOTES)
- Map.SetEventByName (IE_GUI_MAP_ON_PRESS, "SetMapNote")
+ Map.SetEvent (IE_GUI_MAP_ON_PRESS, SetMapNote)
MapTable = GemRB.LoadTable( "MAPNAME" )
MapName = MapTable.GetValue (GemRB.GetCurrentArea (), "STRING")
@@ -92,7 +92,7 @@ def OpenMapWindow ():
# Done
Button = Window.GetControl (5)
Button.SetText (1403)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenMapWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenMapWindow)
Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR)
GemRB.UnhideGUI ()
@@ -107,7 +107,7 @@ def SetMapNote ():
global PosX, PosY
Label = MapWindow.GetControl (6)
- Label.SetEventByName (IE_GUI_EDIT_ON_CHANGE, "NoteChanged")
+ Label.SetEvent (IE_GUI_EDIT_ON_CHANGE, NoteChanged)
PosX = GemRB.GetVar("MapControlX")
PosY = GemRB.GetVar("MapControlY")
Label.SetStatus (IE_GUI_CONTROL_FOCUSED)
@@ -134,11 +134,11 @@ def WorldMapWindowCommon (Travel):
WorldMapWindow.Unload ()
WorldMapWindow = None
GemRB.SetVar ("OtherWindow", -1)
- EnableAnimatedWindows ()
+ GUICommonWindows.EnableAnimatedWindows ()
GemRB.UnhideGUI ()
return
- DisableAnimatedWindows ()
+ GUICommonWindows.DisableAnimatedWindows ()
GemRB.LoadWindowPack ("GUIWMAP")
WorldMapWindow = Window = GemRB.LoadWindow (0)
MapWindow = None
@@ -155,9 +155,9 @@ def WorldMapWindowCommon (Travel):
Button = Window.GetControl (0)
Button.SetText (1403)
if Travel>=0:
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenWorldMapWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenWorldMapWindow)
else:
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenMapWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenMapWindow)
GemRB.UnhideGUI ()
###################################################
diff --git a/gemrb/GUIScripts/pst/GUIMG.py b/gemrb/GUIScripts/pst/GUIMG.py
index 2f73e0e..804ed0d 100644
--- a/gemrb/GUIScripts/pst/GUIMG.py
+++ b/gemrb/GUIScripts/pst/GUIMG.py
@@ -23,10 +23,10 @@
###################################################
import GemRB
+import GUICommon
+import GUICommonWindows
from GUIDefines import *
from ie_stats import *
-from GUICommon import CloseOtherWindow, ClassSkillsTable
-from GUICommonWindows import SetSelectionChangeHandler
MageWindow = None
MageSpellInfoWindow = None
@@ -36,14 +36,14 @@ MageSpellUnmemorizeWindow = None
def OpenMageWindow ():
global MageWindow
- if CloseOtherWindow (OpenMageWindow):
+ if GUICommon.CloseOtherWindow (OpenMageWindow):
GemRB.HideGUI ()
if MageWindow:
MageWindow.Unload ()
MageWindow = None
GemRB.SetVar ("OtherWindow", -1)
- SetSelectionChangeHandler (None)
+ GUICommonWindows.SetSelectionChangeHandler (None)
GemRB.UnhideGUI ()
return
@@ -53,17 +53,17 @@ def OpenMageWindow ():
GemRB.SetVar ("OtherWindow", MageWindow.ID)
Button = Window.GetControl (0)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "MagePrevLevelPress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, MagePrevLevelPress)
Button = Window.GetControl (1)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "MageNextLevelPress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, MageNextLevelPress)
# Setup memorized spells buttons
for i in range (12):
Icon = Window.GetControl (2 + i)
Icon.SetBorder (0, 0, 0, 0, 0, 0, 0, 0, 160, 0, 1)
- SetSelectionChangeHandler (UpdateMageWindow)
+ GUICommonWindows.SetSelectionChangeHandler (UpdateMageWindow)
GemRB.UnhideGUI ()
UpdateMageWindow ()
@@ -95,10 +95,10 @@ def UpdateMageWindow ():
Icon.SetSpellIcon (ms['SpellResRef'])
Icon.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
if ms['Flags']:
- Icon.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenMageSpellUnmemorizeWindow")
+ Icon.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenMageSpellUnmemorizeWindow)
else:
- Icon.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OnMageUnmemorizeSpell")
- Icon.SetEventByName (IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenMageSpellInfoWindow")
+ Icon.SetEvent (IE_GUI_BUTTON_ON_PRESS, OnMageUnmemorizeSpell)
+ Icon.SetEvent (IE_GUI_BUTTON_ON_RIGHT_PRESS, OpenMageSpellInfoWindow)
spell = GemRB.GetSpell (ms['SpellResRef'])
Icon.SetTooltip (spell['SpellName'])
MageMemorizedSpellList.append (ms['SpellResRef'])
@@ -125,8 +125,8 @@ def UpdateMageWindow ():
ks = GemRB.GetKnownSpell (pc, type, level, i)
Icon.SetSpellIcon (ks['SpellResRef'])
Icon.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
- Icon.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OnMageMemorizeSpell")
- Icon.SetEventByName (IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenMageSpellInfoWindow")
+ Icon.SetEvent (IE_GUI_BUTTON_ON_PRESS, OnMageMemorizeSpell)
+ Icon.SetEvent (IE_GUI_BUTTON_ON_RIGHT_PRESS, OpenMageSpellInfoWindow)
spell = GemRB.GetSpell (ks['SpellResRef'])
Icon.SetTooltip (spell['SpellName'])
MageKnownSpellList.append (ks['SpellResRef'])
@@ -136,7 +136,7 @@ def UpdateMageWindow ():
Icon.SetEvent (IE_GUI_BUTTON_ON_PRESS, None)
Icon.SetEvent (IE_GUI_BUTTON_ON_RIGHT_PRESS, None)
Icon.SetTooltip ('')
- if (ClassSkillsTable.GetValue (GemRB.GetPlayerStat( GemRB.GameGetSelectedPCSingle(), IE_CLASS), 2)=="*"):
+ if (GUICommon.ClassSkillsTable.GetValue (GemRB.GetPlayerStat( GemRB.GameGetSelectedPCSingle(), IE_CLASS), 2)=="*"):
Window.SetVisible (WINDOW_GRAYED)
else:
Window.SetVisible (WINDOW_VISIBLE)
@@ -175,7 +175,7 @@ def OpenMageSpellInfoWindow ():
Button = Window.GetControl (4)
Button.SetText (1403)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenMageSpellInfoWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenMageSpellInfoWindow)
index = GemRB.GetVar ("SpellButton")
if index < 100:
@@ -241,12 +241,12 @@ def OpenMageSpellUnmemorizeWindow ():
# Remove
Button = Window.GetControl (0)
Button.SetText (42514)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OnMageUnmemorizeSpell")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OnMageUnmemorizeSpell)
Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR)
Button = Window.GetControl (1)
Button.SetText (4196)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenMageSpellUnmemorizeWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenMageSpellUnmemorizeWindow)
Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR)
GemRB.UnhideGUI ()
diff --git a/gemrb/GUIScripts/pst/GUIOPT.py b/gemrb/GUIScripts/pst/GUIOPT.py
index ae87410..a91d060 100644
--- a/gemrb/GUIScripts/pst/GUIOPT.py
+++ b/gemrb/GUIScripts/pst/GUIOPT.py
@@ -34,12 +34,10 @@
###################################################
import GemRB
+import GUICommon
+import GUICommonWindows
+import GUISAVE
from GUIDefines import *
-from GUICommon import CloseOtherWindow
-from GUICommonWindows import EnableAnimatedWindows, DisableAnimatedWindows
-
-from GUISAVE import OpenSaveWindow
-import MessageWindow
###################################################
OptionsWindow = None
@@ -58,7 +56,7 @@ def OpenOptionsWindow ():
"""Open main options window (peacock tail)"""
global OptionsWindow
- if CloseOtherWindow (OpenOptionsWindow):
+ if GUICommon.CloseOtherWindow (OpenOptionsWindow):
if VideoOptionsWindow: OpenVideoOptionsWindow ()
if AudioOptionsWindow: OpenAudioOptionsWindow ()
if GameplayOptionsWindow: OpenGameplayOptionsWindow ()
@@ -73,7 +71,7 @@ def OpenOptionsWindow ():
if OptionsWindow:
OptionsWindow.Unload ()
GemRB.SetVar ("OtherWindow", -1)
- EnableAnimatedWindows ()
+ GUICommonWindows.EnableAnimatedWindows ()
OptionsWindow = None
GemRB.UnhideGUI ()
@@ -83,52 +81,52 @@ def OpenOptionsWindow ():
GemRB.LoadWindowPack ("GUIOPT")
OptionsWindow = Window = GemRB.LoadWindow (0)
GemRB.SetVar ("OtherWindow", OptionsWindow.ID)
- DisableAnimatedWindows ()
+ GUICommonWindows.DisableAnimatedWindows ()
# Return to Game
Button = Window.GetControl (0)
Button.SetText (28638)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenOptionsWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenOptionsWindow)
# Quit Game
Button = Window.GetControl (1)
Button.SetText (2595)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenQuitMsgWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenQuitMsgWindow)
# Load Game
Button = Window.GetControl (2)
Button.SetText (2592)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenLoadMsgWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenLoadMsgWindow)
# Save Game
Button = Window.GetControl (3)
Button.SetText (20639)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenSaveWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, GUISAVE.OpenSaveWindow)
# Video Options
Button = Window.GetControl (4)
Button.SetText (28781)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenVideoOptionsWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenVideoOptionsWindow)
# Audio Options
Button = Window.GetControl (5)
Button.SetText (29720)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenAudioOptionsWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenAudioOptionsWindow)
# Gameplay Options
Button = Window.GetControl (6)
Button.SetText (29722)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenGameplayOptionsWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenGameplayOptionsWindow)
# Keyboard Mappings
Button = Window.GetControl (7)
Button.SetText (29723)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenKeyboardMappingsWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenKeyboardMappingsWindow)
# Movies
Button = Window.GetControl (9)
Button.SetText (38156) # or 2594
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenMoviesWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenMoviesWindow)
# game version, e.g. v1.1.0000
Label = Window.GetControl (0x10000007)
@@ -166,12 +164,12 @@ def OpenVideoOptionsWindow ():
OptDone ('VideoOptions', Window, 7)
OptCancel ('VideoOptions', Window, 8)
- OptSlider ('VideoOptions', 'Brightness', Window, 1, 10, 31234, "Brightness Correction", "GammaFeedback", 1)
- OptSlider ('VideoOptions', 'Contrast', Window, 2, 11, 31429, "Gamma Correction", "GammaFeedback", 1)
+ OptSlider ('VideoOptions', 'Brightness', Window, 1, 10, 31234, "Brightness Correction", GammaFeedback, 1)
+ OptSlider ('VideoOptions', 'Contrast', Window, 2, 11, 31429, "Gamma Correction", GammaFeedback, 1)
- OptCheckbox ('VideoOptions', 'SoftwareBlitting', Window, 6, 15, 30898, "SoftBlt")
- OptCheckbox ('VideoOptions', 'SoftwareMirroring', Window, 4, 13, 30896, "SoftMirrorBlt")
- OptCheckbox ('VideoOptions', 'SoftwareTransparency', Window, 5, 14, 30897, "SoftSrcKeyBlt")
+ OptCheckbox ('VideoOptions', 'SoftwareBlitting', Window, 6, 15, 30898, None) #TODO: SoftBlt
+ OptCheckbox ('VideoOptions', 'SoftwareMirroring', Window, 4, 13, 30896, None) #TODO: SoftMirrorBlt
+ OptCheckbox ('VideoOptions', 'SoftwareTransparency', Window, 5, 14, 30897, None) #TODO: SoftSrcKeyBlt
GemRB.UnhideGUI ()
Window.ShowModal (MODAL_SHADOW_GRAY)
@@ -242,11 +240,11 @@ def OpenAudioOptionsWindow ():
OptCancel ('AudioOptions', Window, 8)
- OptSlider ('AudioOptions', 'AmbientVolume', Window, 1, 10, 31460, "Volume Ambients", "UpdateVolume")
- OptSlider ('AudioOptions', 'SoundFXVolume', Window, 2, 11, 31466, "Volume SFX", "UpdateVolume")
- OptSlider ('AudioOptions', 'VoiceVolume', Window, 3, 12, 31467, "Volume Voices", "UpdateVolume")
- OptSlider ('AudioOptions', 'MusicVolume', Window, 4, 13, 31468, "Volume Music", "UpdateVolume")
- OptSlider ('AudioOptions', 'MovieVolume', Window, 5, 14, 31469, "Volume Movie", "UpdateVolume")
+ OptSlider ('AudioOptions', 'AmbientVolume', Window, 1, 10, 31460, "Volume Ambients", UpdateVolume)
+ OptSlider ('AudioOptions', 'SoundFXVolume', Window, 2, 11, 31466, "Volume SFX", UpdateVolume)
+ OptSlider ('AudioOptions', 'VoiceVolume', Window, 3, 12, 31467, "Volume Voices", UpdateVolume)
+ OptSlider ('AudioOptions', 'MusicVolume', Window, 4, 13, 31468, "Volume Music", UpdateVolume)
+ OptSlider ('AudioOptions', 'MovieVolume', Window, 5, 14, 31469, "Volume Movie", UpdateVolume)
OptCheckbox ('AudioOptions', 'CreativeEAX', Window, 6, 15, 30900, "Environmental Audio")
OptCheckbox ('AudioOptions', 'SoundProcessing', Window, 16, 17, 63242, "Sound Processing")
@@ -320,9 +318,9 @@ def OpenGameplayOptionsWindow ():
OptDone ('GameplayOptions', Window, 10)
OptCancel ('GameplayOptions', Window, 11)
- OptSlider ('GameplayOptions', 'TooltipDelay', Window, 1, 13, 31481, "Tooltips", "UpdateTooltips", TOOLTIP_DELAY_FACTOR)
- OptSlider ('GameplayOptions', 'MouseScrollingSpeed', Window, 2, 14, 31482, "Mouse Scroll Speed", "UpdateMouseSpeed")
- OptSlider ('GameplayOptions', 'KeyboardScrollingSpeed', Window, 3, 15, 31480, "Keyboard Scroll Speed", "UpdateKeyboardSpeed")
+ OptSlider ('GameplayOptions', 'TooltipDelay', Window, 1, 13, 31481, "Tooltips", UpdateTooltips, TOOLTIP_DELAY_FACTOR)
+ OptSlider ('GameplayOptions', 'MouseScrollingSpeed', Window, 2, 14, 31482, "Mouse Scroll Speed", UpdateMouseSpeed)
+ OptSlider ('GameplayOptions', 'KeyboardScrollingSpeed', Window, 3, 15, 31480, "Keyboard Scroll Speed", UpdateKeyboardSpeed)
OptSlider ('GameplayOptions', 'Difficulty', Window, 4, 16, 31479, "Difficulty Level")
OptCheckbox ('GameplayOptions', 'DitherAlways', Window, 5, 17, 31217, "Always Dither")
@@ -489,13 +487,13 @@ def OpenAutopauseOptionsWindow ():
GemRB.SetVar("AutoPauseState_EndRound", (state & 0x40) != 0 )
- OptCheckbox ('AutopauseOptions', 'CharacterHit', Window, 2, 9, 37598, "AutoPauseState_Hit", "OnAutoPauseClicked")
- OptCheckbox ('AutopauseOptions', 'CharacterInjured', Window, 3, 10, 37681, "AutoPauseState_Wounded", "OnAutoPauseClicked")
- OptCheckbox ('AutopauseOptions', 'CharacterDead', Window, 4, 11, 37682, "AutoPauseState_Dead", "OnAutoPauseClicked")
- OptCheckbox ('AutopauseOptions', 'CharacterAttacked', Window, 5, 12, 37683, "AutoPauseState_Attacked", "OnAutoPauseClicked")
- OptCheckbox ('AutopauseOptions', 'WeaponUnusable', Window, 6, 13, 37684, "AutoPauseState_Unusable", "OnAutoPauseClicked")
- OptCheckbox ('AutopauseOptions', 'TargetGone', Window, 7, 14, 37685, "AutoPauseState_NoTarget", "OnAutoPauseClicked")
- OptCheckbox ('AutopauseOptions', 'EndOfRound', Window, 8, 15, 37686, "AutoPauseState_EndRound", "OnAutoPauseClicked")
+ OptCheckbox ('AutopauseOptions', 'CharacterHit', Window, 2, 9, 37598, "AutoPauseState_Hit", OnAutoPauseClicked)
+ OptCheckbox ('AutopauseOptions', 'CharacterInjured', Window, 3, 10, 37681, "AutoPauseState_Wounded", OnAutoPauseClicked)
+ OptCheckbox ('AutopauseOptions', 'CharacterDead', Window, 4, 11, 37682, "AutoPauseState_Dead", OnAutoPauseClicked)
+ OptCheckbox ('AutopauseOptions', 'CharacterAttacked', Window, 5, 12, 37683, "AutoPauseState_Attacked", OnAutoPauseClicked)
+ OptCheckbox ('AutopauseOptions', 'WeaponUnusable', Window, 6, 13, 37684, "AutoPauseState_Unusable", OnAutoPauseClicked)
+ OptCheckbox ('AutopauseOptions', 'TargetGone', Window, 7, 14, 37685, "AutoPauseState_NoTarget", OnAutoPauseClicked)
+ OptCheckbox ('AutopauseOptions', 'EndOfRound', Window, 8, 15, 37686, "AutoPauseState_EndRound", OnAutoPauseClicked)
GemRB.UnhideGUI ()
Window.ShowModal (MODAL_SHADOW_GRAY)
@@ -558,12 +556,12 @@ def OpenLoadMsgWindow ():
# Load
Button = Window.GetControl (0)
Button.SetText (28648)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "LoadGame")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, LoadGame)
# Cancel
Button = Window.GetControl (1)
Button.SetText (4196)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenLoadMsgWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenLoadMsgWindow)
# Loading a game will destroy ...
Text = Window.GetControl (3)
@@ -602,17 +600,17 @@ def OpenQuitMsgWindow ():
# Save
Button = Window.GetControl (0)
Button.SetText (28645)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "SaveGame")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, SaveGame)
# Quit Game
Button = Window.GetControl (1)
Button.SetText (2595)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "QuitGame")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, QuitGame)
# Cancel
Button = Window.GetControl (2)
Button.SetText (4196)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenQuitMsgWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenQuitMsgWindow)
Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR)
# The game has not been saved ....
@@ -687,13 +685,13 @@ def OpenKeyboardMappingsWindow ():
# Done
Button = Window.GetControl (4)
Button.SetText (1403)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenKeyboardMappingsWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenKeyboardMappingsWindow)
Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR)
# Cancel
Button = Window.GetControl (5)
Button.SetText (4196)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenKeyboardMappingsWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenKeyboardMappingsWindow)
Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR)
keys_setup_page (0)
@@ -735,12 +733,12 @@ def keys_setup_page (pageno):
else:
Label = Window.GetControl (0x10000005 + i)
Label.SetText (key)
- Label.SetEventByName (IE_GUI_LABEL_ON_PRESS, "OnActionLabelPress")
+ Label.SetEvent (IE_GUI_LABEL_ON_PRESS, OnActionLabelPress)
Label.SetVarAssoc ("KeyAction", i)
Label = Window.GetControl (0x10000041 + i)
Label.SetText (label)
- Label.SetEventByName (IE_GUI_LABEL_ON_PRESS, "OnActionLabelPress")
+ Label.SetEvent (IE_GUI_LABEL_ON_PRESS, OnActionLabelPress)
Label.SetVarAssoc ("KeyAction", i)
@@ -793,24 +791,24 @@ def OpenMoviesWindow ():
# Play Movie
Button = Window.GetControl (2)
Button.SetText (33034)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OnPlayMoviePress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OnPlayMoviePress)
# Credits
Button = Window.GetControl (3)
Button.SetText (33078)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OnCreditsPress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OnCreditsPress)
# Done
Button = Window.GetControl (4)
Button.SetText (1403)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenMoviesWindow")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenMoviesWindow)
# movie list
List = Window.GetControl (0)
List.SetFlags (IE_GUI_TEXTAREA_SELECTABLE)
List.SetVarAssoc ('SelectedMovie', -1)
- #Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenMoviesWindow")
+ #Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenMoviesWindow)
MovieTable = GemRB.LoadTable ("MOVIDESC")
@@ -858,9 +856,9 @@ def OnCreditsPress ():
def OptSlider (winname, ctlname, window, slider_id, label_id, label_strref, assoc_var, fn = None, scale = 1):
"""Standard slider for option windows"""
slider = window.GetControl (slider_id)
- #slider.SetEventByName (IE_GUI_MOUSE_ENTER_BUTTON, "DisplayHelp" + ctlname)
- #slider.SetEventByName (IE_GUI_MOUSE_LEAVE_BUTTON, "DisplayHelp" + winname)
- if fn: slider.SetEventByName (IE_GUI_SLIDER_ON_CHANGE, fn)
+ #slider.SetEvent (IE_GUI_MOUSE_ENTER_BUTTON, eval("DisplayHelp" + ctlname))
+ #slider.SetEvent (IE_GUI_MOUSE_LEAVE_BUTTON, eval("DisplayHelp" + winname))
+ if fn: slider.SetEvent (IE_GUI_SLIDER_ON_CHANGE, fn)
slider.SetVarAssoc (assoc_var, scale)
@@ -868,9 +866,9 @@ def OptSlider (winname, ctlname, window, slider_id, label_id, label_strref, asso
label.SetText (label_strref)
label.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_SET)
label.SetState (IE_GUI_BUTTON_LOCKED)
- #label.SetEventByName (IE_GUI_MOUSE_OVER_BUTTON, "DisplayHelp" + ctlname)
- label.SetEventByName (IE_GUI_MOUSE_ENTER_BUTTON, "DisplayHelp" + ctlname)
- label.SetEventByName (IE_GUI_MOUSE_LEAVE_BUTTON, "DisplayHelp" + winname)
+ #label.SetEvent (IE_GUI_MOUSE_OVER_BUTTON, eval("DisplayHelp" + ctlname))
+ label.SetEvent (IE_GUI_MOUSE_ENTER_BUTTON, eval("DisplayHelp" + ctlname))
+ label.SetEvent (IE_GUI_MOUSE_LEAVE_BUTTON, eval("DisplayHelp" + winname))
return slider
@@ -880,8 +878,8 @@ def OptCheckbox (winname, ctlname, window, button_id, label_id, label_strref, as
button = window.GetControl (button_id)
button.SetFlags (IE_GUI_BUTTON_CHECKBOX, OP_OR)
- button.SetEventByName (IE_GUI_MOUSE_ENTER_BUTTON, "DisplayHelp" + ctlname)
- button.SetEventByName (IE_GUI_MOUSE_LEAVE_BUTTON, "DisplayHelp" + winname)
+ button.SetEvent (IE_GUI_MOUSE_ENTER_BUTTON, eval("DisplayHelp" + ctlname))
+ button.SetEvent (IE_GUI_MOUSE_LEAVE_BUTTON, eval("DisplayHelp" + winname))
if assoc_var:
button.SetVarAssoc (assoc_var, 1)
if GemRB.GetVar (assoc_var):
@@ -892,43 +890,43 @@ def OptCheckbox (winname, ctlname, window, button_id, label_id, label_strref, as
button.SetState (IE_GUI_BUTTON_UNPRESSED)
if handler:
- button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, handler)
+ button.SetEvent (IE_GUI_BUTTON_ON_PRESS, handler)
label = window.GetControl (label_id)
label.SetText (label_strref)
label.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_SET)
label.SetState (IE_GUI_BUTTON_LOCKED)
- label.SetEventByName (IE_GUI_MOUSE_ENTER_BUTTON, "DisplayHelp" + ctlname)
- label.SetEventByName (IE_GUI_MOUSE_LEAVE_BUTTON, "DisplayHelp" + winname)
+ label.SetEvent (IE_GUI_MOUSE_ENTER_BUTTON, eval("DisplayHelp" + ctlname))
+ label.SetEvent (IE_GUI_MOUSE_LEAVE_BUTTON, eval("DisplayHelp" + winname))
return button
def OptButton (winname, ctlname, window, button_id, label_id, label_strref):
"""Standard subwindow button for option windows"""
button = window.GetControl (button_id)
- button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "Open%sWindow" %ctlname)
- button.SetEventByName (IE_GUI_MOUSE_ENTER_BUTTON, "DisplayHelp" + ctlname)
- button.SetEventByName (IE_GUI_MOUSE_LEAVE_BUTTON, "DisplayHelp" + winname)
+ button.SetEvent (IE_GUI_BUTTON_ON_PRESS, eval("Open%sWindow" %ctlname))
+ button.SetEvent (IE_GUI_MOUSE_ENTER_BUTTON, eval("DisplayHelp" + ctlname))
+ button.SetEvent (IE_GUI_MOUSE_LEAVE_BUTTON, eval("DisplayHelp" + winname))
label = window.GetControl (label_id)
label.SetText (label_strref)
label.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_SET)
label.SetState (IE_GUI_BUTTON_LOCKED)
- label.SetEventByName (IE_GUI_MOUSE_ENTER_BUTTON, "DisplayHelp" + ctlname)
- label.SetEventByName (IE_GUI_MOUSE_LEAVE_BUTTON, "DisplayHelp" + winname)
+ label.SetEvent (IE_GUI_MOUSE_ENTER_BUTTON, eval("DisplayHelp" + ctlname))
+ label.SetEvent (IE_GUI_MOUSE_LEAVE_BUTTON, eval("DisplayHelp" + winname))
def OptDone (winname, window, button_id):
"""Standard `Done' button for option windows"""
button = window.GetControl (button_id)
button.SetText (1403) # Done
- button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "Open%sWindow" %winname)
+ button.SetEvent (IE_GUI_BUTTON_ON_PRESS, eval("Open%sWindow" %winname))
button.SetVarAssoc ("Cancel", 0)
def OptCancel (winname, window, button_id):
"""Standard `Cancel' button for option windows"""
button = window.GetControl (button_id)
button.SetText (4196) # Cancel
- button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "Open%sWindow" %winname)
+ button.SetEvent (IE_GUI_BUTTON_ON_PRESS, eval("Open%sWindow" %winname))
button.SetVarAssoc ("Cancel", 1)
def OptHelpText (winname, window, text_id, text_strref):
diff --git a/gemrb/GUIScripts/pst/GUIPR.py b/gemrb/GUIScripts/pst/GUIPR.py
index 5b3193c..9141226 100644
--- a/gemrb/GUIScripts/pst/GUIPR.py
+++ b/gemrb/GUIScripts/pst/GUIPR.py
@@ -23,10 +23,10 @@
###################################################
import GemRB
+import GUICommon
+import GUICommonWindows
from GUIDefines import *
from ie_stats import *
-from GUICommon import CloseOtherWindow, ClassSkillsTable
-from GUICommonWindows import SetSelectionChangeHandler
PriestWindow = None
PriestSpellInfoWindow = None
@@ -37,14 +37,14 @@ PriestSpellUnmemorizeWindow = None
def OpenPriestWindow ():
global PriestWindow
- if CloseOtherWindow (OpenPriestWindow):
+ if GUICommon.CloseOtherWindow (OpenPriestWindow):
GemRB.HideGUI ()
if PriestWindow:
PriestWindow.Unload ()
PriestWindow = None
GemRB.SetVar ("OtherWindow", -1)
- SetSelectionChangeHandler (None)
+ GUICommonWindows.SetSelectionChangeHandler (None)
GemRB.UnhideGUI ()
return
@@ -54,10 +54,10 @@ def OpenPriestWindow ():
GemRB.SetVar ("OtherWindow", PriestWindow.ID)
Button = Window.GetControl (0)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "PriestPrevLevelPress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, PriestPrevLevelPress)
Button = Window.GetControl (1)
- Button.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "PriestNextLevelPress")
+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, PriestNextLevelPress)
# Setup memorized spells buttons
for i in range (12):
@@ -65,7 +65,7 @@ def OpenPriestWindow ():
Icon.SetBorder (0, 0, 0, 0, 0, 0, 0, 0, 160, 0, 1)
- SetSelectionChangeHandler (UpdatePriestWindow)
+ GUICommonWindows.SetSelectionChangeHandler (UpdatePriestWindow)
GemRB.UnhideGUI ()
UpdatePriestWindow ()
@@ -99,10 +99,10 @@ def UpdatePriestWindow ():
Icon.SetSpellIcon (ms['SpellResRef'])
Icon.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
if ms['Flags']:
- Icon.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OpenPriestSpellUnmemorizeWindow")
+ Icon.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenPriestSpellUnmemorizeWindow)
else:
- Icon.SetEventByName (IE_GUI_BUTTON_ON_PRESS, "OnPriestUnmemorizeSpell")
- Icon.SetEventByName (IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenPriestSpellInfoWindow")
+ Icon.SetEvent (IE_GUI_BUTTON_ON_PRESS, OnPriestUnmemorizeSpell)
+ Icon.SetEvent (IE_GUI_BUTTON_ON_RIGHT_PRESS, OpenPriestSpellInfoWindow)
spell = GemRB.GetSpell (ms['SpellResRef'])
Icon.SetToolti...
[truncated message content] |