[Gemrb-commits] gemrb/gemrb/GUIScripts/iwd CharGen.py,1.35,1.36 GUIMOVIE.py,1.3,1.4 GUIOPT.py,1.2,1.3 GUISTORE.py,1.9,1.10 MessageWindow.py,1.13,1.14

[Laszlo T. <ave...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/iwd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7513/iwd

Modified Files:
	CharGen.py GUIMOVIE.py GUIOPT.py GUISTORE.py MessageWindow.py 
Log Message:
Updated TextAreaFlags in all scripts


Index: MessageWindow.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/iwd/MessageWindow.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MessageWindow.py	6 Mar 2005 10:46:36 -0000	1.13
--- MessageWindow.py	20 Mar 2005 21:28:26 -0000	1.14
***************
*** 57,61 ****
  	PortraitWindow = GUICommonWindows.PortraitWindow
  	MessageTA = GemRB.GetControl(MessageWindow, 3)
! 	GemRB.SetTAAutoScroll(MessageWindow, MessageTA, 1)
  	#GemRB.SetVar("PortraitWindow", PortraitWindow)
  	GemRB.SetVar("ActionsWindow", ActionsWindow)
--- 57,61 ----
  	PortraitWindow = GUICommonWindows.PortraitWindow
  	MessageTA = GemRB.GetControl(MessageWindow, 3)
! 	GemRB.SetTextAreaFlags(MessageWindow, MessageTA, IE_GUI_TEXTAREA_AUTOSCROLL)
  	#GemRB.SetVar("PortraitWindow", PortraitWindow)
  	GemRB.SetVar("ActionsWindow", ActionsWindow)
***************
*** 100,104 ****
  		GemRB.SetVar("MessageWindow", TMessageWindow)
  		GemRB.SetVar("MessageTextArea", TMessageTA)
! 		GemRB.SetTAAutoScroll(TMessageWindow, TMessageTA, 1)
  	else :
  		if Expand == 1:
--- 100,104 ----
  		GemRB.SetVar("MessageWindow", TMessageWindow)
  		GemRB.SetVar("MessageTextArea", TMessageTA)
! 		GemRB.SetTextAreaFlags(TMessageWindow, TMessageTA, IE_GUI_TEXTAREA_AUTOSCROLL)
  	else :
  		if Expand == 1:
***************
*** 108,112 ****
  			GemRB.SetVar("MessageWindow", TMessageWindow)
  			GemRB.SetVar("MessageTextArea", TMessageTA)
! 			GemRB.SetTAAutoScroll(TMessageWindow, TMessageTA, 1)
  	
  	if Expand!=2:
--- 108,112 ----
  			GemRB.SetVar("MessageWindow", TMessageWindow)
  			GemRB.SetVar("MessageTextArea", TMessageTA)
! 			GemRB.SetTextAreaFlags(TMessageWindow, TMessageTA, IE_GUI_TEXTAREA_AUTOSCROLL)
  	
  	if Expand!=2:
***************
*** 138,142 ****
  		GemRB.SetVar("MessageWindow", TMessageWindow)
  		GemRB.SetVar("MessageTextArea", TMessageTA)
! 		GemRB.SetTAAutoScroll(TMessageWindow, TMessageTA, 1)
  	else:
  		if Expand == 1:
--- 138,142 ----
  		GemRB.SetVar("MessageWindow", TMessageWindow)
  		GemRB.SetVar("MessageTextArea", TMessageTA)
! 		GemRB.SetTextAreaFlags(TMessageWindow, TMessageTA, IE_GUI_TEXTAREA_AUTOSCROLL)
  	else:
  		if Expand == 1:
***************
*** 146,150 ****
  			GemRB.SetVar("MessageWindow", TMessageWindow)
  			GemRB.SetVar("MessageTextArea", TMessageTA)
! 			GemRB.SetTAAutoScroll(TMessageWindow, TMessageTA, 1)
  	if Expand:
  		GemRB.MoveTAText(MessageWindow, MessageTA, TMessageWindow, TMessageTA)
--- 146,150 ----
  			GemRB.SetVar("MessageWindow", TMessageWindow)
  			GemRB.SetVar("MessageTextArea", TMessageTA)
! 			GemRB.SetTextAreaFlags(TMessageWindow, TMessageTA, IE_GUI_TEXTAREA_AUTOSCROLL)
  	if Expand:
  		GemRB.MoveTAText(MessageWindow, MessageTA, TMessageWindow, TMessageTA)

Index: GUISTORE.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/iwd/GUISTORE.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** GUISTORE.py	20 Mar 2005 16:24:22 -0000	1.9
--- GUISTORE.py	20 Mar 2005 21:28:26 -0000	1.10
***************
*** 807,811 ****
  	
  	TextArea = GemRB.GetControl (Window, 0)	
! 	GemRB.SetTAAutoScroll (Window, TextArea, 1)
  
  	Button = GemRB.GetControl (Window, 10)
--- 807,811 ----
  	
  	TextArea = GemRB.GetControl (Window, 0)	
! 	GemRB.SetTextAreaFlags (Window, TextArea, IE_GUI_TEXTAREA_AUTOSCROLL)
  
  	Button = GemRB.GetControl (Window, 10)
***************
*** 933,937 ****
  
  	TextArea = GemRB.GetControl (Window, 13)
! 	GemRB.SetTAAutoScroll (Window, TextArea, 1)
  	pc = GemRB.GameGetSelectedPCSingle ()
  	intox = GemRB.GetPlayerStat (pc, IE_INTOXICATION)
--- 933,937 ----
  
  	TextArea = GemRB.GetControl (Window, 13)
! 	GemRB.SetTextAreaFlags (Window, TextArea, IE_GUI_TEXTAREA_AUTOSCROLL)
  	pc = GemRB.GameGetSelectedPCSingle ()
  	intox = GemRB.GetPlayerStat (pc, IE_INTOXICATION)

Index: CharGen.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/iwd/CharGen.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** CharGen.py	20 Mar 2005 16:24:21 -0000	1.35
--- CharGen.py	20 Mar 2005 21:28:25 -0000	1.36
***************
*** 2132,2136 ****
  
  	CharSoundVoiceList = GemRB.GetControl (CharSoundWindow, 45)
! 	GemRB.SetTextAreaSelectable (CharSoundWindow, CharSoundVoiceList, 1)
  	
  	VoiceList = []
--- 2132,2136 ----
  
  	CharSoundVoiceList = GemRB.GetControl (CharSoundWindow, 45)
! 	GemRB.SetTextAreaFlags (CharSoundWindow, CharSoundVoiceList, IE_GUI_TEXTAREA_SELECTABLE)
  	
  	VoiceList = []

Index: GUIMOVIE.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/iwd/GUIMOVIE.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GUIMOVIE.py	20 Mar 2005 16:24:22 -0000	1.3
--- GUIMOVIE.py	20 Mar 2005 21:28:26 -0000	1.4
***************
*** 37,41 ****
  	GemRB.SetWindowFrame(MovieWindow)
  	TextAreaControl = GemRB.GetControl(MovieWindow, 0)
! 	GemRB.SetTextAreaSelectable(MovieWindow, TextAreaControl,1)
  	PlayButton = GemRB.GetControl(MovieWindow, 2)
  	CreditsButton = GemRB.GetControl(MovieWindow, 3)
--- 37,41 ----
  	GemRB.SetWindowFrame(MovieWindow)
  	TextAreaControl = GemRB.GetControl(MovieWindow, 0)
! 	GemRB.SetTextAreaFlags(MovieWindow, TextAreaControl,IE_GUI_TEXTAREA_SELECTABLE)
  	PlayButton = GemRB.GetControl(MovieWindow, 2)
  	CreditsButton = GemRB.GetControl(MovieWindow, 3)

Index: GUIOPT.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/iwd/GUIOPT.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GUIOPT.py	7 Nov 2004 18:23:49 -0000	1.2
--- GUIOPT.py	20 Mar 2005 21:28:26 -0000	1.3
***************
*** 148,152 ****
  	GemRB.SetVar ("FloatWindow", VideoOptionsWindow)
  
- 
  	VideoHelpText = OptHelpText ('VideoOptions', Window, 33, 18038)
  
--- 148,151 ----
***************
*** 154,168 ****
  	OptCancel ('VideoOptions', Window, 32)
  
! ## 	OptSlider ('Brightness', Window, 1, 10, 31234)
! ## 	OptSlider ('Contrast', Window, 2, 11, 31429)
  
! ## 	OptCheckbox ('SoftwareBlitting', Window, 6, 15, 30898)
! ## 	OptCheckbox ('SoftwareMirroring', Window, 4, 13, 30896)
! ## 	OptCheckbox ('SoftwareTransparency', Window, 5, 14, 30897)
  
  	GemRB.UnhideGUI ()
  	GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
  	
- 	
  
  def DisplayHelpBrightness ():
--- 153,167 ----
  	OptCancel ('VideoOptions', Window, 32)
  
! 	OptSlider ('Brightness', Window, 3, 35)
! 	OptSlider ('Contrast', Window, 22, 36)
  
! 	OptCheckbox ('Full Screen', Window, 9, 38)
! 	OptCheckbox ('SoftwareMirroring', Window, 40, 44)
! 	OptCheckbox ('SoftwareTransparency', Window, 41, 46)
! 	OptCheckbox ('SoftwareBlitting', Window, 42, 48)
  
  	GemRB.UnhideGUI ()
  	GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
  	
  
  def DisplayHelpBrightness ():
***************
*** 211,223 ****
  	OptCancel ('AudioOptions', Window, 25)
  
!  	OptSlider ('AmbientVolume', Window, 1, 16, 31460)
!  	OptSlider ('SoundFXVolume', Window, 2, 17, 31466)
!  	OptSlider ('VoiceVolume', Window, 3, 18, 31467)
!  	OptSlider ('MusicVolume', Window, 4, 19, 31468)
!  	OptSlider ('MovieVolume', Window, 22, 20, 31469)
  
! 	OptButton ('TalkOptions', Window, 13, 17778)
  
!  	OptCheckbox ('CreativeEAX', Window, 26, 28, 30900)
  
  	GemRB.UnhideGUI ()
--- 210,222 ----
  	OptCancel ('AudioOptions', Window, 25)
  
! 	OptSlider ('AmbientVolume', Window, 1, 16)
! 	OptSlider ('SoundFXVolume', Window, 2, 17)
! 	OptSlider ('VoiceVolume', Window, 3, 18)
! 	OptSlider ('MusicVolume', Window, 4, 19)
! 	OptSlider ('MovieVolume', Window, 22, 20)
  
! 	OptButton ('TalkOptions', Window, 13)
  
! 	OptCheckbox ('CreativeEAX', Window, 26, 28)
  
  	GemRB.UnhideGUI ()
***************
*** 272,282 ****
  	OptCancel ('TalkOptions', Window, 25)
  
! ## 	OptCheckbox ('CharacterHit', Window, 2, 9, 37598)
! ## 	OptCheckbox ('CharacterInjured', Window, 3, 10, 37681)
! ## 	OptCheckbox ('CharacterDead', Window, 4, 11, 37682)
! ## 	OptCheckbox ('CharacterAttacked', Window, 5, 12, 37683)
! ## 	OptCheckbox ('WeaponUnusable', Window, 6, 13, 37684)
! ## 	OptCheckbox ('TargetGone', Window, 7, 14, 37685)
! ## 	OptCheckbox ('EndOfRound', Window, 8, 15, 37686)
  
  	GemRB.UnhideGUI ()
--- 271,281 ----
  	OptCancel ('TalkOptions', Window, 25)
  
! ##	OptCheckbox ('CharacterHit', Window, 2, 9)
! ##	OptCheckbox ('CharacterInjured', Window, 3, 10)
! ##	OptCheckbox ('CharacterDead', Window, 4, 11)
! ##	OptCheckbox ('CharacterAttacked', Window, 5, 12)
! ##	OptCheckbox ('WeaponUnusable', Window, 6, 13)
! ##	OptCheckbox ('TargetGone', Window, 7, 14)
! ##	OptCheckbox ('EndOfRound', Window, 8, 15)
  
  	GemRB.UnhideGUI ()
***************
*** 312,326 ****
  	OptCancel ('GameplayOptions', Window, 20)
  
! ## 	OptSlider ('TooltipDelay', Window, 1, 13, 31481)
! ## 	OptSlider ('MouseScrollingSpeed', Window, 2, 14, 31482)
! ## 	OptSlider ('KeyboardScrollingSpeed', Window, 3, 15, 31480)
! ## 	OptSlider ('Difficulty', Window, 4, 16, 31479)
  
! ## 	OptCheckbox ('DitherAlways', Window, 5, 17, 31217)
! ## 	OptCheckbox ('Gore', Window, 6, 18, 31218)
! ## 	OptCheckbox ('AlwaysRun', Window, 22, 23, 62418)
  
! 	OptButton ('FeedbackOptions', Window, 5, 17163)
! 	OptButton ('AutopauseOptions', Window, 6, 17166)
  
  	GemRB.UnhideGUI ()
--- 311,324 ----
  	OptCancel ('GameplayOptions', Window, 20)
  
! ##	OptSlider ('TooltipDelay', Window, 1, 13)
! ##	OptSlider ('MouseScrollingSpeed', Window, 2, 14)
! ##	OptSlider ('KeyboardScrollingSpeed', Window, 3, 15)
! ##	OptSlider ('Difficulty', Window, 4, 16)
  
! ##	OptCheckbox ('DitherAlways', Window, 5, 17)
! ##	OptCheckbox ('Gore', Window, 6, 18)
  
! 	OptButton ('FeedbackOptions', Window, 5)
! 	OptButton ('AutopauseOptions', Window, 6)
  
  	GemRB.UnhideGUI ()
***************
*** 386,399 ****
  	OptCancel ('FeedbackOptions', Window, 27)
  
! ## 	OptSlider ('MarkerFeedback', Window, 1, 10, 37463)
! ## 	OptSlider ('LocatorFeedback', Window, 2, 11, 37586)
! ## 	OptSlider ('SelectionFeedbackLevel', Window, 20, 21, 54879)
! ## 	OptSlider ('CommandFeedbackLevel', Window, 22, 23, 55012)
  
! ## 	OptCheckbox ('CharacterStates', Window, 6, 15, 37594)
! ## 	OptCheckbox ('MiscellaneousMessages', Window, 17, 19, 37596)
! ## 	OptCheckbox ('ToHitRolls', Window, 3, 12, 37588)
! ## 	OptCheckbox ('CombatInfo', Window, 4, 13, 37590)
! ## 	OptCheckbox ('SpellCasting', Window, 5, 14, 37592)
  
  
--- 384,396 ----
  	OptCancel ('FeedbackOptions', Window, 27)
  
! 	OptSlider ('MarkerFeedback', Window, 8, 30)
! 	OptSlider ('LocatorFeedback', Window, 9, 31)
  
! 	OptCheckbox ('ToHitRolls', Window, 10, 32)
! 	OptCheckbox ('CombatInfo', Window, 11, 33)
! 	OptCheckbox ('Actions', Window, 12, 34)
! 	OptCheckbox ('CharacterStates', Window, 13, 35)
! 	OptCheckbox ('SelectionText', Window, 14, 36)
! 	OptCheckbox ('MiscellaneousMessages', Window, 15, 37)
  
  
***************
*** 457,467 ****
  	OptCancel ('AutopauseOptions', Window, 14)
  
! ## 	OptCheckbox ('CharacterHit', Window, 2, 9, 37598)
! ## 	OptCheckbox ('CharacterInjured', Window, 3, 10, 37681)
! ## 	OptCheckbox ('CharacterDead', Window, 4, 11, 37682)
! ## 	OptCheckbox ('CharacterAttacked', Window, 5, 12, 37683)
! ## 	OptCheckbox ('WeaponUnusable', Window, 6, 13, 37684)
! ## 	OptCheckbox ('TargetGone', Window, 7, 14, 37685)
! ## 	OptCheckbox ('EndOfRound', Window, 8, 15, 37686)
  
  	GemRB.UnhideGUI ()
--- 454,464 ----
  	OptCancel ('AutopauseOptions', Window, 14)
  
! ##	OptCheckbox ('CharacterHit', Window, 2, 9, 37598)
! ##	OptCheckbox ('CharacterInjured', Window, 3, 10, 37681)
! ##	OptCheckbox ('CharacterDead', Window, 4, 11, 37682)
! ##	OptCheckbox ('CharacterAttacked', Window, 5, 12, 37683)
! ##	OptCheckbox ('WeaponUnusable', Window, 6, 13, 37684)
! ##	OptCheckbox ('TargetGone', Window, 7, 14, 37685)
! ##	OptCheckbox ('EndOfRound', Window, 8, 15, 37686)
  
  	GemRB.UnhideGUI ()
***************
*** 767,771 ****
  ## 	# movie list
  ## 	List = GemRB.GetControl (Window, 0)
! ## 	GemRB.SetTextAreaSelectable (Window, List, 1)
  ## 	GemRB.SetVarAssoc (Window, List, 'SelectedMovie', -1)
  	
--- 764,768 ----
  ## 	# movie list
  ## 	List = GemRB.GetControl (Window, 0)
! ## 	GemRB.SetTextAreaFlags (Window, List, IE_GUI_TEXTAREA_SELECTABLE)
  ## 	GemRB.SetVarAssoc (Window, List, 'SelectedMovie', -1)
  	
***************
*** 821,825 ****
  
  
! def OptSlider (name, window, slider_id, label_id, label_strref):
  	"""Standard slider for option windows"""
  	slider = GemRB.GetControl (window, slider_id)
--- 818,822 ----
  
  
! def OptSlider (name, window, slider_id, label_id):
  	"""Standard slider for option windows"""
  	slider = GemRB.GetControl (window, slider_id)
***************
*** 827,831 ****
  	
  	label = GemRB.GetControl (window, label_id)
- 	GemRB.SetText (window, label, label_strref)
  	GemRB.SetButtonFlags (window, label, IE_GUI_BUTTON_NO_IMAGE, OP_SET)
  	GemRB.SetButtonState (window, label, IE_GUI_BUTTON_LOCKED)
--- 824,827 ----
***************
*** 836,840 ****
  
  
! def OptCheckbox (name, window, button_id, label_id, label_strref):
  	"""Standard checkbox for option windows"""
  
--- 832,836 ----
  
  
! def OptCheckbox (name, window, button_id, label_id):
  	"""Standard checkbox for option windows"""
  
***************
*** 845,849 ****
  
  	label = GemRB.GetControl (window, label_id)
- 	GemRB.SetText (window, label, label_strref)
  	GemRB.SetButtonFlags (window, label, IE_GUI_BUTTON_NO_IMAGE, OP_SET)
  	GemRB.SetButtonState (window, label, IE_GUI_BUTTON_LOCKED)
--- 841,844 ----
***************
*** 853,864 ****
  	return button
  
! def OptButton (name, window, button_id, button_strref):
  	"""Standard subwindow button for option windows"""
  	button = GemRB.GetControl (window, button_id)
  	GemRB.SetEvent (window, button, IE_GUI_BUTTON_ON_PRESS, "Open%sWindow" %name)	
  
- 	GemRB.SetText (window, button, button_strref)
- 
- 
  def OptDone (name, window, button_id):
  	"""Standard `Done' button for option windows"""
--- 848,856 ----
  	return button
  
! def OptButton (name, window, button_id):
  	"""Standard subwindow button for option windows"""
  	button = GemRB.GetControl (window, button_id)
  	GemRB.SetEvent (window, button, IE_GUI_BUTTON_ON_PRESS, "Open%sWindow" %name)	
  
  def OptDone (name, window, button_id):
  	"""Standard `Done' button for option windows"""