[Gemrb-commits] SF.net SVN: gemrb:[5351] gemrb/trunk/gemrb/GUIScripts

[<lyn...@us...>]

Revision: 5351
          http://gemrb.svn.sourceforge.net/gemrb/?rev=5351&view=rev
Author:   lynxlupodian
Date:     2008-09-23 20:47:40 +0000 (Tue, 23 Sep 2008)

Log Message:
-----------
bg1, bg2: made the sun dial pausing work, patch from zefklop
[ 2121876 ] Gears : tooltip and pause

Modified Paths:
--------------
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py
    gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py
    gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py	2008-09-23 20:46:02 UTC (rev 5350)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py	2008-09-23 20:47:40 UTC (rev 5351)
@@ -100,6 +100,17 @@
 	Button = GemRB.GetControl (Window, 8)
 	GemRB.SetTooltip (Window, Button, 16312)
 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenPartyWindow")
+	
+	#gears
+	if Gears:
+		# Pendulum, gears, sun/moon dial  (time)
+		# FIXME: display all animations: CPEN, CGEAR, CDIAL
+		Button = GemRB.GetControl (Window, 9)
+		GemRB.SetAnimation (Window, Button, "CGEAR")
+		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED)
+		GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_NORMAL, OP_SET)
+		GemRB.SetEvent(Window, Button, IE_GUI_BUTTON_ON_PRESS, "GearsClicked")
+		GemRB.SetTooltip(Window, Button, 16041)
 
 	return
 
@@ -693,3 +704,6 @@
 		GemRB.SetLabelTextColor (Window, Label, 255, 255, 255)
 		GemRB.SetLabelTextColor (Window, Label2, 255, 0, 0)
 	return
+
+def GearsClicked():
+	GemRB.GamePause(2,0)

Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py	2008-09-23 20:46:02 UTC (rev 5350)
+++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py	2008-09-23 20:47:40 UTC (rev 5351)
@@ -98,8 +98,10 @@
 		# FIXME: display all animations: CPEN, CGEAR, CDIAL
 		Button = GemRB.GetControl (Window, 9)
 		GemRB.SetAnimation (Window, Button, "CPEN")
-		GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_ANIMATED, OP_SET)
-		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
+		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED)
+		GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_NORMAL, OP_SET)
+		GemRB.SetEvent(Window, Button, IE_GUI_BUTTON_ON_PRESS, "GearsClicked")
+		GemRB.SetTooltip(Window, Button, 16041)
 		rb = 11
 	else:
 		rb = 9
@@ -212,8 +214,10 @@
 	Button = GemRB.GetControl (Window, 62)
 	# FIXME: display all animations
 	GemRB.SetAnimation (Window, Button, "CPEN")
-	GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_ANIMATED, OP_SET)
-	GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
+	GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED)
+	GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_NORMAL, OP_SET)
+	GemRB.SetEvent(Window, Button, IE_GUI_BUTTON_ON_PRESS, "GearsClicked")
+	GemRB.SetTooltip(Window, Button, 16041)
 	UpdateActionsWindow ()
 	return
 
@@ -751,3 +755,6 @@
 		print 2**i, GemRB.GetSlots (pc, 2**i, 1)
 	print SLOT_ANY, GemRB.GetSlots (pc, SLOT_ANY, 1)
 	print
+	
+def GearsClicked():
+	GemRB.GamePause(2,0)

Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py	2008-09-23 20:46:02 UTC (rev 5350)
+++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py	2008-09-23 20:47:40 UTC (rev 5351)
@@ -224,8 +224,10 @@
 	# Gears (time) when options pane is down
 	Button = GemRB.GetControl (Window, 62)
 	GemRB.SetAnimation (Window, Button, "CGEAR")
-	GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_ANIMATED, OP_SET)
-	GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
+	GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED)
+	GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_NORMAL, OP_SET)
+	GemRB.SetEvent(Window, Button, IE_GUI_BUTTON_ON_PRESS, "GearsClicked")
+	GemRB.SetTooltip(Window, Button, 16041)
 
 	# 0 - 5 - Ground Item
 	# 10 - 13 - Personal Item


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.