diff --git a/MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/Plasma.py b/MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/Plasma.py index 7f3d6733..8d684e7d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/Plasma.py +++ b/MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/Plasma.py @@ -5480,6 +5480,22 @@ This event record is used to pass a ptKey variable to another python program""" def addVarNumber(self,name,number): """Add a number variable event record to the Notify message +Method will try to pick appropriate variable type +This event record is used to pass a number variable to another python program""" + pass + + def addVarFloat(self,name,number): + """Add a float variable event record to the Notify message +This event record is used to pass a number variable to another python program""" + pass + + def addVarInt(self,name,number): + """Add a integer variable event record to the Notify message +This event record is used to pass a number variable to another python program""" + pass + + def addVarNull(self,name): + """Add a null (no data) variable event record to the Notify message This event record is used to pass a number variable to another python program""" pass diff --git a/MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/PlasmaConstants.py b/MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/PlasmaConstants.py index 2f626d00..c575bcc8 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/PlasmaConstants.py +++ b/MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/PlasmaConstants.py @@ -215,8 +215,10 @@ class PtNotificationType: class PtNotifyDataType: """(none)""" - kNumber = 1 + kFloat = 1 kKey = 2 + kInt = 3 + kNull = 4 class PtSDLReadWriteOptions: """(none)""" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/PlasmaTypes.py b/MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/PlasmaTypes.py index 8587e08e..5c33412c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/PlasmaTypes.py +++ b/MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/PlasmaTypes.py @@ -69,7 +69,7 @@ kOfferLinkingBook=PtEventType.kOfferLinkingBook # [1]=offerer, [2]=link panel ID # OnNotify Var Event Data Types -kVarNumberType=PtNotifyDataType.kNumber +kVarNumberType=PtNotifyDataType.kFloat kVarKeyType=PtNotifyDataType.kKey # OnNotify MultiStageEvent - what event types kEnterStage=PtMultiStageEventType.kEnterStage @@ -179,8 +179,12 @@ def PtAddEvent(notify,event): elif event[0] == kControlKeyEvent: notify.addControlKeyEvent(event[1],event[2]) elif event[0] == kVariableEvent: - if event[2] == kVarNumberType: - notify.addVarNumber(event[1],event[3]) + if event[2] == PtNotifyDataType.kFloat: + notify.addVarFloat(event[1],event[3]) + elif event[2] == PtNotifyDataType.kInt: + notify.addVarInt(event[1],event[3]) + elif event[2] == PtNotifyDataType.kNull: + notify.addVarNull(event[1]) elif event[2] == kVarKeyType: notify.addVarKey(event[1],event[3]) elif event[0] == kFacingEvent: diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp index 03351963..a32eff60 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp @@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // This line must NEVER be modified manually; it is automatically updated // by the build server. -#define BUILD_ID 906 +#define BUILD_ID 912 COMPILER_ASSERT(BUILD_ID != 0);