[Gemrb-commits] gemrb: branch master updated. v0.6.2-1108-gc877b55

[Alyssa M. <fu...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  c877b553f34595fe12ec2fba3f7a3885e7e12ae8 (commit)

Summary of changes:
 gemrb/GUIScripts/GUISTORE.py |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
      from  f7eff95634ed9603e4ea9f8fa9dc905b96a53119 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=c877b553f34595fe12ec2fba3f7a3885e7e12ae8

commit c877b553f34595fe12ec2fba3f7a3885e7e12ae8
Author: Alyssa Milburn <fu...@fu...>
Date:   Sun Apr 24 12:27:07 2011 +0200

    fix picture centering and text in bg2 stores

diff --git a/gemrb/GUIScripts/GUISTORE.py b/gemrb/GUIScripts/GUISTORE.py
index bb2a113..fd44b11 100644
--- a/gemrb/GUIScripts/GUISTORE.py
+++ b/gemrb/GUIScripts/GUISTORE.py
@@ -991,26 +991,33 @@ def InfoWindow (Slot, Item):
 
 	MessageWindow = Window = GemRB.LoadWindow (12)
 
+	# TODO: check non-bg2 games to see which label is which
+	if GUICommon.GameIsBG2():
+		NameLabel = Window.GetControl (0x10000000)
+		FakeLabel = Window.GetControl (0x10000007)
+	else:
+		NameLabel = Window.GetControl (0x10000007)
+		FakeLabel = Window.GetControl (0x10000000)
+
 	#fake label
-	Label = Window.GetControl (0x10000000)
-	Label.SetText ("")
+	FakeLabel.SetText ("")
 
 	#description bam
 	if GUICommon.GameIsBG1() or GUICommon.GameIsBG2():
 		Button = Window.GetControl (7)
+		Button.SetFlags (IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_CENTER_PICTURES | IE_GUI_BUTTON_NO_IMAGE, OP_OR)
 		Button.SetItemIcon (Slot['ItemResRef'], 2)
 
 	#slot bam
 	Button = Window.GetControl (2)
 	Button.SetItemIcon (Slot['ItemResRef'], 0)
 
-	Label = Window.GetControl (0x10000007)
 	TextArea = Window.GetControl (5)
 	if Identify:
-		Label.SetText (Item['ItemNameIdentified'])
+		NameLabel.SetText (Item['ItemNameIdentified'])
 		TextArea.SetText (Item['ItemDescIdentified'])
 	else:
-		Label.SetText (Item['ItemName'])
+		NameLabel.SetText (Item['ItemName'])
 		TextArea.SetText (Item['ItemDesc'])
 
 	#Done

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator