mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-18 08:54:15 +01:00
OP-1150/OP-1068 Fix signal name in wizardmodel
This commit is contained in:
parent
39f3d36e09
commit
7cd3e83fbc
@ -31,12 +31,13 @@
|
|||||||
#include <QStateMachine>
|
#include <QStateMachine>
|
||||||
#include <QQmlListProperty>
|
#include <QQmlListProperty>
|
||||||
#include "wizardstate.h"
|
#include "wizardstate.h"
|
||||||
|
#include <accelsensor.h>
|
||||||
|
|
||||||
class WizardModel : public QStateMachine
|
class WizardModel : public QStateMachine
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY(QQmlListProperty<QObject> steps READ steps CONSTANT)
|
Q_PROPERTY(QQmlListProperty<QObject> steps READ steps CONSTANT)
|
||||||
Q_PROPERTY(QString instructions READ instructions NOTIFY instructionChanged)
|
Q_PROPERTY(QString instructions READ instructions NOTIFY instructionsChanged)
|
||||||
Q_PROPERTY(WizardState* currentState READ currentState NOTIFY currentStateChanged)
|
Q_PROPERTY(WizardState* currentState READ currentState NOTIFY currentStateChanged)
|
||||||
public:
|
public:
|
||||||
explicit WizardModel(QObject *parent = 0);
|
explicit WizardModel(QObject *parent = 0);
|
||||||
@ -51,7 +52,7 @@ public:
|
|||||||
|
|
||||||
void setInstructions(QString instructions){
|
void setInstructions(QString instructions){
|
||||||
m_instructions = instructions;
|
m_instructions = instructions;
|
||||||
emit instructionChanged();
|
emit instructionsChanged(instructions);
|
||||||
}
|
}
|
||||||
WizardState *currentState();
|
WizardState *currentState();
|
||||||
protected:
|
protected:
|
||||||
@ -59,8 +60,8 @@ protected:
|
|||||||
private:
|
private:
|
||||||
QString m_instructions;
|
QString m_instructions;
|
||||||
signals:
|
signals:
|
||||||
void instructionChanged();
|
void instructionsChanged(QString status);
|
||||||
void currentStateChanged();
|
void currentStateChanged(WizardState *status);
|
||||||
public slots:
|
public slots:
|
||||||
|
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user