From: <lyn...@us...> - 2009-06-27 07:58:03
|
Revision: 6633 http://gemrb.svn.sourceforge.net/gemrb/?rev=6633&view=rev Author: lynxlupodian Date: 2009-06-27 07:57:44 +0000 (Sat, 27 Jun 2009) Log Message: ----------- bg2: display all mage schools in cg Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-06-26 22:35:12 UTC (rev 6632) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-06-27 07:57:44 UTC (rev 6633) @@ -66,7 +66,10 @@ if not KitTable: RowCount = 1 else: - RowCount = KitTable.GetRowCount() + if ClassID == 1: + RowCount = SchoolList.GetRowCount() + else: + RowCount = KitTable.GetRowCount() TopIndex = 0 GemRB.SetVar("TopIndex", 0) @@ -87,6 +90,7 @@ if not KitTable: if ClassID == 1: + # TODO: this seems to be never reached Kit = GemRB.GetVar("MAGESCHOOL") KitName = SchoolList.GetValue(i+TopIndex, 0) Kit = SchoolList.GetValue (Kit, 3) @@ -95,17 +99,29 @@ KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 0) else: - Kit = KitTable.GetValue(i+TopIndex,0) - if Kit: - KitName = KitListTable.GetValue(Kit, 1) + Kit = KitTable.GetValue (i+TopIndex, 0) + if ClassID == 1: + KitName = SchoolList.GetValue (i+TopIndex, 0) + if Kit == 0: + KitName = SchoolList.GetValue (0, 0) + elif Kit == "*": + Kit = 0 else: - KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 0) - + if Kit: + KitName = KitListTable.GetValue(Kit, 1) + else: + KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 0) Button.SetState(IE_GUI_BUTTON_ENABLED) Button.SetText(KitName) if i+TopIndex==0: - GemRB.SetVar("Class Kit",Kit) - Button.SetVarAssoc("Class Kit",Kit) + GemRB.SetVar("Class Kit", Kit) + if ClassID == 1: + if i+TopIndex == 0: + Button.SetVarAssoc("Class Kit", 0) + else: + Button.SetVarAssoc("Class Kit", i+TopIndex+21) + else: + Button.SetVarAssoc("Class Kit", Kit) Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "KitPress") BackButton = KitWindow.GetControl(8) @@ -131,12 +147,14 @@ global TopIndex TopIndex=GemRB.GetVar("TopIndex") + EnabledButtons = [] for i in range(RowCount): if i<4: Button = KitWindow.GetControl(i+1) else: Button = KitWindow.GetControl(i+5) + Button.SetState(IE_GUI_BUTTON_DISABLED) if not KitTable: if ClassID == 1: Kit = GemRB.GetVar("MAGESCHOOL") @@ -147,18 +165,27 @@ KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 0) else: - Kit = KitTable.GetValue(i+TopIndex,0) - if Kit: - KitName = KitListTable.GetValue(Kit, 1) + Kit = KitTable.GetValue (i+TopIndex,0) + if ClassID == 1: + KitName = SchoolList.GetValue (i+TopIndex, 0) + if Kit != "*": + EnabledButtons.append(Kit-21) + if Kit == 0: + KitName = SchoolList.GetValue (0, 0) + Button.SetState(IE_GUI_BUTTON_ENABLED) else: - KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 0) + if Kit: + KitName = KitListTable.GetValue(Kit, 1) + else: + KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 0) - Button.SetState(IE_GUI_BUTTON_ENABLED) Button.SetText(KitName) + if not EnabledButtons or i+TopIndex in EnabledButtons: + Button.SetState(IE_GUI_BUTTON_ENABLED) + if Kit == "*": + continue if i+TopIndex==0 and Init: GemRB.SetVar("Class Kit",Kit) - Button.SetVarAssoc("Class Kit",Kit) - Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "KitPress") return def KitPress(): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-08-19 15:04:15
|
Revision: 6940 http://gemrb.svn.sourceforge.net/gemrb/?rev=6940&view=rev Author: lynxlupodian Date: 2009-08-19 15:03:50 +0000 (Wed, 19 Aug 2009) Log Message: ----------- bg2: applieed patch from nugrud fixing the cg kit window when there are too many kits Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-08-19 12:14:48 UTC (rev 6939) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-08-19 15:03:50 UTC (rev 6940) @@ -113,15 +113,7 @@ KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 0) Button.SetState(IE_GUI_BUTTON_ENABLED) Button.SetText(KitName) - if i+TopIndex==0: - GemRB.SetVar("Class Kit", Kit) - if ClassID == 1: - if i+TopIndex == 0: - Button.SetVarAssoc("Class Kit", 0) - else: - Button.SetVarAssoc("Class Kit", i+TopIndex+21) - else: - Button.SetVarAssoc("Class Kit", Kit) + Button.SetVarAssoc("ButtonPressed", i) Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "KitPress") BackButton = KitWindow.GetControl(8) @@ -185,28 +177,57 @@ if Kit == "*": continue if i+TopIndex==0 and Init: - GemRB.SetVar("Class Kit",Kit) + GemRB.SetVar("ButtonPressed", i) return def KitPress(): global ClassID - Kit = GemRB.GetVar("Class Kit") + ButtonPressed=GemRB.GetVar("ButtonPressed") + + if not KitTable: + if ClassID == 1: + # TODO: this seems to be never reached + Kit = GemRB.GetVar("MAGESCHOOL") + KitName = SchoolList.GetValue(ButtonPressed+TopIndex, 0) + Kit = SchoolList.GetValue (Kit, 3) + else: + Kit = 0 + KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 0) + else: + Kit = KitTable.GetValue (ButtonPressed+TopIndex, 0) + if ClassID == 1: + KitName = SchoolList.GetValue (ButtonPressed+TopIndex, 0) + if Kit == 0: + KitName = SchoolList.GetValue (0, 0) + elif Kit == "*": + Kit = 0 + else: + if Kit: + KitName = KitListTable.GetValue(Kit, 1) + else: + KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 0) + if ClassID == 1 and Kit != 0: GemRB.SetVar("MAGESCHOOL", Kit-21) # hack: -21 to make the generalist 0 else: GemRB.SetVar("MAGESCHOOL", 0) # so bards don't get schools - + if Kit == 0: KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 1) else: KitName = KitListTable.GetValue(Kit, 3) + TextAreaControl.SetText(KitName) DoneButton.SetState(IE_GUI_BUTTON_ENABLED) + + GemRB.SetVar("Class Kit", Kit) + return def BackPress(): GemRB.SetVar("Class Kit",0) #scrapping + GemRB.SetVar("MAGESCHOOL", 0) if KitWindow: KitWindow.Unload() GemRB.SetNextScript("GUICG2") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-08-25 21:37:23
|
Revision: 7051 http://gemrb.svn.sourceforge.net/gemrb/?rev=7051&view=rev Author: lynxlupodian Date: 2009-08-25 21:36:53 +0000 (Tue, 25 Aug 2009) Log Message: ----------- bg2::cg: most of nugrud's kit window cleanup patch and a preselection fix Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-08-25 20:44:44 UTC (rev 7050) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-08-25 21:36:53 UTC (rev 7051) @@ -63,10 +63,10 @@ Button.SetState(IE_GUI_BUTTON_DISABLED) Button.SetFlags(IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - if not KitTable: + if not KitTable: # sorcerer or monk RowCount = 1 else: - if ClassID == 1: + if ClassID == 1: # mages RowCount = SchoolList.GetRowCount() else: RowCount = KitTable.GetRowCount() @@ -87,32 +87,6 @@ Button = KitWindow.GetControl(i+1) else: Button = KitWindow.GetControl(i+5) - - if not KitTable: - if ClassID == 1: - # TODO: this seems to be never reached - Kit = GemRB.GetVar("MAGESCHOOL") - KitName = SchoolList.GetValue(i+TopIndex, 0) - Kit = SchoolList.GetValue (Kit, 3) - else: - Kit = 0 - KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 0) - - else: - Kit = KitTable.GetValue (i+TopIndex, 0) - if ClassID == 1: - KitName = SchoolList.GetValue (i+TopIndex, 0) - if Kit == 0: - KitName = SchoolList.GetValue (0, 0) - elif Kit == "*": - Kit = 0 - else: - if Kit: - KitName = KitListTable.GetValue(Kit, 1) - else: - KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 0) - Button.SetState(IE_GUI_BUTTON_ENABLED) - Button.SetText(KitName) Button.SetVarAssoc("ButtonPressed", i) Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "KitPress") @@ -149,64 +123,56 @@ Button.SetState(IE_GUI_BUTTON_DISABLED) if not KitTable: if ClassID == 1: + # TODO: check if this is ever reached Kit = GemRB.GetVar("MAGESCHOOL") KitName = SchoolList.GetValue(i+TopIndex, 0) Kit = SchoolList.GetValue (Kit, 3) else: Kit = 0 KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 0) - else: Kit = KitTable.GetValue (i+TopIndex,0) if ClassID == 1: KitName = SchoolList.GetValue (i+TopIndex, 0) - if Kit != "*": - EnabledButtons.append(Kit-21) if Kit == 0: KitName = SchoolList.GetValue (0, 0) Button.SetState(IE_GUI_BUTTON_ENABLED) + if Kit != "*": + EnabledButtons.append(Kit-21) else: if Kit: KitName = KitListTable.GetValue(Kit, 1) else: KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 0) - Button.SetText(KitName) if not EnabledButtons or i+TopIndex in EnabledButtons: Button.SetState(IE_GUI_BUTTON_ENABLED) if Kit == "*": continue if i+TopIndex==0 and Init: - GemRB.SetVar("ButtonPressed", i) + if EnabledButtons: + GemRB.SetVar("ButtonPressed", EnabledButtons[0]) + else: + GemRB.SetVar("ButtonPressed", 0) return def KitPress(): - global ClassID - ButtonPressed=GemRB.GetVar("ButtonPressed") if not KitTable: if ClassID == 1: # TODO: this seems to be never reached Kit = GemRB.GetVar("MAGESCHOOL") - KitName = SchoolList.GetValue(ButtonPressed+TopIndex, 0) Kit = SchoolList.GetValue (Kit, 3) else: Kit = 0 - KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 0) else: Kit = KitTable.GetValue (ButtonPressed+TopIndex, 0) if ClassID == 1: - KitName = SchoolList.GetValue (ButtonPressed+TopIndex, 0) - if Kit == 0: - KitName = SchoolList.GetValue (0, 0) - elif Kit == "*": + if ButtonPressed + TopIndex == 0: Kit = 0 - else: - if Kit: - KitName = KitListTable.GetValue(Kit, 1) else: - KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 0) + Kit = ButtonPressed + TopIndex + 21 if ClassID == 1 and Kit != 0: GemRB.SetVar("MAGESCHOOL", Kit-21) # hack: -21 to make the generalist 0 @@ -214,11 +180,11 @@ GemRB.SetVar("MAGESCHOOL", 0) # so bards don't get schools if Kit == 0: - KitName = ClassTable.GetValue(GemRB.GetVar("Class")-1, 1) + KitDescription = ClassTable.GetValue(GemRB.GetVar("Class")-1, 1) else: - KitName = KitListTable.GetValue(Kit, 3) + KitDescription = KitListTable.GetValue(Kit, 3) - TextAreaControl.SetText(KitName) + TextAreaControl.SetText(KitDescription) DoneButton.SetState(IE_GUI_BUTTON_ENABLED) GemRB.SetVar("Class Kit", Kit) @@ -226,7 +192,7 @@ return def BackPress(): - GemRB.SetVar("Class Kit",0) #scrapping + GemRB.SetVar("Class Kit", 0) # reverting the value so we are idempotent GemRB.SetVar("MAGESCHOOL", 0) if KitWindow: KitWindow.Unload() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-08-28 11:32:11
|
Revision: 7064 http://gemrb.svn.sourceforge.net/gemrb/?rev=7064&view=rev Author: lynxlupodian Date: 2009-08-28 11:32:01 +0000 (Fri, 28 Aug 2009) Log Message: ----------- bg2::cg: mark the preselected kit buttons, patch by nugrud Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-08-27 23:26:22 UTC (rev 7063) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-08-28 11:32:01 UTC (rev 7064) @@ -104,13 +104,12 @@ BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress") Init = 1 RedrawKits() - Init = 0 KitPress() KitWindow.SetVisible(1) return def RedrawKits(): - global TopIndex + global TopIndex, Init TopIndex=GemRB.GetVar("TopIndex") EnabledButtons = [] @@ -119,7 +118,6 @@ Button = KitWindow.GetControl(i+1) else: Button = KitWindow.GetControl(i+5) - Button.SetState(IE_GUI_BUTTON_DISABLED) if not KitTable: if ClassID == 1: @@ -137,6 +135,9 @@ if Kit == 0: KitName = SchoolList.GetValue (0, 0) Button.SetState(IE_GUI_BUTTON_ENABLED) + if Init: #preselection of mage plain kit + Button.SetState(IE_GUI_BUTTON_SELECTED) + Init=0 if Kit != "*": EnabledButtons.append(Kit-21) else: @@ -147,13 +148,18 @@ Button.SetText(KitName) if not EnabledButtons or i+TopIndex in EnabledButtons: Button.SetState(IE_GUI_BUTTON_ENABLED) + if Init and i+TopIndex>0: + Button.SetState(IE_GUI_BUTTON_SELECTED) + Init=0 if Kit == "*": continue - if i+TopIndex==0 and Init: + if Init and i+TopIndex==0: if EnabledButtons: - GemRB.SetVar("ButtonPressed", EnabledButtons[0]) + GemRB.SetVar("ButtonPressed", EnabledButtons[0]) #but leave Init==1 else: GemRB.SetVar("ButtonPressed", 0) + Button.SetState(IE_GUI_BUTTON_SELECTED) + Init=0 return def KitPress(): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-08-28 11:47:22
|
Revision: 7065 http://gemrb.svn.sourceforge.net/gemrb/?rev=7065&view=rev Author: lynxlupodian Date: 2009-08-28 11:47:05 +0000 (Fri, 28 Aug 2009) Log Message: ----------- bg2::cg: re-mark the selected kit button on scroll, patch by nugrud Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-08-28 11:32:01 UTC (rev 7064) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-08-28 11:47:05 UTC (rev 7065) @@ -31,6 +31,7 @@ RowCount = 10 KitTable = 0 Init = 0 +KitSelected = 0 #store clicked kit on redraw as number withing RowCount def OnLoad(): global KitWindow, TextAreaControl, DoneButton @@ -109,7 +110,7 @@ return def RedrawKits(): - global TopIndex, Init + global TopIndex, Init, KitSelected TopIndex=GemRB.GetVar("TopIndex") EnabledButtons = [] @@ -137,6 +138,7 @@ Button.SetState(IE_GUI_BUTTON_ENABLED) if Init: #preselection of mage plain kit Button.SetState(IE_GUI_BUTTON_SELECTED) + KitSelected = i+TopIndex Init=0 if Kit != "*": EnabledButtons.append(Kit-21) @@ -150,6 +152,7 @@ Button.SetState(IE_GUI_BUTTON_ENABLED) if Init and i+TopIndex>0: Button.SetState(IE_GUI_BUTTON_SELECTED) + KitSelected = i+TopIndex Init=0 if Kit == "*": continue @@ -159,12 +162,17 @@ else: GemRB.SetVar("ButtonPressed", 0) Button.SetState(IE_GUI_BUTTON_SELECTED) + KitSelected = i+TopIndex Init=0 + if not Init and i+TopIndex == KitSelected: #remark selection state on redraw + Button.SetState(IE_GUI_BUTTON_SELECTED) return def KitPress(): + global KitSelected + ButtonPressed=GemRB.GetVar("ButtonPressed") - + KitSelected = ButtonPressed + TopIndex if not KitTable: if ClassID == 1: # TODO: this seems to be never reached This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-08-28 12:46:28
|
Revision: 7066 http://gemrb.svn.sourceforge.net/gemrb/?rev=7066&view=rev Author: lynxlupodian Date: 2009-08-28 12:46:19 +0000 (Fri, 28 Aug 2009) Log Message: ----------- bg2::cg: nugrud fixed his own kit scrolling code :) Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-08-28 11:47:05 UTC (rev 7065) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-08-28 12:46:19 UTC (rev 7066) @@ -78,7 +78,7 @@ KitWindow.CreateScrollBar(1000, 290, 47, 16, 200) ScrollBar = KitWindow.GetControl (1000) ScrollBar.SetSprites("GUISCRCW", 0, 0,1,2,3,5,4) - ScrollBar.SetVarAssoc("TopIndex",RowCount-10) + ScrollBar.SetVarAssoc("TopIndex",RowCount-9) ScrollBar.SetEvent(IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawKits") ScrollBar.SetDefaultScrollBar() RowCount=10 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-08-28 13:59:46
|
Revision: 7068 http://gemrb.svn.sourceforge.net/gemrb/?rev=7068&view=rev Author: lynxlupodian Date: 2009-08-28 13:59:36 +0000 (Fri, 28 Aug 2009) Log Message: ----------- bg2::cg: applied modified patch by nugrud which optionally enables the 11th kit window button and the scrollbar Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-08-28 13:39:38 UTC (rev 7067) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-08-28 13:59:36 UTC (rev 7068) @@ -31,13 +31,14 @@ RowCount = 10 KitTable = 0 Init = 0 -KitSelected = 0 #store clicked kit on redraw as number withing RowCount +KitSelected = 0 #store clicked kit on redraw as number within RowCount +EnhanceGUI = GemRB.GetVar("GUIEnhancements") #extra kit button and scroll bar toggle def OnLoad(): global KitWindow, TextAreaControl, DoneButton global SchoolList, ClassID global RowCount, TopIndex, KitTable, Init - + GemRB.LoadWindowPack("GUICG", 640, 480) RaceName = RaceTable.GetRowName(GemRB.GetVar("Race")-1 ) Class = GemRB.GetVar("Class")-1 @@ -74,14 +75,24 @@ TopIndex = 0 GemRB.SetVar("TopIndex", 0) - if RowCount>10: - KitWindow.CreateScrollBar(1000, 290, 47, 16, 200) - ScrollBar = KitWindow.GetControl (1000) - ScrollBar.SetSprites("GUISCRCW", 0, 0,1,2,3,5,4) - ScrollBar.SetVarAssoc("TopIndex",RowCount-9) - ScrollBar.SetEvent(IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawKits") - ScrollBar.SetDefaultScrollBar() - RowCount=10 + if EnhanceGUI: + tmpRowCount = RowCount + if RowCount>10: #create 11 kit button + KitWindow.CreateButton (15, 18, 250, 271, 20) + extrakit = KitWindow.GetControl(15) + extrakit.SetState(IE_GUI_BUTTON_DISABLED) + extrakit.SetFlags(IE_GUI_BUTTON_RADIOBUTTON, OP_OR) + extrakit.SetSprites("GUICGBC",0, 0,1,2,3) + RowCount = 11 + if tmpRowCount>11: #create scroll bar + KitWindow.CreateScrollBar(1000, 290, 50, 16, 220) + ScrollBar = KitWindow.GetControl (1000) + ScrollBar.SetSprites("GUISCRCW", 0, 0,1,2,3,5,4) + ScrollBar.SetVarAssoc("TopIndex",tmpRowCount-10) + ScrollBar.SetEvent(IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawKits") + ScrollBar.SetDefaultScrollBar() + elif not EnhanceGUI and RowCount>10: + RowCount = 10 for i in range(RowCount): if i<4: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |