diff -Nru actionaz-3.4.1/actions/actionpackdata/actions/readregistryinstance.h actionaz-3.4.2/actions/actionpackdata/actions/readregistryinstance.h --- actionaz-3.4.1/actions/actionpackdata/actions/readregistryinstance.h 2012-04-10 21:52:24.000000000 +0000 +++ actionaz-3.4.2/actions/actionpackdata/actions/readregistryinstance.h 2012-05-27 14:26:52.000000000 +0000 @@ -30,8 +30,6 @@ class ReadRegistryInstance : public ActionTools::ActionInstance { Q_OBJECT - Q_ENUMS(ActionTools::Registry::Key) - Q_ENUMS(ActionTools::Registry::ReadResult) public: enum Exceptions diff -Nru actionaz-3.4.1/actions/actionpackdata/actions/writeregistryinstance.h actionaz-3.4.2/actions/actionpackdata/actions/writeregistryinstance.h --- actionaz-3.4.1/actions/actionpackdata/actions/writeregistryinstance.h 2012-04-10 21:52:24.000000000 +0000 +++ actionaz-3.4.2/actions/actionpackdata/actions/writeregistryinstance.h 2012-05-27 14:26:52.000000000 +0000 @@ -30,8 +30,6 @@ class WriteRegistryInstance : public ActionTools::ActionInstance { Q_OBJECT - Q_ENUMS(ActionTools::Registry::Key) - Q_ENUMS(ActionTools::Registry::WriteResult) public: enum Exceptions diff -Nru actionaz-3.4.1/actions/actionpackdevice/code/mouse.cpp actionaz-3.4.2/actions/actionpackdevice/code/mouse.cpp --- actionaz-3.4.1/actions/actionpackdevice/code/mouse.cpp 2012-04-10 21:52:24.000000000 +0000 +++ actionaz-3.4.2/actions/actionpackdevice/code/mouse.cpp 2012-05-27 14:26:52.000000000 +0000 @@ -20,7 +20,6 @@ #include "mouse.h" #include "code/point.h" -#include "systeminputreceiver.h" #include @@ -50,8 +49,7 @@ } Mouse::Mouse() - : CodeClass(), - mRecorder(this) + : CodeClass() { } @@ -71,30 +69,30 @@ return thisObject(); } - bool Mouse::isButtonPressed(MouseDevice::Button button) const + bool Mouse::isButtonPressed(Button button) const { - return mMouseDevice.isButtonPressed(button); + return mMouseDevice.isButtonPressed(static_cast(button)); } - QScriptValue Mouse::press(MouseDevice::Button button) + QScriptValue Mouse::press(Button button) { - if(!mMouseDevice.pressButton(button)) + if(!mMouseDevice.pressButton(static_cast(button))) throwError("PressButtonError", tr("Unable to press the button")); return thisObject(); } - QScriptValue Mouse::release(MouseDevice::Button button) + QScriptValue Mouse::release(Button button) { - if(!mMouseDevice.releaseButton(button)) + if(!mMouseDevice.releaseButton(static_cast(button))) throwError("ReleaseButtonError", tr("Unable to release the button")); return thisObject(); } - QScriptValue Mouse::click(MouseDevice::Button button) + QScriptValue Mouse::click(Button button) { - if(!mMouseDevice.buttonClick(button)) + if(!mMouseDevice.buttonClick(static_cast(button))) throwError("ClickError", tr("Unable to emulate a button click")); return thisObject(); diff -Nru actionaz-3.4.1/actions/actionpackdevice/code/mouse.h actionaz-3.4.2/actions/actionpackdevice/code/mouse.h --- actionaz-3.4.1/actions/actionpackdevice/code/mouse.h 2012-04-10 21:52:24.000000000 +0000 +++ actionaz-3.4.2/actions/actionpackdevice/code/mouse.h 2012-05-27 14:26:52.000000000 +0000 @@ -32,11 +32,10 @@ namespace Code { - class Mouse : public CodeClass, public ActionTools::SystemInput::Listener + class Mouse : public CodeClass { Q_OBJECT - Q_ENUMS(MouseDevice::Button) - Q_ENUMS(ActionTools::SystemInput::Button) + Q_ENUMS(Button) Q_PROPERTY(QScriptValue onMotion READ onMotion WRITE setOnMotion) Q_PROPERTY(QScriptValue onWheel READ onWheel WRITE setOnWheel) Q_PROPERTY(QScriptValue onButtonPressed READ onButtonPressed WRITE setOnButtonPressed) @@ -44,6 +43,13 @@ public: static QScriptValue constructor(QScriptContext *context, QScriptEngine *engine); + + enum Button + { + LeftButton, + MiddleButton, + RightButton + }; Mouse(); ~Mouse(); @@ -62,10 +68,10 @@ QString toString() const { return "Mouse"; } QScriptValue position() const; QScriptValue move() const; - bool isButtonPressed(MouseDevice::Button button) const; - QScriptValue press(MouseDevice::Button button = MouseDevice::LeftButton); - QScriptValue release(MouseDevice::Button button = MouseDevice::LeftButton); - QScriptValue click(MouseDevice::Button button = MouseDevice::LeftButton); + bool isButtonPressed(Button button = LeftButton) const; + QScriptValue press(Button button = LeftButton); + QScriptValue release(Button button = LeftButton); + QScriptValue click(Button button = LeftButton); QScriptValue wheel(int intensity = 1) const; private: @@ -76,7 +82,6 @@ private: MouseDevice mMouseDevice; - ActionTools::SystemInput::Recorder mRecorder; QScriptValue mOnMotion; QScriptValue mOnWheel; QScriptValue mOnButtonPressed; @@ -84,4 +89,6 @@ }; } +Q_DECLARE_METATYPE(MouseDevice::Button) + #endif // MOUSE_H diff -Nru actionaz-3.4.1/actions/actionpackinternal/actions/timeconditioninstance.h actionaz-3.4.2/actions/actionpackinternal/actions/timeconditioninstance.h --- actionaz-3.4.1/actions/actionpackinternal/actions/timeconditioninstance.h 2012-04-10 21:52:24.000000000 +0000 +++ actionaz-3.4.2/actions/actionpackinternal/actions/timeconditioninstance.h 2012-05-27 14:26:52.000000000 +0000 @@ -43,8 +43,8 @@ QString date = evaluateString(ok, "date"); ActionTools::IfActionValue ifBefore = evaluateIfAction(ok, "ifBefore"); - ActionTools::IfActionValue ifNow = evaluateIfAction(ok, "ifBefore"); - ActionTools::IfActionValue ifAfter = evaluateIfAction(ok, "ifNow"); + ActionTools::IfActionValue ifNow = evaluateIfAction(ok, "ifNow"); + ActionTools::IfActionValue ifAfter = evaluateIfAction(ok, "ifAfter"); if(!ok) return; diff -Nru actionaz-3.4.1/actions/actionpacksystem/code/process.cpp actionaz-3.4.2/actions/actionpacksystem/code/process.cpp --- actionaz-3.4.1/actions/actionpacksystem/code/process.cpp 2012-04-10 21:52:24.000000000 +0000 +++ actionaz-3.4.2/actions/actionpacksystem/code/process.cpp 2012-05-27 14:26:52.000000000 +0000 @@ -182,14 +182,14 @@ return thisObject(); } - QProcess::ProcessState Process::state() const + Process::ProcessState Process::state() const { - return mProcess->state(); + return static_cast(mProcess->state()); } - QProcess::ProcessError Process::error() const + Process::ProcessError Process::error() const { - return mProcess->error(); + return static_cast(mProcess->error()); } int Process::exitCode() const @@ -197,9 +197,9 @@ return mProcess->exitCode(); } - QProcess::ExitStatus Process::exitStatus() const + Process::ExitStatus Process::exitStatus() const { - return mProcess->exitStatus(); + return static_cast(mProcess->exitStatus()); } QScriptValue Process::readError() const @@ -274,9 +274,9 @@ return thisObject(); } - QScriptValue Process::setProcessChannelMode(QProcess::ProcessChannelMode channelMode) + QScriptValue Process::setProcessChannelMode(ProcessChannelMode channelMode) { - mProcess->setProcessChannelMode(channelMode); + mProcess->setProcessChannelMode(static_cast(channelMode)); return thisObject(); } @@ -315,16 +315,16 @@ return thisObject(); } - QScriptValue Process::setReadChannel(QProcess::ProcessChannel channel) + QScriptValue Process::setReadChannel(ProcessChannel channel) { - mProcess->setReadChannel(channel); + mProcess->setReadChannel(static_cast(channel)); return thisObject(); } - QScriptValue Process::setStandardErrorFile(const QString &fileName, QIODevice::OpenMode openMode) + QScriptValue Process::setStandardErrorFile(const QString &fileName, int openMode) { - mProcess->setStandardErrorFile(fileName, openMode); + mProcess->setStandardErrorFile(fileName, static_cast(openMode)); return thisObject(); } @@ -336,9 +336,9 @@ return thisObject(); } - QScriptValue Process::setStandardOutputFile(const QString &fileName, QIODevice::OpenMode openMode) + QScriptValue Process::setStandardOutputFile(const QString &fileName, int openMode) { - mProcess->setStandardOutputFile(fileName, openMode); + mProcess->setStandardOutputFile(fileName, static_cast(openMode)); return thisObject(); } @@ -367,7 +367,7 @@ QScriptValue Process::waitForStarted(int waitTime) { - if(!mProcess->waitForFinished(waitTime)) + if(!mProcess->waitForStarted(waitTime)) throwError("WaitForStartedError", tr("Wait for started failed")); return thisObject(); @@ -375,7 +375,7 @@ QScriptValue Process::waitForBytesWritten(int waitTime) { - if(!mProcess->waitForReadyRead(waitTime)) + if(!mProcess->waitForBytesWritten(waitTime)) throwError("WaitForBytesWrittenError", tr("Waiting for bytes written failed")); return thisObject(); @@ -413,13 +413,13 @@ void Process::error(QProcess::ProcessError processError) { if(mOnError.isValid()) - mOnError.call(thisObject(), QScriptValueList() << processError); + mOnError.call(thisObject(), QScriptValueList() << static_cast(processError)); } void Process::finished(int exitCode, QProcess::ExitStatus exitStatus) { if(mOnFinished.isValid()) - mOnFinished.call(thisObject(), QScriptValueList() << exitCode << exitStatus); + mOnFinished.call(thisObject(), QScriptValueList() << exitCode << static_cast(exitStatus)); } void Process::readyReadStandardError() @@ -443,6 +443,6 @@ void Process::stateChanged(QProcess::ProcessState newState) { if(mOnStateChanged.isValid()) - mOnStateChanged.call(thisObject(), QScriptValueList() << newState); + mOnStateChanged.call(thisObject(), QScriptValueList() << static_cast(newState)); } } diff -Nru actionaz-3.4.1/actions/actionpacksystem/code/process.h actionaz-3.4.2/actions/actionpacksystem/code/process.h --- actionaz-3.4.1/actions/actionpacksystem/code/process.h 2012-04-10 21:52:24.000000000 +0000 +++ actionaz-3.4.2/actions/actionpacksystem/code/process.h 2012-05-27 14:26:52.000000000 +0000 @@ -40,14 +40,58 @@ Q_PROPERTY(QScriptValue onReadyReadStandardOutput READ onReadyReadStandardOutput WRITE setOnReadyReadStandardOutput) Q_PROPERTY(QScriptValue onStarted READ onStarted WRITE setOnStarted) Q_PROPERTY(QScriptValue onStateChanged READ onStateChanged WRITE setOnStateChanged) - Q_ENUMS(QProcess::ProcessError) - Q_ENUMS(QProcess::ExitStatus) - Q_ENUMS(QProcess::ProcessState) - Q_ENUMS(QProcess::ProcessChannel) - Q_ENUMS(QProcess::ProcessChannelMode) - Q_FLAGS(QIODevice::OpenMode) + Q_ENUMS(ProcessError) + Q_ENUMS(ExitStatus) + Q_ENUMS(ProcessState) + Q_ENUMS(ProcessChannel) + Q_ENUMS(ProcessChannelMode) + Q_FLAGS(OpenModeFlag OpenMode) public: + enum ProcessError + { + FailedToStart = QProcess::FailedToStart, + Crashed = QProcess::Crashed, + Timedout = QProcess::Timedout, + ReadError = QProcess::ReadError, + WriteError = QProcess::WriteError, + UnknownError = QProcess::UnknownError + }; + enum ExitStatus + { + NormalExit = QProcess::NormalExit, + CrashExit = QProcess::CrashExit + }; + enum ProcessState + { + NotRunning = QProcess::NotRunning, + Starting = QProcess::Starting, + Running = QProcess::Running + }; + enum ProcessChannel + { + StandardOutput = QProcess::StandardOutput, + StandardError = QProcess::StandardError + }; + enum ProcessChannelMode + { + SeparateChannels = QProcess::SeparateChannels, + MergedChannels = QProcess::MergedChannels, + ForwardedChannels = QProcess::ForwardedChannels + }; + enum OpenModeFlag + { + NotOpen = QIODevice::NotOpen, + ReadOnly = QIODevice::ReadOnly, + WriteOnly = QIODevice::WriteOnly, + ReadWrite = QIODevice::ReadWrite, + Append = QIODevice::Append, + Truncate = QIODevice::Truncate, + Text = QIODevice::Text, + Unbuffered = QIODevice::Unbuffered + }; + Q_DECLARE_FLAGS(OpenMode, OpenModeFlag) + static QScriptValue constructor(QScriptContext *context, QScriptEngine *engine); static QScriptValue list(QScriptContext *context, QScriptEngine *engine); @@ -77,10 +121,10 @@ QScriptValue handle() const; int id() const; QScriptValue start(); - QProcess::ProcessState state() const; - QProcess::ProcessError error() const; + ProcessState state() const; + ProcessError error() const; int exitCode() const; - QProcess::ExitStatus exitStatus() const; + ExitStatus exitStatus() const; QScriptValue readError() const; QScriptValue read() const; QString readErrorText(Encoding encoding = Native) const; @@ -92,13 +136,13 @@ QScriptValue write(const QScriptValue &data); QScriptValue writeText(const QString &data, Encoding encoding = Native); QScriptValue setWorkingDirectory(const QString &workingDirectory); - QScriptValue setProcessChannelMode(QProcess::ProcessChannelMode channelMode); + QScriptValue setProcessChannelMode(ProcessChannelMode channelMode); QScriptValue setEnvironment(); QScriptValue updateEnvironment(); - QScriptValue setReadChannel(QProcess::ProcessChannel channel); - QScriptValue setStandardErrorFile(const QString &fileName, QIODevice::OpenMode openMode = QIODevice::Truncate); + QScriptValue setReadChannel(ProcessChannel channel); + QScriptValue setStandardErrorFile(const QString &fileName, int openMode = Truncate); QScriptValue setStandardInputFile(const QString &fileName); - QScriptValue setStandardOutputFile(const QString &fileName, QIODevice::OpenMode openMode = QIODevice::Truncate); + QScriptValue setStandardOutputFile(const QString &fileName, int openMode = Truncate); QScriptValue setStandardOutputProcess(const QScriptValue &processValue); QScriptValue waitForFinished(int waitTime = 30000); QScriptValue waitForStarted(int waitTime = 30000); diff -Nru actionaz-3.4.1/actions/actionpackwindows/actions/datainputinstance.cpp actionaz-3.4.2/actions/actionpackwindows/actions/datainputinstance.cpp --- actionaz-3.4.1/actions/actionpackwindows/actions/datainputinstance.cpp 2012-04-10 21:52:24.000000000 +0000 +++ actionaz-3.4.2/actions/actionpackwindows/actions/datainputinstance.cpp 2012-05-27 14:26:52.000000000 +0000 @@ -57,8 +57,8 @@ return; QString textDefaultValue; - double decimalDefaultValue; - int integerDefaultValue; + double decimalDefaultValue = 0.0; + int integerDefaultValue = 0; mInputDialog = 0; diff -Nru actionaz-3.4.1/actions/actionpackwindows/actions/windowinstance.cpp actionaz-3.4.2/actions/actionpackwindows/actions/windowinstance.cpp --- actionaz-3.4.1/actions/actionpackwindows/actions/windowinstance.cpp 2012-04-10 21:52:24.000000000 +0000 +++ actionaz-3.4.2/actions/actionpackwindows/actions/windowinstance.cpp 2012-05-27 14:26:52.000000000 +0000 @@ -53,8 +53,8 @@ return; QPoint movePosition; - int resizeWidth; - int resizeHeight; + int resizeWidth = 0; + int resizeHeight = 0; if(action == Move) { diff -Nru actionaz-3.4.1/actiontools/code/processhandle.cpp actionaz-3.4.2/actiontools/code/processhandle.cpp --- actionaz-3.4.1/actiontools/code/processhandle.cpp 2012-04-10 21:52:24.000000000 +0000 +++ actionaz-3.4.2/actiontools/code/processhandle.cpp 2012-05-27 14:26:52.000000000 +0000 @@ -164,9 +164,9 @@ return processId(); } - bool ProcessHandle::kill(ActionTools::CrossPlatform::KillMode killMode, int timeout) const + bool ProcessHandle::kill(KillMode killMode, int timeout) const { - return ActionTools::CrossPlatform::killProcess(mProcessId, killMode, timeout); + return ActionTools::CrossPlatform::killProcess(mProcessId, static_cast(killMode), timeout); } bool ProcessHandle::isRunning() const diff -Nru actionaz-3.4.1/actiontools/code/processhandle.h actionaz-3.4.2/actiontools/code/processhandle.h --- actionaz-3.4.1/actiontools/code/processhandle.h 2012-04-10 21:52:24.000000000 +0000 +++ actionaz-3.4.2/actiontools/code/processhandle.h 2012-05-27 14:26:52.000000000 +0000 @@ -18,11 +18,16 @@ class ACTIONTOOLSSHARED_EXPORT ProcessHandle : public CodeClass { Q_OBJECT - Q_ENUMS(ActionTools::CrossPlatform::KillMode) - Q_ENUMS(ActionTools::CrossPlatform::ProcessStatus) + Q_ENUMS(KillMode) Q_ENUMS(Priority) public: + enum KillMode + { + Graceful, + Forceful, + GracefulThenForceful + }; enum Priority { AboveNormal, @@ -56,7 +61,7 @@ bool equals(const QScriptValue &other) const; QString toString() const; int id() const; - bool kill(ActionTools::CrossPlatform::KillMode killMode = ActionTools::CrossPlatform::GracefulThenForceful, int timeout = 3000) const; + bool kill(KillMode killMode = GracefulThenForceful, int timeout = 3000) const; bool isRunning() const; QString command() const; Priority priority() const; diff -Nru actionaz-3.4.1/CHANGELOG actionaz-3.4.2/CHANGELOG --- actionaz-3.4.1/CHANGELOG 2012-04-10 21:52:24.000000000 +0000 +++ actionaz-3.4.2/CHANGELOG 2012-05-27 14:26:52.000000000 +0000 @@ -1,3 +1,9 @@ +3.4.2 (27/05/12) +- Actions: corrected a bug in the Time Condition action +- Code: corrected a bug preventing Mouse functions to work with other buttons than the left one +- Code: corrected bugs in the waitForX Process functions +- Code: corrected bugs in code classes using enums as function parameters + 3.4.1 (10/04/12) - Executer: fixed a bug increasing the pause before and after an action - Gui: removed spaces at begin and end of imported scripts to prevent an XML import error diff -Nru actionaz-3.4.1/common.pri actionaz-3.4.2/common.pri --- actionaz-3.4.1/common.pri 2012-04-10 21:52:24.000000000 +0000 +++ actionaz-3.4.2/common.pri 2012-05-27 14:26:52.000000000 +0000 @@ -1,7 +1,7 @@ DEFINES += QT_USE_FAST_CONCATENATION \ QT_USE_FAST_OPERATOR_PLUS -ACTIONAZ_VERSION = 3.4.1 +ACTIONAZ_VERSION = 3.4.2 SCRIPT_VERSION = 1.0.0 DEFINES *= ACT_VERSION=$$ACTIONAZ_VERSION diff -Nru actionaz-3.4.1/debian/changelog actionaz-3.4.2/debian/changelog --- actionaz-3.4.1/debian/changelog 2012-06-06 07:50:42.000000000 +0000 +++ actionaz-3.4.2/debian/changelog 2012-06-25 11:32:40.000000000 +0000 @@ -1,3 +1,9 @@ +actionaz (3.4.2-1) unstable; urgency=low + + * New upstream release + + -- Adrien Cunin Sun, 24 Jun 2012 17:09:31 +0200 + actionaz (3.4.1-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nru actionaz-3.4.1/gui/aboutdialog.ui actionaz-3.4.2/gui/aboutdialog.ui --- actionaz-3.4.1/gui/aboutdialog.ui 2012-04-10 21:52:24.000000000 +0000 +++ actionaz-3.4.2/gui/aboutdialog.ui 2012-05-27 14:26:52.000000000 +0000 @@ -130,6 +130,16 @@ David-Yossef Messika + + + Quentin Dugard + + + + + Andrei Marin + + @@ -159,6 +169,16 @@ + wismerheal + + + + + niconil + + + + cyberia @@ -243,6 +263,11 @@ + wismerheal + + + + Yann Huriez