Menu
▾
▴
[Gemrb-commits] SF.net SVN: gemrb:[5292] gemrb/trunk/gemrb/GUIScripts/bg1
|
From: <ave...@us...> - 2008-09-14 15:44:52
|
Revision: 5292
http://gemrb.svn.sourceforge.net/gemrb/?rev=5292&view=rev
Author: avenger_teambg
Date: 2008-09-14 15:45:01 +0000 (Sun, 14 Sep 2008)
Log Message:
-----------
fixed some problems and added mousewheel feature (used zefklop's patch #2109514)
Modified Paths:
--------------
gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py
gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py
gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py
gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py
gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py
gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py
gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py
gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py
gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py
Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py 2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py 2008-09-14 15:45:01 UTC (rev 5292)
@@ -45,7 +45,7 @@
# Return to Game
Button = GemRB.GetControl (Window, 0)
GemRB.SetTooltip (Window, Button, 16313)
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
+ #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 0)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, ReturnToGame)
Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py 2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py 2008-09-14 15:45:01 UTC (rev 5292)
@@ -39,7 +39,7 @@
###################################################
def OpenJournalWindow ():
global StartTime, StartYear
- global JournalWindow, OptionsWindow, PortraitWindow
+ global JournalWindow, OptionsWindow
global OldOptionsWindow
Table = GemRB.LoadTable("YEARS")
@@ -87,7 +87,7 @@
GemRB.SetVisible (OptionsWindow, 1)
GemRB.SetVisible (Window, 1)
- GemRB.SetVisible (PortraitWindow, 1)
+ GemRB.SetVisible (GUICommonWindows.PortraitWindow, 1)
###################################################
Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py 2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py 2008-09-14 15:45:01 UTC (rev 5292)
@@ -59,7 +59,7 @@
# for farsight effect
###################################################
def ShowMap ():
- global MapWindow, OptionsWindow, PortraitWindow
+ global MapWindow, OptionsWindow
global OldOptionsWindow
if CloseOtherWindow (ShowMap):
@@ -97,7 +97,7 @@
Map = GemRB.GetControl (Window, 2)
GemRB.SetEvent (Window, Map, IE_GUI_MAP_ON_PRESS, "RevealMap")
GemRB.SetVisible (Window, 1)
- GemRB.SetVisible (PortraitWindow, 2)
+ GemRB.SetVisible (GUICommonWindows.PortraitWindow, 2)
GemRB.SetVisible (OptionsWindow, 3)
GemRB.SetVisible (Window, 3)
GemRB.SetControlStatus(Window, Map, IE_GUI_CONTROL_FOCUSED)
Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py 2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py 2008-09-14 15:45:01 UTC (rev 5292)
@@ -38,7 +38,7 @@
def OpenMageWindow ():
- global MageWindow, OptionsWindow, PortraitWindow
+ global MageWindow, OptionsWindow
global OldOptionsWindow
if CloseOtherWindow (OpenMageWindow):
@@ -103,7 +103,7 @@
GemRB.SetVisible (OptionsWindow, 1)
GemRB.SetVisible (Window, 1)
- GemRB.SetVisible (PortraitWindow, 1)
+ GemRB.SetVisible (GUICommonWindows.PortraitWindow, 1)
return
Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py 2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py 2008-09-14 15:45:01 UTC (rev 5292)
@@ -80,7 +80,7 @@
###################################################
def OpenOptionsWindow ():
"""Open main options window"""
- global GameOptionsWindow, OptionsWindow, PortraitWindow
+ global GameOptionsWindow, OptionsWindow
global OldOptionsWindow
if CloseOtherWindow(OpenOptionsWindow):
@@ -142,7 +142,7 @@
GemRB.SetVisible (OptionsWindow, 1)
GemRB.SetVisible (Window, 1)
- GemRB.SetVisible (PortraitWindow, 1)
+ GemRB.SetVisible (GUICommonWindows.PortraitWindow, 1)
return
@@ -535,7 +535,7 @@
GemRB.UnloadWindow (LoadMsgWindow)
LoadMsgWindow = None
- GemRB.SetVisible (OptionsWindow, 1)
+ #GemRB.SetVisible (OptionsWindow, 1)
return
def LoadGamePress ():
Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py 2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py 2008-09-14 15:45:01 UTC (rev 5292)
@@ -38,7 +38,7 @@
def OpenPriestWindow ():
- global PriestWindow, PortraitWindow, OptionsWindow
+ global PriestWindow, OptionsWindow
global OldOptionsWindow
@@ -99,7 +99,7 @@
GemRB.SetVisible (OptionsWindow, 1)
GemRB.SetVisible (Window, 1)
- GemRB.SetVisible (PortraitWindow, 1)
+ GemRB.SetVisible (GUICommonWindows.PortraitWindow, 1)
return
Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py 2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py 2008-09-14 15:45:01 UTC (rev 5292)
@@ -36,10 +36,11 @@
InformationWindow = None
BiographyWindow = None
OldOptionsWindow = None
+OptionsWindow = None
###################################################
def OpenRecordsWindow ():
- global RecordsWindow, OptionsWindow, PortraitWindow
+ global RecordsWindow, OptionsWindow
global OldOptionsWindow
if CloseOtherWindow (OpenRecordsWindow):
@@ -107,7 +108,7 @@
GemRB.SetVisible (OptionsWindow, 1)
GemRB.SetVisible (Window, 1)
- GemRB.SetVisible (PortraitWindow, 1)
+ GemRB.SetVisible (GUICommonWindows.PortraitWindow, 1)
return
def GetNextLevelExp (Level, Class):
@@ -470,7 +471,7 @@
InformationWindow = None
GemRB.SetVisible (OptionsWindow, 1)
GemRB.SetVisible (RecordsWindow, 1)
- GemRB.SetVisible (PortraitWindow, 1)
+ GemRB.SetVisible (GUICommonWindows.PortraitWindow, 1)
return
def OpenBiographyWindow ():
Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py 2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py 2008-09-14 15:45:01 UTC (rev 5292)
@@ -35,7 +35,7 @@
StoreWindow = None
MessageWindow = None
ActionWindow = None
-PortraitWindow = None
+#PortraitWindow = None
StoreShoppingWindow = None
StoreIdentifyWindow = None
StoreStealWindow = None
@@ -43,7 +43,7 @@
StoreHealWindow = None
StoreRumourWindow = None
StoreRentWindow = None
-OldPortraitWindow = None
+#OldPortraitWindow = None
RentConfirmWindow = None
LeftButton = None
RightButton = None
@@ -93,17 +93,17 @@
def CloseStoreWindow ():
- global StoreWindow, ActionWindow, PortraitWindow
- global OldPortraitWindow
+ global StoreWindow, ActionWindow #, PortraitWindow
+ #global OldPortraitWindow
GemRB.SetVar ("Inventory", 0)
CloseWindows ()
GemRB.UnloadWindow (StoreWindow)
GemRB.UnloadWindow (ActionWindow)
- GemRB.UnloadWindow (PortraitWindow)
+ #GemRB.UnloadWindow (PortraitWindow)
StoreWindow = None
GemRB.LeaveStore ()
- GUICommonWindows.PortraitWindow = OldPortraitWindow
+ #GUICommonWindows.PortraitWindow = OldPortraitWindow
if Inventory:
GemRB.RunEventHandler("OpenInventoryWindow")
else:
@@ -114,8 +114,8 @@
def OpenStoreWindow ():
global Store
- global StoreWindow, ActionWindow, PortraitWindow
- global OldPortraitWindow
+ global StoreWindow, ActionWindow #, PortraitWindow
+ #global OldPortraitWindow
global store_update_funcs
global Inventory
@@ -138,8 +138,8 @@
GemRB.LoadWindowPack ("GUISTORE", 640, 480)
StoreWindow = Window = GemRB.LoadWindow (3)
#saving the original portrait window
- OldPortraitWindow = GUICommonWindows.PortraitWindow
- PortraitWindow = OpenPortraitWindow (0)
+ #OldPortraitWindow = GUICommonWindows.PortraitWindow
+ #PortraitWindow = OpenPortraitWindow (0)
ActionWindow = GemRB.LoadWindow (0)
#this window is static and grey, but good to stick the frame onto
GemRB.SetWindowFrame (ActionWindow)
@@ -177,7 +177,7 @@
GemRB.SetVisible (ActionWindow, 1)
GemRB.SetVisible (Window, 1)
store_update_funcs[store_buttons[0]] ()
- GemRB.SetVisible (PortraitWindow, 1)
+ GemRB.SetVisible (GUICommonWindows.PortraitWindow, 1)
def OpenStoreShoppingWindow ():
@@ -196,16 +196,26 @@
Label = GemRB.GetControl (Window, 0x1000002c)
GemRB.SetText (Window, Label, "0")
+ # left scrollbar
+ ScrollBarLeft = GemRB.GetControl (Window, 11)
+ GemRB.SetEvent (Window, ScrollBarLeft, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreShoppingWindow")
+
+ # right scrollbar
+ ScrollBarRight = GemRB.GetControl (Window, 12)
+ GemRB.SetEvent (Window, ScrollBarRight, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreShoppingWindow")
+
for i in range(4):
Button = GemRB.GetControl (Window, i+5)
GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SelectBuy")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoLeftWindow")
+ GemRB.AttachScrollBar(Window, Button, ScrollBarLeft)
Button = GemRB.GetControl (Window, i+13)
GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SelectSell")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoRightWindow")
+ GemRB.AttachScrollBar(Window, Button, ScrollBarRight)
# Buy
LeftButton = Button = GemRB.GetControl (Window, 2)
@@ -230,14 +240,6 @@
Label = GemRB.CreateLabel (Window, 0x10000043, 15,325,60,15,"NUMBER","0:",IE_FONT_ALIGN_LEFT|IE_FONT_ALIGN_TOP)
Label = GemRB.CreateLabel (Window, 0x10000044, 15,365,80,15,"NUMBER","0:",IE_FONT_ALIGN_RIGHT|IE_FONT_ALIGN_TOP)
- # left scrollbar
- ScrollBar = GemRB.GetControl (Window, 11)
- GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreShoppingWindow")
-
- # right scrollbar
- ScrollBar = GemRB.GetControl (Window, 12)
- GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreShoppingWindow")
-
SetSelectionChangeHandler( UpdateStoreShoppingWindow )
UpdateStoreShoppingWindow ()
GemRB.SetVisible (Window, 1)
@@ -263,16 +265,17 @@
Label = GemRB.GetControl (Window, 0x10000003)
GemRB.SetText (Window, Label, "0")
+ ScrollBar = GemRB.GetControl (Window, 7)
+ GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreIdentifyWindow")
+
# 8-11 item slots, 0x1000000c-f labels
for i in range(4):
Button = GemRB.GetControl (Window, i+8)
GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "RedrawStoreIdentifyWindow")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoIdentifyWindow")
+ GemRB.AttachScrollBar(Window, Button, ScrollBar)
- ScrollBar = GemRB.GetControl (Window, 7)
- GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreIdentifyWindow")
-
SetSelectionChangeHandler( UpdateStoreIdentifyWindow )
UpdateStoreIdentifyWindow ()
GemRB.SetVisible (Window, 1)
@@ -289,14 +292,24 @@
StoreStealWindow = Window = GemRB.LoadWindow (6)
+ # left scrollbar
+ ScrollBarLeft = GemRB.GetControl (Window, 9)
+ GemRB.SetEvent (Window, ScrollBarLeft, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreStealWindow")
+
+ # right scrollbar
+ ScrollBarRight = GemRB.GetControl (Window, 10)
+ GemRB.SetEvent (Window, ScrollBarRight, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreStealWindow")
+
for i in range(4):
Button = GemRB.GetControl (Window, i+4)
GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "RedrawStoreStealWindow")
+ GemRB.AttachScrollBar(Window, Button, ScrollBarLeft)
Button = GemRB.GetControl (Window, i+11)
GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoRightWindow")
+ GemRB.AttachScrollBar(Window, Button, ScrollBarRight)
# Steal
LeftButton = Button = GemRB.GetControl (Window, 1)
@@ -310,14 +323,6 @@
Label = GemRB.CreateLabel (Window, 0x10000043, 15,325,60,15,"NUMBER","0:",IE_FONT_ALIGN_LEFT|IE_FONT_ALIGN_TOP)
Label = GemRB.CreateLabel (Window, 0x10000044, 15,365,80,15,"NUMBER","0:",IE_FONT_ALIGN_RIGHT|IE_FONT_ALIGN_TOP)
- # left scrollbar
- ScrollBar = GemRB.GetControl (Window, 9)
- GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreStealWindow")
-
- # right scrollbar
- ScrollBar = GemRB.GetControl (Window, 10)
- GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreStealWindow")
-
SetSelectionChangeHandler( UpdateStoreStealWindow )
UpdateStoreStealWindow ()
GemRB.SetVisible (Window, 1)
@@ -368,12 +373,16 @@
StoreHealWindow = Window = GemRB.LoadWindow (5)
+ ScrollBar = GemRB.GetControl (Window, 7)
+ GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "UpdateStoreHealWindow")
+
#spell buttons
for i in range(4):
Button = GemRB.GetControl (Window, i+8)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "UpdateStoreHealWindow")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoHealWindow")
+ GemRB.AttachScrollBar(Window, Button, ScrollBar)
# price tag
Label = GemRB.GetControl (Window, 0x10000003)
@@ -385,8 +394,6 @@
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "BuyHeal")
GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED)
- ScrollBar = GemRB.GetControl (Window, 7)
- GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "UpdateStoreHealWindow")
Count = Store['StoreCureCount']
if Count>4:
Count = Count-4
Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py 2008-09-14 12:13:10 UTC (rev 5291)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py 2008-09-14 15:45:01 UTC (rev 5292)
@@ -25,6 +25,7 @@
import GemRB
from GUIDefines import *
+from ie_restype import *
from GUICommon import CloseOtherWindow
from GUICommonWindows import *
@@ -504,13 +505,16 @@
return
def GetWindowPack():
+ ret = "GUIW"
width = GemRB.GetSystemVariable (SV_WIDTH)
if width == 800:
- return "GUIW08"
+ ret = "GUIW08"
if width == 1024:
- return "GUIW10"
+ ret = "GUIW10"
if width == 1280:
- return "GUIW12"
+ ret = "GUIW12"
+ if GemRB.HasResource (ret, RES_CHU):
+ return ret
#default
return "GUIW"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|