Menu
▾
▴
[Gemrb-commits] gemrb/gemrb/GUIScripts CharGen4.py,1.4,1.5 GUICG10.py,1.2,1.3 GUICG2.py,1.8,1.9 GUICG23.py,1.1,1.2 GUICG24.py,1.2,1.3 GUICG3.py,1.5,1.6 GUICG4.py,1.1,1.2 GUICG8.py,1.2,1.3 GUIMOVIE.py,1.4,1.5 ImportFile.py,1.1,1.2 ImportGame.py,1.1,1.2 Start.py,1.14,1.15
|
From: <ave...@us...> - 2003-11-02 18:49:27
|
Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts
In directory sc8-pr-cvs1:/tmp/cvs-serv30116
Modified Files:
CharGen4.py GUICG10.py GUICG2.py GUICG23.py GUICG24.py
GUICG3.py GUICG4.py GUICG8.py GUIMOVIE.py ImportFile.py
ImportGame.py Start.py
Log Message:
Removed a lot of unnecessary lines (less controls loaded)
Index: CharGen4.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/CharGen4.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CharGen4.py 2 Nov 2003 14:02:24 -0000 1.4
--- CharGen4.py 2 Nov 2003 18:49:23 -0000 1.5
***************
*** 84,94 ****
GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,12136, -1)
GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
- print("7")
GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(ClassTable,GemRB.GetVar("Class")-1,2))
- print("8")
GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
GemRB.SetEvent(CharGenWindow, AlignmentButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
GemRB.SetVisible(CharGenWindow,1)
return
--- 84,93 ----
GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,12136, -1)
GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,": ")
GemRB.TextAreaAppend(CharGenWindow, TextAreaControl,GemRB.GetTableValue(ClassTable,GemRB.GetVar("Class")-1,2))
GemRB.SetEvent(CharGenWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
GemRB.SetEvent(CharGenWindow, BackButton, IE_GUI_BUTTON_ON_PRESS, "BackPress")
GemRB.SetEvent(CharGenWindow, AlignmentButton, IE_GUI_BUTTON_ON_PRESS, "NextPress")
GemRB.SetVisible(CharGenWindow,1)
+ print("9")
return
Index: GUICG10.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/GUICG10.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GUICG10.py 1 Nov 2003 19:44:15 -0000 1.2
--- GUICG10.py 2 Nov 2003 18:49:23 -0000 1.3
***************
*** 2,6 ****
import GemRB
- CharGenWindow = 0
ClassWindow = 0
TextAreaControl = 0
--- 2,5 ----
***************
*** 9,13 ****
def OnLoad():
! global CharGenWindow, ClassWindow, TextAreaControl, DoneButton
global ClassTable
--- 8,12 ----
def OnLoad():
! global ClassWindow, TextAreaControl, DoneButton
global ClassTable
***************
*** 15,24 ****
ClassTable = GemRB.LoadTable("classes")
ClassCount = GemRB.GetTableRowCount(ClassTable)-1
- CharGenWindow = GemRB.LoadWindow(0)
ClassWindow = GemRB.LoadWindow(10)
! for i in range(0,7):
! Button = GemRB.GetControl(CharGenWindow,i)
! GemRB.SetButtonState(CharGenWindow,Button,IE_GUI_BUTTON_DISABLED)
j=0
--- 14,29 ----
ClassTable = GemRB.LoadTable("classes")
ClassCount = GemRB.GetTableRowCount(ClassTable)-1
ClassWindow = GemRB.LoadWindow(10)
! j=0
! for i in range(1,ClassCount):
! if GemRB.GetTableValue(ClassTable,i-1,3)==0:
! continue
! if j>11:
! Button = GemRB.GetControl(ClassWindow,j+7)
! else:
! Button = GemRB.GetControl(ClassWindow,j+2)
! GemRB.SetButtonState(ClassWindow, Button, IE_GUI_BUTTON_DISABLED)
! GemRB.SetButtonFlags(ClassWindow, Button, IE_GUI_BUTTON_RADIOBUTTON,OP_OR)
j=0
***************
*** 33,59 ****
t = GemRB.GetTableValue(ClassTable, i-1, 0)
GemRB.SetText(ClassWindow, Button, t )
GemRB.SetEvent(ClassWindow, Button, IE_GUI_BUTTON_ON_PRESS, "ClassPress")
GemRB.SetVarAssoc(ClassWindow, Button , "Class", i) #multiclass, actually
j=j+1
- PortraitButton = GemRB.GetControl(CharGenWindow, 12)
- GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
-
- AcceptButton = GemRB.GetControl(CharGenWindow, 8)
- GemRB.SetText(CharGenWindow, AcceptButton, 11962)
- GemRB.SetButtonState(CharGenWindow,AcceptButton,IE_GUI_BUTTON_DISABLED)
-
- ImportButton = GemRB.GetControl(CharGenWindow, 13)
- GemRB.SetText(CharGenWindow, ImportButton, 13955)
- GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
-
- CancelButton = GemRB.GetControl(CharGenWindow, 15)
- GemRB.SetText(CharGenWindow, CancelButton, 8159)
- GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
-
- BiographyButton = GemRB.GetControl(CharGenWindow, 16)
- GemRB.SetText(CharGenWindow, BiographyButton, 18003)
- GemRB.SetButtonState(CharGenWindow,BiographyButton,IE_GUI_BUTTON_DISABLED)
-
BackButton = GemRB.GetControl(ClassWindow,14)
GemRB.SetText(ClassWindow,BackButton,15416)
--- 38,46 ----
t = GemRB.GetTableValue(ClassTable, i-1, 0)
GemRB.SetText(ClassWindow, Button, t )
+ GemRB.SetButtonState(ClassWindow, Button, IE_GUI_BUTTON_ENABLED)
GemRB.SetEvent(ClassWindow, Button, IE_GUI_BUTTON_ON_PRESS, "ClassPress")
GemRB.SetVarAssoc(ClassWindow, Button , "Class", i) #multiclass, actually
j=j+1
BackButton = GemRB.GetControl(ClassWindow,14)
GemRB.SetText(ClassWindow,BackButton,15416)
***************
*** 66,72 ****
GemRB.SetEvent(ClassWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress")
GemRB.SetEvent(ClassWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress")
- GemRB.SetEvent(CharGenWindow,CancelButton,IE_GUI_BUTTON_ON_PRESS,"CancelPress")
GemRB.SetButtonState(ClassWindow,DoneButton,IE_GUI_BUTTON_DISABLED)
- GemRB.SetVisible(CharGenWindow,1)
GemRB.SetVisible(ClassWindow,1)
return
--- 53,57 ----
***************
*** 79,83 ****
def BackPress():
- GemRB.UnloadWindow(CharGenWindow)
GemRB.UnloadWindow(ClassWindow)
GemRB.SetNextScript("GUICG2")
--- 64,67 ----
***************
*** 85,96 ****
def NextPress():
- GemRB.UnloadWindow(CharGenWindow)
GemRB.UnloadWindow(ClassWindow)
GemRB.SetNextScript("CharGen4") #alignment
return
-
- def CancelPress():
- GemRB.UnloadWindow(CharGenWindow)
- GemRB.UnloadWindow(ClassWindow)
- GemRB.SetNextScript("CharGen")
- return
--- 69,73 ----
Index: GUICG2.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/GUICG2.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** GUICG2.py 2 Nov 2003 11:54:24 -0000 1.8
--- GUICG2.py 2 Nov 2003 18:49:23 -0000 1.9
***************
*** 2,6 ****
import GemRB
- CharGenWindow = 0
ClassWindow = 0
TextAreaControl = 0
--- 2,5 ----
***************
*** 9,13 ****
def OnLoad():
! global CharGenWindow, ClassWindow, TextAreaControl, DoneButton
global ClassTable
--- 8,12 ----
def OnLoad():
! global ClassWindow, TextAreaControl, DoneButton
global ClassTable
***************
*** 15,27 ****
ClassTable = GemRB.LoadTable("classes")
ClassCount = GemRB.GetTableRowCount(ClassTable)-1
- CharGenWindow = GemRB.LoadWindow(0)
ClassWindow = GemRB.LoadWindow(2)
-
RaceColumn = GemRB.GetVar("Race")+3
- for i in range(0,7):
- Button = GemRB.GetControl(CharGenWindow,i)
- GemRB.SetButtonState(CharGenWindow,Button,IE_GUI_BUTTON_DISABLED)
-
j = 0
#radiobutton groups must be set up before doing anything else to them
--- 14,20 ----
***************
*** 58,80 ****
GemRB.SetVarAssoc(ClassWindow, Button , "Class", i)
- PortraitButton = GemRB.GetControl(CharGenWindow, 12)
- GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
-
- AcceptButton = GemRB.GetControl(CharGenWindow, 8)
- GemRB.SetText(CharGenWindow, AcceptButton, 11962)
- GemRB.SetButtonState(CharGenWindow,AcceptButton,IE_GUI_BUTTON_DISABLED)
-
- ImportButton = GemRB.GetControl(CharGenWindow, 13)
- GemRB.SetText(CharGenWindow, ImportButton, 13955)
- GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
-
- CancelButton = GemRB.GetControl(CharGenWindow, 15)
- GemRB.SetText(CharGenWindow, CancelButton, 8159)
- GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
-
- BiographyButton = GemRB.GetControl(CharGenWindow, 16)
- GemRB.SetText(CharGenWindow, BiographyButton, 18003)
- GemRB.SetButtonState(CharGenWindow,BiographyButton,IE_GUI_BUTTON_DISABLED)
-
MultiClassButton = GemRB.GetControl(ClassWindow, 10)
GemRB.SetText(ClassWindow,MultiClassButton, 11993)
--- 51,54 ----
***************
*** 90,101 ****
GemRB.SetEvent(ClassWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress")
GemRB.SetEvent(ClassWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress")
- GemRB.SetEvent(CharGenWindow,CancelButton,IE_GUI_BUTTON_ON_PRESS,"CancelPress")
GemRB.SetButtonState(ClassWindow,DoneButton,IE_GUI_BUTTON_DISABLED)
- GemRB.SetVisible(CharGenWindow,1)
GemRB.SetVisible(ClassWindow,1)
return
def MultiClassPress():
- GemRB.UnloadWindow(CharGenWindow)
GemRB.UnloadWindow(ClassWindow)
GemRB.SetNextScript("GUICG10")
--- 64,72 ----
***************
*** 109,113 ****
def BackPress():
- GemRB.UnloadWindow(CharGenWindow)
GemRB.UnloadWindow(ClassWindow)
GemRB.SetNextScript("CharGen3")
--- 80,83 ----
***************
*** 116,127 ****
def NextPress():
- GemRB.UnloadWindow(CharGenWindow)
GemRB.UnloadWindow(ClassWindow)
GemRB.SetNextScript("CharGen4") #alignment
return
-
- def CancelPress():
- GemRB.UnloadWindow(CharGenWindow)
- GemRB.UnloadWindow(ClassWindow)
- GemRB.SetNextScript("CharGen")
- return
--- 86,90 ----
Index: GUICG23.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/GUICG23.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GUICG23.py 29 Oct 2003 18:26:57 -0000 1.1
--- GUICG23.py 2 Nov 2003 18:49:23 -0000 1.2
***************
*** 25,29 ****
GemRB.SetEvent(ImportWindow, SavedGameButton, IE_GUI_BUTTON_ON_PRESS, "GamePress")
GemRB.SetEvent(ImportWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
! GemRB.ShowModal(ImportWindow)
return
--- 25,29 ----
GemRB.SetEvent(ImportWindow, SavedGameButton, IE_GUI_BUTTON_ON_PRESS, "GamePress")
GemRB.SetEvent(ImportWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
! GemRB.SetVisible(ImportWindow,1)
return
Index: GUICG24.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/GUICG24.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GUICG24.py 29 Oct 2003 18:26:57 -0000 1.2
--- GUICG24.py 2 Nov 2003 18:49:23 -0000 1.3
***************
*** 25,29 ****
GemRB.SetEvent(ImportWindow, SavedGameButton, IE_GUI_BUTTON_ON_PRESS, "GamePress")
GemRB.SetEvent(ImportWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
! GemRB.ShowModal(ImportWindow)
return
--- 25,29 ----
GemRB.SetEvent(ImportWindow, SavedGameButton, IE_GUI_BUTTON_ON_PRESS, "GamePress")
GemRB.SetEvent(ImportWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
! GemRB.SetVisible(ImportWindow,1)
return
Index: GUICG3.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/GUICG3.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GUICG3.py 2 Nov 2003 14:02:24 -0000 1.5
--- GUICG3.py 2 Nov 2003 18:49:23 -0000 1.6
***************
*** 2,22 ****
import GemRB
- CharGenWindow = 0
AlignmentWindow = 0
TextAreaControl = 0
DoneButton = 0
def OnLoad():
! global CharGenWindow, AlignmentWindow, TextAreaControl, DoneButton
GemRB.LoadWindowPack("GUICG")
AlignmentTable = GemRB.LoadTable("aligns")
- CharGenWindow = GemRB.LoadWindow(0)
AlignmentWindow = GemRB.LoadWindow(3)
! for i in range(0,7):
! Button = GemRB.GetControl(CharGenWindow,i)
! GemRB.SetButtonState(CharGenWindow,Button,IE_GUI_BUTTON_DISABLED)
!
for i in range(0,9):
Button = GemRB.GetControl(AlignmentWindow, i+2)
--- 2,21 ----
import GemRB
AlignmentWindow = 0
TextAreaControl = 0
DoneButton = 0
+ AlignmentTable = 0
def OnLoad():
! global AlignmentWindow, TextAreaControl, DoneButton
! global AlignmentTable
GemRB.LoadWindowPack("GUICG")
AlignmentTable = GemRB.LoadTable("aligns")
AlignmentWindow = GemRB.LoadWindow(3)
! for i in range(0,9):
! Button = GemRB.GetControl(AlignmentWindow, i+2)
! GemRB.SetButtonFlags(AlignmentWindow, Button, IE_GUI_BUTTON_RADIOBUTTON,OP_OR)
for i in range(0,9):
Button = GemRB.GetControl(AlignmentWindow, i+2)
***************
*** 25,47 ****
GemRB.SetVarAssoc(AlignmentWindow, Button, "Alignment", GemRB.GetTableValue(AlignmentTable,i,3) )
- PortraitButton = GemRB.GetControl(CharGenWindow, 12)
- GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
-
- AcceptButton = GemRB.GetControl(CharGenWindow, 8)
- GemRB.SetText(CharGenWindow, AcceptButton, 11962)
- GemRB.SetButtonState(CharGenWindow,AcceptButton,IE_GUI_BUTTON_DISABLED)
-
- ImportButton = GemRB.GetControl(CharGenWindow, 13)
- GemRB.SetText(CharGenWindow, ImportButton, 13955)
- GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
-
- CancelButton = GemRB.GetControl(CharGenWindow, 15)
- GemRB.SetText(CharGenWindow, CancelButton, 8159)
- GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
-
- BiographyButton = GemRB.GetControl(CharGenWindow, 16)
- GemRB.SetText(CharGenWindow, BiographyButton, 18003)
- GemRB.SetButtonState(CharGenWindow,BiographyButton,IE_GUI_BUTTON_DISABLED)
-
BackButton = GemRB.GetControl(AlignmentWindow,13)
GemRB.SetText(AlignmentWindow,BackButton,15416)
--- 24,27 ----
***************
*** 54,60 ****
GemRB.SetEvent(AlignmentWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress")
GemRB.SetEvent(AlignmentWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress")
- GemRB.SetEvent(CharGenWindow,CancelButton,IE_GUI_BUTTON_ON_PRESS,"CancelPress")
GemRB.SetButtonState(AlignmentWindow,DoneButton,IE_GUI_BUTTON_DISABLED)
- GemRB.SetVisible(CharGenWindow,1)
GemRB.SetVisible(AlignmentWindow,1)
return
--- 34,38 ----
***************
*** 67,71 ****
def BackPress():
- GemRB.UnloadWindow(CharGenWindow)
GemRB.UnloadWindow(AlignmentWindow)
GemRB.SetNextScript("CharGen4")
--- 45,48 ----
***************
*** 74,85 ****
def NextPress():
- GemRB.UnloadWindow(CharGenWindow)
GemRB.UnloadWindow(AlignmentWindow)
GemRB.SetNextScript("GUICG12") #appearance
return
-
- def CancelPress():
- GemRB.UnloadWindow(CharGenWindow)
- GemRB.UnloadWindow(AlignmentWindow)
- GemRB.SetNextScript("CharGen")
- return
--- 51,55 ----
Index: GUICG4.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/GUICG4.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GUICG4.py 2 Nov 2003 14:02:24 -0000 1.1
--- GUICG4.py 2 Nov 2003 18:49:23 -0000 1.2
***************
*** 2,47 ****
import GemRB
- CharGenWindow = 0
AbilityWindow = 0
TextAreaControl = 0
DoneButton = 0
def OnLoad():
! global CharGenWindow, AbilityWindow, TextAreaControl, DoneButton
GemRB.LoadWindowPack("GUICG")
AbilityTable = GemRB.LoadTable("weapprof")
- CharGenWindow = GemRB.LoadWindow(0)
AbilityWindow = GemRB.LoadWindow(4)
! for i in range(0,7):
! Button = GemRB.GetControl(CharGenWindow,i)
! GemRB.SetButtonState(CharGenWindow,Button,IE_GUI_BUTTON_DISABLED)
!
! for i in range(0,9):
! print i+2
! Button = GemRB.GetControl(AbilityWindow, i+2)
GemRB.SetText(AbilityWindow, Button, GemRB.GetTableValue(AbilityTable,i,0) )
! GemRB.SetEvent(AbilityWindow, Button, IE_GUI_BUTTON_ON_PRESS, "AbilityPress")
! GemRB.SetVarAssoc(AbilityWindow, Button, "Ability", GemRB.GetTableValue(AlignmentTable,i,3) )
!
! PortraitButton = GemRB.GetControl(CharGenWindow, 12)
! GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
!
! AcceptButton = GemRB.GetControl(CharGenWindow, 8)
! GemRB.SetText(CharGenWindow, AcceptButton, 11962)
! GemRB.SetButtonState(CharGenWindow,AcceptButton,IE_GUI_BUTTON_DISABLED)
!
! ImportButton = GemRB.GetControl(CharGenWindow, 13)
! GemRB.SetText(CharGenWindow, ImportButton, 13955)
! GemRB.SetButtonState(CharGenWindow,ImportButton,IE_GUI_BUTTON_DISABLED)
!
! CancelButton = GemRB.GetControl(CharGenWindow, 15)
! GemRB.SetText(CharGenWindow, CancelButton, 8159)
! GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_ENABLED)
! BiographyButton = GemRB.GetControl(CharGenWindow, 16)
! GemRB.SetText(CharGenWindow, BiographyButton, 18003)
! GemRB.SetButtonState(CharGenWindow,BiographyButton,IE_GUI_BUTTON_DISABLED)
BackButton = GemRB.GetControl(AbilityWindow,13)
--- 2,29 ----
import GemRB
AbilityWindow = 0
TextAreaControl = 0
DoneButton = 0
+ AbilityTable = 0
def OnLoad():
! global AbilityWindow, TextAreaControl, DoneButton
! global AbilityTable
GemRB.LoadWindowPack("GUICG")
AbilityTable = GemRB.LoadTable("weapprof")
AbilityWindow = GemRB.LoadWindow(4)
! for i in range(0,6):
! print i
! Button = GemRB.GetControl(AbilityWindow, i*2+20)
GemRB.SetText(AbilityWindow, Button, GemRB.GetTableValue(AbilityTable,i,0) )
! GemRB.SetEvent(AbilityWindow, Button, IE_GUI_BUTTON_ON_PRESS, "LeftPress")
! GemRB.SetVarAssoc(AbilityWindow, Button, "AbilityIncrease", i )
! Button = GemRB.GetControl(AbilityWindow, i*2+20)
! GemRB.SetText(AbilityWindow, Button, GemRB.GetTableValue(AbilityTable,i,0) )
! GemRB.SetEvent(AbilityWindow, Button, IE_GUI_BUTTON_ON_PRESS, "RightPress")
! GemRB.SetVarAssoc(AbilityWindow, Button, "AbilityDecrease", i )
BackButton = GemRB.GetControl(AbilityWindow,13)
***************
*** 55,72 ****
GemRB.SetEvent(AbilityWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress")
GemRB.SetEvent(AbilityWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress")
- GemRB.SetEvent(CharGenWindow,CancelButton,IE_GUI_BUTTON_ON_PRESS,"CancelPress")
GemRB.SetButtonState(AbilityWindow,DoneButton,IE_GUI_BUTTON_DISABLED)
- GemRB.SetVisible(CharGenWindow,1)
GemRB.SetVisible(AbilityWindow,1)
return
! def AbilityPress():
! Ability = GemRB.GetVar("Ability")-1
! GemRB.SetText(AbilityWindow, TextAreaControl, GemRB.GetTableValue(AbilityTable,Alignment,1) )
! GemRB.SetButtonState(ClassWindow, DoneButton, IE_GUI_BUTTON_ENABLED)
return
def BackPress():
- GemRB.UnloadWindow(CharGenWindow)
GemRB.UnloadWindow(AbilityWindow)
GemRB.SetNextScript("CharGen4")
--- 37,51 ----
GemRB.SetEvent(AbilityWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress")
GemRB.SetEvent(AbilityWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress")
GemRB.SetButtonState(AbilityWindow,DoneButton,IE_GUI_BUTTON_DISABLED)
GemRB.SetVisible(AbilityWindow,1)
return
! def LeftPress():
! return
!
! def RightPress():
return
def BackPress():
GemRB.UnloadWindow(AbilityWindow)
GemRB.SetNextScript("CharGen4")
***************
*** 75,86 ****
def NextPress():
- GemRB.UnloadWindow(CharGenWindow)
GemRB.UnloadWindow(AbilityWindow)
GemRB.SetNextScript("GUICG12") #appearance
return
-
- def CancelPress():
- GemRB.UnloadWindow(CharGenWindow)
- GemRB.UnloadWindow(AbilityWindow)
- GemRB.SetNextScript("CharGen")
- return
--- 54,58 ----
Index: GUICG8.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/GUICG8.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GUICG8.py 1 Nov 2003 13:45:28 -0000 1.2
--- GUICG8.py 2 Nov 2003 18:49:23 -0000 1.3
***************
*** 2,6 ****
import GemRB
- CharGenWindow = 0
RaceWindow = 0
TextAreaControl = 0
--- 2,5 ----
***************
*** 9,23 ****
def OnLoad():
! global CharGenWindow, RaceWindow, TextAreaControl, DoneButton
global RaceTable
GemRB.LoadWindowPack("GUICG")
- CharGenWindow = GemRB.LoadWindow(0)
RaceWindow = GemRB.LoadWindow(8)
- for i in range(0,7):
- Button = GemRB.GetControl(CharGenWindow,i)
- GemRB.SetButtonState(CharGenWindow,Button,IE_GUI_BUTTON_DISABLED)
-
RaceTable = GemRB.LoadTable("races")
RaceCount = GemRB.GetTableRowCount(RaceTable)
--- 8,17 ----
def OnLoad():
! global RaceWindow, TextAreaControl, DoneButton
global RaceTable
GemRB.LoadWindowPack("GUICG")
RaceWindow = GemRB.LoadWindow(8)
RaceTable = GemRB.LoadTable("races")
RaceCount = GemRB.GetTableRowCount(RaceTable)
***************
*** 25,58 ****
for i in range(2,RaceCount+1):
Button = GemRB.GetControl(RaceWindow,i)
GemRB.SetText(RaceWindow,Button, GemRB.GetTableValue(RaceTable,i-2,0) )
GemRB.SetButtonState(RaceWindow,Button,IE_GUI_BUTTON_ENABLED)
GemRB.SetEvent(RaceWindow,Button,IE_GUI_BUTTON_ON_PRESS,"RacePress")
- for i in range(2, RaceCount+1):
- Button = GemRB.GetControl(RaceWindow,i)
GemRB.SetVarAssoc(RaceWindow,Button,"Race",i-1)
- PortraitButton = GemRB.GetControl(CharGenWindow,12)
- GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_DISABLED|IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET)
-
- DoneButton = GemRB.GetControl(CharGenWindow, 8)
- GemRB.SetText(CharGenWindow, DoneButton, 11962)
- GemRB.SetButtonState(CharGenWindow,DoneButton,IE_GUI_BUTTON_DISABLED)
-
- BackButton = GemRB.GetControl(CharGenWindow,11)
- GemRB.SetText(CharGenWindow, BackButton, 15416)
- GemRB.SetButtonState(CharGenWindow, BackButton, IE_GUI_BUTTON_DISABLED)
-
- ImportButton = GemRB.GetControl(CharGenWindow,13)
- GemRB.SetText(CharGenWindow, ImportButton, 13955)
- GemRB.SetButtonState(CharGenWindow, ImportButton, IE_GUI_BUTTON_DISABLED)
-
- CancelButton = GemRB.GetControl(CharGenWindow, 15)
- GemRB.SetText(CharGenWindow, CancelButton, 8159)
- GemRB.SetButtonState(CharGenWindow,CancelButton,IE_GUI_BUTTON_DISABLED)
-
- BiographyButton = GemRB.GetControl(CharGenWindow, 16)
- GemRB.SetText(CharGenWindow, BiographyButton, 18003)
- GemRB.SetButtonState(CharGenWindow,BiographyButton,IE_GUI_BUTTON_DISABLED)
-
BackButton = GemRB.GetControl(RaceWindow,i+2) #i=8 now (when race count is 7)
GemRB.SetText(RaceWindow,BackButton,15416)
--- 19,30 ----
for i in range(2,RaceCount+1):
Button = GemRB.GetControl(RaceWindow,i)
+ GemRB.SetButtonFlags(RaceWindow,Button,IE_GUI_BUTTON_RADIOBUTTON,OP_OR)
+ for i in range(2, RaceCount+1):
+ Button = GemRB.GetControl(RaceWindow,i)
GemRB.SetText(RaceWindow,Button, GemRB.GetTableValue(RaceTable,i-2,0) )
GemRB.SetButtonState(RaceWindow,Button,IE_GUI_BUTTON_ENABLED)
GemRB.SetEvent(RaceWindow,Button,IE_GUI_BUTTON_ON_PRESS,"RacePress")
GemRB.SetVarAssoc(RaceWindow,Button,"Race",i-1)
BackButton = GemRB.GetControl(RaceWindow,i+2) #i=8 now (when race count is 7)
GemRB.SetText(RaceWindow,BackButton,15416)
***************
*** 65,72 ****
GemRB.SetEvent(RaceWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress")
- # GemRB.SetEvent(CharGenWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress")
GemRB.SetEvent(RaceWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress")
- GemRB.SetEvent(CharGenWindow,CancelButton,IE_GUI_BUTTON_ON_PRESS,"CancelPress")
- GemRB.SetVisible(CharGenWindow,1)
GemRB.SetVisible(RaceWindow,1)
return
--- 37,41 ----
***************
*** 76,84 ****
GemRB.SetText(RaceWindow,TextAreaControl, GemRB.GetTableValue(RaceTable,Race,1) )
GemRB.SetButtonState(RaceWindow,DoneButton,IE_GUI_BUTTON_ENABLED)
- # GemRB.SetButtonState(CharGenWindow,DoneButton,IE_GUI_BUTTON_ENABLED)
return
def BackPress():
- GemRB.UnloadWindow(CharGenWindow)
GemRB.UnloadWindow(RaceWindow)
GemRB.SetNextScript("GUICG12")
--- 45,51 ----
***************
*** 87,98 ****
def NextPress():
- GemRB.UnloadWindow(CharGenWindow)
GemRB.UnloadWindow(RaceWindow)
GemRB.SetNextScript("CharGen3") #class
return
-
- def CancelPress():
- GemRB.UnloadWindow(CharGenWindow)
- GemRB.UnloadWindow(RaceWindow)
- GemRB.SetNextScript("CharGen")
- return
--- 54,58 ----
Index: GUIMOVIE.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/GUIMOVIE.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GUIMOVIE.py 1 Nov 2003 19:59:51 -0000 1.4
--- GUIMOVIE.py 2 Nov 2003 18:49:23 -0000 1.5
***************
*** 31,35 ****
GemRB.SetEvent(MovieWindow, CreditsButton, IE_GUI_BUTTON_ON_PRESS, "CreditsPress")
GemRB.SetEvent(MovieWindow, DoneButton, IE_GUI_BUTTON_ON_PRESS, "DonePress")
! GemRB.ShowModal(MovieWindow)
return
--- 31,35 ----
GemRB.SetEvent(MovieWindow, CreditsButton, IE_GUI_BUTTON_ON_PRESS, "CreditsPress")
GemRB.SetEvent(MovieWindow, DoneButton, IE_GUI_BUTTON_ON_PRESS, "DonePress")
! GemRB.SetVisible(MovieWindow,1)
return
Index: ImportFile.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/ImportFile.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ImportFile.py 29 Oct 2003 18:26:57 -0000 1.1
--- ImportFile.py 2 Nov 2003 18:49:23 -0000 1.2
***************
*** 26,30 ****
GemRB.SetEvent(ImportWindow, DoneButton, IE_GUI_BUTTON_ON_PRESS, "DonePress")
GemRB.SetEvent(ImportWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
! GemRB.ShowModal(ImportWindow)
return
--- 26,30 ----
GemRB.SetEvent(ImportWindow, DoneButton, IE_GUI_BUTTON_ON_PRESS, "DonePress")
GemRB.SetEvent(ImportWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
! GemRB.SetVisible(ImportWindow,1)
return
Index: ImportGame.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/ImportGame.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ImportGame.py 29 Oct 2003 18:26:57 -0000 1.1
--- ImportGame.py 2 Nov 2003 18:49:23 -0000 1.2
***************
*** 26,30 ****
GemRB.SetEvent(ImportWindow, DoneButton, IE_GUI_BUTTON_ON_PRESS, "Done1Press")
GemRB.SetEvent(ImportWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
! GemRB.ShowModal(ImportWindow)
return
--- 26,30 ----
GemRB.SetEvent(ImportWindow, DoneButton, IE_GUI_BUTTON_ON_PRESS, "Done1Press")
GemRB.SetEvent(ImportWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress")
! GemRB.SetVisible(ImportWindow,1)
return
Index: Start.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/Start.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Start.py 28 Oct 2003 18:51:19 -0000 1.14
--- Start.py 2 Nov 2003 18:49:23 -0000 1.15
***************
*** 124,128 ****
def Tutorial():
GemRB.SetVisible(StartWindow,0)
! GemRB.ShowModal(TutorialWindow)
return
--- 124,129 ----
def Tutorial():
GemRB.SetVisible(StartWindow,0)
! GemRB.SetVisible(TutorialWindow,1)
! # GemRB.ShowModal(TutorialWindow)
return
***************
*** 143,147 ****
def ExitPress():
GemRB.SetVisible(StartWindow,0)
! GemRB.ShowModal(QuitWindow)
return
--- 144,149 ----
def ExitPress():
GemRB.SetVisible(StartWindow,0)
! GemRB.SetVisible(QuitWindow,1)
! # GemRB.ShowModal(QuitWindow)
return
***************
*** 185,188 ****
--- 187,191 ----
GemRB.SetEvent(StartWindow, MultiPlayerButton, IE_GUI_BUTTON_ON_PRESS, "MultiPlayerPress")
GemRB.SetEvent(StartWindow, MoviesButton, IE_GUI_BUTTON_ON_PRESS, "MoviesPress")
+ GemRB.SetVisible(QuitWindow, 0)
GemRB.SetVisible(StartWindow, 1)
return
|