From: Laszlo T. <ave...@us...> - 2005-02-28 19:01:52
|
Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4431/GUIScripts/bg2 Modified Files: GUISTORE.py Log Message: more work on Store interface and bg2 GUISTORE script Index: GUISTORE.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUISTORE.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GUISTORE.py 28 Feb 2005 17:35:11 -0000 1.6 --- GUISTORE.py 28 Feb 2005 19:01:08 -0000 1.7 *************** *** 80,84 **** OpenStoreRumourWindow,OpenStoreRentWindow ) ! if CloseOtherWindow(StoreWindow): GemRB.HideGUI () CloseStoreShoppingWindow () --- 80,84 ---- OpenStoreRumourWindow,OpenStoreRentWindow ) ! if CloseOtherWindow( StoreWindow ): GemRB.HideGUI () CloseStoreShoppingWindow () *************** *** 93,97 **** StoreWindow = None GemRB.SetVar ("OtherWindow", -1) ! SetSelectionChangeHandler (None) GemRB.UnhideGUI () return --- 93,97 ---- StoreWindow = None GemRB.SetVar ("OtherWindow", -1) ! SetSelectionChangeHandler( None ) GemRB.UnhideGUI () return *************** *** 130,137 **** GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) ! SetSelectionChangeHandler (store_update_funcs[store_buttons[0]]) GemRB.UnhideGUI() #initializing selected variables - GemRB.SetVar("StoreRent",0) store_update_funcs[store_buttons[0]] () --- 130,137 ---- GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) ! SetSelectionChangeHandler( store_update_funcs[store_buttons[0]] ) ! GemRB.SetVar ("StoreRent",0) GemRB.UnhideGUI() #initializing selected variables store_update_funcs[store_buttons[0]] () *************** *** 331,334 **** --- 331,335 ---- # room types + StoreRent = -1 for i in range(4): ok = Store['StoreRoomPrices'][i] *************** *** 348,357 **** GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) GemRB.SetVarAssoc (Window, Button, "StoreRent", i) # Rent Button = GemRB.GetControl (Window, 11) GemRB.SetText (Window, Button, 14293) ! GemRB.SetVar("StoreRent",StoreRent) ! GemRB.UnhideGUI () --- 349,359 ---- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) GemRB.SetVarAssoc (Window, Button, "StoreRent", i) + if ok<0: + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) # Rent Button = GemRB.GetControl (Window, 11) GemRB.SetText (Window, Button, 14293) ! GemRB.SetVar ("StoreRent",StoreRent) GemRB.UnhideGUI () *************** *** 360,368 **** Window = StoreRentWindow ! room = GemRB.GetVar("StoreRent") Text = GemRB.GetControl (Window, 12) GemRB.SetText (Window, Text, roomtypes[room] ) Label = GemRB.GetControl (Window, 0x1000000d) ! Rent = GemRB.GetVar("StoreRent") price = Store['StoreRoomPrices'][Rent] GemRB.SetText (Window, Label, str(price) ) --- 362,370 ---- Window = StoreRentWindow ! room = GemRB.GetVar ("StoreRent") Text = GemRB.GetControl (Window, 12) GemRB.SetText (Window, Text, roomtypes[room] ) Label = GemRB.GetControl (Window, 0x1000000d) ! Rent = GemRB.GetVar ("StoreRent") price = Store['StoreRoomPrices'][Rent] GemRB.SetText (Window, Label, str(price) ) *************** *** 405,409 **** UpdateStoreCommon (StoreRentWindow, 0x10000008, 0, 0x10000009) # price ... ! SelectStoreRent() --- 407,411 ---- UpdateStoreCommon (StoreRentWindow, 0x10000008, 0, 0x10000009) # price ... ! SelectStoreRent () |