Menu
▾
▴
[Gemrb-commits] gemrb/gemrb/GUIScripts/how CharGen.py,1.10,1.11 MessageWindow.py,1.3,1.4 PartyFormation.py,1.5,1.6
|
From: Laszlo T. <ave...@us...> - 2004-04-15 19:24:01
|
Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/how In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30002/how Modified Files: CharGen.py MessageWindow.py PartyFormation.py Log Message: Minor changes in iwd character generation/main game screen Index: MessageWindow.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/how/MessageWindow.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MessageWindow.py 15 Apr 2004 16:35:11 -0000 1.3 --- MessageWindow.py 15 Apr 2004 19:23:45 -0000 1.4 *************** *** 2,5 **** --- 2,6 ---- MessageWindow = 0 + PortraitWindow = 0 ExpandButton = 0 ContractButton = 0 *************** *** 7,11 **** def OnLoad(): ! global MessageWindow, ExpandButton, Expand GemRB.LoadWindowPack("GUIW") ActionsWindow = GemRB.LoadWindow(3) --- 8,13 ---- def OnLoad(): ! global MessageWindow, PortraitWindow, ExpandButton, Expand ! GemRB.LoadWindowPack("GUIW") ActionsWindow = GemRB.LoadWindow(3) *************** *** 136,140 **** GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "PortraitButtonOnPress") ! pic = GemRB.GetPlayerPortrait (i+1,0) GemRB.SetButtonPicture(Window, Button, pic) GemRB.SetButtonFlags(Window, Button, IE_GUI_BUTTON_PICTURE, OP_SET) --- 138,142 ---- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "PortraitButtonOnPress") ! pic = GemRB.GetPlayerPortrait (i+1,1) GemRB.SetButtonPicture(Window, Button, pic) GemRB.SetButtonFlags(Window, Button, IE_GUI_BUTTON_PICTURE, OP_SET) Index: CharGen.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/how/CharGen.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CharGen.py 15 Apr 2004 16:57:24 -0000 1.10 --- CharGen.py 15 Apr 2004 19:23:45 -0000 1.11 *************** *** 118,121 **** --- 118,122 ---- GenderButton = GemRB.GetControl(CharGenWindow, 0) GemRB.SetButtonState(CharGenWindow, GenderButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(CharGenWindow, GenderButton, IE_GUI_BUTTON_DEFAULT, OP_OR) GemRB.SetEvent(CharGenWindow, GenderButton, IE_GUI_BUTTON_ON_PRESS, "GenderPress") GemRB.SetText(CharGenWindow, GenderButton, 11956) *************** *** 205,224 **** --- 206,236 ---- if CharGenState == 0: GemRB.SetButtonState(CharGenWindow, RaceButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonFlags(CharGenWindow, RaceButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) GemRB.SetButtonState(CharGenWindow, GenderButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(CharGenWindow, GenderButton, IE_GUI_BUTTON_DEFAULT, OP_OR) elif CharGenState == 1: GemRB.SetButtonState(CharGenWindow, ClassButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonFlags(CharGenWindow, ClassButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) GemRB.SetButtonState(CharGenWindow, RaceButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(CharGenWindow, RaceButton, IE_GUI_BUTTON_DEFAULT, OP_OR) elif CharGenState == 2: GemRB.SetButtonState(CharGenWindow, AlignmentButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonFlags(CharGenWindow, AlignmentButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) GemRB.SetButtonState(CharGenWindow, ClassButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(CharGenWindow, ClassButton, IE_GUI_BUTTON_DEFAULT, OP_OR) elif CharGenState == 3: GemRB.SetButtonState(CharGenWindow, AbilitiesButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonFlags(CharGenWindow, AbilitiesButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) GemRB.SetButtonState(CharGenWindow, AlignmentButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(CharGenWindow, AlignmentButton, IE_GUI_BUTTON_DEFAULT, OP_OR) elif CharGenState == 4: GemRB.SetButtonState(CharGenWindow, SkillsButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonFlags(CharGenWindow, SkillsButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) GemRB.SetButtonState(CharGenWindow, AbilitiesButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(CharGenWindow, AbilitiesButton, IE_GUI_BUTTON_DEFAULT, OP_OR) elif CharGenState == 5: GemRB.SetButtonState(CharGenWindow, AppearanceButton, IE_GUI_BUTTON_DISABLED) GemRB.SetButtonState(CharGenWindow, SkillsButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(CharGenWindow, SkillsButton, IE_GUI_BUTTON_DEFAULT, OP_OR) elif CharGenState == 6: *************** *** 272,275 **** --- 284,288 ---- GemRB.SetPlayerStat(MyChar, IE_CHR, GemRB.GetVar("Ability 6")) + GemRB.SetPlayerName(MyChar, NameField, 0) GemRB.FillPlayerInfo(MyChar,PortraitName+"S", PortraitName+"L") GemRB.UnloadWindow(CharGenWindow) *************** *** 364,373 **** --- 377,391 ---- MaleButton = GemRB.GetControl(GenderWindow, 2) GemRB.SetButtonState(GenderWindow, MaleButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(GenderWindow, MaleButton, IE_GUI_BUTTON_RADIOBUTTON,OP_OR) GemRB.SetEvent(GenderWindow, MaleButton, IE_GUI_BUTTON_ON_PRESS, "MalePress") FemaleButton = GemRB.GetControl(GenderWindow, 3) GemRB.SetButtonState(GenderWindow, FemaleButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(GenderWindow, FemaleButton, IE_GUI_BUTTON_RADIOBUTTON,OP_OR) GemRB.SetEvent(GenderWindow, FemaleButton, IE_GUI_BUTTON_ON_PRESS, "FemalePress") + GemRB.SetVarAssoc(GenderWindow, MaleButton, "Gender", 1) + GemRB.SetVarAssoc(GenderWindow, FemaleButton, "Gender", 2) + GenderTextArea = GemRB.GetControl(GenderWindow, 5) GemRB.SetText(GenderWindow, GenderTextArea, 17236) *************** *** 389,393 **** def MalePress(): global GenderWindow, GenderDoneButton, GenderTextArea - GemRB.SetVar("Gender", 1) GemRB.SetText(GenderWindow, GenderTextArea, 13083) GemRB.SetButtonState(GenderWindow, GenderDoneButton, IE_GUI_BUTTON_ENABLED) --- 407,410 ---- *************** *** 396,400 **** def FemalePress(): global GenderWindow, GenderDoneButton, GenderTextArea - GemRB.SetVar("Gender", 2) GemRB.SetText(GenderWindow, GenderTextArea, 13084) GemRB.SetButtonState(GenderWindow, GenderDoneButton, IE_GUI_BUTTON_ENABLED) --- 413,416 ---- *************** *** 488,492 **** --- 504,510 ---- GemRB.SetButtonPicture(CharGenWindow, PortraitButton, GemRB.GetTableRowName(PortraitTable, Portrait) + "L") GemRB.SetButtonState(CharGenWindow, GenderButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonFlags(CharGenWindow, GenderButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) GemRB.SetButtonState(CharGenWindow, RaceButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(CharGenWindow, RaceButton, IE_GUI_BUTTON_DEFAULT, OP_OR) CharGenState = 1 SetCharacterDescription() *************** *** 508,511 **** --- 526,530 ---- RaceWindow = GemRB.LoadWindow(8) RaceTable = GemRB.LoadTable("RACES") + GemRB.SetVar("Race", 0) for i in range(2, 8): *************** *** 548,552 **** --- 567,573 ---- GemRB.UnloadWindow(RaceWindow) GemRB.SetButtonState(CharGenWindow, RaceButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonFlags(CharGenWindow, RaceButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) GemRB.SetButtonState(CharGenWindow, ClassButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(CharGenWindow, ClassButton, IE_GUI_BUTTON_DEFAULT, OP_OR) CharGenState = 2 SetCharacterDescription() *************** *** 729,733 **** --- 750,756 ---- GemRB.UnloadWindow(ClassWindow) GemRB.SetButtonState(CharGenWindow, ClassButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonFlags(CharGenWindow, ClassButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) GemRB.SetButtonState(CharGenWindow, AlignmentButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(CharGenWindow, AlignmentButton, IE_GUI_BUTTON_DEFAULT, OP_OR) CharGenState = 3 SetCharacterDescription() *************** *** 796,800 **** --- 819,825 ---- GemRB.UnloadWindow(AlignmentWindow) GemRB.SetButtonState(CharGenWindow, AlignmentButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonFlags(CharGenWindow, AlignmentButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) GemRB.SetButtonState(CharGenWindow, AbilitiesButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(CharGenWindow, AbilitiesButton, IE_GUI_BUTTON_DEFAULT, OP_OR) CharGenState = 4 SetCharacterDescription() *************** *** 988,992 **** --- 1013,1019 ---- GemRB.UnloadWindow(AbilitiesWindow) GemRB.SetButtonState(CharGenWindow, AbilitiesButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonFlags(CharGenWindow, AbilitiesButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) GemRB.SetButtonState(CharGenWindow, SkillsButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(CharGenWindow, SkillsButton, IE_GUI_BUTTON_DEFAULT, OP_OR) CharGenState = 5 SkillsState = 0 *************** *** 1050,1054 **** --- 1077,1083 ---- if SkillsState == 4: GemRB.SetButtonState(CharGenWindow, SkillsButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonFlags(CharGenWindow, SkillsButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) GemRB.SetButtonState(CharGenWindow, AppearanceButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(CharGenWindow, AppearanceButton, IE_GUI_BUTTON_DEFAULT, OP_OR) CharGenState = 6 SetCharacterDescription() *************** *** 1792,1795 **** --- 1821,1825 ---- GemRB.UnloadWindow(CharSoundWindow) GemRB.SetButtonState(CharGenWindow, AppearanceButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonFlags(CharGenWindow, AppearanceButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) GemRB.SetButtonState(CharGenWindow, BiographyButton, IE_GUI_BUTTON_ENABLED) GemRB.SetButtonState(CharGenWindow, NameButton, IE_GUI_BUTTON_ENABLED) *************** *** 1893,1896 **** --- 1923,1927 ---- CharGenState = 8 GemRB.SetButtonState(CharGenWindow, AcceptButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags(CharGenWindow, AcceptButton, IE_GUI_BUTTON_DEFAULT, OP_OR) SetCharacterDescription() GemRB.SetVisible(CharGenWindow, 1) Index: PartyFormation.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/how/PartyFormation.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PartyFormation.py 15 Apr 2004 16:57:25 -0000 1.5 --- PartyFormation.py 15 Apr 2004 19:23:45 -0000 1.6 *************** *** 78,82 **** GemRB.SetControlStatus(CreateCharWindow, CancelButton, IE_GUI_BUTTON_ENABLED) GemRB.SetText(CreateCharWindow, CancelButton, 13727) ! GemRB.SetButtonFlags(CreateCharWindow, CancelButton, IE_GUI_BUTTON_DEFAULT, OP_OR) GemRB.SetVisible(CreateCharWindow, 1) --- 78,82 ---- GemRB.SetControlStatus(CreateCharWindow, CancelButton, IE_GUI_BUTTON_ENABLED) GemRB.SetText(CreateCharWindow, CancelButton, 13727) ! GemRB.SetButtonFlags(CreateCharWindow, CreateButton, IE_GUI_BUTTON_DEFAULT, OP_OR) GemRB.SetVisible(CreateCharWindow, 1) |