From: Laszlo T. <ave...@us...> - 2011-12-28 17:53:17
|
gemrb: Infinity Engine emulator The branch master has been updated via 8d4b84cb1fbd46fb208a42879a5d8644d02e8594 (commit) Summary of changes: gemrb/GUIScripts/GUIClasses.py | 3 +- gemrb/GUIScripts/iwd/CharGen.py | 1 + gemrb/core/Inventory.cpp | 2 - gemrb/plugins/GUIScript/GUIScript.cpp | 37 +++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 3 deletions(-) from 77be80c3fa2748a53736a0bb9cc50d0f0c389181 (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=8d4b84cb1fbd46fb208a42879a5d8644d02e8594 commit 8d4b84cb1fbd46fb208a42879a5d8644d02e8594 Author: Avenger <ave...@so...> Date: Wed Dec 28 18:51:42 2011 +0100 add another hack command, so the buggy biography editbox could be fixed in IWD diff --git a/gemrb/GUIScripts/GUIClasses.py b/gemrb/GUIScripts/GUIClasses.py index ac6468b..2d4ada4 100644 --- a/gemrb/GUIScripts/GUIClasses.py +++ b/gemrb/GUIScripts/GUIClasses.py @@ -138,7 +138,8 @@ class GTextArea(GControl): class GTextEdit(GControl): __metaclass__ = metaControl methods = { - 'SetBufferLength': _GemRB.TextEdit_SetBufferLength + 'SetBufferLength': _GemRB.TextEdit_SetBufferLength, + 'SetBackground': _GemRB.TextEdit_SetBackground } def ConvertEdit(self, ScrollBarID): newID = _GemRB.TextEdit_ConvertEdit(self.WinID, self.ID, ScrollBarID) diff --git a/gemrb/GUIScripts/iwd/CharGen.py b/gemrb/GUIScripts/iwd/CharGen.py index 96108d3..330e57b 100644 --- a/gemrb/GUIScripts/iwd/CharGen.py +++ b/gemrb/GUIScripts/iwd/CharGen.py @@ -2575,6 +2575,7 @@ def BiographyPress(): BiographyField = BiographyWindow.GetControl (4) BiographyField.SetText (19423) + BiographyField.SetBackground("") BiographyClearButton = BiographyWindow.GetControl (5) BiographyClearButton.SetState (IE_GUI_BUTTON_ENABLED) diff --git a/gemrb/core/Inventory.cpp b/gemrb/core/Inventory.cpp index 10abd1a..babe0e2 100644 --- a/gemrb/core/Inventory.cpp +++ b/gemrb/core/Inventory.cpp @@ -276,7 +276,6 @@ void Inventory::AddSlotEffects(ieDword index) EffectQueue *eqfx = itm->GetEffectBlock(Owner, Owner->Pos, -1, index, 0); gamedata->FreeItem( itm, slot->ItemResRef, false ); -print("Added equipping effects of slot: %d\n", index); Owner->RefreshEffects(eqfx); //call gui for possible paperdoll animation changes if (Owner->InParty) { @@ -288,7 +287,6 @@ print("Added equipping effects of slot: %d\n", index); //is stored in them void Inventory::RemoveSlotEffects(ieDword index) { -print("Removed equipping effects of slot: %d\n", index); Owner->fxqueue.RemoveEquippingEffects(index); Owner->RefreshEffects(NULL); //call gui for possible paperdoll animation changes diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp index ab7fd1e..aca69ba 100644 --- a/gemrb/plugins/GUIScript/GUIScript.cpp +++ b/gemrb/plugins/GUIScript/GUIScript.cpp @@ -2264,6 +2264,42 @@ static PyObject* GemRB_TextEdit_ConvertEdit(PyObject * /*self*/, PyObject* args) return PyInt_FromLong( ret ); } +PyDoc_STRVAR( GemRB_TextEdit_SetBackground__doc, +"SetBackground(WindowIndex, ControlIndex, ResRef)\n\n" +"Sets the background MOS for a TextEdit control."); + +static PyObject* GemRB_TextEdit_SetBackground(PyObject * /*self*/, PyObject* args) +{ + int WindowIndex, ControlIndex; + char *ResRef; + + if (!PyArg_ParseTuple( args, "iis", &WindowIndex, &ControlIndex,&ResRef) ) { + return AttributeError( GemRB_TextEdit_SetBackground__doc ); + } + TextEdit* te = ( TextEdit* ) GetControl(WindowIndex, ControlIndex, IE_GUI_EDIT); + if (!te) { + return NULL; + } + + if (ResRef[0]) { + ResourceHolder<ImageMgr> im(ResRef); + if (im == NULL) { + return RuntimeError("Picture resource not found!\n"); + } + + Sprite2D* Picture = im->GetSprite2D(); + if (Picture == NULL) { + return RuntimeError("Failed to acquire the picture!\n"); + } + te->SetBackGround(Picture); + } else { + te->SetBackGround(NULL); + } + + Py_INCREF( Py_None ); + return Py_None; +} + PyDoc_STRVAR( GemRB_ScrollBar_SetSprites__doc, "SetScrollBarSprites(WindowIndex, ControlIndex, ResRef, Cycle, UpUnpressedFrame, UpPressedFrame, DownUnpressedFrame, DownPressedFrame, TroughFrame, SliderFrame)\n\n" "Sets a ScrollBar Sprites Images." ); @@ -10267,6 +10303,7 @@ static PyMethodDef GemRBInternalMethods[] = { METHOD(TextArea_SelectText, METH_VARARGS), METHOD(TextArea_SetHistory, METH_VARARGS), METHOD(TextEdit_ConvertEdit, METH_VARARGS), + METHOD(TextEdit_SetBackground, METH_VARARGS), METHOD(TextEdit_SetBufferLength, METH_VARARGS), METHOD(Window_CreateButton, METH_VARARGS), METHOD(Window_CreateLabel, METH_VARARGS), ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |