From: <lyn...@us...> - 2009-02-14 11:28:03
|
Revision: 5688 http://gemrb.svn.sourceforge.net/gemrb/?rev=5688&view=rev Author: lynxlupodian Date: 2009-02-14 11:27:58 +0000 (Sat, 14 Feb 2009) Log Message: ----------- bg2: added default cancel buttons to cg Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/CharGenCommon.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG1.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG10.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG15.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG19.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG24.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG3.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG4.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG5.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG7.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG8.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGenCommon.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGenCommon.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGenCommon.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -63,6 +63,7 @@ BackButton.SetText (15416) BackButton.SetState (IE_GUI_BUTTON_ENABLED) BackButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "BackPress") + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) AcceptButton = CharGenWindow.GetControl (8) playmode = GemRB.GetVar ("PlayMode") Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG1.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG1.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG1.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -33,6 +33,7 @@ BackButton = GenderWindow.GetControl(6) BackButton.SetText(15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DoneButton = GenderWindow.GetControl(0) DoneButton.SetText(11973) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG10.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG10.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG10.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -50,8 +50,10 @@ BackButton = ClassWindow.GetControl(14) BackButton.SetText(15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DoneButton = ClassWindow.GetControl(0) DoneButton.SetText(11973) + DoneButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) TextAreaControl = ClassWindow.GetControl(12) TextAreaControl.SetText(17244) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -40,6 +40,7 @@ BackButton = AppearanceWindow.GetControl (5) BackButton.SetText (15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) CustomButton = AppearanceWindow.GetControl (6) CustomButton.SetText (17545) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -86,6 +86,7 @@ BackButton = ColorWindow.GetControl(13) BackButton.SetText(15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DoneButton = ColorWindow.GetControl(0) DoneButton.SetText(11973) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG15.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG15.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG15.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -62,6 +62,7 @@ BackButton = RaceWindow.GetControl(4) BackButton.SetText(15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DoneButton = RaceWindow.GetControl(5) DoneButton.SetText(11973) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG19.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG19.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG19.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -36,6 +36,7 @@ BackButton = CharSoundWindow.GetControl(10) BackButton.SetText(15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DoneButton = CharSoundWindow.GetControl(0) DoneButton.SetText(11973) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -63,8 +63,10 @@ BackButton = ClassWindow.GetControl(14) BackButton.SetText(15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DoneButton = ClassWindow.GetControl(0) DoneButton.SetText(11973) + DoneButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) TextAreaControl = ClassWindow.GetControl(13) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -99,6 +99,7 @@ BackButton = KitWindow.GetControl(8) BackButton.SetText(15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DoneButton = KitWindow.GetControl(7) DoneButton.SetText(11973) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -29,6 +29,7 @@ # back CancelButton = BioWindow.GetControl (2) CancelButton.SetText (12896) + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) OkButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OkPress") ClearButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClearPress") Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG24.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG24.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG24.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -20,6 +20,7 @@ CancelButton = ImportWindow.GetControl(3) CancelButton.SetText(13727) + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) FileButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "FilePress") SavedGameButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "GamePress") Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG3.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG3.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG3.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -40,6 +40,7 @@ BackButton = AlignmentWindow.GetControl(13) BackButton.SetText(15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DoneButton = AlignmentWindow.GetControl(0) DoneButton.SetText(11973) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG4.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG4.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG4.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -122,6 +122,7 @@ BackButton = AbilityWindow.GetControl(36) BackButton.SetText(15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DoneButton = AbilityWindow.GetControl(0) DoneButton.SetText(11973) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG5.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG5.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG5.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -13,6 +13,7 @@ BackButton = NameWindow.GetControl(3) BackButton.SetText(15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DoneButton = NameWindow.GetControl(0) DoneButton.SetText(11973) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -139,6 +139,7 @@ BackButton = SkillWindow.GetControl(25) BackButton.SetText(15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DoneButton = SkillWindow.GetControl(0) DoneButton.SetText(11973) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG7.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG7.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG7.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -113,6 +113,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) MageSpellsPickButton = MageSpellsWindow.GetControl(30) MageSpellsPickButton.SetState(IE_GUI_BUTTON_ENABLED) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG8.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG8.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG8.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -28,6 +28,7 @@ BackButton = RaceWindow.GetControl(i+2) #i=8 now (when race count is 7) BackButton.SetText(15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DoneButton = RaceWindow.GetControl(0) DoneButton.SetText(11973) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py 2009-02-12 22:41:32 UTC (rev 5687) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py 2009-02-14 11:27:58 UTC (rev 5688) @@ -132,6 +132,7 @@ BackButton = SkillWindow.GetControl(77) BackButton.SetText(15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) DoneButton = SkillWindow.GetControl(0) DoneButton.SetText(11973) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |