From: <wjp...@us...> - 2009-02-01 20:42:34
|
Revision: 5609 http://gemrb.svn.sourceforge.net/gemrb/?rev=5609&view=rev Author: wjpalenstijn Date: 2009-02-01 20:42:31 +0000 (Sun, 01 Feb 2009) Log Message: ----------- missing global; missing function Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/GUIClasses.py gemrb/trunk/gemrb/GUIScripts/bg2/Start2.py Modified: gemrb/trunk/gemrb/GUIScripts/GUIClasses.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/GUIClasses.py 2009-02-01 18:48:44 UTC (rev 5608) +++ gemrb/trunk/gemrb/GUIScripts/GUIClasses.py 2009-02-01 20:42:31 UTC (rev 5609) @@ -100,6 +100,7 @@ class GLabel(GControl): __metaclass__ = metaControl methods = { + 'SetTextColor': GemRB.SetLabelTextColor, 'SetUseRGB': GemRB.SetLabelUseRGB } Modified: gemrb/trunk/gemrb/GUIScripts/bg2/Start2.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/Start2.py 2009-02-01 18:48:44 UTC (rev 5608) +++ gemrb/trunk/gemrb/GUIScripts/bg2/Start2.py 2009-02-01 20:42:31 UTC (rev 5609) @@ -14,6 +14,7 @@ def OnLoad(): global StartWindow, TutorialWindow, QuitWindow global ExitButton, OptionsButton, MultiPlayerButton, MoviesButton + global SinglePlayerButton skip_videos = not GemRB.GetVar ("SkipIntroVideos") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wjp...@us...> - 2009-02-01 22:33:13
|
Revision: 5614 http://gemrb.svn.sourceforge.net/gemrb/?rev=5614&view=rev Author: wjpalenstijn Date: 2009-02-01 22:17:59 +0000 (Sun, 01 Feb 2009) Log Message: ----------- fixed ID/object mixup; missing function Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/GUIClasses.py gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py Modified: gemrb/trunk/gemrb/GUIScripts/GUIClasses.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/GUIClasses.py 2009-02-01 22:05:31 UTC (rev 5613) +++ gemrb/trunk/gemrb/GUIScripts/GUIClasses.py 2009-02-01 22:17:59 UTC (rev 5614) @@ -116,7 +116,8 @@ 'Clear': GemRB.TextAreaClear, 'Scroll': GemRB.TextAreaScroll, 'SetFlags': GemRB.SetTextAreaFlags, - 'GetCharSounds': GemRB.GetCharSounds + 'GetCharSounds': GemRB.GetCharSounds, + 'GetCharacters': GemRB.GetCharacters } def MoveText(self, other): GemRB.MoveTAText(self.WinID, self.ID, other.WinID, other.ID) Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py 2009-02-01 22:05:31 UTC (rev 5613) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py 2009-02-01 22:17:59 UTC (rev 5614) @@ -611,7 +611,7 @@ TextArea.SetText(10962) TextArea = ExportWindow.GetControl(0) - GemRB.GetCharacters (ExportWindow, TextArea) + TextArea.GetCharacters () ExportDoneButton = ExportWindow.GetControl(4) ExportDoneButton.SetText(11973) Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py 2009-02-01 22:05:31 UTC (rev 5613) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py 2009-02-01 22:17:59 UTC (rev 5614) @@ -218,7 +218,7 @@ GemRB.LoadWindowPack (GetWindowPack()) ContainerWindow = Window = GemRB.LoadWindowObject (8) OldActionsWindow = GWindow( GemRB.GetVar ("ActionsWindow") ) - OldMessageWindow = GemRB.GetVar ("MessageWindow") + OldMessageWindow = GWindow( GemRB.GetVar ("MessageWindow") ) GemRB.SetVar ("ActionsWindow", Window.ID) GemRB.SetVar ("MessageWindow", -1) @@ -452,7 +452,7 @@ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenReformPartyWindow") OldActionsWindow = GWindow( GemRB.GetVar ("ActionsWindow") ) - OldMessageWindow = GemRB.GetVar ("MessageWindow") + OldMessageWindow = GWindow( GemRB.GetVar ("MessageWindow") ) GemRB.SetVar ("ActionsWindow", -1) GemRB.SetVar ("MessageWindow", -1) UpdateReformWindow () This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wjp...@us...> - 2009-02-01 22:59:17
|
Revision: 5619 http://gemrb.svn.sourceforge.net/gemrb/?rev=5619&view=rev Author: wjpalenstijn Date: 2009-02-01 22:59:13 +0000 (Sun, 01 Feb 2009) Log Message: ----------- use classes in IWD GUIScripts Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/how/CharGen.py gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py gemrb/trunk/gemrb/GUIScripts/how/GUIJRNL.py gemrb/trunk/gemrb/GUIScripts/how/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/how/GUIMA.py gemrb/trunk/gemrb/GUIScripts/how/GUIMG.py gemrb/trunk/gemrb/GUIScripts/how/GUIMOVIE.py gemrb/trunk/gemrb/GUIScripts/how/GUIOPT.py gemrb/trunk/gemrb/GUIScripts/how/GUIPR.py gemrb/trunk/gemrb/GUIScripts/how/GUIREC.py gemrb/trunk/gemrb/GUIScripts/how/GUISAVE.py gemrb/trunk/gemrb/GUIScripts/how/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/how/GUIWORLD.py gemrb/trunk/gemrb/GUIScripts/how/LoadScreen.py gemrb/trunk/gemrb/GUIScripts/how/MessageWindow.py gemrb/trunk/gemrb/GUIScripts/how/PartyFormation.py gemrb/trunk/gemrb/GUIScripts/how/Start.py gemrb/trunk/gemrb/GUIScripts/how/TextScreen.py gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIJRNL.py gemrb/trunk/gemrb/GUIScripts/iwd/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIMA.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIMG.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIMOVIE.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIOPT.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIPR.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIREC.py gemrb/trunk/gemrb/GUIScripts/iwd/GUISAVE.py gemrb/trunk/gemrb/GUIScripts/iwd/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py gemrb/trunk/gemrb/GUIScripts/iwd/LoadScreen.py gemrb/trunk/gemrb/GUIScripts/iwd/MessageWindow.py gemrb/trunk/gemrb/GUIScripts/iwd/PartyFormation.py gemrb/trunk/gemrb/GUIScripts/iwd/Start.py gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py Modified: gemrb/trunk/gemrb/GUIScripts/how/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2009-02-01 22:57:03 UTC (rev 5618) +++ gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2009-02-01 22:59:13 UTC (rev 5619) @@ -150,86 +150,86 @@ global GenderButton, RaceButton, ClassButton, AlignmentButton, AbilitiesButton, SkillsButton, AppearanceButton, BiographyButton, NameButton GemRB.LoadWindowPack ("GUICG", 640, 480) - CharGenWindow = GemRB.LoadWindow (0) - GemRB.SetWindowFrame (CharGenWindow) + CharGenWindow = GemRB.LoadWindowObject (0) + CharGenWindow.SetFrame () CharGenState = 0 - 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) + GenderButton = CharGenWindow.GetControl (0) + GenderButton.SetState (IE_GUI_BUTTON_ENABLED) + GenderButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) + GenderButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "GenderPress") + GenderButton.SetText (11956) - RaceButton = GemRB.GetControl (CharGenWindow, 1) - GemRB.SetButtonState (CharGenWindow, RaceButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (CharGenWindow, RaceButton, IE_GUI_BUTTON_ON_PRESS, "RacePress") - GemRB.SetText (CharGenWindow, RaceButton, 11957) + RaceButton = CharGenWindow.GetControl (1) + RaceButton.SetState (IE_GUI_BUTTON_DISABLED) + RaceButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RacePress") + RaceButton.SetText (11957) - ClassButton = GemRB.GetControl (CharGenWindow, 2) - GemRB.SetButtonState (CharGenWindow, ClassButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (CharGenWindow, ClassButton, IE_GUI_BUTTON_ON_PRESS, "ClassPress") - GemRB.SetText (CharGenWindow, ClassButton, 11959) + ClassButton = CharGenWindow.GetControl (2) + ClassButton.SetState (IE_GUI_BUTTON_DISABLED) + ClassButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClassPress") + ClassButton.SetText (11959) - AlignmentButton = GemRB.GetControl (CharGenWindow, 3) - GemRB.SetButtonState (CharGenWindow, AlignmentButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (CharGenWindow, AlignmentButton, IE_GUI_BUTTON_ON_PRESS, "AlignmentPress") - GemRB.SetText (CharGenWindow, AlignmentButton, 11958) + AlignmentButton = CharGenWindow.GetControl (3) + AlignmentButton.SetState (IE_GUI_BUTTON_DISABLED) + AlignmentButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AlignmentPress") + AlignmentButton.SetText (11958) - AbilitiesButton = GemRB.GetControl (CharGenWindow, 4) - GemRB.SetButtonState (CharGenWindow, AbilitiesButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (CharGenWindow, AbilitiesButton, IE_GUI_BUTTON_ON_PRESS, "AbilitiesPress") - GemRB.SetText (CharGenWindow, AbilitiesButton, 11960) + AbilitiesButton = CharGenWindow.GetControl (4) + AbilitiesButton.SetState (IE_GUI_BUTTON_DISABLED) + AbilitiesButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AbilitiesPress") + AbilitiesButton.SetText (11960) - SkillsButton = GemRB.GetControl (CharGenWindow, 5) - GemRB.SetButtonState (CharGenWindow, SkillsButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (CharGenWindow, SkillsButton, IE_GUI_BUTTON_ON_PRESS, "SkillsPress") - GemRB.SetText (CharGenWindow, SkillsButton, 11983) + SkillsButton = CharGenWindow.GetControl (5) + SkillsButton.SetState (IE_GUI_BUTTON_DISABLED) + SkillsButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "SkillsPress") + SkillsButton.SetText (11983) - AppearanceButton = GemRB.GetControl (CharGenWindow, 6) - GemRB.SetButtonState (CharGenWindow, AppearanceButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (CharGenWindow, AppearanceButton, IE_GUI_BUTTON_ON_PRESS, "AppearancePress") - GemRB.SetText (CharGenWindow, AppearanceButton, 11961) + AppearanceButton = CharGenWindow.GetControl (6) + AppearanceButton.SetState (IE_GUI_BUTTON_DISABLED) + AppearanceButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AppearancePress") + AppearanceButton.SetText (11961) - BiographyButton = GemRB.GetControl (CharGenWindow, 16) - GemRB.SetButtonState (CharGenWindow, BiographyButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (CharGenWindow, BiographyButton, IE_GUI_BUTTON_ON_PRESS, "BiographyPress") - GemRB.SetText (CharGenWindow, BiographyButton, 18003) + BiographyButton = CharGenWindow.GetControl (16) + BiographyButton.SetState (IE_GUI_BUTTON_DISABLED) + BiographyButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "BiographyPress") + BiographyButton.SetText (18003) - NameButton = GemRB.GetControl (CharGenWindow, 7) - GemRB.SetButtonState (CharGenWindow, NameButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (CharGenWindow, NameButton, IE_GUI_BUTTON_ON_PRESS, "NamePress") - GemRB.SetText (CharGenWindow, NameButton, 11963) + NameButton = CharGenWindow.GetControl (7) + NameButton.SetState (IE_GUI_BUTTON_DISABLED) + NameButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "NamePress") + NameButton.SetText (11963) - BackButton = GemRB.GetControl (CharGenWindow, 11) - GemRB.SetButtonState (CharGenWindow, BackButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent (CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress") + BackButton = CharGenWindow.GetControl (11) + BackButton.SetState (IE_GUI_BUTTON_ENABLED) + BackButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "BackPress") - PortraitButton = GemRB.GetControl (CharGenWindow, 12) - GemRB.SetButtonFlags (CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE, OP_SET) + PortraitButton = CharGenWindow.GetControl (12) + PortraitButton.SetFlags (IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE, OP_SET) - ImportButton = GemRB.GetControl (CharGenWindow, 13) - GemRB.SetButtonState (CharGenWindow, ImportButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetText (CharGenWindow, ImportButton, 13955) - GemRB.SetEvent (CharGenWindow, ImportButton, IE_GUI_BUTTON_ON_PRESS, "ImportPress") + ImportButton = CharGenWindow.GetControl (13) + ImportButton.SetState (IE_GUI_BUTTON_ENABLED) + ImportButton.SetText (13955) + ImportButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ImportPress") - CancelButton = GemRB.GetControl (CharGenWindow, 15) - GemRB.SetButtonState (CharGenWindow, CancelButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetText (CharGenWindow, CancelButton, 13727) - GemRB.SetEvent (CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress") + CancelButton = CharGenWindow.GetControl (15) + CancelButton.SetState (IE_GUI_BUTTON_ENABLED) + CancelButton.SetText (13727) + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CancelPress") - BackButton = GemRB.GetControl (CharGenWindow, 11) - GemRB.SetButtonState (CharGenWindow, BackButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent (CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress") + BackButton = CharGenWindow.GetControl (11) + BackButton.SetState (IE_GUI_BUTTON_ENABLED) + BackButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "BackPress") - AcceptButton = GemRB.GetControl (CharGenWindow, 8) - GemRB.SetButtonState (CharGenWindow, AcceptButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetText (CharGenWindow, AcceptButton, 11962) - GemRB.SetEvent (CharGenWindow, AcceptButton, IE_GUI_BUTTON_ON_PRESS, "AcceptPress") + AcceptButton = CharGenWindow.GetControl (8) + AcceptButton.SetState (IE_GUI_BUTTON_DISABLED) + AcceptButton.SetText (11962) + AcceptButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AcceptPress") - TextArea = GemRB.GetControl (CharGenWindow, 9) - GemRB.SetText (CharGenWindow, TextArea, 16575) + TextArea = CharGenWindow.GetControl (9) + TextArea.SetText (16575) - GemRB.SetVisible (CharGenWindow, 1) + CharGenWindow.SetVisible (1) return def BackPress(): @@ -243,48 +243,49 @@ CharGenState = 6 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) + RaceButton.SetState (IE_GUI_BUTTON_DISABLED) + RaceButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_NAND) + GenderButton.SetState (IE_GUI_BUTTON_ENABLED) + GenderButton.SetFlags (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) + ClassButton.SetState (IE_GUI_BUTTON_DISABLED) + ClassButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_NAND) + RaceButton.SetState (IE_GUI_BUTTON_ENABLED) + RaceButton.SetFlags (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) + AlignmentButton.SetState (IE_GUI_BUTTON_DISABLED) + AlignmentButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_NAND) + ClassButton.SetState (IE_GUI_BUTTON_ENABLED) + ClassButton.SetFlags (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) + AbilitiesButton.SetState (IE_GUI_BUTTON_DISABLED) + AbilitiesButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_NAND) + AlignmentButton.SetState (IE_GUI_BUTTON_ENABLED) + AlignmentButton.SetFlags (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) + SkillsButton.SetState (IE_GUI_BUTTON_DISABLED) + SkillsButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_NAND) + AbilitiesButton.SetState (IE_GUI_BUTTON_ENABLED) + AbilitiesButton.SetFlags (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) + AppearanceButton.SetState (IE_GUI_BUTTON_DISABLED) + SkillsButton.SetState (IE_GUI_BUTTON_ENABLED) + SkillsButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) SkillsState = 0 elif CharGenState == 6: - GemRB.SetButtonState (CharGenWindow, NameButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetButtonState (CharGenWindow, BiographyButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetButtonState (CharGenWindow, AppearanceButton, IE_GUI_BUTTON_ENABLED) + NameButton.SetState (IE_GUI_BUTTON_DISABLED) + BiographyButton.SetState (IE_GUI_BUTTON_DISABLED) + AppearanceButton.SetState (IE_GUI_BUTTON_ENABLED) - GemRB.SetButtonState (CharGenWindow, AcceptButton, IE_GUI_BUTTON_DISABLED) + AcceptButton.SetState (IE_GUI_BUTTON_DISABLED) SetCharacterDescription() return def CancelPress(): global CharGenWindow - GemRB.UnloadWindow (CharGenWindow) + if CharGenWindow: + CharGenWindow.Unload () GemRB.SetNextScript("PartyFormation") return @@ -295,18 +296,18 @@ GemRB.SetPlayerStat (MyChar, IE_RACE, GemRB.GetVar ("Race") ) ClassIndex = GemRB.GetVar ("Class")-1 - ClassTable = GemRB.LoadTable ("classes") - Class = GemRB.GetTableValue (ClassTable, ClassIndex, 5) + ClassTable = GemRB.LoadTableObject ("classes") + Class = ClassTable.GetValue (ClassIndex, 5) GemRB.SetPlayerStat (MyChar, IE_CLASS, Class) KitIndex = GemRB.GetVar ("Class Kit") GemRB.SetPlayerStat (MyChar, IE_KIT, KitIndex) - AlignmentTable = GemRB.LoadTable ("aligns") - t = GemRB.GetTableValue ( AlignmentTable, GemRB.GetVar ("Alignment")-1, 3) + AlignmentTable = GemRB.LoadTableObject ("aligns") + t = AlignmentTable.GetValue ( GemRB.GetVar ("Alignment")-1, 3) GemRB.SetPlayerStat (MyChar, IE_ALIGNMENT, t) - TmpTable = GemRB.LoadTable ("clskills") + TmpTable = GemRB.LoadTableObject ("clskills") #mage spells - TableName = GemRB.GetTableValue (TmpTable, Class, 2, 0) + TableName = TmpTable.GetValue (Class, 2, 0) if TableName != "*": #todo: set up ALL spell levels not just level 1 SetupSpellLevels(MyChar, TableName, IE_SPELL_TYPE_WIZARD, 1) @@ -319,7 +320,7 @@ j=j<<1 #priest spells - TableName = GemRB.GetTableValue (TmpTable, Class, 1, 0) + TableName = TmpTable.GetValue (Class, 1, 0) if TableName != "*": #there is no separate druid table, falling back to priest if TableName == "MXSPLDRU": @@ -330,18 +331,17 @@ Learnable = GetLearnablePriestSpells( ClassFlag, t, 1) for i in range (len(Learnable) ): GemRB.LearnSpell (MyChar, Learnable[i], 0) - GemRB.UnloadTable (TmpTable) - TmpTable = GemRB.LoadTable ("repstart") - t=GemRB.FindTableValue (AlignmentTable, 3, t) - t = GemRB.GetTableValue (TmpTable, t, 0) + TmpTable = GemRB.LoadTableObject ("repstart") + t=AlignmentTable.FindValue (3, t) + t = TmpTable.GetValue (t, 0) GemRB.SetPlayerStat (MyChar, IE_REPUTATION, t) - TmpTable = GemRB.LoadTable ("strtgold") - a = GemRB.GetTableValue (TmpTable, Class, 1) #number of dice - b = GemRB.GetTableValue (TmpTable, Class, 0) #size - c = GemRB.GetTableValue (TmpTable, Class, 2) #adjustment - d = GemRB.GetTableValue (TmpTable, Class, 3) #external multiplier - e = GemRB.GetTableValue (TmpTable, Class, 4) #level bonus rate + TmpTable = GemRB.LoadTableObject ("strtgold") + a = TmpTable.GetValue (Class, 1) #number of dice + b = TmpTable.GetValue (Class, 0) #size + c = TmpTable.GetValue (Class, 2) #adjustment + d = TmpTable.GetValue (Class, 3) #external multiplier + e = TmpTable.GetValue (Class, 4) #level bonus rate t = GemRB.GetPlayerStat (MyChar, IE_LEVEL) #FIXME: calculate multiclass average if t>1: e=e*(t-1) @@ -365,17 +365,16 @@ GemRB.SetPlayerStat (MyChar, IE_CHR, GemRB.GetVar ("Ability6")) GemRB.SetPlayerName (MyChar, GemRB.GetToken ("CHARNAME"), 0) - TmpTable = GemRB.LoadTable ("clskills") - GemRB.SetPlayerStat (MyChar, IE_XP, GemRB.GetTableValue (TmpTable, Class, 3) ) #this will also set the level (automatically) + TmpTable = GemRB.LoadTableObject ("clskills") + GemRB.SetPlayerStat (MyChar, IE_XP, TmpTable.GetValue (Class, 3) ) #this will also set the level (automatically) - TmpTable=GemRB.LoadTable ("weapprof") - ProfCount = GemRB.GetTableRowCount (TmpTable) + TmpTable=GemRB.LoadTableObject ("weapprof") + ProfCount = TmpTable.GetRowCount () #bg2 weapprof.2da contains the bg1 proficiencies too, skipping those for i in range(ProfCount): - StatID = GemRB.GetTableValue (TmpTable, i, 0) + StatID = TmpTable.GetValue (i, 0) Value = GemRB.GetVar ("Proficiency"+str(i) ) GemRB.SetPlayerStat (MyChar, StatID, Value ) - GemRB.UnloadTable (TmpTable) SetColorStat (MyChar, IE_SKIN_COLOR, GemRB.GetVar ("SkinColor") ) SetColorStat (MyChar, IE_HAIR_COLOR, GemRB.GetVar ("HairColor") ) @@ -394,7 +393,8 @@ GemRB.CreateItem(MyChar, "staf01", 10, 1, 0, 0) GemRB.SetEquippedQuickSlot(MyChar, 0) - GemRB.UnloadWindow (CharGenWindow) + if CharGenWindow: + CharGenWindow.Unload () GemRB.SetNextScript ("PartyFormation") return @@ -403,123 +403,123 @@ global ClassTable, KitTable, RaceTable, AlignmentTable, AbilitiesTable global SkillsTable, ProficienciesTable, RacialEnemyTable - GemRB.TextAreaClear(CharGenWindow, TextArea) + TextArea.Clear() if CharGenState > 7: - GemRB.TextAreaAppend (CharGenWindow, TextArea, 1047) - GemRB.TextAreaAppend (CharGenWindow, TextArea, ": ") - GemRB.TextAreaAppend (CharGenWindow, TextArea, GemRB.GetToken ("CHARNAME")) - GemRB.TextAreaAppend (CharGenWindow, TextArea, "", -1) + TextArea.Append (1047) + TextArea.Append (": ") + TextArea.Append (GemRB.GetToken ("CHARNAME")) + TextArea.Append ("", -1) if CharGenState > 0: - GemRB.TextAreaAppend (CharGenWindow, TextArea, 12135) - GemRB.TextAreaAppend (CharGenWindow, TextArea, ": ") + TextArea.Append (12135) + TextArea.Append (": ") if GemRB.GetVar ("Gender") == 1: - GemRB.TextAreaAppend (CharGenWindow, TextArea, 1050) + TextArea.Append (1050) else: - GemRB.TextAreaAppend (CharGenWindow, TextArea, 1051) + TextArea.Append (1051) if CharGenState > 2: - GemRB.TextAreaAppend (CharGenWindow, TextArea, 12136, -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, ": ") + TextArea.Append (12136, -1) + TextArea.Append (": ") #this is only mage school in iwd KitIndex = GemRB.GetVar ("MAGESCHOOL") if KitIndex == 0: Class = GemRB.GetVar ("Class")-1 - ClassTitle=GemRB.GetTableValue (ClassTable, Class, 2) + ClassTitle=ClassTable.GetValue (Class, 2) else: - ClassTitle=GemRB.GetTableValue (KitTable, KitIndex, 2) - GemRB.TextAreaAppend (CharGenWindow, TextArea, ClassTitle) + ClassTitle=KitTable.GetValue (KitIndex, 2) + TextArea.Append (ClassTitle) if CharGenState > 1: - GemRB.TextAreaAppend (CharGenWindow, TextArea, 1048, -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, ": ") - GemRB.TextAreaAppend (CharGenWindow, TextArea, GemRB.GetTableValue (RaceTable, GemRB.GetVar ("Race") - 1, 2) ) + TextArea.Append (1048, -1) + TextArea.Append (": ") + TextArea.Append (RaceTable.GetValue (GemRB.GetVar ("Race") - 1, 2) ) if CharGenState > 3: - GemRB.TextAreaAppend (CharGenWindow, TextArea, 1049, -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, ": ") - GemRB.TextAreaAppend (CharGenWindow, TextArea, GemRB.GetTableValue (AlignmentTable, GemRB.GetVar ("Alignment") - 1, 2) ) + TextArea.Append (1049, -1) + TextArea.Append (": ") + TextArea.Append (AlignmentTable.GetValue (GemRB.GetVar ("Alignment") - 1, 2) ) if CharGenState > 4: - GemRB.TextAreaAppend (CharGenWindow, TextArea, "", -1) + TextArea.Append ("", -1) for i in range (6): - GemRB.TextAreaAppend (CharGenWindow, TextArea, GemRB.GetTableValue (AbilitiesTable, i, 2), -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, ": " ) - GemRB.TextAreaAppend (CharGenWindow, TextArea, str(GemRB.GetVar ("Ability" + str(i + 1))) ) + TextArea.Append (AbilitiesTable.GetValue (i, 2), -1) + TextArea.Append (": " ) + TextArea.Append (str(GemRB.GetVar ("Ability" + str(i + 1))) ) if CharGenState > 5: Class = GemRB.GetVar ("Class")-1 - ClassName = GemRB.GetTableRowName (ClassTable, Class) - Class = GemRB.GetTableValue (ClassTable, Class, 5) - IsRanger = GemRB.GetTableValue (ClassSkillsTable, Class, 0) - IsArcane = GemRB.GetTableValue (ClassSkillsTable, Class, 1) - IsMage = GemRB.GetTableValue (ClassSkillsTable, Class, 2) - IsBard = GemRB.GetTableValue (ClassSkillsTable, Class, 4) - IsThief = GemRB.GetTableValue (ClassSkillsTable, Class, 5) + ClassName = ClassTable.GetRowName (Class) + Class = ClassTable.GetValue (Class, 5) + IsRanger = ClassSkillsTable.GetValue (Class, 0) + IsArcane = ClassSkillsTable.GetValue (Class, 1) + IsMage = ClassSkillsTable.GetValue (Class, 2) + IsBard = ClassSkillsTable.GetValue (Class, 4) + IsThief = ClassSkillsTable.GetValue (Class, 5) if IsThief!="*": - GemRB.TextAreaAppend (CharGenWindow, TextArea, "", -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, 8442, -1) + TextArea.Append ("", -1) + TextArea.Append (8442, -1) for i in range (4): - GemRB.TextAreaAppend (CharGenWindow, TextArea, GemRB.GetTableValue (SkillsTable, i, 2), -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, ": " ) - GemRB.TextAreaAppend (CharGenWindow, TextArea, str(GemRB.GetVar ("Skill" + str(i))) ) - GemRB.TextAreaAppend (CharGenWindow, TextArea, "%" ) + TextArea.Append (SkillsTable.GetValue (i, 2), -1) + TextArea.Append (": " ) + TextArea.Append (str(GemRB.GetVar ("Skill" + str(i))) ) + TextArea.Append ("%" ) elif IsRanger!="*": - GemRB.TextAreaAppend (CharGenWindow, TextArea, "", -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, 8442, -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, 9461, -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, ": " ) - GemRB.TextAreaAppend (CharGenWindow, TextArea, str(GemRB.GetVar ("Skill0")) ) - GemRB.TextAreaAppend (CharGenWindow, TextArea, "%" ) - GemRB.TextAreaAppend (CharGenWindow, TextArea, "", -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, 15982, -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, ": " ) + TextArea.Append ("", -1) + TextArea.Append (8442, -1) + TextArea.Append (9461, -1) + TextArea.Append (": " ) + TextArea.Append (str(GemRB.GetVar ("Skill0")) ) + TextArea.Append ("%" ) + TextArea.Append ("", -1) + TextArea.Append (15982, -1) + TextArea.Append (": " ) RacialEnemy = GemRB.GetVar ("RacialEnemyIndex") + GemRB.GetVar ("RacialEnemy") - 1 - GemRB.TextAreaAppend (CharGenWindow, TextArea, GemRB.GetTableValue (RacialEnemyTable, RacialEnemy, 2) ) + TextArea.Append (RacialEnemyTable.GetValue (RacialEnemy, 2) ) elif IsBard!="*": - GemRB.TextAreaAppend (CharGenWindow, TextArea, "", -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, 8442, -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, 9463, -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, ": " ) - GemRB.TextAreaAppend (CharGenWindow, TextArea, str(GemRB.GetVar ("Skill2")) ) - GemRB.TextAreaAppend (CharGenWindow, TextArea, "%" ) + TextArea.Append ("", -1) + TextArea.Append (8442, -1) + TextArea.Append (9463, -1) + TextArea.Append (": " ) + TextArea.Append (str(GemRB.GetVar ("Skill2")) ) + TextArea.Append ("%" ) - GemRB.TextAreaAppend (CharGenWindow, TextArea, "", -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, 9466, -1) + TextArea.Append ("", -1) + TextArea.Append (9466, -1) for i in range (15): ProficiencyValue = GemRB.GetVar ("Proficiency" + str(i) ) if ProficiencyValue > 0: - GemRB.TextAreaAppend (CharGenWindow, TextArea, GemRB.GetTableValue (ProficienciesTable, i, 3), -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, " ") + TextArea.Append (ProficienciesTable.GetValue (i, 3), -1) + TextArea.Append (" ") j = 0 while j < ProficiencyValue: - GemRB.TextAreaAppend (CharGenWindow, TextArea, "+") + TextArea.Append ("+") j = j + 1 if IsMage !="*": - GemRB.TextAreaAppend (CharGenWindow, TextArea, "", -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, 11027, -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, ": " ) - t = GemRB.GetTableValue ( AlignmentTable, GemRB.GetVar ("Alignment")-1, 3) + TextArea.Append ("", -1) + TextArea.Append (11027, -1) + TextArea.Append (": " ) + t = AlignmentTable.GetValue ( GemRB.GetVar ("Alignment")-1, 3) Learnable = GetLearnableMageSpells(GemRB.GetVar ("Class Kit"), t,1) MageSpellBook = GemRB.GetVar ("MageSpellBook") MageMemorized = GemRB.GetVar ("MageMemorized") for i in range (len(Learnable)): if (1 << i) & MageSpellBook: Spell = GemRB.GetSpell (Learnable[i]) - GemRB.TextAreaAppend (CharGenWindow, TextArea, Spell["SpellName"], -1) + TextArea.Append (Spell["SpellName"], -1) if (1 << i) & MageMemorized: - GemRB.TextAreaAppend (CharGenWindow, TextArea, "+") - GemRB.TextAreaAppend (CharGenWindow, TextArea, " ") + TextArea.Append ("+") + TextArea.Append (" ") if IsArcane!="*": - GemRB.TextAreaAppend (CharGenWindow, TextArea, "", -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, 11028, -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, ": " ) - t = GemRB.GetTableValue ( AlignmentTable, GemRB.GetVar ("Alignment")-1, 3) + TextArea.Append ("", -1) + TextArea.Append (11028, -1) + TextArea.Append (": " ) + t = AlignmentTable.GetValue ( GemRB.GetVar ("Alignment")-1, 3) Learnable = GetLearnablePriestSpells( ClassFlag, t, 1) PriestMemorized = GemRB.GetVar ("PriestMemorized") for i in range (len(Learnable)): if (1 << i) & PriestMemorized: Spell = GemRB.GetSpell (Learnable[i]) - GemRB.TextAreaAppend (CharGenWindow, TextArea, Spell["SpellName"], -1) - GemRB.TextAreaAppend (CharGenWindow, TextArea, " +") + TextArea.Append (Spell["SpellName"], -1) + TextArea.Append (" +") return @@ -528,59 +528,60 @@ def GenderPress(): global CharGenWindow, GenderWindow, GenderDoneButton, GenderTextArea - GemRB.SetVisible (CharGenWindow, 0) - GenderWindow = GemRB.LoadWindow (1) + CharGenWindow.SetVisible (0) + GenderWindow = GemRB.LoadWindowObject (1) GemRB.SetVar ("Gender", 0) - 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") + MaleButton = GenderWindow.GetControl (2) + MaleButton.SetState (IE_GUI_BUTTON_ENABLED) + MaleButton.SetFlags (IE_GUI_BUTTON_RADIOBUTTON,OP_OR) + MaleButton.SetEvent (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") + FemaleButton = GenderWindow.GetControl (3) + FemaleButton.SetState (IE_GUI_BUTTON_ENABLED) + FemaleButton.SetFlags (IE_GUI_BUTTON_RADIOBUTTON,OP_OR) + FemaleButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "FemalePress") - GemRB.SetVarAssoc (GenderWindow, MaleButton, "Gender", 1) - GemRB.SetVarAssoc (GenderWindow, FemaleButton, "Gender", 2) + MaleButton.SetVarAssoc ("Gender", 1) + FemaleButton.SetVarAssoc ("Gender", 2) - GenderTextArea = GemRB.GetControl (GenderWindow, 5) - GemRB.SetText (GenderWindow, GenderTextArea, 17236) + GenderTextArea = GenderWindow.GetControl (5) + GenderTextArea.SetText (17236) - GenderDoneButton = GemRB.GetControl (GenderWindow, 0) - GemRB.SetButtonState (GenderWindow, GenderDoneButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (GenderWindow, GenderDoneButton, IE_GUI_BUTTON_ON_PRESS, "GenderDonePress") - GemRB.SetText (GenderWindow, GenderDoneButton, 11973) - GemRB.SetButtonFlags (GenderWindow, GenderDoneButton, IE_GUI_BUTTON_DEFAULT, OP_OR) + GenderDoneButton = GenderWindow.GetControl (0) + GenderDoneButton.SetState (IE_GUI_BUTTON_DISABLED) + GenderDoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "GenderDonePress") + GenderDoneButton.SetText (11973) + GenderDoneButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) - GenderCancelButton = GemRB.GetControl (GenderWindow, 6) - GemRB.SetButtonState (GenderWindow, GenderCancelButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent (GenderWindow, GenderCancelButton, IE_GUI_BUTTON_ON_PRESS, "GenderCancelPress") - GemRB.SetText (GenderWindow, GenderCancelButton, 13727) + GenderCancelButton = GenderWindow.GetControl (6) + GenderCancelButton.SetState (IE_GUI_BUTTON_ENABLED) + GenderCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "GenderCancelPress") + GenderCancelButton.SetText (13727) - GemRB.SetVisible (GenderWindow, 1) + GenderWindow.SetVisible (1) return def MalePress(): global GenderWindow, GenderDoneButton, GenderTextArea - GemRB.SetText (GenderWindow, GenderTextArea, 13083) - GemRB.SetButtonState (GenderWindow, GenderDoneButton, IE_GUI_BUTTON_ENABLED) + GenderTextArea.SetText (13083) + GenderDoneButton.SetState (IE_GUI_BUTTON_ENABLED) return def FemalePress(): global GenderWindow, GenderDoneButton, GenderTextArea - GemRB.SetText (GenderWindow, GenderTextArea, 13084) - GemRB.SetButtonState (GenderWindow, GenderDoneButton, IE_GUI_BUTTON_ENABLED) + GenderTextArea.SetText (13084) + GenderDoneButton.SetState (IE_GUI_BUTTON_ENABLED) return def GenderDonePress(): global CharGenWindow, GenderWindow - GemRB.UnloadWindow (GenderWindow) - GemRB.SetVisible (CharGenWindow, 1) + if GenderWindow: + GenderWindow.Unload () + CharGenWindow.SetVisible (1) PortraitSelect() return @@ -588,54 +589,55 @@ global CharGenWindow, GenderWindow, Gender GemRB.SetVar ("Gender", 0) - GemRB.UnloadWindow (GenderWindow) - GemRB.SetVisible (CharGenWindow, 1) + if GenderWindow: + GenderWindow.Unload () + CharGenWindow.SetVisible (1) return def PortraitSelect(): global CharGenWindow, PortraitWindow, Portrait, PortraitPortraitButton, PortraitsTable - GemRB.SetVisible (CharGenWindow, 0) - PortraitWindow = GemRB.LoadWindow (11) + CharGenWindow.SetVisible (0) + PortraitWindow = GemRB.LoadWindowObject (11) # this is not the correct one, but I don't know which is - PortraitsTable = GemRB.LoadTable ("PICTURES") + PortraitsTable = GemRB.LoadTableObject ("PICTURES") Portrait = 0 - PortraitPortraitButton = GemRB.GetControl (PortraitWindow, 1) - GemRB.SetButtonFlags (PortraitWindow, PortraitPortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE, OP_SET) + PortraitPortraitButton = PortraitWindow.GetControl (1) + PortraitPortraitButton.SetFlags (IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE, OP_SET) - PortraitLeftButton = GemRB.GetControl (PortraitWindow, 2) - GemRB.SetButtonState (PortraitWindow, PortraitLeftButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent (PortraitWindow, PortraitLeftButton, IE_GUI_BUTTON_ON_PRESS, "PortraitLeftPress") - GemRB.SetButtonFlags (PortraitWindow, PortraitLeftButton, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) + PortraitLeftButton = PortraitWindow.GetControl (2) + PortraitLeftButton.SetState (IE_GUI_BUTTON_ENABLED) + PortraitLeftButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "PortraitLeftPress") + PortraitLeftButton.SetFlags (IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - PortraitRightButton = GemRB.GetControl (PortraitWindow, 3) - GemRB.SetButtonState (PortraitWindow, PortraitRightButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent (PortraitWindow, PortraitRightButton, IE_GUI_BUTTON_ON_PRESS, "PortraitRightPress") - GemRB.SetButtonFlags (PortraitWindow, PortraitRightButton, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) + PortraitRightButton = PortraitWindow.GetControl (3) + PortraitRightButton.SetState (IE_GUI_BUTTON_ENABLED) + PortraitRightButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "PortraitRightPress") + PortraitRightButton.SetFlags (IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - PortraitCustomButton = GemRB.GetControl (PortraitWindow, 6) - GemRB.SetButtonState (PortraitWindow, PortraitCustomButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent (PortraitWindow, PortraitCustomButton, IE_GUI_BUTTON_ON_PRESS, "PortraitCustomPress") - GemRB.SetText (PortraitWindow, PortraitCustomButton, 17545) + PortraitCustomButton = PortraitWindow.GetControl (6) + PortraitCustomButton.SetState (IE_GUI_BUTTON_ENABLED) + PortraitCustomButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "PortraitCustomPress") + PortraitCustomButton.SetText (17545) - PortraitDoneButton = GemRB.GetControl (PortraitWindow, 0) - GemRB.SetButtonState (PortraitWindow, PortraitDoneButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent (PortraitWindow, PortraitDoneButton, IE_GUI_BUTTON_ON_PRESS, "PortraitDonePress") - GemRB.SetText (PortraitWindow, PortraitDoneButton, 11973) - GemRB.SetButtonFlags (PortraitWindow, PortraitDoneButton, IE_GUI_BUTTON_DEFAULT, OP_OR) + PortraitDoneButton = PortraitWindow.GetControl (0) + PortraitDoneButton.SetState (IE_GUI_BUTTON_ENABLED) + PortraitDoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "PortraitDonePress") + PortraitDoneButton.SetText (11973) + PortraitDoneButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) - PortraitCancelButton = GemRB.GetControl (PortraitWindow, 5) - GemRB.SetButtonState (PortraitWindow, PortraitCancelButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent (PortraitWindow, PortraitCancelButton, IE_GUI_BUTTON_ON_PRESS, "PortraitCancelPress") - GemRB.SetText (PortraitWindow, PortraitCancelButton, 13727) + PortraitCancelButton = PortraitWindow.GetControl (5) + PortraitCancelButton.SetState (IE_GUI_BUTTON_ENABLED) + PortraitCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "PortraitCancelPress") + PortraitCancelButton.SetText (13727) - while GemRB.GetTableValue (PortraitsTable, Portrait, 0) != GemRB.GetVar ("Gender"): + while PortraitsTable.GetValue (Portrait, 0) != GemRB.GetVar ("Gender"): Portrait = Portrait + 1 - GemRB.SetButtonPicture(PortraitWindow, PortraitPortraitButton, GemRB.GetTableRowName (PortraitsTable, Portrait) + "G") + PortraitPortraitButton.SetPicture(PortraitsTable.GetRowName (Portrait) + "G") - GemRB.SetVisible (PortraitWindow, 1) + PortraitWindow.SetVisible (1) return def PortraitLeftPress(): @@ -644,9 +646,9 @@ while True: Portrait = Portrait - 1 if Portrait < 0: - Portrait = GemRB.GetTableRowCount (PortraitsTable) - 1 - if GemRB.GetTableValue (PortraitsTable, Portrait, 0) == GemRB.GetVar ("Gender"): - GemRB.SetButtonPicture(PortraitWindow, PortraitPortraitButton, GemRB.GetTableRowName (PortraitsTable, Portrait) + "G") + Portrait = PortraitsTable.GetRowCount () - 1 + if PortraitsTable.GetValue (Portrait, 0) == GemRB.GetVar ("Gender"): + PortraitPortraitButton.SetPicture(PortraitsTable.GetRowName (Portrait) + "G") return def PortraitRightPress(): @@ -654,10 +656,10 @@ while True: Portrait = Portrait + 1 - if Portrait == GemRB.GetTableRowCount (PortraitsTable): + if Portrait == PortraitsTable.GetRowCount (): Portrait = 0 - if GemRB.GetTableValue (PortraitsTable, Portrait, 0) == GemRB.GetVar ("Gender"): - GemRB.SetButtonPicture(PortraitWindow, PortraitPortraitButton, GemRB.GetTableRowName (PortraitsTable, Portrait) + "G") + if PortraitsTable.GetValue (Portrait, 0) == GemRB.GetVar ("Gender"): + PortraitPortraitButton.SetPicture(PortraitsTable.GetRowName (Portrait) + "G") return def CustomDone(): @@ -665,72 +667,75 @@ Window = CustomWindow - PortraitName = GemRB.QueryText (Window, PortraitList2) + PortraitName = PortraitList2.QueryText () GemRB.SetToken ("SmallPortrait", PortraitName) - PortraitName = GemRB.QueryText (Window, PortraitList1) + PortraitName = PortraitList1.QueryText () GemRB.SetToken ("LargePortrait", PortraitName) - GemRB.UnloadWindow (Window) + if Window: + Window.Unload () - GemRB.UnloadWindow (PortraitWindow) - GemRB.SetButtonPicture(CharGenWindow, PortraitButton, PortraitName) - 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) + if PortraitWindow: + PortraitWindow.Unload () + PortraitButton.SetPicture(PortraitName) + GenderButton.SetState (IE_GUI_BUTTON_DISABLED) + GenderButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_NAND) + RaceButton.SetState (IE_GUI_BUTTON_ENABLED) + RaceButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) CharGenState = 1 Portrait = -1 SetCharacterDescription() - GemRB.SetVisible (CharGenWindow, 1) + CharGenWindow.SetVisible (1) return def CustomAbort(): - GemRB.UnloadWindow (CustomWindow) + if CustomWindow: + CustomWindow.Unload () return def LargeCustomPortrait(): Window = CustomWindow - Portrait = GemRB.QueryText (Window, PortraitList1) + Portrait = PortraitList1.QueryText () #small hack if GemRB.GetVar ("Row1") == RowCount1: return - Label = GemRB.GetControl (Window, 0x10000007) - GemRB.SetText (Window, Label, Portrait) + Label = Window.GetControl (0x10000007) + Label.SetText (Portrait) - Button = GemRB.GetControl (Window, 6) + Button = Window.GetControl (6) if Portrait=="": Portrait = "NOPORTMD" - GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + Button.SetState (IE_GUI_BUTTON_DISABLED) else: - if GemRB.QueryText (Window, PortraitList2)!="": - GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) + if PortraitList2.QueryText ()!="": + Button.SetState (IE_GUI_BUTTON_ENABLED) - Button = GemRB.GetControl (Window, 0) - GemRB.SetButtonPicture (Window, Button, Portrait, "NOPORTMD") + Button = Window.GetControl (0) + Button.SetPicture (Portrait, "NOPORTMD") return def SmallCustomPortrait(): Window = CustomWindow - Portrait = GemRB.QueryText (Window, PortraitList2) + Portrait = PortraitList2.QueryText () #small hack if GemRB.GetVar ("Row2") == RowCount2: return - Label = GemRB.GetControl (Window, 0x10000008) - GemRB.SetText (Window, Label, Portrait) + Label = Window.GetControl (0x10000008) + Label.SetText (Portrait) - Button = GemRB.GetControl (Window, 6) + Button = Window.GetControl (6) if Portrait=="": Portrait = "NOPORTSM" - GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + Button.SetState (IE_GUI_BUTTON_DISABLED) else: - if GemRB.QueryText (Window, PortraitList1)!="": - GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) + if PortraitList1.QueryText ()!="": + Button.SetState (IE_GUI_BUTTON_ENABLED) - Button = GemRB.GetControl (Window, 1) - GemRB.SetButtonPicture (Window, Button, Portrait, "NOPORTSM") + Button = Window.GetControl (1) + Button.SetPicture (Portrait, "NOPORTSM") return def PortraitCustomPress(): @@ -738,63 +743,65 @@ global RowCount1, RowCount2 global CustomWindow - CustomWindow = Window = GemRB.LoadWindow (18) - PortraitList1 = GemRB.GetControl (Window, 2) + CustomWindow = Window = GemRB.LoadWindowObject (18) + PortraitList1 = Window.GetControl (2) RowCount1 = GemRB.GetPortraits (Window, PortraitList1, 0) - GemRB.SetEvent (Window, PortraitList1, IE_GUI_TEXTAREA_ON_CHANGE, "LargeCustomPortrait") + PortraitList1.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "LargeCustomPortrait") GemRB.SetVar ("Row1", RowCount1) - GemRB.SetVarAssoc (Window, PortraitList1, "Row1",RowCount1) + PortraitList1.SetVarAssoc ("Row1",RowCount1) - PortraitList2 = GemRB.GetControl (Window, 4) + PortraitList2 = Window.GetControl (4) RowCount2 = GemRB.GetPortraits (Window, PortraitList2, 1) - GemRB.SetEvent (Window, PortraitList2, IE_GUI_TEXTAREA_ON_CHANGE, "SmallCustomPortrait") + PortraitList2.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "SmallCustomPortrait") GemRB.SetVar ("Row2", RowCount2) - GemRB.SetVarAssoc (Window, PortraitList2, "Row2",RowCount2) + PortraitList2.SetVarAssoc ("Row2",RowCount2) - Button = GemRB.GetControl (Window, 6) - GemRB.SetText (Window, Button, 11973) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CustomDone") - GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + Button = Window.GetControl (6) + Button.SetText (11973) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CustomDone") + Button.SetState (IE_GUI_BUTTON_DISABLED) - Button = GemRB.GetControl (Window, 7) - GemRB.SetText (Window, Button, 15416) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CustomAbort") + Button = Window.GetControl (7) + Button.SetText (15416) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CustomAbort") - Button = GemRB.GetControl (Window, 0) - PortraitName = GemRB.GetTableRowName (PortraitsTable, Portrait)+"L" - GemRB.SetButtonPicture (Window, Button, PortraitName, "NOPORTMD") - GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) + Button = Window.GetControl (0) + PortraitName = PortraitsTable.GetRowName (Portrait)+"L" + Button.SetPicture (PortraitName, "NOPORTMD") + Button.SetState (IE_GUI_BUTTON_LOCKED) - Button = GemRB.GetControl (Window, 1) - PortraitName = GemRB.GetTableRowName (PortraitsTable, Portrait)+"S" - GemRB.SetButtonPicture (Window, Button, PortraitName, "NOPORTSM") - GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) + Button = Window.GetControl (1) + PortraitName = PortraitsTable.GetRowName (Portrait)+"S" + Button.SetPicture (PortraitName, "NOPORTSM") + Button.SetState (IE_GUI_BUTTON_LOCKED) - GemRB.ShowModal (Window, MODAL_SHADOW_NONE) + Window.ShowModal (MODAL_SHADOW_NONE) return def PortraitDonePress(): global CharGenWindow, CharGenState, PortraitWindow, PortraitButton, PortraitsTable, Portrait, GenderButton, RaceButton - PortraitName = GemRB.GetTableRowName (PortraitsTable, Portrait ) + PortraitName = PortraitsTable.GetRowName (Portrait ) GemRB.SetToken ("SmallPortrait", PortraitName+"S") GemRB.SetToken ("LargePortrait", PortraitName+"L") - GemRB.SetButtonPicture(CharGenWindow, PortraitButton, GemRB.GetTableRowName (PortraitsTable, 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) + PortraitButton.SetPicture(PortraitsTable.GetRowName (Portrait) + "L") + GenderButton.SetState (IE_GUI_BUTTON_DISABLED) + GenderButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_NAND) + RaceButton.SetState (IE_GUI_BUTTON_ENABLED) + RaceButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) CharGenState = 1 SetCharacterDescription() - GemRB.SetVisible (CharGenWindow, 1) - GemRB.UnloadWindow (PortraitWindow) + CharGenWindow.SetVisible (1) + if PortraitWindow: + PortraitWindow.Unload () return def PortraitCancelPress(): global CharGenWindow, PortraitWindow - GemRB.UnloadWindow (PortraitWindow) - GemRB.SetVisible (CharGenWindow, 1) + if PortraitWindow: + PortraitWindow.Unload () + CharGenWindow.SetVisible (1) return # Race Selection @@ -802,65 +809,67 @@ def RacePress(): global CharGenWindow, RaceWindow, RaceDoneButton, RaceTable, RaceTextArea - GemRB.SetVisible (CharGenWindow, 0) - RaceWindow = GemRB.LoadWindow (8) - RaceTable = GemRB.LoadTable ("RACES") + CharGenWindow.SetVisible (0) + RaceWindow = GemRB.LoadWindowObject (8) + RaceTable = GemRB.LoadTableObject ("RACES") GemRB.SetVar ("Race", 0) for i in range (2, 8): - RaceSelectButton = GemRB.GetControl (RaceWindow, i) - GemRB.SetButtonFlags (RaceWindow, RaceSelectButton, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) + RaceSelectButton = RaceWindow.GetControl (i) + RaceSelectButton.SetFlags (IE_GUI_BUTTON_RADIOBUTTON, OP_OR) for i in range (2, 8): - RaceSelectButton = GemRB.GetControl (RaceWindow, i) - GemRB.SetButtonState (RaceWindow, RaceSelectButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent (RaceWindow, RaceSelectButton, IE_GUI_BUTTON_ON_PRESS, "RaceSelectPress") - GemRB.SetText (RaceWindow, RaceSelectButton, GemRB.GetTableValue (RaceTable, i - 2, 0)) - GemRB.SetVarAssoc (RaceWindow, RaceSelectButton, "Race", i - 1) + RaceSelectButton = RaceWindow.GetControl (i) + RaceSelectButton.SetState (IE_GUI_BUTTON_ENABLED) + RaceSelectButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RaceSelectPress") + RaceSelectButton.SetText (RaceTable.GetValue (i - 2, 0)) + RaceSelectButton.SetVarAssoc ("Race", i - 1) - RaceTextArea = GemRB.GetControl (RaceWindow, 8) - GemRB.SetText (RaceWindow, RaceTextArea, 17237) + RaceTextArea = RaceWindow.GetControl (8) + RaceTextArea.SetText (17237) - RaceDoneButton = GemRB.GetControl (RaceWindow, 0) - GemRB.SetButtonState (RaceWindow, RaceDoneButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (RaceWindow, RaceDoneButton, IE_GUI_BUTTON_ON_PRESS, "RaceDonePress") - GemRB.SetText (RaceWindow, RaceDoneButton, 11973) - GemRB.SetButtonFlags (RaceWindow, RaceDoneButton, IE_GUI_BUTTON_DEFAULT, OP_OR) + RaceDoneButton = RaceWindow.GetControl (0) + RaceDoneButton.SetState (IE_GUI_BUTTON_DISABLED) + RaceDoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RaceDonePress") + RaceDoneButton.SetText (11973) + RaceDoneButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) - RaceCancelButton = GemRB.GetControl (RaceWindow, 10) - GemRB.SetButtonState (RaceWindow, RaceCancelButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent (RaceWindow, RaceCancelButton, IE_GUI_BUTTON_ON_PRESS, "RaceCancelPress") - GemRB.SetText (RaceWindow, RaceCancelButton, 13727) + RaceCancelButton = RaceWindow.GetControl (10) + RaceCancelButton.SetState (IE_GUI_BUTTON_ENABLED) + RaceCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RaceCancelPress") + RaceCancelButton.SetText (13727) - GemRB.SetVisible (RaceWindow, 1) + RaceWindow.SetVisible (1) return def RaceSelectPress(): global RaceWindow, RaceDoneButton, RaceTable, RaceTextArea Race = GemRB.GetVar ("Race") - 1 - GemRB.SetText (RaceWindow, RaceTextArea, GemRB.GetTableValue (RaceTable, Race, 1) ) - GemRB.SetButtonState (RaceWindow, RaceDoneButton, IE_GUI_BUTTON_ENABLED) + RaceTextArea.SetText (RaceTable.GetValue (Race, 1) ) + RaceDoneButton.SetState (IE_GUI_BUTTON_ENABLED) return def RaceDonePress(): global CharGenWindow, CharGenState, RaceWindow, RaceButton, ClassButton - 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) + if RaceWindow: + RaceWindow.Unload () + RaceButton.SetState (IE_GUI_BUTTON_DISABLED) + RaceButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_NAND) + ClassButton.SetState (IE_GUI_BUTTON_ENABLED) + ClassButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) CharGenState = 2 SetCharacterDescription() - GemRB.SetVisible (CharGenWindow, 1) + CharGenWindow.SetVisible (1) return def RaceCancelPress(): global CharGenWindow, RaceWindow - GemRB.UnloadWindow (RaceWindow) - GemRB.SetVisible (CharGenWindow, 1) + if RaceWindow: + RaceWindow.Unload () + CharGenWindow.SetVisible (1) return # Class Selection @@ -868,224 +877,230 @@ def ClassPress(): global CharGenWindow, ClassWindow, ClassTable, KitTable, ClassTextArea, ClassDoneButton - GemRB.SetVisible (CharGenWindow, 0) - ClassWindow = GemRB.LoadWindow (2) - ClassTable = GemRB.LoadTable ("classes") - KitTable = GemRB.LoadTable ("magesch") - ClassCount = GemRB.GetTableRowCount (ClassTable) - RaceName = GemRB.GetTableRowName (RaceTable, GemRB.GetVar ("Race") - 1) + CharGenWindow.SetVisible (0) + ClassWindow = GemRB.LoadWindowObject (2) + ClassTable = GemRB.LoadTableObject ("classes") + KitTable = GemRB.LoadTableObject ("magesch") + ClassCount = ClassTable.GetRowCount () + RaceName = RaceTable.GetRowName (GemRB.GetVar ("Race") - 1) GemRB.SetVar ("Class", 0) GemRB.SetVar ("Class Kit", 0) GemRB.SetVar ("MAGESCHOOL", 0) for i in range (2, 10): - ClassSelectButton = GemRB.GetControl (ClassWindow, i) - GemRB.SetButtonFlags (ClassWindow, ClassSelectButton, IE_GUI_BUTTON_RADIOBUTTON, OP_SET) + ClassSelectButton = ClassWindow.GetControl (i) + ClassSelectButton.SetFlags (IE_GUI_BUTTON_RADIOBUTTON, OP_SET) HasMulti = 0 j = 2 for i in range (ClassCount): - Allowed = GemRB.GetTableValue (ClassTable, GemRB.GetTableRowName (ClassTable, i), RaceName) - if GemRB.GetTableValue (ClassTable, i, 4): + Allowed = ClassTable.GetValue (ClassTable.GetRowName (i), RaceName) + if ClassTable.GetValue (i, 4): if Allowed != 0: HasMulti = 1 else: - ClassSelectButton = GemRB.GetControl (ClassWindow, j) + ClassSelectButton = ClassWindow.GetControl (j) j = j + 1 if Allowed > 0: - GemRB.SetButtonState (ClassWindow, ClassSelectButton, IE_GUI_BUTTON_ENABLED) + ClassSelectButton.SetState (IE_GUI_BUTTON_ENABLED) else: - GemRB.SetButtonState (ClassWindow, ClassSelectButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (ClassWindow, ClassSelectButton, IE_GUI_BUTTON_ON_PRESS, "ClassSelectPress") - GemRB.SetText (ClassWindow, ClassSelectButton, GemRB.GetTableValue (ClassTable, i, 0) ) - GemRB.SetVarAssoc (ClassWindow, ClassSelectButton , "Class", i + 1) + ClassSelectButton.SetState (IE_GUI_BUTTON_DISABLED) + ClassSelectButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClassSelectPress") + ClassSelectButton.SetText (ClassTable.GetValue (i, 0) ) + ClassSelectButton.SetVarAssoc ("Class", i + 1) - ClassMultiButton = GemRB.GetControl (ClassWindow, 10) + ClassMultiButton = ClassWindow.GetControl (10) if HasMulti == 0: - GemRB.SetButtonState (ClassWindow, ClassMultiButton, IE_GUI_BUTTON_DISABLED) + ClassMultiButton.SetState (IE_GUI_BUTTON_DISABLED) else: - GemRB.SetButtonState (ClassWindow, ClassMultiButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent (ClassWindow, ClassMultiButton, IE_GUI_BUTTON_ON_PRESS, "ClassMultiPress") - GemRB.SetText (ClassWindow, ClassMultiButton, 11993) + ClassMultiButton.SetState (IE_GUI_BUTTON_ENABLED) + ClassMultiButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClassMultiPress") + ClassMultiButton.SetText (11993) - KitButton = GemRB.GetControl (ClassWindow, 11) + KitButton = ClassWindow.GetControl (11) #only the mage class has schools - Allowed = GemRB.GetTableValue (ClassTable, "MAGE", RaceName) + Allowed = ClassTable.GetValue ("MAGE", RaceName) if Allowed: - GemRB.SetButtonState (ClassWindow, KitButton, IE_GUI_BUTTON_ENABLED) + KitButton.SetState (IE_GUI_BUTTON_ENABLED) else: - GemRB.SetButtonState (ClassWindow, KitButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (ClassWindow, KitButton, IE_GUI_BUTTON_ON_PRESS, "KitPress") - GemRB.SetText (ClassWindow, KitButton, 11994) + KitButton.SetState (IE_GUI_BUTTON_DISABLED) + KitButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "KitPress") + KitButton.SetText (11994) - ClassTextArea = GemRB.GetControl (ClassWindow, 13) - GemRB.SetText (ClassWindow, ClassTextArea, 17242) + ClassTextArea = ClassWindow.GetControl (13) + ClassTextArea.SetText (17242) - ClassDoneButton = GemRB.GetControl (ClassWindow, 0) - GemRB.SetButtonState (ClassWindow, ClassDoneButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (ClassWindow, ClassDoneButton, IE_GUI_BUTTON_ON_PRESS, "ClassDonePress") - GemRB.SetText (ClassWindow, ClassDoneButton, 11973) - GemRB.SetButtonFlags (ClassWindow, ClassDoneButton, IE_GUI_BUTTON_DEFAULT, OP_OR) + ClassDoneButton = ClassWindow.GetControl (0) + ClassDoneButton.SetState (IE_GUI_BUTTON_DISABLED) + ClassDoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClassDonePress") + ClassDoneButton.SetText (11973) + ClassDoneButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) - ClassCancelButton = GemRB.GetControl (ClassWindow, 14) - GemRB.SetButtonState (ClassWindow, ClassCancelButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent (ClassWindow, ClassCancelButton, IE_GUI_BUTTON_ON_PRESS, "ClassCancelPress") - GemRB.SetText (ClassWindow, ClassCancelButton, 13727) + ClassCancelButton = ClassWindow.GetControl (14) + ClassCancelButton.SetState (IE_GUI_BUTTON_ENABLED) + ClassCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClassCancelPress") + ClassCancelButton.SetText (13727) - GemRB.SetVisible (ClassWindow, 1) + ClassWindow.SetVisible (1) return def ClassSelectPress(): global ClassWindow, ClassTable, ClassTextArea, ClassDoneButton Class = GemRB.GetVar ("Class") - 1 - GemRB.SetText (ClassWindow, ClassTextArea, GemRB.GetTableValue (ClassTable, Class, 1) ) - GemRB.SetButtonState (ClassWindow, ClassDoneButton, IE_GUI_BUTTON_ENABLED) + ClassTextArea.SetText (ClassTable.GetValue (Class, 1) ) + ClassDoneButton.SetState (IE_GUI_BUTTON_ENABLED) return def ClassMultiPress(): global ClassWindow, ClassTable, ClassMultiWindow, ClassMultiTextArea, ClassMultiDoneButton - GemRB.SetVisible (ClassWindow, 0) - ClassMultiWindow = GemRB.LoadWindow (10) - ClassCount = GemRB.GetTableRowCount (ClassTable) - RaceName = GemRB.GetTableRowName (RaceTable, GemRB.GetVar ("Race") - 1) + ClassWindow.SetVisible (0) + ClassMultiWindow = GemRB.LoadWindowObject (10) + ClassCount = ClassTable.GetRowCount () + RaceName = RaceTable.GetRowName (GemRB.GetVar ("Race") - 1) for i in range (2, 10): - ClassMultiSelectButton = GemRB.GetControl (ClassMultiWindow, i) - GemRB.SetButtonFlags (ClassMultiWindow, ClassMultiSelectButton, IE_GUI_BUTTON_RADIOBUTTON, OP_SET) + ClassMultiSelectButton = ClassMultiWindow.GetControl (i) + ClassMultiSelectButton.SetFlags (IE_GUI_BUTTON_RADIOBUTTON, OP_SET) j = 2 for i in range (ClassCount): - ClassName = GemRB.GetTableRowName (ClassTable, i) - if (GemRB.GetTableValue (ClassTable, ClassName, "MULTI") > 0): - ClassMultiSelectButton = GemRB.GetControl (ClassMultiWindow, j) + ClassName = ClassTable.GetRowName (i) + if (ClassTable.GetValue (ClassName, "MULTI") > 0): + ClassMultiSelectButton = ClassMultiWindow.GetControl (j) j = j + 1 - if (GemRB.GetTableValue (ClassTable, ClassName, RaceName) > 0): - GemRB.SetButtonState (ClassMultiWindow, ClassMultiSelectButton, IE_GUI_BUTTON_ENABLED) + if (ClassTable.GetValue (ClassName, RaceName) > 0): + ClassMultiSelectButton.SetState (IE_GUI_BUTTON_ENABLED) else: - GemRB.SetButtonState (ClassMultiWindow, ClassMultiSelectButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (ClassMultiWindow, ClassMultiSelectButton, IE_GUI_BUTTON_ON_PRESS, "ClassMultiSelectPress") - GemRB.SetText (ClassMultiWindow, ClassMultiSelectButton, GemRB.GetTableValue (ClassTable, i, 0) ) - GemRB.SetVarAssoc (ClassMultiWindow, ClassMultiSelectButton , "Class", i + 1) + ClassMultiSelectButton.SetState (IE_GUI_BUTTON_DISABLED) + ClassMultiSelectButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClassMultiSelectPress") + ClassMultiSelectButton.SetText (ClassTable.GetValue (i, 0) ) + ClassMultiSelectButton.SetVarAssoc ("Class", i + 1) - ClassMultiTextArea = GemRB.GetControl (ClassMultiWindow, 12) - GemRB.SetText (ClassMultiWindow, ClassMultiTextArea, 17244) + ClassMultiTextArea = ClassMultiWindow.GetControl (12) + ClassMultiTextArea.SetText (17244) - ClassMultiDoneButton = GemRB.GetControl (ClassMultiWindow, 0) - GemRB.SetButtonState (ClassMultiWindow, ClassMultiDoneButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (ClassMultiWindow, ClassMultiDoneButton, IE_GUI_BUTTON_ON_PRESS, "ClassMultiDonePress") - GemRB.SetText (ClassMultiWindow, ClassMultiDoneButton, 11973) - GemRB.SetButtonFlags (ClassMultiWindow, ClassMultiDoneButton, IE_GUI_BUTTON_DEFAULT, OP_OR) + ClassMultiDoneButton = ClassMultiWindow.GetControl (0) + ClassMultiDoneButton.SetState (IE_GUI_BUTTON_DISABLED) + ClassMultiDoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClassMultiDonePress") + ClassMultiDoneButton.SetText (11973) + ClassMultiDoneButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) - ClassMultiCancelButton = GemRB.GetControl (ClassMultiWindow, 14) - GemRB.SetButtonState (ClassMultiWindow, ClassMultiCancelButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent (ClassMultiWindow, ClassMultiCancelButton, IE_GUI_BUTTON_ON_PRESS, "ClassMultiCancelPress") - GemRB.SetText (ClassMultiWindow, ClassMultiCancelButton, 13727) + ClassMultiCancelButton = ClassMultiWindow.GetControl (14) + ClassMultiCancelButton.SetState (IE_GUI_BUTTON_ENABLED) + ClassMultiCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClassMultiCancelPress") + ClassMultiCancelButton.SetText (13727) - GemRB.SetVisible (ClassMultiWindow, 1) + ClassMultiWindow.SetVisible (1) return def ClassMultiSelectPress(): global ClassMultiWindow, ClassTable, ClassMultiTextArea, ClassMultiDoneButton Class = GemRB.GetVar ("Class") - 1 - GemRB.SetText (ClassMultiWindow, ClassMultiTextArea, GemRB.GetTableValue (ClassTable, Class, 1) ) - GemRB.SetButtonState (ClassMultiWindow, ClassMultiDoneButton, IE_GUI_BUTTON_ENABLED) + ClassMultiTextArea.SetText (ClassTable.GetValue (Class, 1) ) + ClassMultiDoneButton.SetState (IE_GUI_BUTTON_ENABLED) return def ClassMultiDonePress(): global ClassMultiWindow - GemRB.UnloadWindow (ClassMultiWindow) + if ClassMultiWindow: + ClassMultiWindow.Unload () ClassDonePress() return def ClassMultiCancelPress(): global ClassWindow, ClassMultiWindow - GemRB.UnloadWindow (ClassMultiWindow) - GemRB.SetVisible (ClassWindow, 1) + if ClassMultiWindow: + ClassMultiWindow.Unload () + ClassWindow.SetVisible (1) return def KitPress(): global ClassWindow, KitWindow, KitTextArea, KitDoneButton, KitTable - GemRB.SetVisible (ClassWindow, 0) - KitWindow = GemRB.LoadWindow (12) + ClassWindow.SetVisible (0) + KitWindow = GemRB.LoadWindowObject (12) - KitTable = GemRB.LoadTable ("magesch") + KitTable = GemRB.LoadTableObject ("magesch") #only mage class has schools GemRB.SetVar ("Class",6) GemRB.SetVar ("MAGESCHOOL",0) GemRB.SetVar ("Class Kit",0) for i in range (8): - Button = GemRB.GetControl (KitWindow, i+2) - GemRB.SetButtonFlags (KitWindow, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - GemRB.SetText (KitWindow, Button, GemRB.GetTableValue (KitTable, i+1, 0) ) - GemRB.SetVarAssoc (KitWindow, Button, "MAGESCHOOL", i+1) - GemRB.SetEvent (KitWindow, Button, IE_GUI_BUTTON_ON_PRESS, "KitSelectPress") + Button = KitWindow.GetControl (i+2) + Button.SetFlags (IE_GUI_BUTTON_RADIOBUTTON, OP_OR) + Button.SetText (KitTable.GetValue (i+1, 0) ) + Button.SetVarAssoc ("MAGESCHOOL", i+1) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "KitSelectPress") - KitTextArea = GemRB.GetControl (KitWindow, 11) - GemRB.SetText (KitWindow, KitTextArea, 17245) + KitTextArea = KitWindow.GetControl (11) + KitTextArea.SetText (17245) - KitDoneButton = GemRB.GetControl (KitWindow, 0) - GemRB.SetButtonState (KitWindow, KitDoneButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetEvent (KitWindow, KitDoneButton, IE_GUI_BUTTON_ON_PRESS, "KitDonePress") - GemRB.SetText (KitWindow, KitDoneButton, 11973) - GemRB.SetButtonFlags (KitWindow, KitDoneButton, IE_GUI_BUTTON_DEFAULT, OP_OR) + KitDoneButton = KitWindow.GetControl (0) + KitDoneButton.SetState (IE_GUI_BUTTON_DISABLED) + KitDoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "KitDonePress") + KitDoneButton.SetText (11973) + KitDoneButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) - KitCancelButton = GemRB.GetControl (KitWindow, 12) - GemRB.SetButtonState (KitWindow, KitCancelButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent (KitWindow, KitCancelButton, IE_GUI_BUTTON_ON_PRESS, "KitCancelPress") - GemRB.SetText (KitWindow, KitCancelButton, 13727) + KitCancelButton = KitWindow.GetControl (12) + KitCancelButton.SetState (IE_GUI_BUTTON_ENABLED) + KitCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "KitCancelPress") + KitCancelButton.SetText (13727) - GemRB.SetVisible (KitWindow, 1) + KitWindow.SetVisible (1) return def KitSelectPress(): global KitWindow, KitTextArea Kit = GemRB.GetVar ("MAGESCHOOL") - GemRB.SetText (KitWindow, KitTextArea, GemRB.GetTableValue (KitTable, Kit, 1)) - GemRB.SetButtonState (KitWindow, KitDo... [truncated message content] |
From: <wjp...@us...> - 2009-02-01 23:03:37
|
Revision: 5621 http://gemrb.svn.sourceforge.net/gemrb/?rev=5621&view=rev Author: wjpalenstijn Date: 2009-02-01 23:03:34 +0000 (Sun, 01 Feb 2009) Log Message: ----------- missing function Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/GUIClasses.py gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/pst/GUIJRNL.py Modified: gemrb/trunk/gemrb/GUIScripts/GUIClasses.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/GUIClasses.py 2009-02-01 23:01:26 UTC (rev 5620) +++ gemrb/trunk/gemrb/GUIScripts/GUIClasses.py 2009-02-01 23:03:34 UTC (rev 5621) @@ -75,6 +75,9 @@ def CreateLabel(self, control, *args): GemRB.CreateLabel(self.ID, control, *args) return GemRB.GetControlObject(self.ID, control) + def CreateButton(self, control, *args): + GemRB.CreateButton(self.ID, control, *args) + return GemRB.GetControlObject(self.ID, control) def CreateTextEdit(self, control, *args): GemRB.CreateTextEdit(self.ID, control, *args) return GemRB.GetControlObject(self.ID, control) Modified: gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py 2009-02-01 23:01:26 UTC (rev 5620) +++ gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py 2009-02-01 23:03:34 UTC (rev 5621) @@ -103,7 +103,7 @@ if Gears: # Gears (time), how doesn't have this in the right place pos = GemRB.GetSystemVariable (SV_HEIGHT)-71 - GemRB.CreateButton (Window, 9, 6, pos, 64, 71) + Window.CreateButton (9, 6, pos, 64, 71) Button = Window.GetControl (9) Button.SetAnimation ("CGEAR") Button.SetState (IE_GUI_BUTTON_ENABLED) @@ -475,7 +475,7 @@ PortraitWindow = Window = GemRB.LoadWindowObject(26) # Rest pos = GemRB.GetSystemVariable (SV_HEIGHT) - 37 - GemRB.CreateButton (Window, 8, 6, pos, 55, 37) + Window.CreateButton (8, 6, pos, 55, 37) Button = Window.GetControl (8) Button.SetSprites ("GUIRSBUT", 0,0,1,0,0) Button.SetTooltip (11942) @@ -483,7 +483,7 @@ # AI pos = pos - 37 - GemRB.CreateButton (Window, 6, 6, pos, 27, 36) + Window.CreateButton (6, 6, pos, 27, 36) Button = Window.GetControl (6) #fixing a gui bug, and while we are at it, hacking it to be easier Button.SetSprites ("GUIBTACT", 0, 46, 47, 48, 49) @@ -499,7 +499,7 @@ Button.SetTooltip (15918) #Select All - GemRB.CreateButton (Window, 7, 33, pos, 27, 36) + Window.CreateButton (7, 33, pos, 27, 36) Button = Window.GetControl (7) Button.SetSprites ("GUIBTACT", 0, 50, 51, 50, 51) Button.SetTooltip (10485) Modified: gemrb/trunk/gemrb/GUIScripts/pst/GUIJRNL.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/GUIJRNL.py 2009-02-01 23:01:26 UTC (rev 5620) +++ gemrb/trunk/gemrb/GUIScripts/pst/GUIJRNL.py 2009-02-01 23:03:34 UTC (rev 5621) @@ -330,7 +330,7 @@ List.SetVarAssoc ('SelectedBeast', -1) List.SetEvent(IE_GUI_TEXTAREA_ON_CHANGE, "OnJournalBeastSelect") - GemRB.CreateButton (Window, 8, 19, 19, 281, 441) + Window.CreateButton (8, 19, 19, 281, 441) BeastImage = Window.GetControl (8) BeastImage.SetFlags (IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_NO_IMAGE, OP_SET) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wjp...@us...> - 2009-02-04 18:50:58
|
Revision: 5646 http://gemrb.svn.sourceforge.net/gemrb/?rev=5646&view=rev Author: wjpalenstijn Date: 2009-02-04 18:50:47 +0000 (Wed, 04 Feb 2009) Log Message: ----------- fix checks for missing KitTable Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG22.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG22.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG22.py 2009-02-04 17:41:15 UTC (rev 5645) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG22.py 2009-02-04 18:50:47 UTC (rev 5646) @@ -36,14 +36,14 @@ Button.SetState(IE_GUI_BUTTON_DISABLED) Button.SetFlags(IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - if KitTable == -1: + if not KitTable: RowCount = 1 else: RowCount = KitTable.GetRowCount() for i in range(RowCount): Button = KitWindow.GetControl(i+2) - if KitTable == -1: + if not KitTable: if ClassID == 1: Kit=GemRB.GetVar("MAGESCHOOL") KitName = SchoolList.GetValue(i, 0) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-02-04 17:41:15 UTC (rev 5645) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-02-04 18:50:47 UTC (rev 5646) @@ -63,7 +63,7 @@ Button.SetState(IE_GUI_BUTTON_DISABLED) Button.SetFlags(IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - if KitTable == -1: + if not KitTable: RowCount = 1 else: RowCount = KitTable.GetRowCount() @@ -74,7 +74,7 @@ else: Button = KitWindow.GetControl(i+5) - if KitTable == -1: + if not KitTable: if ClassID == 1: Kit = GemRB.GetVar("MAGESCHOOL") KitName = SchoolList.GetValue(i, 0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wjp...@us...> - 2009-02-05 22:31:47
|
Revision: 5654 http://gemrb.svn.sourceforge.net/gemrb/?rev=5654&view=rev Author: wjpalenstijn Date: 2009-02-05 22:31:43 +0000 (Thu, 05 Feb 2009) Log Message: ----------- missing function Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/GUIClasses.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py gemrb/trunk/gemrb/GUIScripts/how/CharGen.py gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py gemrb/trunk/gemrb/GUIScripts/iwd2/Portrait.py Modified: gemrb/trunk/gemrb/GUIScripts/GUIClasses.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/GUIClasses.py 2009-02-05 22:28:29 UTC (rev 5653) +++ gemrb/trunk/gemrb/GUIScripts/GUIClasses.py 2009-02-05 22:31:43 UTC (rev 5654) @@ -121,7 +121,8 @@ 'Scroll': GemRB.TextAreaScroll, 'SetFlags': GemRB.SetTextAreaFlags, 'GetCharSounds': GemRB.GetCharSounds, - 'GetCharacters': GemRB.GetCharacters + 'GetCharacters': GemRB.GetCharacters, + 'GetPortraits': GemRB.GetPortraits } def MoveText(self, other): GemRB.MoveTAText(self.WinID, self.ID, other.WinID, other.ID) Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py 2009-02-05 22:28:29 UTC (rev 5653) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py 2009-02-05 22:31:43 UTC (rev 5654) @@ -157,13 +157,13 @@ CustomWindow = Window = GemRB.LoadWindowObject (18) PortraitList1 = Window.GetControl (2) - RowCount1 = GemRB.GetPortraits (Window, PortraitList1, 0) + RowCount1 = PortraitList1.GetPortraits (0) PortraitList1.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "LargeCustomPortrait") GemRB.SetVar ("Row1", RowCount1) PortraitList1.SetVarAssoc ("Row1",RowCount1) PortraitList2 = Window.GetControl (4) - RowCount2 = GemRB.GetPortraits (Window, PortraitList2, 1) + RowCount2 = PortraitList2.GetPortraits (1) PortraitList2.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "SmallCustomPortrait") GemRB.SetVar ("Row2", RowCount2) PortraitList2.SetVarAssoc ("Row2",RowCount2) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py 2009-02-05 22:28:29 UTC (rev 5653) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py 2009-02-05 22:31:43 UTC (rev 5654) @@ -161,13 +161,13 @@ CustomWindow = Window = GemRB.LoadWindowObject (18) PortraitList1 = Window.GetControl (2) - RowCount1 = GemRB.GetPortraits (Window, PortraitList1, 0) + RowCount1 = PortraitList1.GetPortraits (0) PortraitList1.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "LargeCustomPortrait") GemRB.SetVar ("Row1", RowCount1) PortraitList1.SetVarAssoc ("Row1",RowCount1) PortraitList2 = Window.GetControl (4) - RowCount2 = GemRB.GetPortraits (Window, PortraitList2, 1) + RowCount2 = PortraitList2.GetPortraits (1) PortraitList2.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "SmallCustomPortrait") GemRB.SetVar ("Row2", RowCount2) PortraitList2.SetVarAssoc ("Row2",RowCount2) Modified: gemrb/trunk/gemrb/GUIScripts/how/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2009-02-05 22:28:29 UTC (rev 5653) +++ gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2009-02-05 22:31:43 UTC (rev 5654) @@ -745,13 +745,13 @@ CustomWindow = Window = GemRB.LoadWindowObject (18) PortraitList1 = Window.GetControl (2) - RowCount1 = GemRB.GetPortraits (Window, PortraitList1, 0) + RowCount1 = PortraitList1.GetPortraits (0) PortraitList1.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "LargeCustomPortrait") GemRB.SetVar ("Row1", RowCount1) PortraitList1.SetVarAssoc ("Row1",RowCount1) PortraitList2 = Window.GetControl (4) - RowCount2 = GemRB.GetPortraits (Window, PortraitList2, 1) + RowCount2 = PortraitList2.GetPortraits (1) PortraitList2.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "SmallCustomPortrait") GemRB.SetVar ("Row2", RowCount2) PortraitList2.SetVarAssoc ("Row2",RowCount2) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py 2009-02-05 22:28:29 UTC (rev 5653) +++ gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py 2009-02-05 22:31:43 UTC (rev 5654) @@ -745,13 +745,13 @@ CustomWindow = Window = GemRB.LoadWindowObject (18) PortraitList1 = Window.GetControl (2) - RowCount1 = GemRB.GetPortraits (Window, PortraitList1, 0) + RowCount1 = PortraitList1.GetPortraits (0) PortraitList1.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "LargeCustomPortrait") GemRB.SetVar ("Row1", RowCount1) PortraitList1.SetVarAssoc ("Row1",RowCount1) PortraitList2 = Window.GetControl (4) - RowCount2 = GemRB.GetPortraits (Window, PortraitList2, 1) + RowCount2 = PortraitList2.GetPortraits (1) PortraitList2.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "SmallCustomPortrait") GemRB.SetVar ("Row2", RowCount2) PortraitList2.SetVarAssoc ("Row2",RowCount2) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Portrait.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Portrait.py 2009-02-05 22:28:29 UTC (rev 5653) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Portrait.py 2009-02-05 22:31:43 UTC (rev 5654) @@ -158,13 +158,13 @@ CustomWindow = Window = GemRB.LoadWindowObject (18) PortraitList1 = Window.GetControl (2) - RowCount1 = GemRB.GetPortraits (Window, PortraitList1, 0) + RowCount1 = PortraitList1.GetPortraits (0) PortraitList1.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "LargeCustomPortrait") GemRB.SetVar ("Row1", RowCount1) PortraitList1.SetVarAssoc ("Row1",RowCount1) PortraitList2 = Window.GetControl (4) - RowCount2 = GemRB.GetPortraits (Window, PortraitList2, 1) + RowCount2 = PortraitList2.GetPortraits (1) PortraitList2.SetEvent (IE_GUI_TEXTAREA_ON_CHANGE, "SmallCustomPortrait") GemRB.SetVar ("Row2", RowCount2) PortraitList2.SetVarAssoc ("Row2",RowCount2) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-02-12 22:41:37
|
Revision: 5687 http://gemrb.svn.sourceforge.net/gemrb/?rev=5687&view=rev Author: avenger_teambg Date: 2009-02-12 22:41:32 +0000 (Thu, 12 Feb 2009) Log Message: ----------- added default cancel button to pst main screen (esc=quit) Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/GUIDefines.py gemrb/trunk/gemrb/GUIScripts/pst/Start.py Modified: gemrb/trunk/gemrb/GUIScripts/GUIDefines.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/GUIDefines.py 2009-02-12 22:40:50 UTC (rev 5686) +++ gemrb/trunk/gemrb/GUIScripts/GUIDefines.py 2009-02-12 22:41:32 UTC (rev 5687) @@ -29,7 +29,7 @@ IE_GUI_BUTTON_ALT_SOUND = 0x00000008 IE_GUI_BUTTON_CHECKBOX = 0x00000010 #or radio button IE_GUI_BUTTON_RADIOBUTTON= 0x00000020 #sticks in a state -IE_GUI_BUTTON_DEFAULT = 0x00000040 #enter button triggers it +IE_GUI_BUTTON_DEFAULT = 0x00000040 #enter key triggers it IE_GUI_BUTTON_ANIMATED = 0x00000080 # the button is animated #these bits are hardcoded in the .chu structure, don't move them @@ -48,8 +48,8 @@ IE_GUI_BUTTON_CENTER_PICTURES = 0x00080000 # center the button's PictureList IE_GUI_BUTTON_BG1_PAPERDOLL = 0x00100000 # BG1-style paperdoll IE_GUI_BUTTON_HORIZONTAL = 0x00200000 # horizontal clipping of overlay +IE_GUI_BUTTON_CANCEL = 0x00400000 # escape key triggers it - #scrollbar flags IE_GUI_SCROLLBAR_DEFAULT = 0x00000040 # mousewheel triggers it (same value as default button) Modified: gemrb/trunk/gemrb/GUIScripts/pst/Start.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/Start.py 2009-02-12 22:40:50 UTC (rev 5686) +++ gemrb/trunk/gemrb/GUIScripts/pst/Start.py 2009-02-12 22:41:32 UTC (rev 5687) @@ -44,14 +44,15 @@ #quit subwindow QuitWindow = GemRB.LoadWindowObject(3) QuitTextArea = QuitWindow.GetControl(0) - CancelButton = QuitWindow.GetControl(2) + QuitTextArea.SetText(20582) ConfirmButton = QuitWindow.GetControl(1) - QuitTextArea.SetText(20582) - CancelButton.SetText(23789) ConfirmButton.SetText(23787) ConfirmButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ExitConfirmed") + ConfirmButton.SetFlags(IE_GUI_BUTTON_DEFAULT, OP_OR) + CancelButton = QuitWindow.GetControl(2) + CancelButton.SetText(23789) CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ExitCancelled") - CancelButton.SetFlags(IE_GUI_BUTTON_DEFAULT, OP_OR) + CancelButton.SetFlags(IE_GUI_BUTTON_CANCEL, OP_OR) #main window StartWindow = GemRB.LoadWindowObject(0) @@ -61,6 +62,7 @@ NewLifeButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "NewLifePress") ResumeLifeButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ResumeLifePress") ExitButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ExitPress") + ExitButton.SetFlags(IE_GUI_BUTTON_CANCEL, OP_OR) StartWindow.CreateLabel(0x0fff0000, 0,415,640,30, "EXOFONT", "", 1) Label=StartWindow.GetControl(0x0fff0000) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-02-16 14:36:20
|
Revision: 5698 http://gemrb.svn.sourceforge.net/gemrb/?rev=5698&view=rev Author: lynxlupodian Date: 2009-02-16 14:36:16 +0000 (Mon, 16 Feb 2009) Log Message: ----------- bg1: set the number of attacks in cg also removed two bad copy-pasted comments Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py gemrb/trunk/gemrb/GUIScripts/how/CharGen.py gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py 2009-02-16 11:58:51 UTC (rev 5697) +++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py 2009-02-16 14:36:16 UTC (rev 5698) @@ -169,6 +169,8 @@ StatID=TmpTable.GetValue (i,4) GemRB.SetPlayerStat (MyChar, StatID, GemRB.GetVar ("Ability "+str(i) ) ) + # set the base number of attacks; effects will add the proficiency bonus + GemRB.SetPlayerStat (MyChar, IE_NUMBEROFATTACKS, 2) TmpTable=GemRB.LoadTableObject ("weapprof") ProfCount = TmpTable.GetRowCount () for i in range(7,ProfCount): Modified: gemrb/trunk/gemrb/GUIScripts/how/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2009-02-16 11:58:51 UTC (rev 5697) +++ gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2009-02-16 14:36:16 UTC (rev 5698) @@ -370,7 +370,6 @@ TmpTable=GemRB.LoadTableObject ("weapprof") ProfCount = TmpTable.GetRowCount () - #bg2 weapprof.2da contains the bg1 proficiencies too, skipping those for i in range(ProfCount): StatID = TmpTable.GetValue (i, 0) Value = GemRB.GetVar ("Proficiency"+str(i) ) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py 2009-02-16 11:58:51 UTC (rev 5697) +++ gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py 2009-02-16 14:36:16 UTC (rev 5698) @@ -370,7 +370,6 @@ TmpTable=GemRB.LoadTableObject ("weapprof") ProfCount = TmpTable.GetRowCount () - #bg2 weapprof.2da contains the bg1 proficiencies too, skipping those for i in range(ProfCount): StatID = TmpTable.GetValue (i, 0) Value = GemRB.GetVar ("Proficiency"+str(i) ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-02-16 23:27:20
|
Revision: 5705 http://gemrb.svn.sourceforge.net/gemrb/?rev=5705&view=rev Author: avenger_teambg Date: 2009-02-16 23:27:16 +0000 (Mon, 16 Feb 2009) Log Message: ----------- some default cancel/enter buttons in iwd chargen Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/how/CharGen.py gemrb/trunk/gemrb/GUIScripts/how/PartyFormation.py gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py gemrb/trunk/gemrb/GUIScripts/iwd/PartyFormation.py Modified: gemrb/trunk/gemrb/GUIScripts/how/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2009-02-16 23:18:54 UTC (rev 5704) +++ gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2009-02-16 23:27:16 UTC (rev 5705) @@ -203,6 +203,7 @@ BackButton = CharGenWindow.GetControl (11) BackButton.SetState (IE_GUI_BUTTON_ENABLED) BackButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "BackPress") + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) PortraitButton = CharGenWindow.GetControl (12) PortraitButton.SetFlags (IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE, OP_SET) @@ -217,10 +218,6 @@ CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CancelPress") - BackButton = CharGenWindow.GetControl (11) - BackButton.SetState (IE_GUI_BUTTON_ENABLED) - BackButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "BackPress") - AcceptButton = CharGenWindow.GetControl (8) AcceptButton.SetState (IE_GUI_BUTTON_DISABLED) AcceptButton.SetText (11962) @@ -239,6 +236,10 @@ GemRB.SetToken ("CHARNAME","") if CharGenState > 0: CharGenState = CharGenState - 1 + else: + CancelPress() + return + if CharGenState > 6: CharGenState = 6 @@ -557,6 +558,7 @@ GenderCancelButton.SetState (IE_GUI_BUTTON_ENABLED) GenderCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "GenderCancelPress") GenderCancelButton.SetText (13727) + GenderCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) GenderWindow.SetVisible (1) return @@ -631,6 +633,7 @@ PortraitCancelButton.SetState (IE_GUI_BUTTON_ENABLED) PortraitCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "PortraitCancelPress") PortraitCancelButton.SetText (13727) + PortraitCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) while PortraitsTable.GetValue (Portrait, 0) != GemRB.GetVar ("Gender"): Portrait = Portrait + 1 @@ -837,6 +840,7 @@ RaceCancelButton.SetState (IE_GUI_BUTTON_ENABLED) RaceCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RaceCancelPress") RaceCancelButton.SetText (13727) + RaceCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) RaceWindow.SetVisible (1) return @@ -939,6 +943,7 @@ ClassCancelButton.SetState (IE_GUI_BUTTON_ENABLED) ClassCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClassCancelPress") ClassCancelButton.SetText (13727) + ClassCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) ClassWindow.SetVisible (1) return @@ -990,6 +995,7 @@ ClassMultiCancelButton.SetState (IE_GUI_BUTTON_ENABLED) ClassMultiCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClassMultiCancelPress") ClassMultiCancelButton.SetText (13727) + ClassMultiCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) ClassMultiWindow.SetVisible (1) return @@ -1050,6 +1056,7 @@ KitCancelButton.SetState (IE_GUI_BUTTON_ENABLED) KitCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "KitCancelPress") KitCancelButton.SetText (13727) + KitCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) KitWindow.SetVisible (1) return @@ -1141,6 +1148,7 @@ AlignmentCancelButton.SetState (IE_GUI_BUTTON_ENABLED) AlignmentCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AlignmentCancelPress") AlignmentCancelButton.SetText (13727) + AlignmentCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) AlignmentWindow.SetVisible (1) return @@ -1180,6 +1188,7 @@ def AbilitiesPress(): global CharGenWindow, AbilitiesWindow, AbilitiesTable, AbilitiesRaceAddTable, AbilitiesRaceReqTable, AbilitiesClassReqTable, AbilitiesTextArea, AbilitiesRecallButton, AbilitiesDoneButton + GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_NAND) CharGenWindow.SetVisible (0) AbilitiesWindow = GemRB.LoadWindowObject (4) AbilitiesTable = GemRB.LoadTableObject ("ABILITY") @@ -1237,6 +1246,7 @@ AbilitiesCancelButton.SetState (IE_GUI_BUTTON_ENABLED) AbilitiesCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AbilitiesCancelPress") AbilitiesCancelButton.SetText (13727) + AbilitiesCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) AbilitiesRerollPress() @@ -1376,6 +1386,7 @@ CharGenState = 5 SkillsState = 0 SetCharacterDescription() + GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_OR) CharGenWindow.SetVisible (1) return @@ -1384,6 +1395,7 @@ if AbilitiesWindow: AbilitiesWindow.Unload () + GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_OR) CharGenWindow.SetVisible (1) return @@ -1518,6 +1530,7 @@ SkillsCancelButton.SetState (IE_GUI_BUTTON_ENABLED) SkillsCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "SkillsCancelPress") SkillsCancelButton.SetText (13727) + SkillsCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) SkillsWindow.SetVisible (1) return @@ -1622,6 +1635,7 @@ RacialEnemyCancelButton.SetState (IE_GUI_BUTTON_ENABLED) RacialEnemyCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RacialEnemyCancelPress") RacialEnemyCancelButton.SetText (13727) + RacialEnemyCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DisplayRacialEnemies() RacialEnemyWindow.SetVisible (1) @@ -1765,6 +1779,7 @@ ProficienciesCancelButton.SetState (IE_GUI_BUTTON_ENABLED) ProficienciesCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ProficienciesCancelPress") ProficienciesCancelButton.SetText (13727) + ProficienciesCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) ProficienciesWindow.SetVisible (1) return @@ -1897,6 +1912,7 @@ MageSpellsCancelButton.SetState (IE_GUI_BUTTON_ENABLED) MageSpellsCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "MageSpellsCancelPress") MageSpellsCancelButton.SetText (13727) + MageSpellsCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) MageSpellsWindow.SetVisible (1) return @@ -2013,6 +2029,7 @@ MageMemorizeCancelButton.SetState (IE_GUI_BUTTON_ENABLED) MageMemorizeCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "MageMemorizeCancelPress") MageMemorizeCancelButton.SetText (13727) + MageMemorizeCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) MageMemorizeWindow.SetVisible (1) return @@ -2133,6 +2150,7 @@ PriestMemorizeCancelButton.SetState (IE_GUI_BUTTON_ENABLED) PriestMemorizeCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "PriestMemorizeCancelPress") PriestMemorizeCancelButton.SetText (13727) + PriestMemorizeCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) PriestMemorizeWindow.SetVisible (1) return @@ -2258,6 +2276,7 @@ AppearanceCancelButton.SetState (IE_GUI_BUTTON_ENABLED) AppearanceCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AppearanceCancelPress") AppearanceCancelButton.SetText (13727) + AppearanceCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) AppearanceWindow.SetVisible (1) return @@ -2402,6 +2421,7 @@ CharSoundCancelButton.SetState (IE_GUI_BUTTON_ENABLED) CharSoundCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CharSoundCancelPress") CharSoundCancelButton.SetText (13727) + CharSoundCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) CharSoundWindow.SetVisible (1) return @@ -2457,6 +2477,7 @@ BiographyCancelButton.SetState (IE_GUI_BUTTON_ENABLED) BiographyCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "BiographyCancelPress") BiographyCancelButton.SetText (13727) + BiographyCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) BiographyDoneButton = BiographyWindow.GetControl (1) BiographyDoneButton.SetState (IE_GUI_BUTTON_ENABLED) @@ -2511,6 +2532,7 @@ NameCancelButton.SetState (IE_GUI_BUTTON_ENABLED) NameCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "NameCancelPress") NameCancelButton.SetText (13727) + NameCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) NameWindow.SetVisible (1) NameField.SetStatus(IE_GUI_CONTROL_FOCUSED) @@ -2573,6 +2595,7 @@ ImportCancelButton.SetState (IE_GUI_BUTTON_ENABLED) ImportCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ImportCancelPress") ImportCancelButton.SetText (13727) + ImportCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) ImportWindow.SetVisible (1) return Modified: gemrb/trunk/gemrb/GUIScripts/how/PartyFormation.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/PartyFormation.py 2009-02-16 23:18:54 UTC (rev 5704) +++ gemrb/trunk/gemrb/GUIScripts/how/PartyFormation.py 2009-02-16 23:27:16 UTC (rev 5705) @@ -45,6 +45,7 @@ ExitButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ExitPress") ExitButton.SetStatus (IE_GUI_BUTTON_ENABLED) ExitButton.SetText (13906) + ExitButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DoneButton = PartyFormationWindow.GetControl (28) DoneButton.SetText (11973) @@ -151,10 +152,12 @@ ExitButton = ExitWindow.GetControl (1) ExitButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ExitExitPress") ExitButton.SetText (13906) + ExitButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) CancelButton = ExitWindow.GetControl (2) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ExitCancelPress") CancelButton.SetText (13727) + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) TextArea = ExitWindow.GetControl (0) TextArea.SetText (11329) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py 2009-02-16 23:18:54 UTC (rev 5704) +++ gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py 2009-02-16 23:27:16 UTC (rev 5705) @@ -203,6 +203,7 @@ BackButton = CharGenWindow.GetControl (11) BackButton.SetState (IE_GUI_BUTTON_ENABLED) BackButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "BackPress") + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) PortraitButton = CharGenWindow.GetControl (12) PortraitButton.SetFlags (IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE, OP_SET) @@ -217,10 +218,6 @@ CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CancelPress") - BackButton = CharGenWindow.GetControl (11) - BackButton.SetState (IE_GUI_BUTTON_ENABLED) - BackButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "BackPress") - AcceptButton = CharGenWindow.GetControl (8) AcceptButton.SetState (IE_GUI_BUTTON_DISABLED) AcceptButton.SetText (11962) @@ -239,6 +236,10 @@ GemRB.SetToken ("CHARNAME","") if CharGenState > 0: CharGenState = CharGenState - 1 + else: + CancelPress() + return + if CharGenState > 6: CharGenState = 6 @@ -557,6 +558,7 @@ GenderCancelButton.SetState (IE_GUI_BUTTON_ENABLED) GenderCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "GenderCancelPress") GenderCancelButton.SetText (13727) + GenderCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) GenderWindow.SetVisible (1) return @@ -631,6 +633,7 @@ PortraitCancelButton.SetState (IE_GUI_BUTTON_ENABLED) PortraitCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "PortraitCancelPress") PortraitCancelButton.SetText (13727) + PortraitCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) while PortraitsTable.GetValue (Portrait, 0) != GemRB.GetVar ("Gender"): Portrait = Portrait + 1 @@ -837,6 +840,7 @@ RaceCancelButton.SetState (IE_GUI_BUTTON_ENABLED) RaceCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RaceCancelPress") RaceCancelButton.SetText (13727) + RaceCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) RaceWindow.SetVisible (1) return @@ -939,6 +943,7 @@ ClassCancelButton.SetState (IE_GUI_BUTTON_ENABLED) ClassCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClassCancelPress") ClassCancelButton.SetText (13727) + ClassCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) ClassWindow.SetVisible (1) return @@ -990,6 +995,7 @@ ClassMultiCancelButton.SetState (IE_GUI_BUTTON_ENABLED) ClassMultiCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClassMultiCancelPress") ClassMultiCancelButton.SetText (13727) + ClassMultiCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) ClassMultiWindow.SetVisible (1) return @@ -1050,6 +1056,7 @@ KitCancelButton.SetState (IE_GUI_BUTTON_ENABLED) KitCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "KitCancelPress") KitCancelButton.SetText (13727) + KitCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) KitWindow.SetVisible (1) return @@ -1141,6 +1148,7 @@ AlignmentCancelButton.SetState (IE_GUI_BUTTON_ENABLED) AlignmentCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AlignmentCancelPress") AlignmentCancelButton.SetText (13727) + AlignmentCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) AlignmentWindow.SetVisible (1) return @@ -1180,6 +1188,7 @@ def AbilitiesPress(): global CharGenWindow, AbilitiesWindow, AbilitiesTable, AbilitiesRaceAddTable, AbilitiesRaceReqTable, AbilitiesClassReqTable, AbilitiesTextArea, AbilitiesRecallButton, AbilitiesDoneButton + GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_NAND) CharGenWindow.SetVisible (0) AbilitiesWindow = GemRB.LoadWindowObject (4) AbilitiesTable = GemRB.LoadTableObject ("ABILITY") @@ -1237,6 +1246,7 @@ AbilitiesCancelButton.SetState (IE_GUI_BUTTON_ENABLED) AbilitiesCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AbilitiesCancelPress") AbilitiesCancelButton.SetText (13727) + AbilitiesCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) AbilitiesRerollPress() @@ -1376,6 +1386,7 @@ CharGenState = 5 SkillsState = 0 SetCharacterDescription() + GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_OR) CharGenWindow.SetVisible (1) return @@ -1384,6 +1395,7 @@ if AbilitiesWindow: AbilitiesWindow.Unload () + GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_OR) CharGenWindow.SetVisible (1) return @@ -1518,6 +1530,7 @@ SkillsCancelButton.SetState (IE_GUI_BUTTON_ENABLED) SkillsCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "SkillsCancelPress") SkillsCancelButton.SetText (13727) + SkillsCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) SkillsWindow.SetVisible (1) return @@ -1622,6 +1635,7 @@ RacialEnemyCancelButton.SetState (IE_GUI_BUTTON_ENABLED) RacialEnemyCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RacialEnemyCancelPress") RacialEnemyCancelButton.SetText (13727) + RacialEnemyCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DisplayRacialEnemies() RacialEnemyWindow.SetVisible (1) @@ -1765,6 +1779,7 @@ ProficienciesCancelButton.SetState (IE_GUI_BUTTON_ENABLED) ProficienciesCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ProficienciesCancelPress") ProficienciesCancelButton.SetText (13727) + ProficienciesCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) ProficienciesWindow.SetVisible (1) return @@ -1897,6 +1912,7 @@ MageSpellsCancelButton.SetState (IE_GUI_BUTTON_ENABLED) MageSpellsCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "MageSpellsCancelPress") MageSpellsCancelButton.SetText (13727) + MageSpellsCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) MageSpellsWindow.SetVisible (1) return @@ -2013,6 +2029,7 @@ MageMemorizeCancelButton.SetState (IE_GUI_BUTTON_ENABLED) MageMemorizeCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "MageMemorizeCancelPress") MageMemorizeCancelButton.SetText (13727) + MageMemorizeCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) MageMemorizeWindow.SetVisible (1) return @@ -2133,6 +2150,7 @@ PriestMemorizeCancelButton.SetState (IE_GUI_BUTTON_ENABLED) PriestMemorizeCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "PriestMemorizeCancelPress") PriestMemorizeCancelButton.SetText (13727) + PriestMemorizeCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) PriestMemorizeWindow.SetVisible (1) return @@ -2258,6 +2276,7 @@ AppearanceCancelButton.SetState (IE_GUI_BUTTON_ENABLED) AppearanceCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AppearanceCancelPress") AppearanceCancelButton.SetText (13727) + AppearanceCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) AppearanceWindow.SetVisible (1) return @@ -2402,6 +2421,7 @@ CharSoundCancelButton.SetState (IE_GUI_BUTTON_ENABLED) CharSoundCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CharSoundCancelPress") CharSoundCancelButton.SetText (13727) + CharSoundCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) CharSoundWindow.SetVisible (1) return @@ -2457,6 +2477,7 @@ BiographyCancelButton.SetState (IE_GUI_BUTTON_ENABLED) BiographyCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "BiographyCancelPress") BiographyCancelButton.SetText (13727) + BiographyCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) BiographyDoneButton = BiographyWindow.GetControl (1) BiographyDoneButton.SetState (IE_GUI_BUTTON_ENABLED) @@ -2511,6 +2532,7 @@ NameCancelButton.SetState (IE_GUI_BUTTON_ENABLED) NameCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "NameCancelPress") NameCancelButton.SetText (13727) + NameCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) NameWindow.SetVisible (1) NameField.SetStatus(IE_GUI_CONTROL_FOCUSED) @@ -2573,6 +2595,7 @@ ImportCancelButton.SetState (IE_GUI_BUTTON_ENABLED) ImportCancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ImportCancelPress") ImportCancelButton.SetText (13727) + ImportCancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) ImportWindow.SetVisible (1) return Modified: gemrb/trunk/gemrb/GUIScripts/iwd/PartyFormation.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/PartyFormation.py 2009-02-16 23:18:54 UTC (rev 5704) +++ gemrb/trunk/gemrb/GUIScripts/iwd/PartyFormation.py 2009-02-16 23:27:16 UTC (rev 5705) @@ -45,6 +45,7 @@ ExitButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ExitPress") ExitButton.SetStatus (IE_GUI_BUTTON_ENABLED) ExitButton.SetText (13906) + ExitButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DoneButton = PartyFormationWindow.GetControl (28) DoneButton.SetText (11973) @@ -145,10 +146,12 @@ ExitButton = ExitWindow.GetControl (1) ExitButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ExitExitPress") ExitButton.SetText (13906) + ExitButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) CancelButton = ExitWindow.GetControl (2) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ExitCancelPress") CancelButton.SetText (13727) + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) TextArea = ExitWindow.GetControl (0) TextArea.SetText (11329) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-02-17 17:02:50
|
Revision: 5706 http://gemrb.svn.sourceforge.net/gemrb/?rev=5706&view=rev Author: avenger_teambg Date: 2009-02-17 17:02:44 +0000 (Tue, 17 Feb 2009) Log Message: ----------- more default buttons in iwd 'fixed' a possible worldmap travel bug Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py gemrb/trunk/gemrb/GUIScripts/how/Start.py gemrb/trunk/gemrb/GUIScripts/iwd/Start.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py 2009-02-16 23:27:16 UTC (rev 5705) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py 2009-02-17 17:02:44 UTC (rev 5706) @@ -186,6 +186,10 @@ global WorldMapWindow, WorldMapControl tmp = WorldMapControl.GetDestinationArea () + if tmp["Distance"]==-1: + print "Invalid target", tmp + return + CloseWorldMapWindow () GemRB.CreateMovement (tmp["Destination"], tmp["Entrance"]) return Modified: gemrb/trunk/gemrb/GUIScripts/how/Start.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/Start.py 2009-02-16 23:27:16 UTC (rev 5705) +++ gemrb/trunk/gemrb/GUIScripts/how/Start.py 2009-02-17 17:02:44 UTC (rev 5706) @@ -30,10 +30,10 @@ ProtocolWindow = 0 QuitWindow = 0 -def OnLoad(): +def OnLoad (): global StartWindow, JoinGameButton - GemRB.SetVar("oldgame",1) #don't handle expansion yet + GemRB.SetVar ("oldgame",1) #don't handle expansion yet skip_videos = GemRB.GetVar ("SkipIntroVideos") if not skip_videos: @@ -47,163 +47,165 @@ screen_width = GemRB.GetSystemVariable (SV_WIDTH) screen_height = GemRB.GetSystemVariable (SV_HEIGHT) if screen_width == 800: - GemRB.LoadWindowFrame("STON08L", "STON08R", "STON08T", "STON08B") + GemRB.LoadWindowFrame ("STON08L", "STON08R", "STON08T", "STON08B") elif screen_width == 1024: - GemRB.LoadWindowFrame("STON10L", "STON10R", "STON10T", "STON10B") + GemRB.LoadWindowFrame ("STON10L", "STON10R", "STON10T", "STON10B") GemRB.LoadWindowPack("GUICONN", 640, 480) #main window - StartWindow = GemRB.LoadWindowObject(0) - StartWindow.SetFrame() - ProtocolButton = StartWindow.GetControl(0x00) - CreateGameButton = StartWindow.GetControl(0x02) - LoadGameButton = StartWindow.GetControl(0x07) - JoinGameButton = StartWindow.GetControl(0x03) - MoviesButton = StartWindow.GetControl(0x08) - QuitGameButton = StartWindow.GetControl(0x01) - StartWindow.CreateLabel(0x0fff0000, 0,0,800,30, "REALMS2", "", 1) - VersionLabel = StartWindow.GetControl(0x0fff0000) - VersionLabel.SetText(GEMRB_VERSION) - ProtocolButton.SetStatus(IE_GUI_BUTTON_ENABLED) - CreateGameButton.SetStatus(IE_GUI_BUTTON_ENABLED) - LoadGameButton.SetStatus(IE_GUI_BUTTON_ENABLED) - MoviesButton.SetStatus(IE_GUI_BUTTON_ENABLED) - QuitGameButton.SetStatus(IE_GUI_BUTTON_ENABLED) - LastProtocol = GemRB.GetVar("Last Protocol Used") + StartWindow = GemRB.LoadWindowObject (0) + StartWindow.SetFrame () + ProtocolButton = StartWindow.GetControl (0x00) + CreateGameButton = StartWindow.GetControl (0x02) + LoadGameButton = StartWindow.GetControl (0x07) + JoinGameButton = StartWindow.GetControl (0x03) + MoviesButton = StartWindow.GetControl (0x08) + QuitGameButton = StartWindow.GetControl (0x01) + StartWindow.CreateLabel (0x0fff0000, 0,0,800,30, "REALMS2", "", 1) + VersionLabel = StartWindow.GetControl (0x0fff0000) + VersionLabel.SetText (GEMRB_VERSION) + ProtocolButton.SetStatus (IE_GUI_BUTTON_ENABLED) + CreateGameButton.SetStatus (IE_GUI_BUTTON_ENABLED) + LoadGameButton.SetStatus (IE_GUI_BUTTON_ENABLED) + MoviesButton.SetStatus (IE_GUI_BUTTON_ENABLED) + QuitGameButton.SetStatus (IE_GUI_BUTTON_ENABLED) + LastProtocol = GemRB.GetVar ("Last Protocol Used") if LastProtocol == 0: - ProtocolButton.SetText(15413) - JoinGameButton.SetStatus(IE_GUI_BUTTON_DISABLED) + ProtocolButton.SetText (15413) + JoinGameButton.SetStatus (IE_GUI_BUTTON_DISABLED) elif LastProtocol == 1: - ProtocolButton.SetText(13967) - JoinGameButton.SetStatus(IE_GUI_BUTTON_ENABLED) + ProtocolButton.SetText (13967) + JoinGameButton.SetStatus (IE_GUI_BUTTON_ENABLED) elif LastProtocol == 2: - ProtocolButton.SetText(13968) - JoinGameButton.SetStatus(IE_GUI_BUTTON_ENABLED) - CreateGameButton.SetText(13963) - LoadGameButton.SetText(13729) - JoinGameButton.SetText(13964) - MoviesButton.SetText(15415) - QuitGameButton.SetText(13731) - QuitGameButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "QuitPress") - ProtocolButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ProtocolPress") - MoviesButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "MoviesPress") - LoadGameButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "LoadPress") - CreateGameButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CreatePress") - StartWindow.SetVisible(1) + ProtocolButton.SetText (13968) + JoinGameButton.SetStatus (IE_GUI_BUTTON_ENABLED) + CreateGameButton.SetText (13963) + LoadGameButton.SetText (13729) + JoinGameButton.SetText (13964) + MoviesButton.SetText (15415) + QuitGameButton.SetText (13731) + QuitGameButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "QuitPress") + ProtocolButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ProtocolPress") + MoviesButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "MoviesPress") + LoadGameButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "LoadPress") + CreateGameButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CreatePress") + StartWindow.SetVisible (1) GemRB.LoadMusicPL("Theme.mus",1) return -def ProtocolPress(): +def ProtocolPress (): global StartWindow, ProtocolWindow #GemRB.UnloadWindow(StartWindow) - StartWindow.SetVisible(0) - ProtocolWindow = GemRB.LoadWindowObject(1) + StartWindow.SetVisible (0) + ProtocolWindow = GemRB.LoadWindowObject (1) #Disabling Unused Buttons in this Window - Button = ProtocolWindow.GetControl(2) - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE, OP_OR) - Button = ProtocolWindow.GetControl(3) - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE, OP_OR) - Button = ProtocolWindow.GetControl(9) - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE, OP_OR) + Button = ProtocolWindow.GetControl (2) + Button.SetState (IE_GUI_BUTTON_DISABLED) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_OR) + Button = ProtocolWindow.GetControl (3) + Button.SetState (IE_GUI_BUTTON_DISABLED) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_OR) + Button = ProtocolWindow.GetControl (9) + Button.SetState (IE_GUI_BUTTON_DISABLED) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_OR) - SinglePlayerButton = ProtocolWindow.GetControl(10) - SinglePlayerButton.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR) - SinglePlayerButton.SetText(15413) + SinglePlayerButton = ProtocolWindow.GetControl (10) + SinglePlayerButton.SetFlags (IE_GUI_BUTTON_RADIOBUTTON,OP_OR) + SinglePlayerButton.SetText (15413) - IPXButton = ProtocolWindow.GetControl(0) - IPXButton.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR) - IPXButton.SetText(13967) + IPXButton = ProtocolWindow.GetControl (0) + IPXButton.SetFlags (IE_GUI_BUTTON_RADIOBUTTON,OP_OR) + IPXButton.SetText (13967) - TCPIPButton = ProtocolWindow.GetControl(1) - TCPIPButton.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR) - TCPIPButton.SetText(13968) + TCPIPButton = ProtocolWindow.GetControl (1) + TCPIPButton.SetFlags (IE_GUI_BUTTON_RADIOBUTTON,OP_OR) + TCPIPButton.SetText (13968) - SinglePlayerButton.SetVarAssoc("Last Protocol Used", 0) - IPXButton.SetVarAssoc("Last Protocol Used", 1) - TCPIPButton.SetVarAssoc("Last Protocol Used", 2) + SinglePlayerButton.SetVarAssoc ("Last Protocol Used", 0) + IPXButton.SetVarAssoc ("Last Protocol Used", 1) + TCPIPButton.SetVarAssoc ("Last Protocol Used", 2) - TextArea = ProtocolWindow.GetControl(7) - TextArea.SetText(11316) + TextArea = ProtocolWindow.GetControl (7) + TextArea.SetText (11316) - DoneButton = ProtocolWindow.GetControl(6) - DoneButton.SetText(11973) - DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ProtocolDonePress") + DoneButton = ProtocolWindow.GetControl (6) + DoneButton.SetText (11973) + DoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ProtocolDonePress") - ProtocolWindow.SetVisible(1) + ProtocolWindow.SetVisible (1) return -def ProtocolDonePress(): +def ProtocolDonePress (): global StartWindow, ProtocolWindow, JoinGameButton if ProtocolWindow: - ProtocolWindow.Unload() + ProtocolWindow.Unload () - ProtocolButton = StartWindow.GetControl(0x00) + ProtocolButton = StartWindow.GetControl (0x00) - LastProtocol = GemRB.GetVar("Last Protocol Used") + LastProtocol = GemRB.GetVar ("Last Protocol Used") if LastProtocol == 0: - ProtocolButton.SetText(15413) - JoinGameButton.SetStatus(IE_GUI_BUTTON_DISABLED) + ProtocolButton.SetText (15413) + JoinGameButton.SetStatus (IE_GUI_BUTTON_DISABLED) elif LastProtocol == 1: - ProtocolButton.SetText(13967) - JoinGameButton.SetStatus(IE_GUI_BUTTON_ENABLED) + ProtocolButton.SetText (13967) + JoinGameButton.SetStatus (IE_GUI_BUTTON_ENABLED) elif LastProtocol == 2: - ProtocolButton.SetText(13968) - JoinGameButton.SetStatus(IE_GUI_BUTTON_ENABLED) + ProtocolButton.SetText (13968) + JoinGameButton.SetStatus (IE_GUI_BUTTON_ENABLED) - StartWindow.SetVisible(1) + StartWindow.SetVisible (1) return -def CreatePress(): +def CreatePress (): global StartWindow if StartWindow: - StartWindow.Unload() - GemRB.LoadGame(-1) - GemRB.SetNextScript("PartyFormation") + StartWindow.Unload () + GemRB.LoadGame (-1) + GemRB.SetNextScript ("PartyFormation") return -def LoadPress(): +def LoadPress (): global StartWindow if StartWindow: - StartWindow.Unload() - GemRB.SetNextScript("GUILOAD") + StartWindow.Unload () + GemRB.SetNextScript ("GUILOAD") return -def MoviesPress(): +def MoviesPress (): global StartWindow if StartWindow: - StartWindow.Unload() - GemRB.SetNextScript("GUIMOVIE") + StartWindow.Unload () + GemRB.SetNextScript ("GUIMOVIE") return -def QuitPress(): +def QuitPress (): global StartWindow, QuitWindow - StartWindow.SetVisible(0) - QuitWindow = GemRB.LoadWindowObject(22) - CancelButton = QuitWindow.GetControl(2) - CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "QuitCancelPress") - - QuitButton = QuitWindow.GetControl(1) - QuitButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "QuitQuitPress") - - TextArea = QuitWindow.GetControl(0) - CancelButton.SetText(13727) - QuitButton.SetText(15417) - TextArea.SetText(19532) - QuitWindow.SetVisible(1) + StartWindow.SetVisible (0) + QuitWindow = GemRB.LoadWindowObject (22) + CancelButton = QuitWindow.GetControl (2) + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "QuitCancelPress") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + + QuitButton = QuitWindow.GetControl (1) + QuitButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "QuitQuitPress") + QuitButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) + + TextArea = QuitWindow.GetControl (0) + CancelButton.SetText (13727) + QuitButton.SetText (15417) + TextArea.SetText (19532) + QuitWindow.SetVisible (1) return -def QuitCancelPress(): +def QuitCancelPress (): global StartWindow, QuitWindow if QuitWindow: - QuitWindow.Unload() - StartWindow.SetVisible(1) + QuitWindow.Unload () + StartWindow.SetVisible (1) return -def QuitQuitPress(): - GemRB.Quit() +def QuitQuitPress (): + GemRB.Quit () return Modified: gemrb/trunk/gemrb/GUIScripts/iwd/Start.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/Start.py 2009-02-16 23:27:16 UTC (rev 5705) +++ gemrb/trunk/gemrb/GUIScripts/iwd/Start.py 2009-02-17 17:02:44 UTC (rev 5706) @@ -30,7 +30,7 @@ ProtocolWindow = 0 QuitWindow = 0 -def OnLoad(): +def OnLoad (): global StartWindow, JoinGameButton skip_videos = GemRB.GetVar ("SkipIntroVideos") @@ -45,163 +45,165 @@ screen_width = GemRB.GetSystemVariable (SV_WIDTH) screen_height = GemRB.GetSystemVariable (SV_HEIGHT) if screen_width == 800: - GemRB.LoadWindowFrame("STON08L", "STON08R", "STON08T", "STON08B") + GemRB.LoadWindowFrame ("STON08L", "STON08R", "STON08T", "STON08B") elif screen_width == 1024: - GemRB.LoadWindowFrame("STON10L", "STON10R", "STON10T", "STON10B") + GemRB.LoadWindowFrame ("STON10L", "STON10R", "STON10T", "STON10B") GemRB.LoadWindowPack("GUICONN", 640, 480) #main window - StartWindow = GemRB.LoadWindowObject(0) - StartWindow.SetFrame() - ProtocolButton = StartWindow.GetControl(0x00) - CreateGameButton = StartWindow.GetControl(0x02) - LoadGameButton = StartWindow.GetControl(0x07) - JoinGameButton = StartWindow.GetControl(0x03) - MoviesButton = StartWindow.GetControl(0x08) - QuitGameButton = StartWindow.GetControl(0x01) - StartWindow.CreateLabel(0x0fff0000, 0,0,800,30, "REALMS2", "", 1) - VersionLabel = StartWindow.GetControl(0x0fff0000) - VersionLabel.SetText(GEMRB_VERSION) - ProtocolButton.SetStatus(IE_GUI_BUTTON_ENABLED) - CreateGameButton.SetStatus(IE_GUI_BUTTON_ENABLED) - LoadGameButton.SetStatus(IE_GUI_BUTTON_ENABLED) - MoviesButton.SetStatus(IE_GUI_BUTTON_ENABLED) - QuitGameButton.SetStatus(IE_GUI_BUTTON_ENABLED) - LastProtocol = GemRB.GetVar("Last Protocol Used") + StartWindow = GemRB.LoadWindowObject (0) + StartWindow.SetFrame () + ProtocolButton = StartWindow.GetControl (0x00) + CreateGameButton = StartWindow.GetControl (0x02) + LoadGameButton = StartWindow.GetControl (0x07) + JoinGameButton = StartWindow.GetControl (0x03) + MoviesButton = StartWindow.GetControl (0x08) + QuitGameButton = StartWindow.GetControl (0x01) + StartWindow.CreateLabel (0x0fff0000, 0,0,800,30, "REALMS2", "", 1) + VersionLabel = StartWindow.GetControl (0x0fff0000) + VersionLabel.SetText (GEMRB_VERSION) + ProtocolButton.SetStatus (IE_GUI_BUTTON_ENABLED) + CreateGameButton.SetStatus (IE_GUI_BUTTON_ENABLED) + LoadGameButton.SetStatus (IE_GUI_BUTTON_ENABLED) + MoviesButton.SetStatus (IE_GUI_BUTTON_ENABLED) + QuitGameButton.SetStatus (IE_GUI_BUTTON_ENABLED) + LastProtocol = GemRB.GetVar ("Last Protocol Used") if LastProtocol == 0: - ProtocolButton.SetText(15413) - JoinGameButton.SetStatus(IE_GUI_BUTTON_DISABLED) + ProtocolButton.SetText (15413) + JoinGameButton.SetStatus (IE_GUI_BUTTON_DISABLED) elif LastProtocol == 1: - ProtocolButton.SetText(13967) - JoinGameButton.SetStatus(IE_GUI_BUTTON_ENABLED) + ProtocolButton.SetText (13967) + JoinGameButton.SetStatus (IE_GUI_BUTTON_ENABLED) elif LastProtocol == 2: - ProtocolButton.SetText(13968) - JoinGameButton.SetStatus(IE_GUI_BUTTON_ENABLED) - CreateGameButton.SetText(13963) - LoadGameButton.SetText(13729) - JoinGameButton.SetText(13964) - MoviesButton.SetText(15415) - QuitGameButton.SetText(13731) - QuitGameButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "QuitPress") - ProtocolButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ProtocolPress") - MoviesButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "MoviesPress") - LoadGameButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "LoadPress") - CreateGameButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CreatePress") - StartWindow.SetVisible(1) + ProtocolButton.SetText (13968) + JoinGameButton.SetStatus (IE_GUI_BUTTON_ENABLED) + CreateGameButton.SetText (13963) + LoadGameButton.SetText (13729) + JoinGameButton.SetText (13964) + MoviesButton.SetText (15415) + QuitGameButton.SetText (13731) + QuitGameButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "QuitPress") + ProtocolButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ProtocolPress") + MoviesButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "MoviesPress") + LoadGameButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "LoadPress") + CreateGameButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CreatePress") + StartWindow.SetVisible (1) GemRB.LoadMusicPL("Theme.mus",1) return -def ProtocolPress(): +def ProtocolPress (): global StartWindow, ProtocolWindow #GemRB.UnloadWindow(StartWindow) - StartWindow.SetVisible(0) - ProtocolWindow = GemRB.LoadWindowObject(1) + StartWindow.SetVisible (0) + ProtocolWindow = GemRB.LoadWindowObject (1) #Disabling Unused Buttons in this Window - Button = ProtocolWindow.GetControl(2) - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE, OP_OR) - Button = ProtocolWindow.GetControl(3) - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE, OP_OR) - Button = ProtocolWindow.GetControl(9) - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE, OP_OR) + Button = ProtocolWindow.GetControl (2) + Button.SetState (IE_GUI_BUTTON_DISABLED) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_OR) + Button = ProtocolWindow.GetControl (3) + Button.SetState (IE_GUI_BUTTON_DISABLED) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_OR) + Button = ProtocolWindow.GetControl (9) + Button.SetState (IE_GUI_BUTTON_DISABLED) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_OR) - SinglePlayerButton = ProtocolWindow.GetControl(10) - SinglePlayerButton.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR) - SinglePlayerButton.SetText(15413) + SinglePlayerButton = ProtocolWindow.GetControl (10) + SinglePlayerButton.SetFlags (IE_GUI_BUTTON_RADIOBUTTON,OP_OR) + SinglePlayerButton.SetText (15413) - IPXButton = ProtocolWindow.GetControl(0) - IPXButton.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR) - IPXButton.SetText(13967) + IPXButton = ProtocolWindow.GetControl (0) + IPXButton.SetFlags (IE_GUI_BUTTON_RADIOBUTTON,OP_OR) + IPXButton.SetText (13967) - TCPIPButton = ProtocolWindow.GetControl(1) - TCPIPButton.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR) - TCPIPButton.SetText(13968) + TCPIPButton = ProtocolWindow.GetControl (1) + TCPIPButton.SetFlags (IE_GUI_BUTTON_RADIOBUTTON,OP_OR) + TCPIPButton.SetText (13968) - SinglePlayerButton.SetVarAssoc("Last Protocol Used", 0) - IPXButton.SetVarAssoc("Last Protocol Used", 1) - TCPIPButton.SetVarAssoc("Last Protocol Used", 2) + SinglePlayerButton.SetVarAssoc ("Last Protocol Used", 0) + IPXButton.SetVarAssoc ("Last Protocol Used", 1) + TCPIPButton.SetVarAssoc ("Last Protocol Used", 2) - TextArea = ProtocolWindow.GetControl(7) - TextArea.SetText(11316) + TextArea = ProtocolWindow.GetControl (7) + TextArea.SetText (11316) - DoneButton = ProtocolWindow.GetControl(6) - DoneButton.SetText(11973) - DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ProtocolDonePress") + DoneButton = ProtocolWindow.GetControl (6) + DoneButton.SetText (11973) + DoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ProtocolDonePress") - ProtocolWindow.SetVisible(1) + ProtocolWindow.SetVisible (1) return -def ProtocolDonePress(): +def ProtocolDonePress (): global StartWindow, ProtocolWindow, JoinGameButton if ProtocolWindow: - ProtocolWindow.Unload() + ProtocolWindow.Unload () - ProtocolButton = StartWindow.GetControl(0x00) + ProtocolButton = StartWindow.GetControl (0x00) - LastProtocol = GemRB.GetVar("Last Protocol Used") + LastProtocol = GemRB.GetVar ("Last Protocol Used") if LastProtocol == 0: - ProtocolButton.SetText(15413) - JoinGameButton.SetStatus(IE_GUI_BUTTON_DISABLED) + ProtocolButton.SetText (15413) + JoinGameButton.SetStatus (IE_GUI_BUTTON_DISABLED) elif LastProtocol == 1: - ProtocolButton.SetText(13967) - JoinGameButton.SetStatus(IE_GUI_BUTTON_ENABLED) + ProtocolButton.SetText (13967) + JoinGameButton.SetStatus (IE_GUI_BUTTON_ENABLED) elif LastProtocol == 2: - ProtocolButton.SetText(13968) - JoinGameButton.SetStatus(IE_GUI_BUTTON_ENABLED) + ProtocolButton.SetText (13968) + JoinGameButton.SetStatus (IE_GUI_BUTTON_ENABLED) - StartWindow.SetVisible(1) + StartWindow.SetVisible (1) return -def CreatePress(): +def CreatePress (): global StartWindow if StartWindow: - StartWindow.Unload() - GemRB.LoadGame(-1) - GemRB.SetNextScript("PartyFormation") + StartWindow.Unload () + GemRB.LoadGame (-1) + GemRB.SetNextScript ("PartyFormation") return -def LoadPress(): +def LoadPress (): global StartWindow if StartWindow: - StartWindow.Unload() - GemRB.SetNextScript("GUILOAD") + StartWindow.Unload () + GemRB.SetNextScript ("GUILOAD") return -def MoviesPress(): +def MoviesPress (): global StartWindow if StartWindow: - StartWindow.Unload() - GemRB.SetNextScript("GUIMOVIE") + StartWindow.Unload () + GemRB.SetNextScript ("GUIMOVIE") return -def QuitPress(): +def QuitPress (): global StartWindow, QuitWindow - StartWindow.SetVisible(0) - QuitWindow = GemRB.LoadWindowObject(22) - CancelButton = QuitWindow.GetControl(2) - CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "QuitCancelPress") - - QuitButton = QuitWindow.GetControl(1) - QuitButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "QuitQuitPress") - - TextArea = QuitWindow.GetControl(0) - CancelButton.SetText(13727) - QuitButton.SetText(15417) - TextArea.SetText(19532) - QuitWindow.SetVisible(1) + StartWindow.SetVisible (0) + QuitWindow = GemRB.LoadWindowObject (22) + CancelButton = QuitWindow.GetControl (2) + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "QuitCancelPress") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + + QuitButton = QuitWindow.GetControl (1) + QuitButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "QuitQuitPress") + QuitButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) + + TextArea = QuitWindow.GetControl (0) + CancelButton.SetText (13727) + QuitButton.SetText (15417) + TextArea.SetText (19532) + QuitWindow.SetVisible (1) return -def QuitCancelPress(): +def QuitCancelPress (): global StartWindow, QuitWindow if QuitWindow: - QuitWindow.Unload() - StartWindow.SetVisible(1) + QuitWindow.Unload () + StartWindow.SetVisible (1) return -def QuitQuitPress(): - GemRB.Quit() +def QuitQuitPress (): + GemRB.Quit () return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-02-17 17:20:36
|
Revision: 5707 http://gemrb.svn.sourceforge.net/gemrb/?rev=5707&view=rev Author: avenger_teambg Date: 2009-02-17 17:20:31 +0000 (Tue, 17 Feb 2009) Log Message: ----------- default cancel buttons on load/save windows of iwd/bg1 Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/bg1/GUISAVE.py gemrb/trunk/gemrb/GUIScripts/how/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/how/GUISAVE.py gemrb/trunk/gemrb/GUIScripts/iwd/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/iwd/GUISAVE.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUILOAD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUILOAD.py 2009-02-17 17:02:44 UTC (rev 5706) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUILOAD.py 2009-02-17 17:20:31 UTC (rev 5707) @@ -1,4 +1,28 @@ -#load window +# -*-python-*- +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# $Id$ + + +# GUILOAD.py - Load window + +################################################### + import GemRB from LoadScreen import * @@ -7,145 +31,149 @@ GameCount = 0 ScrollBar = 0 -def OnLoad(): +def OnLoad (): global LoadWindow, TextAreaControl, GameCount, ScrollBar - GemRB.LoadWindowPack("GUILOAD") - LoadWindow = GemRB.LoadWindowObject(0) - CancelButton=LoadWindow.GetControl(34) - CancelButton.SetText(13727) - CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress") - GemRB.SetVar("LoadIdx",0) - GemRB.SetVar("TopIndex",0) + GemRB.LoadWindowPack ("GUILOAD", 640, 480) + LoadWindow = GemRB.LoadWindowObject (0) + LoadWindow.SetFrame () - for i in range(4): - Button = LoadWindow.GetControl(26+i) - Button.SetText(15590) - Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "LoadGamePress") - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetVarAssoc("LoadIdx",i) + CancelButton=LoadWindow.GetControl (34) + CancelButton.SetText (13727) + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CancelPress") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) - Button = LoadWindow.GetControl(30+i) - Button.SetText(13957) - Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DeleteGamePress") - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetVarAssoc("LoadIdx",i) + GemRB.SetVar ("LoadIdx",0) + for i in range (4): + Button = LoadWindow.GetControl (26+i) + Button.SetText (15590) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "LoadGamePress") + Button.SetState (IE_GUI_BUTTON_DISABLED) + Button.SetVarAssoc ("LoadIdx",i) + Button = LoadWindow.GetControl (30+i) + Button.SetText (13957) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGamePress") + Button.SetState (IE_GUI_BUTTON_DISABLED) + Button.SetVarAssoc ("LoadIdx",i) + #area previews - Button = LoadWindow.GetControl(1+i) + Button = LoadWindow.GetControl (1+i) Button.SetState (IE_GUI_BUTTON_LOCKED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) #PC portraits - for j in range(PARTY_SIZE): - Button = LoadWindow.GetControl(40+i*PARTY_SIZE+j) + for j in range (PARTY_SIZE): + Button = LoadWindow.GetControl (40 + i*PARTY_SIZE + j) Button.SetState (IE_GUI_BUTTON_LOCKED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) - ScrollBar=LoadWindow.GetControl(25) - ScrollBar.SetEvent(IE_GUI_SCROLLBAR_ON_CHANGE, "ScrollBarPress") - GameCount=GemRB.GetSaveGameCount() #count of games in save folder? + ScrollBar=LoadWindow.GetControl (25) + ScrollBar.SetEvent (IE_GUI_SCROLLBAR_ON_CHANGE, "ScrollBarPress") + GameCount=GemRB.GetSaveGameCount () #count of games in save folder? if GameCount>4: TopIndex = GameCount-4 else: TopIndex = 0 GemRB.SetVar ("TopIndex",TopIndex) ScrollBar.SetVarAssoc ("TopIndex", TopIndex+1) - ScrollBarPress() - LoadWindow.SetVisible(1) + ScrollBarPress () + LoadWindow.SetVisible (1) return -def ScrollBarPress(): +def ScrollBarPress (): #draw load game portraits - Pos = GemRB.GetVar("TopIndex") - for i in range(4): + Pos = GemRB.GetVar ("TopIndex") + for i in range (4): ActPos = Pos + i - Button1 = LoadWindow.GetControl(26+i) - Button2 = LoadWindow.GetControl(30+i) + Button1 = LoadWindow.GetControl (26+i) + Button2 = LoadWindow.GetControl (30+i) if ActPos<GameCount: - Button1.SetState(IE_GUI_BUTTON_ENABLED) - Button2.SetState(IE_GUI_BUTTON_ENABLED) + Button1.SetState (IE_GUI_BUTTON_ENABLED) + Button2.SetState (IE_GUI_BUTTON_ENABLED) else: - Button1.SetState(IE_GUI_BUTTON_DISABLED) - Button2.SetState(IE_GUI_BUTTON_DISABLED) + Button1.SetState (IE_GUI_BUTTON_DISABLED) + Button2.SetState (IE_GUI_BUTTON_DISABLED) if ActPos<GameCount: - Slotname = GemRB.GetSaveGameAttrib(0,ActPos) + Slotname = GemRB.GetSaveGameAttrib (0,ActPos) else: Slotname = "" - Label = LoadWindow.GetControl(0x10000008+i) - Label.SetText(Slotname) + Label = LoadWindow.GetControl (0x10000008+i) + Label.SetText (Slotname) if ActPos<GameCount: - Slotname = GemRB.GetSaveGameAttrib(3,ActPos) + Slotname = GemRB.GetSaveGameAttrib (3,ActPos) else: Slotname = "" - Label = LoadWindow.GetControl(0x10000010+i) - Label.SetText(Slotname) + Label = LoadWindow.GetControl (0x10000010+i) + Label.SetText (Slotname) - Button=LoadWindow.GetControl(1+i) + Button=LoadWindow.GetControl (1+i) if ActPos<GameCount: - Button.SetSaveGamePreview(ActPos) + Button.SetSaveGamePreview (ActPos) else: - Button.SetPicture("") - for j in range(PARTY_SIZE): - Button=LoadWindow.GetControl(40 + i*PARTY_SIZE + j) + Button.SetPicture ("") + for j in range (PARTY_SIZE): + Button=LoadWindow.GetControl (40 + i*PARTY_SIZE + j) if ActPos<GameCount: - Button.SetSaveGamePortrait(ActPos,j) + Button.SetSaveGamePortrait (ActPos,j) else: - Button.SetPicture("") + Button.SetPicture ("") return -def LoadGamePress(): +def LoadGamePress (): if LoadWindow: - LoadWindow.Unload() - Pos = GemRB.GetVar("TopIndex")+GemRB.GetVar("LoadIdx") + LoadWindow.Unload () + Pos = GemRB.GetVar ("TopIndex")+GemRB.GetVar ("LoadIdx") StartLoadScreen() - GemRB.LoadGame(Pos) #loads and enters savegame - GemRB.EnterGame() + GemRB.LoadGame (Pos) #loads and enters savegame + GemRB.EnterGame () return def DeleteGameConfirm(): global GameCount - TopIndex = GemRB.GetVar("TopIndex") - Pos = TopIndex +GemRB.GetVar("LoadIdx") - GemRB.DeleteSaveGame(Pos) + TopIndex = GemRB.GetVar ("TopIndex") + Pos = TopIndex +GemRB.GetVar ("LoadIdx") + GemRB.DeleteSaveGame (Pos) if TopIndex>0: - GemRB.SetVar("TopIndex",TopIndex-1) - GameCount=GemRB.GetSaveGameCount() #count of games in save folder? - ScrollBar.SetVarAssoc("TopIndex", GameCount) - ScrollBarPress() + GemRB.SetVar ("TopIndex",TopIndex-1) + GameCount=GemRB.GetSaveGameCount () #count of games in save folder? + ScrollBar.SetVarAssoc ("TopIndex", GameCount) + ScrollBarPress () if ConfirmWindow: - ConfirmWindow.Unload() - LoadWindow.SetVisible(1) + ConfirmWindow.Unload () + LoadWindow.SetVisible (1) return -def DeleteGameCancel(): +def DeleteGameCancel (): if ConfirmWindow: - ConfirmWindow.Unload() - LoadWindow.SetVisible(1) + ConfirmWindow.Unload () + LoadWindow.SetVisible (1) return -def DeleteGamePress(): +def DeleteGamePress (): global ConfirmWindow - LoadWindow.SetVisible(0) - ConfirmWindow=GemRB.LoadWindowObject(1) - Text=ConfirmWindow.GetControl(0) - Text.SetText(15305) - DeleteButton=ConfirmWindow.GetControl(1) - DeleteButton.SetText(13957) - DeleteButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DeleteGameConfirm") - CancelButton=ConfirmWindow.GetControl(2) - CancelButton.SetText(13727) - CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel") - ConfirmWindow.SetVisible(1) + LoadWindow.SetVisible (0) + ConfirmWindow=GemRB.LoadWindowObject (1) + Text=ConfirmWindow.GetControl (0) + Text.SetText (15305) + DeleteButton=ConfirmWindow.GetControl (1) + DeleteButton.SetText (13957) + DeleteButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGameConfirm") + CancelButton=ConfirmWindow.GetControl (2) + CancelButton.SetText (13727) + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + + ConfirmWindow.SetVisible (1) return -def CancelPress(): +def CancelPress (): if LoadWindow: - LoadWindow.Unload() - GemRB.SetNextScript("Start") + LoadWindow.Unload () + GemRB.SetNextScript ("Start") return Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUISAVE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUISAVE.py 2009-02-17 17:02:44 UTC (rev 5706) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUISAVE.py 2009-02-17 17:20:31 UTC (rev 5707) @@ -1,4 +1,28 @@ -#load window +# -*-python-*- +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# $Id$ + + +# GUISAVE.py - Save window + +################################################### + import GemRB from LoadScreen import * from GUICommon import CloseOtherWindow @@ -27,8 +51,9 @@ CancelButton=Window.GetControl (34) CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenSaveWindow") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + GemRB.SetVar ("LoadIdx",0) - for i in range(4): Button = Window.GetControl (26+i) Button.SetText (15588) @@ -184,6 +209,8 @@ CancelButton=ConfirmWindow.GetControl (8) CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AbortedSaveGame") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + ConfirmWindow.SetVisible (1) NameField.SetStatus (IE_GUI_CONTROL_FOCUSED) return @@ -231,6 +258,8 @@ CancelButton=ConfirmWindow.GetControl (2) CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + ConfirmWindow.SetVisible (1) return Modified: gemrb/trunk/gemrb/GUIScripts/how/GUILOAD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUILOAD.py 2009-02-17 17:02:44 UTC (rev 5706) +++ gemrb/trunk/gemrb/GUIScripts/how/GUILOAD.py 2009-02-17 17:20:31 UTC (rev 5707) @@ -31,45 +31,46 @@ GameCount = 0 ScrollBar = 0 -def OnLoad(): +def OnLoad (): global LoadWindow, TextAreaControl, GameCount, ScrollBar - GemRB.SetVar("PlayMode",2) #iwd is always using 'mpsave' - GemRB.LoadWindowPack("GUILOAD", 640, 480) - LoadWindow = GemRB.LoadWindowObject(0) - LoadWindow.SetFrame() - CancelButton=LoadWindow.GetControl(34) - CancelButton.SetText(13727) - CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress") - GemRB.SetVar("LoadIdx",0) + GemRB.SetVar ("PlayMode",2) #iwd is always using 'mpsave' + GemRB.LoadWindowPack ("GUILOAD", 640, 480) + LoadWindow = GemRB.LoadWindowObject (0) + LoadWindow.SetFrame () + CancelButton=LoadWindow.GetControl (34) + CancelButton.SetText (13727) + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CancelPress") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) - for i in range(4): - Button = LoadWindow.GetControl(26+i) - Button.SetText(15590) - Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "LoadGamePress") - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetVarAssoc("LoadIdx",i) + GemRB.SetVar ("LoadIdx",0) + for i in range (4): + Button = LoadWindow.GetControl (26+i) + Button.SetText (15590) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "LoadGamePress") + Button.SetState (IE_GUI_BUTTON_DISABLED) + Button.SetVarAssoc ("LoadIdx",i) - Button = LoadWindow.GetControl(30+i) - Button.SetText(13957) - Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DeleteGamePress") - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetVarAssoc("LoadIdx",i) + Button = LoadWindow.GetControl (30+i) + Button.SetText (13957) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGamePress") + Button.SetState (IE_GUI_BUTTON_DISABLED) + Button.SetVarAssoc ("LoadIdx",i) #area previews - Button = LoadWindow.GetControl(1+i) + Button = LoadWindow.GetControl (1+i) Button.SetState (IE_GUI_BUTTON_LOCKED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) #PC portraits - for j in range(PARTY_SIZE): - Button = LoadWindow.GetControl(40+i*PARTY_SIZE+j) + for j in range (PARTY_SIZE): + Button = LoadWindow.GetControl (40 + i*PARTY_SIZE + j) Button.SetState (IE_GUI_BUTTON_LOCKED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) - ScrollBar=LoadWindow.GetControl(25) - ScrollBar.SetEvent(IE_GUI_SCROLLBAR_ON_CHANGE, "ScrollBarPress") - GameCount=GemRB.GetSaveGameCount() #count of games in save folder? + ScrollBar=LoadWindow.GetControl (25) + ScrollBar.SetEvent (IE_GUI_SCROLLBAR_ON_CHANGE, "ScrollBarPress") + GameCount=GemRB.GetSaveGameCount () #count of games in save folder? if GameCount>3: TopIndex = GameCount-4 else: @@ -80,97 +81,99 @@ LoadWindow.SetVisible (1) return -def ScrollBarPress(): +def ScrollBarPress (): #draw load game portraits - Pos = GemRB.GetVar("TopIndex") - for i in range(4): + Pos = GemRB.GetVar ("TopIndex") + for i in range (4): ActPos = Pos + i - Button1 = LoadWindow.GetControl(26+i) - Button2 = LoadWindow.GetControl(30+i) + Button1 = LoadWindow.GetControl (26+i) + Button2 = LoadWindow.GetControl (30+i) if ActPos<GameCount: - Button1.SetState(IE_GUI_BUTTON_ENABLED) - Button2.SetState(IE_GUI_BUTTON_ENABLED) + Button1.SetState (IE_GUI_BUTTON_ENABLED) + Button2.SetState (IE_GUI_BUTTON_ENABLED) else: - Button1.SetState(IE_GUI_BUTTON_DISABLED) - Button2.SetState(IE_GUI_BUTTON_DISABLED) + Button1.SetState (IE_GUI_BUTTON_DISABLED) + Button2.SetState (IE_GUI_BUTTON_DISABLED) if ActPos<GameCount: - Slotname = GemRB.GetSaveGameAttrib(0,ActPos) + Slotname = GemRB.GetSaveGameAttrib (0,ActPos) else: Slotname = "" - Label = LoadWindow.GetControl(0x10000008+i) - Label.SetText(Slotname) + Label = LoadWindow.GetControl (0x10000008+i) + Label.SetText (Slotname) if ActPos<GameCount: - Slotname = GemRB.GetSaveGameAttrib(4,ActPos) + Slotname = GemRB.GetSaveGameAttrib (4,ActPos) else: Slotname = "" - Label = LoadWindow.GetControl(0x10000010+i) - Label.SetText(Slotname) + Label = LoadWindow.GetControl (0x10000010+i) + Label.SetText (Slotname) - Button=LoadWindow.GetControl(1+i) + Button=LoadWindow.GetControl (1+i) if ActPos<GameCount: - Button.SetSaveGamePreview(ActPos) + Button.SetSaveGamePreview (ActPos) else: - Button.SetPicture("") - for j in range(PARTY_SIZE): - Button=LoadWindow.GetControl(40+i*PARTY_SIZE+j) + Button.SetPicture ("") + for j in range (PARTY_SIZE): + Button=LoadWindow.GetControl (40 + i*PARTY_SIZE + j) if ActPos<GameCount: - Button.SetSaveGamePortrait(ActPos,j) + Button.SetSaveGamePortrait (ActPos,j) else: - Button.SetPicture("") + Button.SetPicture ("") return -def LoadGamePress(): +def LoadGamePress (): if LoadWindow: - LoadWindow.Unload() - Pos = GemRB.GetVar("TopIndex")+GemRB.GetVar("LoadIdx") + LoadWindow.Unload () + Pos = GemRB.GetVar ("TopIndex")+GemRB.GetVar ("LoadIdx") StartLoadScreen() - GemRB.LoadGame(Pos) #loads and enters savegame - GemRB.EnterGame() + GemRB.LoadGame (Pos) #loads and enters savegame + GemRB.EnterGame () return def DeleteGameConfirm(): global GameCount - TopIndex = GemRB.GetVar("TopIndex") - Pos = TopIndex +GemRB.GetVar("LoadIdx") - GemRB.DeleteSaveGame(Pos) + TopIndex = GemRB.GetVar ("TopIndex") + Pos = TopIndex +GemRB.GetVar ("LoadIdx") + GemRB.DeleteSaveGame (Pos) if TopIndex>0: - GemRB.SetVar("TopIndex",TopIndex-1) - GameCount=GemRB.GetSaveGameCount() #count of games in save folder? - ScrollBar.SetVarAssoc("TopIndex", GameCount) - ScrollBarPress() + GemRB.SetVar ("TopIndex",TopIndex-1) + GameCount=GemRB.GetSaveGameCount () #count of games in save folder? + ScrollBar.SetVarAssoc ("TopIndex", GameCount) + ScrollBarPress () if ConfirmWindow: - ConfirmWindow.Unload() - LoadWindow.SetVisible(1) + ConfirmWindow.Unload () + LoadWindow.SetVisible (1) return -def DeleteGameCancel(): +def DeleteGameCancel (): if ConfirmWindow: - ConfirmWindow.Unload() - LoadWindow.SetVisible(1) + ConfirmWindow.Unload () + LoadWindow.SetVisible (1) return -def DeleteGamePress(): +def DeleteGamePress (): global ConfirmWindow - LoadWindow.SetVisible(0) - ConfirmWindow=GemRB.LoadWindowObject(1) - Text=ConfirmWindow.GetControl(0) - Text.SetText(15305) - DeleteButton=ConfirmWindow.GetControl(1) - DeleteButton.SetText(13957) - DeleteButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DeleteGameConfirm") - CancelButton=ConfirmWindow.GetControl(2) - CancelButton.SetText(13727) - CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel") - ConfirmWindow.SetVisible(1) + LoadWindow.SetVisible (0) + ConfirmWindow=GemRB.LoadWindowObject (1) + Text=ConfirmWindow.GetControl (0) + Text.SetText (15305) + DeleteButton=ConfirmWindow.GetControl (1) + DeleteButton.SetText (13957) + DeleteButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGameConfirm") + CancelButton=ConfirmWindow.GetControl (2) + CancelButton.SetText (13727) + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + + ConfirmWindow.SetVisible (1) return -def CancelPress(): +def CancelPress (): if LoadWindow: - LoadWindow.Unload() - GemRB.SetNextScript("Start") + LoadWindow.Unload () + GemRB.SetNextScript ("Start") return Modified: gemrb/trunk/gemrb/GUIScripts/how/GUISAVE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUISAVE.py 2009-02-17 17:02:44 UTC (rev 5706) +++ gemrb/trunk/gemrb/GUIScripts/how/GUISAVE.py 2009-02-17 17:20:31 UTC (rev 5707) @@ -1,4 +1,28 @@ -#load window +# -*-python-*- +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# $Id$ + + +# GUISAVE.py - Save window + +################################################### + import GemRB from LoadScreen import * from GUICommon import CloseOtherWindow @@ -27,8 +51,9 @@ CancelButton=Window.GetControl (34) CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenSaveWindow") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + GemRB.SetVar ("LoadIdx",0) - for i in range(4): Button = Window.GetControl (26+i) Button.SetText (15588) @@ -184,6 +209,8 @@ CancelButton=ConfirmWindow.GetControl (8) CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AbortedSaveGame") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + ConfirmWindow.SetVisible (1) NameField.SetStatus (IE_GUI_CONTROL_FOCUSED) return @@ -231,6 +258,8 @@ CancelButton=ConfirmWindow.GetControl (2) CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + ConfirmWindow.SetVisible (1) return Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUILOAD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUILOAD.py 2009-02-17 17:02:44 UTC (rev 5706) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUILOAD.py 2009-02-17 17:20:31 UTC (rev 5707) @@ -31,45 +31,46 @@ GameCount = 0 ScrollBar = 0 -def OnLoad(): +def OnLoad (): global LoadWindow, TextAreaControl, GameCount, ScrollBar - GemRB.SetVar("PlayMode",2) #iwd is always using 'mpsave' - GemRB.LoadWindowPack("GUILOAD", 640, 480) - LoadWindow = GemRB.LoadWindowObject(0) - LoadWindow.SetFrame() - CancelButton=LoadWindow.GetControl(34) - CancelButton.SetText(13727) - CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress") - GemRB.SetVar("LoadIdx",0) + GemRB.SetVar ("PlayMode",2) #iwd is always using 'mpsave' + GemRB.LoadWindowPack ("GUILOAD", 640, 480) + LoadWindow = GemRB.LoadWindowObject (0) + LoadWindow.SetFrame () + CancelButton=LoadWindow.GetControl (34) + CancelButton.SetText (13727) + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CancelPress") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) - for i in range(4): - Button = LoadWindow.GetControl(26+i) - Button.SetText(15590) - Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "LoadGamePress") - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetVarAssoc("LoadIdx",i) + GemRB.SetVar ("LoadIdx",0) + for i in range (4): + Button = LoadWindow.GetControl (26+i) + Button.SetText (15590) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "LoadGamePress") + Button.SetState (IE_GUI_BUTTON_DISABLED) + Button.SetVarAssoc ("LoadIdx",i) - Button = LoadWindow.GetControl(30+i) - Button.SetText(13957) - Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DeleteGamePress") - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetVarAssoc("LoadIdx",i) + Button = LoadWindow.GetControl (30+i) + Button.SetText (13957) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGamePress") + Button.SetState (IE_GUI_BUTTON_DISABLED) + Button.SetVarAssoc ("LoadIdx",i) #area previews - Button = LoadWindow.GetControl(1+i) + Button = LoadWindow.GetControl (1+i) Button.SetState (IE_GUI_BUTTON_LOCKED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) #PC portraits - for j in range(PARTY_SIZE): - Button = LoadWindow.GetControl(40+i*PARTY_SIZE+j) + for j in range (PARTY_SIZE): + Button = LoadWindow.GetControl (40 + i*PARTY_SIZE + j) Button.SetState (IE_GUI_BUTTON_LOCKED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) - ScrollBar=LoadWindow.GetControl(25) - ScrollBar.SetEvent(IE_GUI_SCROLLBAR_ON_CHANGE, "ScrollBarPress") - GameCount=GemRB.GetSaveGameCount() #count of games in save folder? + ScrollBar=LoadWindow.GetControl (25) + ScrollBar.SetEvent (IE_GUI_SCROLLBAR_ON_CHANGE, "ScrollBarPress") + GameCount=GemRB.GetSaveGameCount () #count of games in save folder? if GameCount>3: TopIndex = GameCount-4 else: @@ -80,97 +81,99 @@ LoadWindow.SetVisible (1) return -def ScrollBarPress(): +def ScrollBarPress (): #draw load game portraits - Pos = GemRB.GetVar("TopIndex") - for i in range(4): + Pos = GemRB.GetVar ("TopIndex") + for i in range (4): ActPos = Pos + i - Button1 = LoadWindow.GetControl(26+i) - Button2 = LoadWindow.GetControl(30+i) + Button1 = LoadWindow.GetControl (26+i) + Button2 = LoadWindow.GetControl (30+i) if ActPos<GameCount: - Button1.SetState(IE_GUI_BUTTON_ENABLED) - Button2.SetState(IE_GUI_BUTTON_ENABLED) + Button1.SetState (IE_GUI_BUTTON_ENABLED) + Button2.SetState (IE_GUI_BUTTON_ENABLED) else: - Button1.SetState(IE_GUI_BUTTON_DISABLED) - Button2.SetState(IE_GUI_BUTTON_DISABLED) + Button1.SetState (IE_GUI_BUTTON_DISABLED) + Button2.SetState (IE_GUI_BUTTON_DISABLED) if ActPos<GameCount: - Slotname = GemRB.GetSaveGameAttrib(0,ActPos) + Slotname = GemRB.GetSaveGameAttrib (0,ActPos) else: Slotname = "" - Label = LoadWindow.GetControl(0x10000008+i) - Label.SetText(Slotname) + Label = LoadWindow.GetControl (0x10000008+i) + Label.SetText (Slotname) if ActPos<GameCount: - Slotname = GemRB.GetSaveGameAttrib(4,ActPos) + Slotname = GemRB.GetSaveGameAttrib (4,ActPos) else: Slotname = "" - Label = LoadWindow.GetControl(0x10000010+i) - Label.SetText(Slotname) + Label = LoadWindow.GetControl (0x10000010+i) + Label.SetText (Slotname) - Button=LoadWindow.GetControl(1+i) + Button=LoadWindow.GetControl (1+i) if ActPos<GameCount: - Button.SetSaveGamePreview(ActPos) + Button.SetSaveGamePreview (ActPos) else: - Button.SetPicture("") - for j in range(PARTY_SIZE): - Button=LoadWindow.GetControl(40+i*PARTY_SIZE+j) + Button.SetPicture ("") + for j in range (PARTY_SIZE): + Button=LoadWindow.GetControl (40 + i*PARTY_SIZE + j) if ActPos<GameCount: - Button.SetSaveGamePortrait(ActPos,j) + Button.SetSaveGamePortrait (ActPos,j) else: - Button.SetPicture("") + Button.SetPicture ("") return -def LoadGamePress(): +def LoadGamePress (): if LoadWindow: - LoadWindow.Unload() - Pos = GemRB.GetVar("TopIndex")+GemRB.GetVar("LoadIdx") + LoadWindow.Unload () + Pos = GemRB.GetVar ("TopIndex")+GemRB.GetVar ("LoadIdx") StartLoadScreen() - GemRB.LoadGame(Pos) #loads and enters savegame - GemRB.EnterGame() + GemRB.LoadGame (Pos) #loads and enters savegame + GemRB.EnterGame () return def DeleteGameConfirm(): global GameCount - TopIndex = GemRB.GetVar("TopIndex") - Pos = TopIndex +GemRB.GetVar("LoadIdx") - GemRB.DeleteSaveGame(Pos) + TopIndex = GemRB.GetVar ("TopIndex") + Pos = TopIndex +GemRB.GetVar ("LoadIdx") + GemRB.DeleteSaveGame (Pos) if TopIndex>0: - GemRB.SetVar("TopIndex",TopIndex-1) - GameCount=GemRB.GetSaveGameCount() #count of games in save folder? - ScrollBar.SetVarAssoc("TopIndex", GameCount) - ScrollBarPress() + GemRB.SetVar ("TopIndex",TopIndex-1) + GameCount=GemRB.GetSaveGameCount () #count of games in save folder? + ScrollBar.SetVarAssoc ("TopIndex", GameCount) + ScrollBarPress () if ConfirmWindow: - ConfirmWindow.Unload() - LoadWindow.SetVisible(1) + ConfirmWindow.Unload () + LoadWindow.SetVisible (1) return -def DeleteGameCancel(): +def DeleteGameCancel (): if ConfirmWindow: - ConfirmWindow.Unload() - LoadWindow.SetVisible(1) + ConfirmWindow.Unload () + LoadWindow.SetVisible (1) return -def DeleteGamePress(): +def DeleteGamePress (): global ConfirmWindow - LoadWindow.SetVisible(0) - ConfirmWindow=GemRB.LoadWindowObject(1) - Text=ConfirmWindow.GetControl(0) - Text.SetText(15305) - DeleteButton=ConfirmWindow.GetControl(1) - DeleteButton.SetText(13957) - DeleteButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DeleteGameConfirm") - CancelButton=ConfirmWindow.GetControl(2) - CancelButton.SetText(13727) - CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel") - ConfirmWindow.SetVisible(1) + LoadWindow.SetVisible (0) + ConfirmWindow=GemRB.LoadWindowObject (1) + Text=ConfirmWindow.GetControl (0) + Text.SetText (15305) + DeleteButton=ConfirmWindow.GetControl (1) + DeleteButton.SetText (13957) + DeleteButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGameConfirm") + CancelButton=ConfirmWindow.GetControl (2) + CancelButton.SetText (13727) + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + + ConfirmWindow.SetVisible (1) return -def CancelPress(): +def CancelPress (): if LoadWindow: - LoadWindow.Unload() - GemRB.SetNextScript("Start") + LoadWindow.Unload () + GemRB.SetNextScript ("Start") return Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUISAVE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUISAVE.py 2009-02-17 17:02:44 UTC (rev 5706) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUISAVE.py 2009-02-17 17:20:31 UTC (rev 5707) @@ -1,4 +1,28 @@ -#load window +# -*-python-*- +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# $Id$ + + +# GUISAVE.py - Save window + +################################################### + import GemRB from LoadScreen import * from GUICommon import CloseOtherWindow @@ -27,8 +51,9 @@ CancelButton=Window.GetControl (34) CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenSaveWindow") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + GemRB.SetVar ("LoadIdx",0) - for i in range(4): Button = Window.GetControl (26+i) Button.SetText (15588) @@ -184,6 +209,8 @@ CancelButton=ConfirmWindow.GetControl (8) CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AbortedSaveGame") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + ConfirmWindow.SetVisible (1) NameField.SetStatus (IE_GUI_CONTROL_FOCUSED) return @@ -231,6 +258,8 @@ CancelButton=ConfirmWindow.GetControl (2) CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + ConfirmWindow.SetVisible (1) return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-02-17 23:22:39
|
Revision: 5713 http://gemrb.svn.sourceforge.net/gemrb/?rev=5713&view=rev Author: lynxlupodian Date: 2009-02-17 22:41:45 +0000 (Tue, 17 Feb 2009) Log Message: ----------- iwd, how: don't use the scroll spell icon for spells to memorize Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/how/CharGen.py gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py Modified: gemrb/trunk/gemrb/GUIScripts/how/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2009-02-17 22:41:30 UTC (rev 5712) +++ gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2009-02-17 22:41:45 UTC (rev 5713) @@ -2007,7 +2007,7 @@ if j < len(Learnable): Spell = GemRB.GetSpell (Learnable[j]) SpellButton.SetTooltip(Spell["SpellName"]) - SpellButton.SetSpellIcon(Learnable[j]) + SpellButton.SetSpellIcon(Learnable[j], 1) SpellButton.SetState (IE_GUI_BUTTON_ENABLED) SpellButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "MageMemorizeSelectPress") SpellButton.SetVarAssoc ("SpellMask", 1 << j) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py 2009-02-17 22:41:30 UTC (rev 5712) +++ gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py 2009-02-17 22:41:45 UTC (rev 5713) @@ -2007,7 +2007,7 @@ if j < len(Learnable): Spell = GemRB.GetSpell (Learnable[j]) SpellButton.SetTooltip(Spell["SpellName"]) - SpellButton.SetSpellIcon(Learnable[j]) + SpellButton.SetSpellIcon(Learnable[j], 1) SpellButton.SetState (IE_GUI_BUTTON_ENABLED) SpellButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "MageMemorizeSelectPress") SpellButton.SetVarAssoc ("SpellMask", 1 << j) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-02-18 09:50:46
|
Revision: 5714 http://gemrb.svn.sourceforge.net/gemrb/?rev=5714&view=rev Author: lynxlupodian Date: 2009-02-18 09:50:41 +0000 (Wed, 18 Feb 2009) Log Message: ----------- vanilla iwd does not have the stone window frames Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/how/Start.py gemrb/trunk/gemrb/GUIScripts/iwd/Start.py Modified: gemrb/trunk/gemrb/GUIScripts/how/Start.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/Start.py 2009-02-17 22:41:45 UTC (rev 5713) +++ gemrb/trunk/gemrb/GUIScripts/how/Start.py 2009-02-18 09:50:41 UTC (rev 5714) @@ -33,7 +33,7 @@ def OnLoad (): global StartWindow, JoinGameButton - GemRB.SetVar ("oldgame",1) #don't handle expansion yet + GemRB.SetVar("oldgame",1) #don't handle expansion yet skip_videos = GemRB.GetVar ("SkipIntroVideos") if not skip_videos: @@ -46,10 +46,11 @@ # Find proper window border for higher resolutions screen_width = GemRB.GetSystemVariable (SV_WIDTH) screen_height = GemRB.GetSystemVariable (SV_HEIGHT) - if screen_width == 800: - GemRB.LoadWindowFrame ("STON08L", "STON08R", "STON08T", "STON08B") - elif screen_width == 1024: - GemRB.LoadWindowFrame ("STON10L", "STON10R", "STON10T", "STON10B") + if GemRB.HasResource ("STON08L", 0x000003EC): + if screen_width == 800: + GemRB.LoadWindowFrame ("STON08L", "STON08R", "STON08T", "STON08B") + elif screen_width == 1024: + GemRB.LoadWindowFrame ("STON10L", "STON10R", "STON10T", "STON10B") GemRB.LoadWindowPack("GUICONN", 640, 480) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/Start.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/Start.py 2009-02-17 22:41:45 UTC (rev 5713) +++ gemrb/trunk/gemrb/GUIScripts/iwd/Start.py 2009-02-18 09:50:41 UTC (rev 5714) @@ -46,10 +46,11 @@ # Find proper window border for higher resolutions screen_width = GemRB.GetSystemVariable (SV_WIDTH) screen_height = GemRB.GetSystemVariable (SV_HEIGHT) - if screen_width == 800: - GemRB.LoadWindowFrame ("STON08L", "STON08R", "STON08T", "STON08B") - elif screen_width == 1024: - GemRB.LoadWindowFrame ("STON10L", "STON10R", "STON10T", "STON10B") + if GemRB.HasResource ("STON08L", 0x000003EC): + if screen_width == 800: + GemRB.LoadWindowFrame ("STON08L", "STON08R", "STON08T", "STON08B") + elif screen_width == 1024: + GemRB.LoadWindowFrame ("STON10L", "STON10R", "STON10T", "STON10B") GemRB.LoadWindowPack("GUICONN", 640, 480) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-02-18 10:39:15
|
Revision: 5716 http://gemrb.svn.sourceforge.net/gemrb/?rev=5716&view=rev Author: lynxlupodian Date: 2009-02-18 10:39:04 +0000 (Wed, 18 Feb 2009) Log Message: ----------- iwd: vanilla iwd only supports 640x480 with this the gui is at least displayed again, but still buggy Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/how/GUIWORLD.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py Modified: gemrb/trunk/gemrb/GUIScripts/how/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUIWORLD.py 2009-02-18 10:10:54 UTC (rev 5715) +++ gemrb/trunk/gemrb/GUIScripts/how/GUIWORLD.py 2009-02-18 10:39:04 UTC (rev 5716) @@ -505,12 +505,13 @@ def GetWindowPack(): width = GemRB.GetSystemVariable (SV_WIDTH) - if width == 800: - return "GUIW08" - if width == 1024: - return "GUIW10" - if width == 1280: - return "GUIW12" + if GemRB.HasResource("GUIW08", 0x000003EC): + if width == 800: + return "GUIW08" + if width == 1024: + return "GUIW10" + if width == 1280: + return "GUIW12" #default return "GUIW" Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py 2009-02-18 10:10:54 UTC (rev 5715) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py 2009-02-18 10:39:04 UTC (rev 5716) @@ -505,12 +505,13 @@ def GetWindowPack(): width = GemRB.GetSystemVariable (SV_WIDTH) - if width == 800: - return "GUIW08" - if width == 1024: - return "GUIW10" - if width == 1280: - return "GUIW12" + if GemRB.HasResource("GUIW08", 0x000003EC): + if width == 800: + return "GUIW08" + if width == 1024: + return "GUIW10" + if width == 1280: + return "GUIW12" #default return "GUIW" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-02-18 11:09:00
|
Revision: 5717 http://gemrb.svn.sourceforge.net/gemrb/?rev=5717&view=rev Author: lynxlupodian Date: 2009-02-18 11:08:50 +0000 (Wed, 18 Feb 2009) Log Message: ----------- iwd: guis aren chu files Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/how/GUIWORLD.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py Modified: gemrb/trunk/gemrb/GUIScripts/how/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUIWORLD.py 2009-02-18 10:39:04 UTC (rev 5716) +++ gemrb/trunk/gemrb/GUIScripts/how/GUIWORLD.py 2009-02-18 11:08:50 UTC (rev 5717) @@ -505,7 +505,7 @@ def GetWindowPack(): width = GemRB.GetSystemVariable (SV_WIDTH) - if GemRB.HasResource("GUIW08", 0x000003EC): + if GemRB.HasResource("GUIW08", 0x000003EA): if width == 800: return "GUIW08" if width == 1024: Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py 2009-02-18 10:39:04 UTC (rev 5716) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py 2009-02-18 11:08:50 UTC (rev 5717) @@ -505,7 +505,7 @@ def GetWindowPack(): width = GemRB.GetSystemVariable (SV_WIDTH) - if GemRB.HasResource("GUIW08", 0x000003EC): + if GemRB.HasResource("GUIW08", 0x000003EA): if width == 800: return "GUIW08" if width == 1024: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-02-18 16:41:05
|
Revision: 5719 http://gemrb.svn.sourceforge.net/gemrb/?rev=5719&view=rev Author: avenger_teambg Date: 2009-02-18 16:41:02 +0000 (Wed, 18 Feb 2009) Log Message: ----------- use ie_restype for clarity Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG19.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py gemrb/trunk/gemrb/GUIScripts/iwd/Start.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG19.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG19.py 2009-02-18 11:16:06 UTC (rev 5718) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG19.py 2009-02-18 16:41:02 UTC (rev 5719) @@ -1,4 +1,5 @@ #character generation, sounds (GUICG19) +from ie_restype import * import GemRB VoiceList = 0 @@ -52,7 +53,7 @@ CharSound = VoiceList.QueryText() # SClassID.h -> IE_WAV_CLASS_ID = 0x00000004 - while (not GemRB.HasResource (CharSound + SoundSequence[SoundIndex], 0x00000004)): + while (not GemRB.HasResource (CharSound + SoundSequence[SoundIndex], RES_WAV)): NextSound() # play the sound like it was a speech, so any previous yells are quieted GemRB.PlaySound (CharSound + SoundSequence[SoundIndex], 0, 0, 4) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py 2009-02-18 11:16:06 UTC (rev 5718) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py 2009-02-18 16:41:02 UTC (rev 5719) @@ -25,6 +25,7 @@ import GemRB from GUIDefines import * +from ie_restype import * from GUICommon import CloseOtherWindow from GUICommonWindows import * from GUIClasses import GWindow @@ -505,7 +506,7 @@ def GetWindowPack(): width = GemRB.GetSystemVariable (SV_WIDTH) - if GemRB.HasResource("GUIW08", 0x000003EA): + if GemRB.HasResource("GUIW08", RES_CHU): if width == 800: return "GUIW08" if width == 1024: Modified: gemrb/trunk/gemrb/GUIScripts/iwd/Start.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/Start.py 2009-02-18 11:16:06 UTC (rev 5718) +++ gemrb/trunk/gemrb/GUIScripts/iwd/Start.py 2009-02-18 16:41:02 UTC (rev 5719) @@ -24,6 +24,7 @@ ################################################### import GemRB +from ie_restype import * StartWindow = 0 JoinGameButton = 0 @@ -46,7 +47,7 @@ # Find proper window border for higher resolutions screen_width = GemRB.GetSystemVariable (SV_WIDTH) screen_height = GemRB.GetSystemVariable (SV_HEIGHT) - if GemRB.HasResource ("STON08L", 0x000003EC): + if GemRB.HasResource ("STON08L", RES_MOS): if screen_width == 800: GemRB.LoadWindowFrame ("STON08L", "STON08R", "STON08T", "STON08B") elif screen_width == 1024: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-02-23 20:13:17
|
Revision: 5736 http://gemrb.svn.sourceforge.net/gemrb/?rev=5736&view=rev Author: avenger_teambg Date: 2009-02-23 20:13:12 +0000 (Mon, 23 Feb 2009) Log Message: ----------- some more default cancel/enter buttons Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.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 gemrb/trunk/gemrb/GUIScripts/bg2/GUIMG.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIPR.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIPR.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIREC.py gemrb/trunk/gemrb/GUIScripts/iwd/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUISPL.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/pst/GUIMG.py gemrb/trunk/gemrb/GUIScripts/pst/GUIPR.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -289,11 +289,13 @@ # Button = Window.GetControl (0) # Button.SetText (17507) # Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnMageRemoveSpell") +# Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) # # # Cancel # Button = Window.GetControl (1) # Button.SetText (13727) # Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseMageSpellUnmemorizeWindow") +# Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) # # Window.ShowModal (MODAL_SHADOW_GRAY) # return @@ -311,11 +313,13 @@ Button = Window.GetControl (0) Button.SetText (17507) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnMageUnmemorizeSpell") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) # Cancel Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseMageSpellUnmemorizeWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) Window.ShowModal (MODAL_SHADOW_GRAY) return Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -269,11 +269,13 @@ Button = Window.GetControl (0) Button.SetText (17507) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnPriestRemoveSpell") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) # Cancel Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenPriestSpellRemoveWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) Window.ShowModal (MODAL_SHADOW_GRAY) return @@ -299,11 +301,13 @@ Button = Window.GetControl (0) Button.SetText (17507) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnPriestUnmemorizeSpell") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) # Cancel Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClosePriestSpellUnmemorizeWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) Window.ShowModal (MODAL_SHADOW_GRAY) return Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -619,6 +619,7 @@ CancelButton = ExportWindow.GetControl(5) CancelButton.SetText(13727) + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) NameField = ExportWindow.GetControl(6) Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -1230,10 +1230,14 @@ Button = Window.GetControl (0) Button.SetText (17199) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RentConfirm") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) + #deny Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RentDeny") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + #textarea TextArea = Window.GetControl (3) TextArea.SetText (15358) Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -368,11 +368,13 @@ Button = Window.GetControl (1) Button.SetText (17507) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RemovePlayerConfirm") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) #cancel Button = Window.GetControl (2) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RemovePlayerCancel") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) def RemovePlayerConfirm (): global ReformPartyWindow Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIMG.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIMG.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIMG.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -303,11 +303,13 @@ Button = Window.GetControl (0) Button.SetText (17507) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnMageRemoveSpell") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) # Cancel Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseMageSpellUnmemorizeWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) Window.ShowModal (MODAL_SHADOW_GRAY) return @@ -325,11 +327,13 @@ Button = Window.GetControl (0) Button.SetText (17507) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnMageUnmemorizeSpell") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) # Cancel Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseMageSpellUnmemorizeWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) Window.ShowModal (MODAL_SHADOW_GRAY) return Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIPR.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIPR.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIPR.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -280,11 +280,13 @@ Button = Window.GetControl (0) Button.SetText (17507) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnPriestRemoveSpell") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) # Cancel Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClosePriestSpellUnmemorizeWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) Window.ShowModal (MODAL_SHADOW_GRAY) return @@ -310,11 +312,13 @@ Button = Window.GetControl (0) Button.SetText (17507) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnPriestUnmemorizeSpell") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) # Cancel Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClosePriestSpellUnmemorizeWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) Window.ShowModal (MODAL_SHADOW_GRAY) return Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -750,6 +750,7 @@ CancelButton = ExportWindow.GetControl(5) CancelButton.SetText(13727) + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) NameField = ExportWindow.GetControl(6) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -1303,10 +1303,14 @@ Button = Window.GetControl (0) Button.SetText (17199) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RentConfirm") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) + #deny Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RentDeny") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + #textarea TextArea = Window.GetControl (3) TextArea.SetText (15358) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -381,11 +381,13 @@ Button = Window.GetControl (1) Button.SetText (17507) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RemovePlayerConfirm") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) #cancel Button = Window.GetControl (2) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RemovePlayerCancel") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) GemRB.SetVar ("OtherWindow", Window.ID) GemRB.SetVar ("ActionsWindow", -1) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIPR.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIPR.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIPR.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -267,11 +267,13 @@ Button = Window.GetControl (0) Button.SetText (17507) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnPriestRemoveSpell") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) # Cancel Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClosePriestSpelliUnmemorizeWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) Window.ShowModal (MODAL_SHADOW_GRAY) return @@ -297,11 +299,13 @@ Button = Window.GetControl (0) Button.SetText (17507) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnPriestUnmemorizeSpell") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) # Cancel Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClosePriestSpellUnmemorizeWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) Window.ShowModal (MODAL_SHADOW_GRAY) return Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIREC.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIREC.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -674,6 +674,7 @@ CancelButton = ExportWindow.GetControl(5) CancelButton.SetText(13727) + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) NameField = ExportWindow.GetControl(6) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUISTORE.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUISTORE.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -1300,10 +1300,14 @@ Button = Window.GetControl (0) Button.SetText (17199) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RentConfirm") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) + #deny Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RentDeny") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + #textarea TextArea = Window.GetControl (3) TextArea.SetText (15358) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -371,11 +371,13 @@ Button = Window.GetControl (1) Button.SetText (17507) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RemovePlayerConfirm") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) #cancel Button = Window.GetControl (2) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RemovePlayerCancel") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) def RemovePlayerConfirm (): global ReformPartyWindow Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUILOAD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUILOAD.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUILOAD.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -9,12 +9,12 @@ # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Id$ @@ -34,7 +34,7 @@ def OnLoad (): global LoadWindow, TextAreaControl, GameCount, ScrollBar - GemRB.SetVar ("PlayMode",2) #iwd2 is always using 'mpsave' + GemRB.SetVar ("PlayMode",2) #iwd2 is always using 'mpsave' GemRB.LoadWindowPack ("GUILOAD", 800 ,600) LoadWindow = GemRB.LoadWindowObject (0) LoadWindow.SetFrame () @@ -72,11 +72,11 @@ ScrollBar=LoadWindow.GetControl (23) ScrollBar.SetEvent (IE_GUI_SCROLLBAR_ON_CHANGE, "ScrollBarPress") - GameCount=GemRB.GetSaveGameCount () #count of games in save folder? - if GameCount>4: - TopIndex = GameCount-5 - else: - TopIndex = 0 + GameCount=GemRB.GetSaveGameCount () #count of games in save folder? + if GameCount>4: + TopIndex = GameCount-5 + else: + TopIndex = 0 ScrollBar.SetVarAssoc ("TopIndex", GameCount) ScrollBarPress () @@ -149,7 +149,7 @@ GemRB.DeleteSaveGame (Pos) if TopIndex>0: GemRB.SetVar ("TopIndex",TopIndex-1) - GameCount=GemRB.GetSaveGameCount () #count of games in save folder? + GameCount=GemRB.GetSaveGameCount () #count of games in save folder? ScrollBar.SetVarAssoc ("TopIndex", GameCount) ScrollBarPress () if ConfirmWindow: @@ -180,7 +180,7 @@ ConfirmWindow.SetVisible (1) return - + def CancelPress (): if LoadWindow: LoadWindow.Unload () Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -786,6 +786,7 @@ CancelButton = ExportWindow.GetControl(5) CancelButton.SetText(13727) + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) NameField = ExportWindow.GetControl(6) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUISPL.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUISPL.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUISPL.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -304,11 +304,13 @@ Button = Window.GetControl (0) Button.SetText (17507) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnSpellBookRemoveSpell") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) # Cancel Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenSpellBookSpellRemoveWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) GemRB.UnhideGUI () Window.ShowModal (MODAL_SHADOW_GRAY) @@ -339,11 +341,13 @@ Button = Window.GetControl (0) Button.SetText (17507) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnSpellBookUnmemorizeSpell") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) # Cancel Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenSpellBookSpellUnmemorizeWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) GemRB.UnhideGUI () Window.ShowModal (MODAL_SHADOW_GRAY) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUISTORE.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUISTORE.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -1196,10 +1196,14 @@ Button = Window.GetControl (0) Button.SetText (17199) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RentConfirm") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) + #deny Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RentDeny") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + #textarea TextArea = Window.GetControl (3) TextArea.SetText (15358) Modified: gemrb/trunk/gemrb/GUIScripts/pst/GUIMG.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/GUIMG.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/pst/GUIMG.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -244,10 +244,12 @@ Button = Window.GetControl (0) Button.SetText (42514) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnMageUnmemorizeSpell") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) Button = Window.GetControl (1) Button.SetText (4196) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenMageSpellUnmemorizeWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) GemRB.UnhideGUI () Window.ShowModal (MODAL_SHADOW_GRAY) Modified: gemrb/trunk/gemrb/GUIScripts/pst/GUIPR.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/GUIPR.py 2009-02-23 19:57:18 UTC (rev 5735) +++ gemrb/trunk/gemrb/GUIScripts/pst/GUIPR.py 2009-02-23 20:13:12 UTC (rev 5736) @@ -249,11 +249,13 @@ Button = Window.GetControl (0) Button.SetText (42514) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OnPriestUnmemorizeSpell") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) # Cancel Button = Window.GetControl (1) Button.SetText (4196) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenPriestSpellUnmemorizeWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) GemRB.UnhideGUI () Window.ShowModal (MODAL_SHADOW_GRAY) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-02-23 20:51:53
|
Revision: 5737 http://gemrb.svn.sourceforge.net/gemrb/?rev=5737&view=rev Author: avenger_teambg Date: 2009-02-23 20:51:38 +0000 (Mon, 23 Feb 2009) Log Message: ----------- some more default/cancel buttons Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py gemrb/trunk/gemrb/GUIScripts/pst/FloatMenuWindow.py gemrb/trunk/gemrb/GUIScripts/pst/GUIINV.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py 2009-02-23 20:13:12 UTC (rev 5736) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py 2009-02-23 20:51:38 UTC (rev 5737) @@ -51,6 +51,7 @@ Button.SetSprites ("GUILSOP", 0,16,17,28,16) Button.SetVarAssoc ("SelectedWindow", 0) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, ReturnToGame) + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) # Map Button = Window.GetControl (1) Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2009-02-23 20:13:12 UTC (rev 5736) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2009-02-23 20:51:38 UTC (rev 5737) @@ -44,7 +44,7 @@ def OpenInventoryWindowClick(): tmp = GemRB.GetVar("PressedPortrait")+1 GemRB.GameSelectPC(tmp, True, SELECT_REPLACE) - OpenInventoryWindow() + OpenInventoryWindow () def OpenInventoryWindow (): @@ -173,7 +173,7 @@ PortraitWindow.SetVisible (1) return -def ColorDonePress(): +def ColorDonePress (): pc = GemRB.GameGetSelectedPCSingle () if ColorPicker: @@ -188,7 +188,7 @@ UpdateInventoryWindow () return -def MajorPress(): +def MajorPress (): global ColorIndex, PickedColor pc = GemRB.GameGetSelectedPCSingle () @@ -197,7 +197,7 @@ GetColor() return -def MinorPress(): +def MinorPress (): global ColorIndex, PickedColor pc = GemRB.GameGetSelectedPCSingle () @@ -280,7 +280,7 @@ size = PortraitTable.GetValue (row, "SIZE") #Weapon - slot_item = GemRB.GetSlotItem (pc, GemRB.GetEquippedQuickSlot(pc) ) + slot_item = GemRB.GetSlotItem (pc, GemRB.GetEquippedQuickSlot (pc) ) if slot_item: item = GemRB.GetItem (slot_item["ItemResRef"]) if (item['AnimationType'] != ''): @@ -307,7 +307,7 @@ Button.SetPLT("WP" + size + item['AnimationType'] + "INV", Color1, Color2, Color3, Color4, Color5, Color6, Color7, 0, 3) #encumbrance - SetEncumbranceLabels( Window, 0x10000043, 0x10000044, pc) + SetEncumbranceLabels ( Window, 0x10000043, 0x10000044, pc) #armor class ac = GemRB.GetPlayerStat (pc, IE_ARMORCLASS) @@ -541,6 +541,70 @@ UpdateInventoryWindow () return +def DragItemAmount (): + Text = Window.GetControl (6) + Amount = Text.GetText () + print Amount + + OpenItemAmountWindow () + return + +def OpenItemAmountWindow (): + global ItemAmountWindow + + GemRB.HideGUI () + + if ItemAmountWindow != None: + if ItemAmountWindow: + ItemAmountWindow.Unload () + ItemAmountWindow = None + GemRB.SetVar ("FloatWindow", -1) + + GemRB.UnhideGUI () + return + + ItemAmountWindow = Window = GemRB.LoadWindowObject (4) + GemRB.SetVar ("FloatWindow", ItemAmountWindow.ID) + + pc = GemRB.GameGetSelectedPCSingle () + slot = GemRB.GetVar ("ItemButton") + slot_item = GemRB.GetSlotItem (pc, slot) + ResRef = slot_item['ItemResRef'] + item = GemRB.GetItem (ResRef) + + # item icon + Icon = Window.GetControl (0) + Icon.SetFlags (IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_NO_IMAGE, OP_SET) + Icon.SetItemIcon (ResRef) + + # item amount + Text = Window.GetControl (6) + Text.SetSize (40, 40) + Text.SetText ("1") + Text.SetStatus (IE_GUI_EDIT_NUMBER|IE_GUI_CONTROL_FOCUSED) + + # Done + Button = Window.GetControl (2) + Button.SetText (1403) + 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.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenItemAmountWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + + # 0 bmp + # 1,2 done/cancel? + # 3 + + # 4 - + # 6 text + + GemRB.UnhideGUI () + Window.ShowModal (MODAL_SHADOW_GRAY) + return + def DrinkItemWindow (): pc = GemRB.GameGetSelectedPCSingle () slot = GemRB.GetVar ("ItemButton") @@ -598,7 +662,7 @@ if ItemInfoWindow: ItemInfoWindow.Unload () GemRB.ChangeItemFlag (pc, slot, IE_INV_ITEM_IDENTIFIED, OP_OR) - OpenItemInfoWindow() + OpenItemInfoWindow () return def IdentifyUseScroll (): @@ -612,7 +676,7 @@ ItemInfoWindow.Unload () if GemRB.HasSpecialItem (pc, 1, 1): GemRB.ChangeItemFlag (pc, slot, IE_INV_ITEM_IDENTIFIED, OP_OR) - OpenItemInfoWindow() + OpenItemInfoWindow () return def CloseIdentifyItemWindow (): @@ -641,6 +705,7 @@ Button = Window.GetControl (2) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseIdentifyItemWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) TextArea = Window.GetControl (3) TextArea.SetText (19394) @@ -661,7 +726,7 @@ #fake label Label = Window.GetControl (0x10000000) - Label.SetText("") + Label.SetText ("") #item icon Button = Window.GetControl (2) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2009-02-23 20:13:12 UTC (rev 5736) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2009-02-23 20:51:38 UTC (rev 5737) @@ -47,6 +47,7 @@ Button.SetTooltip (16313) Button.SetVarAssoc ("SelectedWindow", 0) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, ReturnToGame) + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) # Map Button = Window.GetControl (1) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py 2009-02-23 20:13:12 UTC (rev 5736) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py 2009-02-23 20:51:38 UTC (rev 5737) @@ -46,7 +46,7 @@ def OpenInventoryWindowClick(): tmp = GemRB.GetVar("PressedPortrait")+1 GemRB.GameSelectPC(tmp, True, SELECT_REPLACE) - OpenInventoryWindow() + OpenInventoryWindow () def OpenInventoryWindow (): @@ -180,7 +180,7 @@ PortraitWindow.SetVisible (1) return -def ColorDonePress(): +def ColorDonePress (): pc = GemRB.GameGetSelectedPCSingle () if ColorPicker: @@ -195,7 +195,7 @@ UpdateInventoryWindow () return -def MajorPress(): +def MajorPress (): global ColorIndex, PickedColor pc = GemRB.GameGetSelectedPCSingle () @@ -204,7 +204,7 @@ GetColor() return -def MinorPress(): +def MinorPress (): global ColorIndex, PickedColor pc = GemRB.GameGetSelectedPCSingle () @@ -287,7 +287,7 @@ size = PortraitTable.GetValue (row, "SIZE") #Weapon - slot_item = GemRB.GetSlotItem (pc, GemRB.GetEquippedQuickSlot(pc) ) + slot_item = GemRB.GetSlotItem (pc, GemRB.GetEquippedQuickSlot (pc) ) if slot_item: item = GemRB.GetItem (slot_item["ItemResRef"]) if (item['AnimationType'] != ''): @@ -314,13 +314,13 @@ Button.SetPLT("WP" + size + item['AnimationType'] + "INV", Color1, Color2, Color3, Color4, Color5, Color6, Color7, 0, 3) #encumbrance - SetEncumbranceLabels( Window, 0x10000043, 0x10000044, pc) + SetEncumbranceLabels ( Window, 0x10000043, 0x10000044, pc) #armor class ac = GemRB.GetPlayerStat (pc, IE_ARMORCLASS) #temporary solution, the dexterity bonus should be handled by the core #some ac bonuses are not cummulative with this AC bonus! - ac += GemRB.GetAbilityBonus(IE_DEX, 2, GemRB.GetPlayerStat(pc, IE_DEX) ) + ac += GemRB.GetAbilityBonus (IE_DEX, 2, GemRB.GetPlayerStat (pc, IE_DEX) ) Label = Window.GetControl (0x10000038) Label.SetText (str (ac)) Label.SetTooltip (10339) @@ -560,6 +560,70 @@ UpdateInventoryWindow () return +def DragItemAmount (): + Text = Window.GetControl (6) + Amount = Text.GetText () + print Amount + + OpenItemAmountWindow() + return + +def OpenItemAmountWindow (): + global ItemAmountWindow + + GemRB.HideGUI () + + if ItemAmountWindow != None: + if ItemAmountWindow: + ItemAmountWindow.Unload () + ItemAmountWindow = None + GemRB.SetVar ("FloatWindow", -1) + + GemRB.UnhideGUI () + return + + ItemAmountWindow = Window = GemRB.LoadWindowObject (4) + GemRB.SetVar ("FloatWindow", ItemAmountWindow.ID) + + pc = GemRB.GameGetSelectedPCSingle () + slot = GemRB.GetVar ("ItemButton") + slot_item = GemRB.GetSlotItem (pc, slot) + ResRef = slot_item['ItemResRef'] + item = GemRB.GetItem (ResRef) + + # item icon + Icon = Window.GetControl (0) + Icon.SetFlags (IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_NO_IMAGE, OP_SET) + Icon.SetItemIcon (ResRef) + + # item amount + Text = Window.GetControl (6) + Text.SetSize (40, 40) + Text.SetText ("1") + Text.SetStatus (IE_GUI_EDIT_NUMBER|IE_GUI_CONTROL_FOCUSED) + + # Done + Button = Window.GetControl (2) + Button.SetText (1403) + 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.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenItemAmountWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + + # 0 bmp + # 1,2 done/cancel? + # 3 + + # 4 - + # 6 text + + GemRB.UnhideGUI () + Window.ShowModal (MODAL_SHADOW_GRAY) + return + def DrinkItemWindow (): pc = GemRB.GameGetSelectedPCSingle () slot = GemRB.GetVar ("ItemButton") @@ -617,7 +681,7 @@ if ItemInfoWindow: ItemInfoWindow.Unload () GemRB.ChangeItemFlag (pc, slot, IE_INV_ITEM_IDENTIFIED, OP_OR) - OpenItemInfoWindow() + OpenItemInfoWindow () return def IdentifyUseScroll (): @@ -631,7 +695,7 @@ ItemInfoWindow.Unload () if GemRB.HasSpecialItem (pc, 1, 1): GemRB.ChangeItemFlag (pc, slot, IE_INV_ITEM_IDENTIFIED, OP_OR) - OpenItemInfoWindow() + OpenItemInfoWindow () return def CloseIdentifyItemWindow (): @@ -659,6 +723,7 @@ Button = Window.GetControl (2) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseIdentifyItemWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) TextArea = Window.GetControl (3) TextArea.SetText (19394) @@ -668,7 +733,7 @@ def CloseItemInfoWindow (): if ItemInfoWindow: ItemInfoWindow.Unload () - UpdateInventoryWindow() + UpdateInventoryWindow () return def DisplayItem (itemresref, type): @@ -679,7 +744,7 @@ #fake label Label = Window.GetControl (0x10000000) - Label.SetText("") + Label.SetText ("") #item icon Button = Window.GetControl (2) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py 2009-02-23 20:13:12 UTC (rev 5736) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py 2009-02-23 20:51:38 UTC (rev 5737) @@ -46,6 +46,7 @@ #Button.SetFlags (IE_GUI_BUTTON_RADIOBUTTON, OP_OR) Button.SetVarAssoc ("SelectedWindow", 0) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, ReturnToGame) + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) # Map Button = Window.GetControl (1) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2009-02-23 20:13:12 UTC (rev 5736) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2009-02-23 20:51:38 UTC (rev 5737) @@ -45,7 +45,7 @@ def OpenInventoryWindowClick(): tmp = GemRB.GetVar("PressedPortrait")+1 GemRB.GameSelectPC(tmp, True, SELECT_REPLACE) - OpenInventoryWindow() + OpenInventoryWindow () def OpenInventoryWindow (): @@ -171,7 +171,7 @@ PortraitWindow.SetVisible (1) return -def ColorDonePress(): +def ColorDonePress (): pc = GemRB.GameGetSelectedPCSingle () if ColorPicker: @@ -186,7 +186,7 @@ UpdateInventoryWindow () return -def MajorPress(): +def MajorPress (): global ColorIndex, PickedColor pc = GemRB.GameGetSelectedPCSingle () @@ -195,7 +195,7 @@ GetColor() return -def MinorPress(): +def MinorPress (): global ColorIndex, PickedColor pc = GemRB.GameGetSelectedPCSingle () @@ -278,7 +278,7 @@ size = PortraitTable.GetValue (row, "SIZE") #Weapon - slot_item = GemRB.GetSlotItem (pc, GemRB.GetEquippedQuickSlot(pc) ) + slot_item = GemRB.GetSlotItem (pc, GemRB.GetEquippedQuickSlot (pc) ) if slot_item: item = GemRB.GetItem (slot_item["ItemResRef"]) if (item['AnimationType'] != ''): @@ -305,7 +305,7 @@ Button.SetPLT("WP" + size + item['AnimationType'] + "INV", Color1, Color2, Color3, Color4, Color5, Color6, Color7, 0, 3) #encumbrance - SetEncumbranceLabels( Window, 0x10000043, 0x10000044, pc) + SetEncumbranceLabels ( Window, 0x10000043, 0x10000044, pc) #armor class ac = GemRB.GetPlayerStat (pc, IE_ARMORCLASS) @@ -539,6 +539,69 @@ UpdateInventoryWindow () return +def DragItemAmount (): + Text = Window.GetControl (6) + Amount = Text.GetText () + print Amount + + return + +def OpenItemAmountWindow (): + global ItemAmountWindow + + GemRB.HideGUI () + + if ItemAmountWindow != None: + if ItemAmountWindow: + ItemAmountWindow.Unload () + ItemAmountWindow = None + GemRB.SetVar ("FloatWindow", -1) + + GemRB.UnhideGUI () + return + + ItemAmountWindow = Window = GemRB.LoadWindowObject (4) + GemRB.SetVar ("FloatWindow", ItemAmountWindow.ID) + + pc = GemRB.GameGetSelectedPCSingle () + slot = GemRB.GetVar ("ItemButton") + slot_item = GemRB.GetSlotItem (pc, slot) + ResRef = slot_item['ItemResRef'] + item = GemRB.GetItem (ResRef) + + # item icon + Icon = Window.GetControl (0) + Icon.SetFlags (IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_NO_IMAGE, OP_SET) + Icon.SetItemIcon (ResRef) + + # item amount + Text = Window.GetControl (6) + Text.SetSize (40, 40) + Text.SetText ("1") + Text.SetStatus (IE_GUI_EDIT_NUMBER) + + # Done + Button = Window.GetControl (2) + Button.SetText (1403) + 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.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenItemAmountWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + + # 0 bmp + # 1,2 done/cancel? + # 3 + + # 4 - + # 6 text + + GemRB.UnhideGUI () + Window.ShowModal (MODAL_SHADOW_GRAY) + return + def OpenItemWindow (): #close inventory GemRB.SetVar ("Inventory", 1) @@ -610,7 +673,7 @@ if ItemInfoWindow: ItemInfoWindow.Unload () GemRB.ChangeItemFlag (pc, slot, IE_INV_ITEM_IDENTIFIED, OP_OR) - OpenItemInfoWindow() + OpenItemInfoWindow () return def IdentifyUseScroll (): @@ -624,7 +687,7 @@ ItemInfoWindow.Unload () if GemRB.HasSpecialItem (pc, 1, 1): GemRB.ChangeItemFlag (pc, slot, IE_INV_ITEM_IDENTIFIED, OP_OR) - OpenItemInfoWindow() + OpenItemInfoWindow () return def CloseIdentifyItemWindow (): @@ -653,6 +716,7 @@ Button = Window.GetControl (2) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseIdentifyItemWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) TextArea = Window.GetControl (3) TextArea.SetText (19394) @@ -673,7 +737,7 @@ #fake label Label = Window.GetControl (0x10000000) - Label.SetText("") + Label.SetText ("") #item icon Button = Window.GetControl (2) Modified: gemrb/trunk/gemrb/GUIScripts/pst/FloatMenuWindow.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/FloatMenuWindow.py 2009-02-23 20:13:12 UTC (rev 5736) +++ gemrb/trunk/gemrb/GUIScripts/pst/FloatMenuWindow.py 2009-02-23 20:51:38 UTC (rev 5737) @@ -207,8 +207,8 @@ UpdateFloatMenuWindow () GemRB.UnhideGUI () + return - def UpdateFloatMenuWindow (): Window = FloatMenuWindow @@ -257,6 +257,7 @@ Button.SetState (IE_GUI_BUTTON_ENABLED) for i in range (5): UpdateFloatMenuSpell (pc, i) + return def UpdateFloatMenuSingleAction (i): Window = FloatMenuWindow @@ -276,8 +277,8 @@ Button.SetSprites (butts[i][0], 0, 0, 1, 2, 3) Button.SetTooltip (butts[i][1]) Button.SetText ('') + return - def UpdateFloatMenuGroupAction (i): Window = FloatMenuWindow butts = [ ('AMGUARD', 31657, ''), @@ -294,6 +295,7 @@ Button.SetSprites (butts[i][0], 0, 0, 1, 2, 3) Button.SetTooltip (butts[i][1]) Button.SetText ('') + return def RefreshSpellList(pc, innate): global spell_hash, spell_list, type @@ -420,6 +422,7 @@ GemRB.GameSelectPC (sel % GemRB.GetPartySize () + 1, 1, SELECT_REPLACE) # NOTE: it invokes FloatMenuSelectAnotherPC() through selection change handler + return def FloatMenuSelectAnotherPC (): global float_menu_mode, float_menu_index, float_menu_selected @@ -427,13 +430,14 @@ float_menu_index = 0 float_menu_selected = None UpdateFloatMenuWindow () + return - def FloatMenuSelectDialog (): global float_menu_selected GemRB.GameControlSetTargetMode (TARGET_MODE_TALK) float_menu_selected = None UpdateFloatMenuWindow () + return def FloatMenuSelectWeapons (): global float_menu_mode, float_menu_index, float_menu_selected @@ -443,6 +447,7 @@ # FIXME: Force attack mode GemRB.GameControlSetTargetMode (TARGET_MODE_ATTACK) UpdateFloatMenuWindow () + return def FloatMenuSelectItems (): global float_menu_mode, float_menu_index, float_menu_selected @@ -450,6 +455,7 @@ float_menu_index = 0 float_menu_selected = None UpdateFloatMenuWindow () + return def FloatMenuSelectSpells (): global float_menu_mode, float_menu_index, float_menu_selected @@ -458,6 +464,7 @@ float_menu_selected = None GemRB.GameControlSetTargetMode (TARGET_MODE_CAST) UpdateFloatMenuWindow () + return def FloatMenuSelectAbilities (): global float_menu_mode, float_menu_index, float_menu_selected @@ -465,8 +472,8 @@ float_menu_index = 0 float_menu_selected = None UpdateFloatMenuWindow () + return - def FloatMenuPreviousItem (): global float_menu_index, float_menu_selected if float_menu_index > 0: @@ -474,6 +481,7 @@ if float_menu_selected!=None: float_menu_selected = float_menu_selected + 1 UpdateFloatMenuWindow () + return def FloatMenuNextItem (): global float_menu_index, float_menu_selected @@ -481,8 +489,11 @@ if float_menu_selected!=None: float_menu_selected = float_menu_selected - 1 UpdateFloatMenuWindow () + return - def FloatMenuDrag (): dx, dy = GemRB.GetVar ("DragX"), GemRB.GetVar ("DragY") FloatMenuWindow.SetPos (dx, dy, WINDOW_RELATIVE | WINDOW_BOUNDED) + return + +############################# Modified: gemrb/trunk/gemrb/GUIScripts/pst/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/GUIINV.py 2009-02-23 20:13:12 UTC (rev 5736) +++ gemrb/trunk/gemrb/GUIScripts/pst/GUIINV.py 2009-02-23 20:51:38 UTC (rev 5737) @@ -407,6 +407,14 @@ UpdateInventoryWindow () return +def DragItemAmount (): + Text = Window.GetControl (6) + Amount = Text.GetText () + print Amount + + OpenItemAmountWindow () + return + def OpenItemAmountWindow (): global ItemAmountWindow @@ -424,6 +432,9 @@ ItemAmountWindow = Window = GemRB.LoadWindowObject (4) GemRB.SetVar ("FloatWindow", ItemAmountWindow.ID) + pc = GemRB.GameGetSelectedPCSingle () + slot = GemRB.GetVar ("ItemButton") + slot_item = GemRB.GetSlotItem (pc, slot) ResRef = slot_item['ItemResRef'] item = GemRB.GetItem (ResRef) @@ -436,16 +447,19 @@ Text = Window.GetControl (6) Text.SetSize (40, 40) Text.SetText ("1") + Text.SetStatus (IE_GUI_EDIT_NUMBER|IE_GUI_CONTROL_FOCUSED) # Done Button = Window.GetControl (2) Button.SetText (1403) - Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenItemAmountWindow") + 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.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenItemAmountWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) # 0 bmp # 1,2 done/cancel? @@ -593,6 +607,7 @@ Button = Window.GetControl (2) Button.SetText (4196) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseIdentifyItemWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) Window.ShowModal (MODAL_SHADOW_GRAY) return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-02-25 21:11:36
|
Revision: 5739 http://gemrb.svn.sourceforge.net/gemrb/?rev=5739&view=rev Author: avenger_teambg Date: 2009-02-25 21:11:30 +0000 (Wed, 25 Feb 2009) Log Message: ----------- default buttons on map notes screen Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py gemrb/trunk/gemrb/GUIScripts/pst/GUIMA.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py 2009-02-25 19:17:46 UTC (rev 5738) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py 2009-02-25 21:11:30 UTC (rev 5739) @@ -257,6 +257,7 @@ Label = NoteWindow.GetControl (2) Label.SetEvent (IE_GUI_BUTTON_ON_PRESS,"CloseNoteWindow") Label.SetText (13727) + Label.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) #remove Label = NoteWindow.GetControl (3) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py 2009-02-25 19:17:46 UTC (rev 5738) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py 2009-02-25 21:11:30 UTC (rev 5739) @@ -271,6 +271,7 @@ Label = NoteWindow.GetControl (2) Label.SetEvent (IE_GUI_BUTTON_ON_PRESS,"CloseNoteWindow") Label.SetText (13727) + Label.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) #remove Label = NoteWindow.GetControl (3) Modified: gemrb/trunk/gemrb/GUIScripts/pst/GUIMA.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/GUIMA.py 2009-02-25 19:17:46 UTC (rev 5738) +++ gemrb/trunk/gemrb/GUIScripts/pst/GUIMA.py 2009-02-25 21:11:30 UTC (rev 5739) @@ -95,6 +95,7 @@ Button = Window.GetControl (5) Button.SetText (1403) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenMapWindow") + Label.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) GemRB.UnhideGUI () This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-02-26 19:37:49
|
Revision: 5747 http://gemrb.svn.sourceforge.net/gemrb/?rev=5747&view=rev Author: avenger_teambg Date: 2009-02-26 19:37:45 +0000 (Thu, 26 Feb 2009) Log Message: ----------- fixed item amount windows (and fixed proficiency in chargen AGAIN) Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2009-02-26 19:19:38 UTC (rev 5746) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2009-02-26 19:37:45 UTC (rev 5747) @@ -32,21 +32,22 @@ from GUICommonWindows import * InventoryWindow = None -PortraitWindow = None -OldPortraitWindow = None ItemInfoWindow = None ItemAmountWindow = None +StackAmount = 0 ItemIdentifyWindow = None +PortraitWindow = None OptionsWindow = None +OldPortraitWindow = None OldOptionsWindow = None OverSlot = None -def OpenInventoryWindowClick(): - tmp = GemRB.GetVar("PressedPortrait")+1 - GemRB.GameSelectPC(tmp, True, SELECT_REPLACE) +def OpenInventoryWindowClick (): + tmp = GemRB.GetVar ("PressedPortrait")+1 + GemRB.GameSelectPC (tmp, True, SELECT_REPLACE) OpenInventoryWindow () + return - def OpenInventoryWindow (): global InventoryWindow, OptionsWindow, PortraitWindow global OldPortraitWindow, OldOptionsWindow @@ -84,7 +85,7 @@ GemRB.LoadWindowPack ("GUIINV", 640, 480) InventoryWindow = Window = GemRB.LoadWindowObject (2) GemRB.SetVar ("OtherWindow", InventoryWindow.ID) - GemRB.SetVar ("MessageLabel", Window.GetControl(0x1000003f).ID ) + GemRB.SetVar ("MessageLabel", Window.GetControl (0x1000003f).ID ) OldOptionsWindow = GUICommonWindows.OptionsWindow OptionsWindow = GemRB.LoadWindowObject (0) SetupMenuWindowControls (OptionsWindow, 0, "OpenInventoryWindow") @@ -537,34 +538,49 @@ #-3 : drop stuff in inventory (but not equippable slots) GemRB.DropDraggedItem (pc, -3) if GemRB.IsDraggingItem (): - GemRB.DisplayString(17999,0xffffff) + GemRB.DisplayString (17999,0xffffff) UpdateInventoryWindow () return +def DecreaseStackAmount (): + Text = ItemAmountWindow.GetControl (6) + Amount = Text.QueryText () + number = int ("0"+Amount)-1 + if number<1: + number=1 + Text.SetText (str (number)) + return + +def IncreaseStackAmount (): + Text = ItemAmountWindow.GetControl (6) + Amount = Text.QueryText () + number = int ("0"+Amount)+1 + if number>=StackAmount: + number=StackAmount-1 + Text.SetText (str (number)) + return + def DragItemAmount (): Text = ItemAmountWindow.GetControl (6) - Amount = Text.GetText () + Amount = Text.QueryText () print Amount OpenItemAmountWindow () return def OpenItemAmountWindow (): - global ItemAmountWindow + global ItemAmountWindow, StackAmount - GemRB.HideGUI () - if ItemAmountWindow != None: if ItemAmountWindow: ItemAmountWindow.Unload () ItemAmountWindow = None - GemRB.SetVar ("FloatWindow", -1) - GemRB.UnhideGUI () + GemRB.SetRepeatClickFlags (GEM_RK_DISABLE, OP_OR) return + GemRB.SetRepeatClickFlags (GEM_RK_DISABLE, OP_NAND) ItemAmountWindow = Window = GemRB.LoadWindowObject (4) - GemRB.SetVar ("FloatWindow", ItemAmountWindow.ID) pc = GemRB.GameGetSelectedPCSingle () slot = GemRB.GetVar ("ItemButton") @@ -572,6 +588,14 @@ ResRef = slot_item['ItemResRef'] item = GemRB.GetItem (ResRef) + if slot_item: + StackAmount = slot_item["Usages0"] + else: + StackAmount = 0 + if StackAmount<=1: + OpenItemAmountWindow () + return + # item icon Icon = Window.GetControl (0) Icon.SetFlags (IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_NO_IMAGE, OP_SET) @@ -579,10 +603,17 @@ # item amount Text = Window.GetControl (6) - Text.SetSize (40, 40) - Text.SetText ("1") + Text.SetText (str (StackAmount) ) Text.SetStatus (IE_GUI_EDIT_NUMBER|IE_GUI_CONTROL_FOCUSED) + # Decrease + Button = Window.GetControl (4) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS,"DecreaseStackAmount") + + # Increase + Button = Window.GetControl (3) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS,"IncreaseStackAmount") + # Done Button = Window.GetControl (2) Button.SetText (11973) @@ -601,7 +632,6 @@ # 4 - # 6 text - GemRB.UnhideGUI () Window.ShowModal (MODAL_SHADOW_GRAY) return @@ -648,7 +678,7 @@ ResRef = slot_item['ItemResRef'] item = GemRB.GetItem (ResRef) dialog=item["Dialog"] - GemRB.ExecuteString("StartDialog(\""+dialog+"\",Myself)", pc) + GemRB.ExecuteString ("StartDialog(\""+dialog+"\",Myself)", pc) return def IdentifyUseSpell (): @@ -738,6 +768,7 @@ Button = Window.GetControl (4) Button.SetText (11973) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseItemInfoWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) #textarea Text = Window.GetControl (5) @@ -748,7 +779,7 @@ Text.SetText (text) #left button - Button = Window.GetControl(8) + Button = Window.GetControl (8) if type&2: Button.SetText (14133) @@ -764,7 +795,7 @@ Button.SetState (IE_GUI_BUTTON_LOCKED) #right button - Button = Window.GetControl(9) + Button = Window.GetControl (9) drink = (type&1) and (item["Function"]&1) read = (type&1) and (item["Function"]&2) container = (type&1) and (item["Function"]&4) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py 2009-02-26 19:19:38 UTC (rev 5746) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py 2009-02-26 19:37:45 UTC (rev 5747) @@ -26,7 +26,7 @@ MaxProf = SkillTable.GetValue(Pos+8, ProfColumn) #we add the bg1 skill count offset #invalid entry, adjusting scrollbar - if SkillName > 32767 or SkillName < 0: + if SkillName > 0x1000000 or SkillName < 0: GemRB.SetVar("TopIndex",TopIndex) ScrollBarControl.SetVarAssoc("TopIndex",Pos-7) break @@ -109,7 +109,7 @@ # decrease it with the number of invalid proficiencies for i in range(RowCount): SkillName = SkillTable.GetValue (i+8, 1) - if SkillName > 32767 or SkillName < 0: + if SkillName > 0x1000000 or SkillName < 0: ProfCount -= 1 ScrollBarControl.SetVarAssoc ("TopIndex", ProfCount) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py 2009-02-26 19:19:38 UTC (rev 5746) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py 2009-02-26 19:37:45 UTC (rev 5747) @@ -91,12 +91,12 @@ InventoryWindow = Window = GemRB.LoadWindowObject (2) GemRB.SetVar ("OtherWindow", InventoryWindow.ID) GemRB.SetVar ("MessageLabel", Window.GetControl (0x1000003f).ID ) - #saving the original portrait window OldOptionsWindow = GUICommonWindows.OptionsWindow OptionsWindow = GemRB.LoadWindowObject (0) MarkMenuButton (OptionsWindow) SetupMenuWindowControls (OptionsWindow, 0, "OpenInventoryWindow") OptionsWindow.SetFrame () + #saving the original portrait window OldPortraitWindow = GUICommonWindows.PortraitWindow PortraitWindow = OpenPortraitWindow (0) @@ -595,23 +595,18 @@ def OpenItemAmountWindow (): global ItemAmountWindow, StackAmount - GemRB.HideGUI () - if ItemAmountWindow != None: if ItemAmountWindow: print ItemAmountWindow.ID print GemRB.GetVar ("FloatWindow") ItemAmountWindow.Unload () ItemAmountWindow = None - GemRB.SetVar ("FloatWindow", -1) - GemRB.UnhideGUI () GemRB.SetRepeatClickFlags (GEM_RK_DISABLE, OP_OR) return GemRB.SetRepeatClickFlags (GEM_RK_DISABLE, OP_NAND) ItemAmountWindow = Window = GemRB.LoadWindowObject (4) - GemRB.SetVar ("FloatWindow", ItemAmountWindow.ID) pc = GemRB.GameGetSelectedPCSingle () slot = GemRB.GetVar ("ItemButton") @@ -619,7 +614,6 @@ ResRef = slot_item['ItemResRef'] item = GemRB.GetItem (ResRef) - print slot_item if slot_item: StackAmount = slot_item["Usages0"] else: @@ -635,8 +629,7 @@ # item amount Text = Window.GetControl (6) - Text.SetSize (40, 40) - Text.SetText ("1") + Text.SetText (str (StackAmount) ) Text.SetStatus (IE_GUI_EDIT_NUMBER|IE_GUI_CONTROL_FOCUSED) # Decrease @@ -665,7 +658,6 @@ # 4 - # 6 text - GemRB.UnhideGUI () Window.ShowModal (MODAL_SHADOW_GRAY) return Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2009-02-26 19:19:38 UTC (rev 5746) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2009-02-26 19:37:45 UTC (rev 5747) @@ -33,21 +33,22 @@ from GUICommonWindows import * InventoryWindow = None -PortraitWindow = None -OldPortraitWindow = None ItemInfoWindow = None ItemAmountWindow = None +StackAmount = 0 ItemIdentifyWindow = None +PortraitWindow = None OptionsWindow = None +OldPortraitWindow = None OldOptionsWindow = None OverSlot = None -def OpenInventoryWindowClick(): - tmp = GemRB.GetVar("PressedPortrait")+1 - GemRB.GameSelectPC(tmp, True, SELECT_REPLACE) +def OpenInventoryWindowClick (): + tmp = GemRB.GetVar ("PressedPortrait")+1 + GemRB.GameSelectPC (tmp, True, SELECT_REPLACE) OpenInventoryWindow () + return - def OpenInventoryWindow (): global InventoryWindow, OptionsWindow, PortraitWindow global OldPortraitWindow, OldOptionsWindow @@ -85,7 +86,7 @@ GemRB.LoadWindowPack ("GUIINV", 640, 480) InventoryWindow = Window = GemRB.LoadWindowObject (2) GemRB.SetVar ("OtherWindow", InventoryWindow.ID) - GemRB.SetVar ("MessageLabel", Window.GetControl(0x1000003f).ID ) + GemRB.SetVar ("MessageLabel", Window.GetControl (0x1000003f).ID ) OldOptionsWindow = GUICommonWindows.OptionsWindow OptionsWindow = GemRB.LoadWindowObject (0) SetupMenuWindowControls (OptionsWindow, 0, "OpenInventoryWindow") @@ -192,7 +193,7 @@ pc = GemRB.GameGetSelectedPCSingle () ColorIndex = 2 PickedColor = GemRB.GetPlayerStat (pc, IE_MAJOR_COLOR, 1) & 0xFF - GetColor() + GetColor () return def MinorPress (): @@ -201,10 +202,10 @@ pc = GemRB.GameGetSelectedPCSingle () ColorIndex = 3 PickedColor = GemRB.GetPlayerStat (pc, IE_MINOR_COLOR, 1) & 0xFF - GetColor() + GetColor () return -def GetColor(): +def GetColor (): global ColorPicker ColorTable = GemRB.LoadTableObject ("clowncol") @@ -486,8 +487,8 @@ def OnDragItemGround (): pc = GemRB.GameGetSelectedPCSingle () + slot = GemRB.GetVar ("GroundItemButton") + GemRB.GetVar ("TopIndex") - slot = GemRB.GetVar ("GroundItemButton") + GemRB.GetVar ("TopIndex") if not GemRB.IsDraggingItem (): slot_item = GemRB.GetContainerItem (pc, slot) item = GemRB.GetItem (slot_item["ItemResRef"]) @@ -515,8 +516,8 @@ def OnDragItem (): pc = GemRB.GameGetSelectedPCSingle () + slot = GemRB.GetVar ("ItemButton") - slot = GemRB.GetVar ("ItemButton") if not GemRB.IsDraggingItem (): slot_item = GemRB.GetSlotItem (pc, slot) item = GemRB.GetItem (slot_item["ItemResRef"]) @@ -535,33 +536,53 @@ #-3 : drop stuff in inventory (but not equippable slots) GemRB.DropDraggedItem (pc, -3) if GemRB.IsDraggingItem (): - GemRB.DisplayString(17999,0xffffff) + GemRB.DisplayString (17999,0xffffff) UpdateInventoryWindow () return +def DecreaseStackAmount (): + Text = ItemAmountWindow.GetControl (6) + Amount = Text.QueryText () + number = int ("0"+Amount)-1 + if number<1: + number=1 + Text.SetText (str (number)) + return + +def IncreaseStackAmount (): + Text = ItemAmountWindow.GetControl (6) + Amount = Text.QueryText () + number = int ("0"+Amount)+1 + if number>=StackAmount: + number=StackAmount-1 + Text.SetText (str (number)) + return + def DragItemAmount (): + pc = GemRB.GameGetSelectedPCSingle () + slot = GemRB.GetVar ("ItemButton") + slot_item = GemRB.GetSlotItem (pc, slot) Text = ItemAmountWindow.GetControl (6) - Amount = Text.GetText () + Amount = Text.QueryText () print Amount - + item = GemRB.GetItem (slot_item["ItemResRef"]) + GemRB.DragItem (pc, slot, item["ItemIcon"], int ("0"+Amount), 0) + OpenItemAmountWindow () return def OpenItemAmountWindow (): - global ItemAmountWindow + global ItemAmountWindow, StackAmount - GemRB.HideGUI () - if ItemAmountWindow != None: - if ItemAmountWindow: - ItemAmountWindow.Unload () - ItemAmountWindow = None - GemRB.SetVar ("FloatWindow", -1) + if ItemAmountWindow: + ItemAmountWindow.Unload () + ItemAmountWindow = None - GemRB.UnhideGUI () - return + GemRB.SetRepeatClickFlags (GEM_RK_DISABLE, OP_OR) + return + GemRB.SetRepeatClickFlags (GEM_RK_DISABLE, OP_NAND) ItemAmountWindow = Window = GemRB.LoadWindowObject (4) - GemRB.SetVar ("FloatWindow", ItemAmountWindow.ID) pc = GemRB.GameGetSelectedPCSingle () slot = GemRB.GetVar ("ItemButton") @@ -569,6 +590,14 @@ ResRef = slot_item['ItemResRef'] item = GemRB.GetItem (ResRef) + if slot_item: + StackAmount = slot_item["Usages0"] + else: + StackAmount = 0 + if StackAmount<=1: + OpenItemAmountWindow () + return + # item icon Icon = Window.GetControl (0) Icon.SetFlags (IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_NO_IMAGE, OP_SET) @@ -576,19 +605,26 @@ # item amount Text = Window.GetControl (6) - Text.SetSize (40, 40) - Text.SetText ("1") - Text.SetStatus (IE_GUI_EDIT_NUMBER) + Text.SetText (str (StackAmount) ) + Text.SetStatus (IE_GUI_EDIT_NUMBER|IE_GUI_CONTROL_FOCUSED) + # Decrease + Button = Window.GetControl (4) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS,"DecreaseStackAmount") + + # Increase + Button = Window.GetControl (3) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS,"IncreaseStackAmount") + # Done Button = Window.GetControl (2) - Button.SetText (1403) + Button.SetText (11973) 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.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenItemAmountWindow") Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) @@ -598,7 +634,6 @@ # 4 - # 6 text - GemRB.UnhideGUI () Window.ShowModal (MODAL_SHADOW_GRAY) return @@ -659,7 +694,7 @@ ResRef = slot_item['ItemResRef'] item = GemRB.GetItem (ResRef) dialog=item["Dialog"] - GemRB.ExecuteString("StartDialog(\""+dialog+"\",Myself)", pc) + GemRB.ExecuteString ("StartDialog(\""+dialog+"\",Myself)", pc) return def IdentifyUseSpell (): @@ -749,6 +784,7 @@ Button = Window.GetControl (4) Button.SetText (11973) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseItemInfoWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) #textarea Text = Window.GetControl (5) @@ -759,7 +795,7 @@ Text.SetText (text) #left button - Button = Window.GetControl(8) + Button = Window.GetControl (8) if type&2: Button.SetText (14133) @@ -774,7 +810,7 @@ #Button.SetItemIcon (itemresref,2) #right button - Button = Window.GetControl(9) + Button = Window.GetControl (9) drink = (type&1) and (item["Function"]&1) read = (type&1) and (item["Function"]&2) container = (type&1) and (item["Function"]&4) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-02-26 19:45:08
|
Revision: 5748 http://gemrb.svn.sourceforge.net/gemrb/?rev=5748&view=rev Author: avenger_teambg Date: 2009-02-26 19:45:04 +0000 (Thu, 26 Feb 2009) Log Message: ----------- fixed off by one maximum amount Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2009-02-26 19:37:45 UTC (rev 5747) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2009-02-26 19:45:04 UTC (rev 5748) @@ -195,7 +195,7 @@ pc = GemRB.GameGetSelectedPCSingle () ColorIndex = 2 PickedColor = GemRB.GetPlayerStat (pc, IE_MAJOR_COLOR, 1) & 0xFF - GetColor() + GetColor () return def MinorPress (): @@ -204,10 +204,10 @@ pc = GemRB.GameGetSelectedPCSingle () ColorIndex = 3 PickedColor = GemRB.GetPlayerStat (pc, IE_MINOR_COLOR, 1) & 0xFF - GetColor() + GetColor () return -def GetColor(): +def GetColor (): global ColorPicker ColorTable = GemRB.LoadTableObject ("clowncol") @@ -555,16 +555,19 @@ Text = ItemAmountWindow.GetControl (6) Amount = Text.QueryText () number = int ("0"+Amount)+1 - if number>=StackAmount: - number=StackAmount-1 + if number>StackAmount: + number=StackAmount Text.SetText (str (number)) return def DragItemAmount (): + pc = GemRB.GameGetSelectedPCSingle () + slot = GemRB.GetVar ("ItemButton") + slot_item = GemRB.GetSlotItem (pc, slot) Text = ItemAmountWindow.GetControl (6) Amount = Text.QueryText () - print Amount - + item = GemRB.GetItem (slot_item["ItemResRef"]) + GemRB.DragItem (pc, slot, item["ItemIcon"], int ("0"+Amount), 0) OpenItemAmountWindow () return Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py 2009-02-26 19:37:45 UTC (rev 5747) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py 2009-02-26 19:45:04 UTC (rev 5748) @@ -575,8 +575,8 @@ Text = ItemAmountWindow.GetControl (6) Amount = Text.QueryText () number = int ("0"+Amount)+1 - if number>=StackAmount: - number=StackAmount-1 + if number>StackAmount: + number=StackAmount Text.SetText (str (number)) return @@ -586,7 +586,6 @@ slot_item = GemRB.GetSlotItem (pc, slot) Text = ItemAmountWindow.GetControl (6) Amount = Text.QueryText () - print Amount item = GemRB.GetItem (slot_item["ItemResRef"]) GemRB.DragItem (pc, slot, item["ItemIcon"], int ("0"+Amount), 0) OpenItemAmountWindow () @@ -597,8 +596,6 @@ if ItemAmountWindow != None: if ItemAmountWindow: - print ItemAmountWindow.ID - print GemRB.GetVar ("FloatWindow") ItemAmountWindow.Unload () ItemAmountWindow = None Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2009-02-26 19:37:45 UTC (rev 5747) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2009-02-26 19:45:04 UTC (rev 5748) @@ -553,8 +553,8 @@ Text = ItemAmountWindow.GetControl (6) Amount = Text.QueryText () number = int ("0"+Amount)+1 - if number>=StackAmount: - number=StackAmount-1 + if number>StackAmount: + number=StackAmount Text.SetText (str (number)) return @@ -564,7 +564,6 @@ slot_item = GemRB.GetSlotItem (pc, slot) Text = ItemAmountWindow.GetControl (6) Amount = Text.QueryText () - print Amount item = GemRB.GetItem (slot_item["ItemResRef"]) GemRB.DragItem (pc, slot, item["ItemIcon"], int ("0"+Amount), 0) OpenItemAmountWindow () This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-02-27 21:30:17
|
Revision: 5752 http://gemrb.svn.sourceforge.net/gemrb/?rev=5752&view=rev Author: avenger_teambg Date: 2009-02-27 21:30:03 +0000 (Fri, 27 Feb 2009) Log Message: ----------- some more default buttons Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIMOVIE.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIOPT.py gemrb/trunk/gemrb/GUIScripts/iwd/PartyFormation.py gemrb/trunk/gemrb/GUIScripts/iwd/Start.py gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py gemrb/trunk/gemrb/GUIScripts/iwd2/TextScreen.py gemrb/trunk/gemrb/GUIScripts/pst/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/pst/GUIREC.py gemrb/trunk/gemrb/GUIScripts/pst/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/pst/QuitGame.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py 2009-02-26 20:08:54 UTC (rev 5751) +++ gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py 2009-02-27 21:30:03 UTC (rev 5752) @@ -64,7 +64,7 @@ Button=TextScreen.GetControl (0) Button.SetText (11973) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "EndTextScreen") - Button.SetFlags (IE_GUI_BUTTON_DEFAULT,OP_OR) + Button.SetFlags (IE_GUI_BUTTON_DEFAULT|IE_GUI_BUTTON_CANCEL,OP_OR) #replay Button=TextScreen.GetControl (3) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py 2009-02-26 20:08:54 UTC (rev 5751) +++ gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py 2009-02-27 21:30:03 UTC (rev 5752) @@ -58,7 +58,7 @@ Button=TextScreen.GetControl (0) Button.SetText (11973) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "EndTextScreen") - Button.SetFlags (IE_GUI_BUTTON_DEFAULT,OP_OR) + Button.SetFlags (IE_GUI_BUTTON_DEFAULT|IE_GUI_BUTTON_CANCEL,OP_OR) #replay Button=TextScreen.GetControl (3) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIMOVIE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIMOVIE.py 2009-02-26 20:08:54 UTC (rev 5751) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIMOVIE.py 2009-02-27 21:30:03 UTC (rev 5752) @@ -29,56 +29,57 @@ TextAreaControl = 0 MoviesTable = 0 -def OnLoad(): +def OnLoad (): global MovieWindow, TextAreaControl, MoviesTable - GemRB.LoadWindowPack("GUIMOVIE", 640, 480) - MovieWindow = GemRB.LoadWindowObject(0) - MovieWindow.SetFrame() - TextAreaControl = MovieWindow.GetControl(0) - TextAreaControl.SetFlags(IE_GUI_TEXTAREA_SELECTABLE) - PlayButton = MovieWindow.GetControl(2) - CreditsButton = MovieWindow.GetControl(3) - DoneButton = MovieWindow.GetControl(4) - MoviesTable = GemRB.LoadTableObject("MOVIDESC") - for i in range(0, MoviesTable.GetRowCount() ): - t = MoviesTable.GetRowName(i) + GemRB.LoadWindowPack ("GUIMOVIE", 640, 480) + MovieWindow = GemRB.LoadWindowObject (0) + MovieWindow.SetFrame () + TextAreaControl = MovieWindow.GetControl (0) + TextAreaControl.SetFlags (IE_GUI_TEXTAREA_SELECTABLE) + PlayButton = MovieWindow.GetControl (2) + CreditsButton = MovieWindow.GetControl (3) + DoneButton = MovieWindow.GetControl (4) + MoviesTable = GemRB.LoadTableObject ("MOVIDESC") + for i in range (0, MoviesTable.GetRowCount () ): + t = MoviesTable.GetRowName (i) if GemRB.GetVar(t)==1: - s = MoviesTable.GetValue(i, 0) - TextAreaControl.Append(s,-1) - TextAreaControl.SetVarAssoc("MovieIndex",0) - PlayButton.SetText(17318) - CreditsButton.SetText(15591) - DoneButton.SetText(11973) - PlayButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "PlayPress") - CreditsButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CreditsPress") - DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DonePress") - MovieWindow.SetVisible(1) + s = MoviesTable.GetValue (i, 0) + TextAreaControl.Append (s,-1) + TextAreaControl.SetVarAssoc ("MovieIndex",0) + PlayButton.SetText (17318) + CreditsButton.SetText (15591) + DoneButton.SetText (11973) + PlayButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "PlayPress") + CreditsButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CreditsPress") + DoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DonePress") + DoneButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + MovieWindow.SetVisible (1) + return - -def PlayPress(): +def PlayPress (): s = GemRB.GetVar("MovieIndex") - for i in range(0, MoviesTable.GetRowCount() ): - t = MoviesTable.GetRowName(i) + for i in range (0, MoviesTable.GetRowCount () ): + t = MoviesTable.GetRowName (i) if GemRB.GetVar(t)==1: if s==0: - s = MoviesTable.GetRowName(i) + s = MoviesTable.GetRowName (i) MovieWindow.SetVisible (0) - GemRB.PlayMovie(s, 1) + GemRB.PlayMovie (s, 1) MovieWindow.SetVisible (1) return s = s - 1 -def CreditsPress(): +def CreditsPress (): MovieWindow.SetVisible (0) - GemRB.PlayMovie("CREDITS", 1) + GemRB.PlayMovie ("CREDITS", 1) MovieWindow.SetVisible (1) -def DonePress(): +def DonePress (): if MovieWindow: - MovieWindow.Unload() - GemRB.SetNextScript("Start") + MovieWindow.Unload () + GemRB.SetNextScript ("Start") Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIOPT.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIOPT.py 2009-02-26 20:08:54 UTC (rev 5751) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIOPT.py 2009-02-27 21:30:03 UTC (rev 5752) @@ -550,11 +550,13 @@ Button = Window.GetControl (0) Button.SetText (15590) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "LoadGamePress") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) # Cancel Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseLoadMsgWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) # Current game will be destroyed ... Text = Window.GetControl (3) @@ -633,6 +635,7 @@ Button = Window.GetControl (2) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseQuitMsgWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) # Do you wish to save the game .... Text = Window.GetControl (3) @@ -710,12 +713,14 @@ button = window.GetControl (button_id) button.SetText (11973) # Done button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "Close%sWindow" %name) + button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) def OptCancel (name, window, button_id): """Standard `Cancel' button for option windows""" button = window.GetControl (button_id) button.SetText (13727) # Cancel button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "Close%sWindow" %name) + button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) def OptHelpText (name, window, text_id, text_strref): """Standard textarea with context help for option windows""" Modified: gemrb/trunk/gemrb/GUIScripts/iwd/PartyFormation.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/PartyFormation.py 2009-02-26 20:08:54 UTC (rev 5751) +++ gemrb/trunk/gemrb/GUIScripts/iwd/PartyFormation.py 2009-02-27 21:30:03 UTC (rev 5752) @@ -94,6 +94,7 @@ CreateButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CreateCharCreatePress") CreateButton.SetStatus (IE_GUI_BUTTON_ENABLED) CreateButton.SetText (13954) + CreateButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) DeleteButton = CreateCharWindow.GetControl (3) DeleteButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CreateCharDeletePress") @@ -104,7 +105,7 @@ CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CreateCharCancelPress") CancelButton.SetStatus (IE_GUI_BUTTON_ENABLED) CancelButton.SetText (13727) - CreateButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) CreateCharWindow.SetVisible (1) return Modified: gemrb/trunk/gemrb/GUIScripts/iwd/Start.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/Start.py 2009-02-26 20:08:54 UTC (rev 5751) +++ gemrb/trunk/gemrb/GUIScripts/iwd/Start.py 2009-02-27 21:30:03 UTC (rev 5752) @@ -187,16 +187,16 @@ StartWindow.SetVisible (0) QuitWindow = GemRB.LoadWindowObject (22) CancelButton = QuitWindow.GetControl (2) + CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "QuitCancelPress") CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) QuitButton = QuitWindow.GetControl (1) + QuitButton.SetText (15417) QuitButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "QuitQuitPress") QuitButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) TextArea = QuitWindow.GetControl (0) - CancelButton.SetText (13727) - QuitButton.SetText (15417) TextArea.SetText (19532) QuitWindow.SetVisible (1) return Modified: gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py 2009-02-26 20:08:54 UTC (rev 5751) +++ gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py 2009-02-27 21:30:03 UTC (rev 5752) @@ -66,7 +66,7 @@ Button=TextScreen.GetControl (0) Button.SetText (11973) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "EndTextScreen") - Button.SetFlags (IE_GUI_BUTTON_DEFAULT,OP_OR) + Button.SetFlags (IE_GUI_BUTTON_DEFAULT|IE_GUI_BUTTON_CANCEL,OP_OR) #replay Button=TextScreen.GetControl (3) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/TextScreen.py 2009-02-26 20:08:54 UTC (rev 5751) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/TextScreen.py 2009-02-27 21:30:03 UTC (rev 5752) @@ -56,7 +56,7 @@ Button=TextScreen.GetControl (0) Button.SetText (11973) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "EndTextScreen") - Button.SetFlags (IE_GUI_BUTTON_DEFAULT,OP_OR) + Button.SetFlags (IE_GUI_BUTTON_DEFAULT|IE_GUI_BUTTON_CANCEL,OP_OR) #replay Button=TextScreen.GetControl (3) Modified: gemrb/trunk/gemrb/GUIScripts/pst/GUILOAD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/GUILOAD.py 2009-02-26 20:08:54 UTC (rev 5751) +++ gemrb/trunk/gemrb/GUIScripts/pst/GUILOAD.py 2009-02-27 21:30:03 UTC (rev 5752) @@ -31,144 +31,151 @@ GameCount = 0 ScrollBar = 0 -def OnLoad(): +def OnLoad (): global LoadWindow, TextAreaControl, GameCount, ScrollBar - GemRB.LoadWindowPack("GUILOAD") - LoadWindow = GemRB.LoadWindowObject(0) - CancelButton=LoadWindow.GetControl(46) - CancelButton.SetText(4196) - CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress") - GemRB.SetVar("LoadIdx",0) + GemRB.LoadWindowPack ("GUILOAD") + LoadWindow = GemRB.LoadWindowObject (0) + CancelButton=LoadWindow.GetControl (46) + CancelButton.SetText (4196) + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CancelPress") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL,OP_OR) - for i in range(4): - Button = LoadWindow.GetControl(14+i) - Button.SetText(28648) - Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "LoadGamePress") - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetVarAssoc("LoadIdx",i) + GemRB.SetVar ("LoadIdx",0) - Button = LoadWindow.GetControl(18+i) - Button.SetText(28640) - Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DeleteGamePress") - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetVarAssoc("LoadIdx",i) + for i in range (4): + Button = LoadWindow.GetControl (14+i) + Button.SetText (28648) + 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.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGamePress") + Button.SetState (IE_GUI_BUTTON_DISABLED) + Button.SetVarAssoc ("LoadIdx",i) + #area previews - Button = LoadWindow.GetControl(1+i) + Button = LoadWindow.GetControl (1+i) Button.SetState (IE_GUI_BUTTON_LOCKED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) #PC portraits - for j in range(PARTY_SIZE): - Button = LoadWindow.GetControl(22+i*PARTY_SIZE+j) + for j in range (PARTY_SIZE): + Button = LoadWindow.GetControl (22+i*PARTY_SIZE+j) Button.SetState (IE_GUI_BUTTON_LOCKED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) - ScrollBar=LoadWindow.GetControl(13) - ScrollBar.SetEvent(IE_GUI_SCROLLBAR_ON_CHANGE, "ScrollBarPress") - GameCount=GemRB.GetSaveGameCount() #count of games in save folder? + ScrollBar=LoadWindow.GetControl (13) + ScrollBar.SetEvent (IE_GUI_SCROLLBAR_ON_CHANGE, "ScrollBarPress") + GameCount=GemRB.GetSaveGameCount () #count of games in save folder? if GameCount>3: TopIndex = GameCount-4 else: TopIndex = 0 GemRB.SetVar ("TopIndex",TopIndex) ScrollBar.SetVarAssoc ("TopIndex", TopIndex+1) - ScrollBarPress() - LoadWindow.SetVisible(1) + ScrollBarPress () + LoadWindow.SetVisible (1) return -def ScrollBarPress(): +def ScrollBarPress (): #draw load game portraits - Pos = GemRB.GetVar("TopIndex") - for i in range(4): + Pos = GemRB.GetVar ("TopIndex") + for i in range (4): ActPos = Pos + i - Button1 = LoadWindow.GetControl(14+i) - Button2 = LoadWindow.GetControl(18+i) + Button1 = LoadWindow.GetControl (14+i) + Button2 = LoadWindow.GetControl (18+i) if ActPos<GameCount: - Button1.SetState(IE_GUI_BUTTON_ENABLED) - Button2.SetState(IE_GUI_BUTTON_ENABLED) + Button1.SetState (IE_GUI_BUTTON_ENABLED) + Button2.SetState (IE_GUI_BUTTON_ENABLED) else: - Button1.SetState(IE_GUI_BUTTON_DISABLED) - Button2.SetState(IE_GUI_BUTTON_DISABLED) + Button1.SetState (IE_GUI_BUTTON_DISABLED) + Button2.SetState (IE_GUI_BUTTON_DISABLED) if ActPos<GameCount: - Slotname = GemRB.GetSaveGameAttrib(0,ActPos) + Slotname = GemRB.GetSaveGameAttrib (0,ActPos) else: Slotname = "" - Label = LoadWindow.GetControl(0x10000004+i) - Label.SetText(Slotname) + Label = LoadWindow.GetControl (0x10000004+i) + Label.SetText (Slotname) if ActPos<GameCount: - Slotname = GemRB.GetSaveGameAttrib(3,ActPos) + Slotname = GemRB.GetSaveGameAttrib (3,ActPos) else: Slotname = "" - Label = LoadWindow.GetControl(0x10000008+i) - Label.SetText(Slotname) + Label = LoadWindow.GetControl (0x10000008+i) + Label.SetText (Slotname) - Button=LoadWindow.GetControl(1+i) + Button=LoadWindow.GetControl (1+i) if ActPos<GameCount: - Button.SetSaveGamePreview(ActPos) + Button.SetSaveGamePreview (ActPos) else: - Button.SetPicture("") - for j in range(PARTY_SIZE): - Button=LoadWindow.GetControl(22+i*PARTY_SIZE+j) + Button.SetPicture ("") + for j in range (PARTY_SIZE): + Button=LoadWindow.GetControl (22+i*PARTY_SIZE+j) if ActPos<GameCount: - Button.SetSaveGamePortrait(ActPos,j) + Button.SetSaveGamePortrait (ActPos,j) else: - Button.SetPicture("") + Button.SetPicture ("") return -def LoadGamePress(): +def LoadGamePress (): if LoadWindow: - LoadWindow.Unload() - Pos = GemRB.GetVar("TopIndex")+GemRB.GetVar("LoadIdx") - StartLoadScreen() - GemRB.LoadGame(Pos) # load & start game - GemRB.EnterGame() + LoadWindow.Unload () + Pos = GemRB.GetVar ("TopIndex")+GemRB.GetVar ("LoadIdx") + StartLoadScreen () + GemRB.LoadGame (Pos) # load & start game + GemRB.EnterGame () return -def DeleteGameConfirm(): +def DeleteGameConfirm (): global GameCount - TopIndex = GemRB.GetVar("TopIndex") - Pos = TopIndex +GemRB.GetVar("LoadIdx") - GemRB.DeleteSaveGame(Pos) + TopIndex = GemRB.GetVar ("TopIndex") + Pos = TopIndex +GemRB.GetVar ("LoadIdx") + GemRB.DeleteSaveGame (Pos) if TopIndex>0: - GemRB.SetVar("TopIndex",TopIndex-1) - GameCount=GemRB.GetSaveGameCount() - ScrollBar.SetVarAssoc("TopIndex", GameCount) - ScrollBarPress() + GemRB.SetVar ("TopIndex",TopIndex-1) + GameCount=GemRB.GetSaveGameCount () + ScrollBar.SetVarAssoc ("TopIndex", GameCount) + ScrollBarPress () if ConfirmWindow: - ConfirmWindow.Unload() - LoadWindow.SetVisible(1) + ConfirmWindow.Unload () + LoadWindow.SetVisible (1) return -def DeleteGameCancel(): +def DeleteGameCancel (): if ConfirmWindow: - ConfirmWindow.Unload() - LoadWindow.SetVisible(1) + ConfirmWindow.Unload () + LoadWindow.SetVisible (1) return -def DeleteGamePress(): +def DeleteGamePress (): global ConfirmWindow - LoadWindow.SetVisible(0) - ConfirmWindow=GemRB.LoadWindowObject(1) - Text=ConfirmWindow.GetControl(0) - Text.SetText(28639) - DeleteButton=ConfirmWindow.GetControl(1) - DeleteButton.SetText(28640) - DeleteButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DeleteGameConfirm") - CancelButton=ConfirmWindow.GetControl(2) - CancelButton.SetText(4196) - CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel") - ConfirmWindow.SetVisible(1) + LoadWindow.SetVisible (0) + ConfirmWindow=GemRB.LoadWindowObject (1) + + Text=ConfirmWindow.GetControl (0) + Text.SetText (28639) + + DeleteButton=ConfirmWindow.GetControl (1) + DeleteButton.SetText (28640) + DeleteButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGameConfirm") + DeleteButton.SetFlags (IE_GUI_BUTTON_DEFAULT,OP_OR) + + CancelButton=ConfirmWindow.GetControl (2) + CancelButton.SetText (4196) + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL,OP_OR) + ConfirmWindow.SetVisible (1) return -def CancelPress(): +def CancelPress (): if LoadWindow: - LoadWindow.Unload() - GemRB.SetNextScript("Start") + LoadWindow.Unload () + GemRB.SetNextScript ("Start") return Modified: gemrb/trunk/gemrb/GUIScripts/pst/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/GUIREC.py 2009-02-26 20:08:54 UTC (rev 5751) +++ gemrb/trunk/gemrb/GUIScripts/pst/GUIREC.py 2009-02-27 21:30:03 UTC (rev 5752) @@ -888,8 +888,8 @@ Button = Window.GetControl (0) Button.SetText (1403) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenInformationWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) - GemRB.UnhideGUI () Window.ShowModal (MODAL_SHADOW_GRAY) @@ -928,7 +928,8 @@ Button = Window.GetControl (2) Button.SetText (1403) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenBiographyWindow") - + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + GemRB.UnhideGUI () Window.ShowModal (MODAL_SHADOW_GRAY) Modified: gemrb/trunk/gemrb/GUIScripts/pst/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/GUISTORE.py 2009-02-26 20:08:54 UTC (rev 5751) +++ gemrb/trunk/gemrb/GUIScripts/pst/GUISTORE.py 2009-02-27 21:30:03 UTC (rev 5752) @@ -88,6 +88,7 @@ Button = Window.GetControl (0) Button.SetText (1403) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseStoreWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) # buy / sell Button = Window.GetControl (1) Modified: gemrb/trunk/gemrb/GUIScripts/pst/QuitGame.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/QuitGame.py 2009-02-26 20:08:54 UTC (rev 5751) +++ gemrb/trunk/gemrb/GUIScripts/pst/QuitGame.py 2009-02-27 21:30:03 UTC (rev 5752) @@ -61,6 +61,7 @@ Button = Window.GetControl (1) Button.SetText (17237) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DonePress") + Button.SetEvent (IE_GUI_BUTTON_DEFAULT|IE_GUI_BUTTON_CANCEL, OP_OR) GemRB.HideGUI () GemRB.SetVar ("MessageWindow", -1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-03-06 20:05:32
|
Revision: 5766 http://gemrb.svn.sourceforge.net/gemrb/?rev=5766&view=rev Author: avenger_teambg Date: 2009-03-06 20:05:17 +0000 (Fri, 06 Mar 2009) Log Message: ----------- improves on the inventory screens (tooltips, doubleclick) Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIREC.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2009-03-05 23:32:53 UTC (rev 5765) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2009-03-06 20:05:17 UTC (rev 5766) @@ -448,6 +448,7 @@ 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_DOUBLE_PRESS, "OpenItemAmountWindow") else: if SlotType["ResRef"]=="*": Button.SetBAM ("",0,0) @@ -518,8 +519,8 @@ def OnDragItem (): pc = GemRB.GameGetSelectedPCSingle () + slot = GemRB.GetVar ("ItemButton") - slot = GemRB.GetVar ("ItemButton") if not GemRB.IsDraggingItem (): slot_item = GemRB.GetSlotItem (pc, slot) item = GemRB.GetItem (slot_item["ItemResRef"]) @@ -574,6 +575,12 @@ def OpenItemAmountWindow (): global ItemAmountWindow, StackAmount + pc = GemRB.GameGetSelectedPCSingle () + slot = GemRB.GetVar ("ItemButton") + + if GemRB.IsDraggingItem (): + GemRB.DropDraggedItem(pc, slot) + if ItemAmountWindow != None: if ItemAmountWindow: ItemAmountWindow.Unload () @@ -585,8 +592,6 @@ GemRB.SetRepeatClickFlags (GEM_RK_DISABLE, OP_NAND) ItemAmountWindow = Window = GemRB.LoadWindowObject (4) - pc = GemRB.GameGetSelectedPCSingle () - slot = GemRB.GetVar ("ItemButton") slot_item = GemRB.GetSlotItem (pc, slot) ResRef = slot_item['ItemResRef'] item = GemRB.GetItem (ResRef) @@ -606,7 +611,7 @@ # item amount Text = Window.GetControl (6) - Text.SetText (str (StackAmount) ) + Text.SetText (str (StackAmount//2) ) Text.SetStatus (IE_GUI_EDIT_NUMBER|IE_GUI_CONTROL_FOCUSED) # Decrease Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py 2009-03-05 23:32:53 UTC (rev 5765) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py 2009-03-06 20:05:17 UTC (rev 5766) @@ -142,15 +142,15 @@ #armor class Label = Window.GetControl (0x10000038) - Label.SetTooltip (4197) + Label.SetTooltip (17183) #hp current Label = Window.GetControl (0x10000039) - Label.SetTooltip (4198) + Label.SetTooltip (17184) #hp max Label = Window.GetControl (0x1000003a) - Label.SetTooltip (4199) + Label.SetTooltip (17378) #info label, game paused, etc Label = Window.GetControl (0x1000003f) @@ -758,6 +758,7 @@ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "IdentifyUseScroll") if not GemRB.HasSpecialItem (pc, 1, 0): Button.SetState (IE_GUI_BUTTON_DISABLED) + Button = Window.GetControl (2) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseIdentifyItemWindow") Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2009-03-05 23:32:53 UTC (rev 5765) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2009-03-06 20:05:17 UTC (rev 5766) @@ -135,15 +135,15 @@ #armor class Label = Window.GetControl (0x10000038) - Label.SetTooltip (4197) + Label.SetTooltip (17183) #hp current Label = Window.GetControl (0x10000039) - Label.SetTooltip (4198) + Label.SetTooltip (17184) #hp max Label = Window.GetControl (0x1000003a) - Label.SetTooltip (4199) + Label.SetTooltip (17378) #info label, game paused, etc Label = Window.GetControl (0x1000003f) @@ -312,16 +312,19 @@ ac = GemRB.GetPlayerStat (pc, IE_ARMORCLASS) Label = Window.GetControl (0x10000038) Label.SetText (str (ac)) + Label.SetTooltip (10339) #hp current hp = GemRB.GetPlayerStat (pc, IE_HITPOINTS) Label = Window.GetControl (0x10000039) Label.SetText (str (hp)) + Label.SetTooltip (17184) #hp max hpmax = GemRB.GetPlayerStat (pc, IE_MAXHITPOINTS) Label = Window.GetControl (0x1000003a) Label.SetText (str (hpmax)) + Label.SetTooltip (17378) #party gold Label = Window.GetControl (0x10000040) @@ -446,6 +449,7 @@ 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_DOUBLE_PRESS, "OpenItemAmountWindow") else: if SlotType["ResRef"]=="*": Button.SetBAM ("",0,0) @@ -572,6 +576,12 @@ def OpenItemAmountWindow (): global ItemAmountWindow, StackAmount + pc = GemRB.GameGetSelectedPCSingle () + slot = GemRB.GetVar ("ItemButton") + + if GemRB.IsDraggingItem (): + GemRB.DropDraggedItem(pc, slot) + if ItemAmountWindow != None: if ItemAmountWindow: ItemAmountWindow.Unload () @@ -583,8 +593,6 @@ GemRB.SetRepeatClickFlags (GEM_RK_DISABLE, OP_NAND) ItemAmountWindow = Window = GemRB.LoadWindowObject (4) - pc = GemRB.GameGetSelectedPCSingle () - slot = GemRB.GetVar ("ItemButton") slot_item = GemRB.GetSlotItem (pc, slot) ResRef = slot_item['ItemResRef'] item = GemRB.GetItem (ResRef) @@ -604,7 +612,7 @@ # item amount Text = Window.GetControl (6) - Text.SetText (str (StackAmount) ) + Text.SetText (str (StackAmount//2) ) Text.SetStatus (IE_GUI_EDIT_NUMBER|IE_GUI_CONTROL_FOCUSED) # Decrease @@ -636,20 +644,6 @@ Window.ShowModal (MODAL_SHADOW_GRAY) return -def OpenItemWindow (): - #close inventory - GemRB.SetVar ("Inventory", 1) - if ItemInfoWindow: - ItemInfoWindow.Unload () - OpenInventoryWindow () - pc = GemRB.GameGetSelectedPCSingle () - slot = GemRB.GetVar ("ItemButton") - slot_item = GemRB.GetSlotItem (pc, slot) - ResRef = slot_item['ItemResRef'] - #the store will have to reopen the inventory - GemRB.EnterStore (ResRef) - return - def DrinkItemWindow (): pc = GemRB.GameGetSelectedPCSingle () slot = GemRB.GetVar ("ItemButton") Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIREC.py 2009-03-05 23:32:53 UTC (rev 5765) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIREC.py 2009-03-06 20:05:17 UTC (rev 5766) @@ -158,17 +158,17 @@ # armorclass Label = Window.GetControl (0x10000028) Label.SetText (str (GemRB.GetPlayerStat (pc, IE_ARMORCLASS))) - Label.SetTooltip (4197) + Label.SetTooltip (17183) # hp now Label = Window.GetControl (0x10000029) Label.SetText (str (GemRB.GetPlayerStat (pc, IE_HITPOINTS))) - Label.SetTooltip (4198) + Label.SetTooltip (17184) # hp max Label = Window.GetControl (0x1000002a) Label.SetText (str (GemRB.GetPlayerStat (pc, IE_MAXHITPOINTS))) - Label.SetTooltip (4199) + Label.SetTooltip (17378) # stats This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ze...@us...> - 2009-03-21 21:12:57
|
Revision: 5816 http://gemrb.svn.sourceforge.net/gemrb/?rev=5816&view=rev Author: zefklop Date: 2009-03-21 21:12:53 +0000 (Sat, 21 Mar 2009) Log Message: ----------- fix bug 2537733. Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py 2009-03-20 17:59:17 UTC (rev 5815) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py 2009-03-21 21:12:53 UTC (rev 5816) @@ -499,14 +499,8 @@ GemRB.HideGUI () GemRB.SetVar ("MessageWindow", -1) - GemRB.SetVar ("ActionsWindow", Window.ID) GemRB.UnhideGUI () - #making the playing field gray - GemRB.SetVisible (0,2) - Window = GWindow( GemRB.GetVar ("PortraitWindow") ) - Window.SetVisible (2) - Window = GWindow( GemRB.GetVar ("OptionsWindow") ) - Window.SetVisible (2) + Window.ShowModal (MODAL_SHADOW_GRAY) return def QuitPress(): Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py 2009-03-20 17:59:17 UTC (rev 5815) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py 2009-03-21 21:12:53 UTC (rev 5816) @@ -510,14 +510,9 @@ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "QuitPress") GemRB.HideGUI () - GemRB.SetVar ("OptionsWindow", -1) - GemRB.SetVar ("PortraitWindow", -1) GemRB.SetVar ("MessageWindow", -1) - GemRB.SetVar ("ActionsWindow", Window.ID) GemRB.UnhideGUI () - #making the playing field gray - GemRB.SetVisible (0,2) - #destructing the game object + Window.ShowModal (MODAL_SHADOW_GRAY) return def QuitPress(): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-03-28 12:22:32
|
Revision: 5828 http://gemrb.svn.sourceforge.net/gemrb/?rev=5828&view=rev Author: avenger_teambg Date: 2009-03-28 12:22:27 +0000 (Sat, 28 Mar 2009) Log Message: ----------- fixed part of #2536278 Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUISAVE.py gemrb/trunk/gemrb/GUIScripts/bg2/GUISAVE.py gemrb/trunk/gemrb/GUIScripts/iwd/GUISAVE.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUISAVE.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUISAVE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUISAVE.py 2009-03-27 19:07:19 UTC (rev 5827) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUISAVE.py 2009-03-28 12:22:27 UTC (rev 5828) @@ -52,8 +52,8 @@ CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenSaveWindow") CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + GemRB.SetVar ("LoadIdx",0) - GemRB.SetVar ("LoadIdx",0) for i in range(4): Button = Window.GetControl (26+i) Button.SetText (15588) @@ -104,17 +104,19 @@ Button2 = Window.GetControl (30+i) if ActPos<GameCount: Button1.SetState (IE_GUI_BUTTON_ENABLED) - Button2.SetState (IE_GUI_BUTTON_ENABLED) else: Button1.SetState (IE_GUI_BUTTON_DISABLED) - Button2.SetState (IE_GUI_BUTTON_DISABLED) if ActPos<GameCount-1: Slotname = GemRB.GetSaveGameAttrib (0,ActPos) + Button2.SetState (IE_GUI_BUTTON_ENABLED) elif ActPos == GameCount-1: Slotname = 15304 + Button2.SetState (IE_GUI_BUTTON_DISABLED) else: Slotname = "" + Button2.SetState (IE_GUI_BUTTON_DISABLED) + Label = Window.GetControl (0x10000008+i) Label.SetText (Slotname) @@ -154,7 +156,6 @@ GemRB.SaveGame(Pos, Slotname) #loads and enters savegame if ConfirmWindow: ConfirmWindow.Unload () - #CloseSaveWindow () SaveWindow.SetVisible (1) return Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUISAVE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUISAVE.py 2009-03-27 19:07:19 UTC (rev 5827) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUISAVE.py 2009-03-28 12:22:27 UTC (rev 5828) @@ -1,4 +1,28 @@ -#load window +# -*-python-*- +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# $Id$ + + +# GUISAVE.py - Save window + +################################################### + import GemRB from LoadScreen import * from GUICommon import CloseOtherWindow @@ -80,17 +104,19 @@ Button2 = Window.GetControl (30+i) if ActPos<GameCount: Button1.SetState (IE_GUI_BUTTON_ENABLED) - Button2.SetState (IE_GUI_BUTTON_ENABLED) else: Button1.SetState (IE_GUI_BUTTON_DISABLED) - Button2.SetState (IE_GUI_BUTTON_DISABLED) if ActPos<GameCount-1: Slotname = GemRB.GetSaveGameAttrib (0,ActPos) + Button2.SetState (IE_GUI_BUTTON_ENABLED) elif ActPos == GameCount-1: Slotname = 15304 + Button2.SetState (IE_GUI_BUTTON_DISABLED) else: Slotname = "" + Button2.SetState (IE_GUI_BUTTON_DISABLED) + Label = Window.GetControl (0x10000008+i) Label.SetText (Slotname) @@ -130,7 +156,6 @@ GemRB.SaveGame(Pos, Slotname) #loads and enters savegame if ConfirmWindow: ConfirmWindow.Unload () - #CloseSaveWindow () SaveWindow.SetVisible (1) return @@ -185,6 +210,8 @@ CancelButton=ConfirmWindow.GetControl (8) CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AbortedSaveGame") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + ConfirmWindow.SetVisible (1) NameField.SetStatus (IE_GUI_CONTROL_FOCUSED) return @@ -232,6 +259,8 @@ CancelButton=ConfirmWindow.GetControl (2) CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + ConfirmWindow.SetVisible (1) return Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUISAVE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUISAVE.py 2009-03-27 19:07:19 UTC (rev 5827) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUISAVE.py 2009-03-28 12:22:27 UTC (rev 5828) @@ -52,8 +52,8 @@ CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenSaveWindow") CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + GemRB.SetVar ("LoadIdx",0) - GemRB.SetVar ("LoadIdx",0) for i in range(4): Button = Window.GetControl (26+i) Button.SetText (15588) @@ -104,17 +104,19 @@ Button2 = Window.GetControl (30+i) if ActPos<GameCount: Button1.SetState (IE_GUI_BUTTON_ENABLED) - Button2.SetState (IE_GUI_BUTTON_ENABLED) else: Button1.SetState (IE_GUI_BUTTON_DISABLED) - Button2.SetState (IE_GUI_BUTTON_DISABLED) if ActPos<GameCount-1: Slotname = GemRB.GetSaveGameAttrib (0,ActPos) + Button2.SetState (IE_GUI_BUTTON_ENABLED) elif ActPos == GameCount-1: Slotname = 15304 + Button2.SetState (IE_GUI_BUTTON_DISABLED) else: Slotname = "" + Button2.SetState (IE_GUI_BUTTON_DISABLED) + Label = Window.GetControl (0x10000008+i) Label.SetText (Slotname) @@ -154,7 +156,6 @@ GemRB.SaveGame(Pos, Slotname) #loads and enters savegame if ConfirmWindow: ConfirmWindow.Unload () - #CloseSaveWindow () SaveWindow.SetVisible (1) return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUISAVE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUISAVE.py 2009-03-27 19:07:19 UTC (rev 5827) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUISAVE.py 2009-03-28 12:22:27 UTC (rev 5828) @@ -52,8 +52,8 @@ CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenSaveWindow") CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + GemRB.SetVar ("LoadIdx",0) - GemRB.SetVar ("LoadIdx",0) for i in range(5): Button = Window.GetControl (55+i) Button.SetText (15588) @@ -104,17 +104,19 @@ Button2 = Window.GetControl (60+i) if ActPos<GameCount: Button1.SetState (IE_GUI_BUTTON_ENABLED) - Button2.SetState (IE_GUI_BUTTON_ENABLED) else: Button1.SetState (IE_GUI_BUTTON_DISABLED) - Button2.SetState (IE_GUI_BUTTON_DISABLED) if ActPos<GameCount-1: Slotname = GemRB.GetSaveGameAttrib (0,ActPos) + Button2.SetState (IE_GUI_BUTTON_ENABLED) elif ActPos == GameCount-1: Slotname = 15304 + Button2.SetState (IE_GUI_BUTTON_DISABLED) else: Slotname = "" + Button2.SetState (IE_GUI_BUTTON_DISABLED) + Label = Window.GetControl (0x10000005+i) Label.SetText (Slotname) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |