summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Qt3DStudio/Palettes/Action/ActionView.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/Authoring/Qt3DStudio/Palettes/Action/ActionView.h')
-rw-r--r--src/Authoring/Qt3DStudio/Palettes/Action/ActionView.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/Authoring/Qt3DStudio/Palettes/Action/ActionView.h b/src/Authoring/Qt3DStudio/Palettes/Action/ActionView.h
index ab2976f3..6e826448 100644
--- a/src/Authoring/Qt3DStudio/Palettes/Action/ActionView.h
+++ b/src/Authoring/Qt3DStudio/Palettes/Action/ActionView.h
@@ -48,6 +48,8 @@
#include "Qt3DSDMMetaDataTypes.h"
#include "TabOrderHandler.h"
#include "MouseHelper.h"
+#include "InspectorControlView.h"
+#include "InspectorControlModel.h"
class ActionModel;
class CClientDataModelBridge;
@@ -91,7 +93,7 @@ class ActionView : public QQuickWidget,
Q_PROPERTY(QString targetObjectName READ targetObjectName NOTIFY actionChanged FINAL)
Q_PROPERTY(QString eventName READ eventName NOTIFY actionChanged FINAL)
Q_PROPERTY(QString handlerName READ handlerName NOTIFY actionChanged FINAL)
- Q_PROPERTY(QVariantList handlerArguments READ handlerArguments NOTIFY actionChanged FINAL)
+ Q_PROPERTY(QVariantList handlerArguments READ handlerArguments NOTIFY handlerArgumentsChanged FINAL)
Q_PROPERTY(PropertyInfo property READ property NOTIFY propertyChanged FINAL)
Q_PROPERTY(QString firedEvent MEMBER m_firedEvent NOTIFY firedEventChanged FINAL)
Q_PROPERTY(bool propertyValueInvalid READ isPropertyValueInvalid NOTIFY propertyValueInvalidChanged FINAL)
@@ -103,6 +105,7 @@ public:
QSize sizeHint() const override;
void setItem(const qt3dsdm::Qt3DSDMInstanceHandle &handle);
+ void setControlView(InspectorControlView *controlView);
QString itemIcon() const;
QString itemText() const;
QColor itemColor() const;
@@ -116,6 +119,8 @@ public:
PropertyInfo property() const;
bool isPropertyValueInvalid() const;
+
+ Q_INVOKABLE QColor showColorDialog(const QColor &color, int instance = 0, int handle = 0);
Q_INVOKABLE void setCurrentActionIndex(int index);
Q_INVOKABLE void setCurrentPropertyIndex(int handle, int index);
Q_INVOKABLE void addAction();
@@ -166,6 +171,7 @@ Q_SIGNALS:
void hasItemChanged();
void propertyValueInvalidChanged();
void dialogCurrentColorChanged(const QColor &newColor);
+ void handlerArgumentsChanged();
private Q_SLOTS:
void copyAction();
@@ -226,6 +232,7 @@ private:
bool m_propertyValueInvalid = true;
QColor m_currentColor;
QPointer<QWidget> m_activeBrowser = nullptr;
+ QPointer<InspectorControlView> m_inspectorControlView;
};
#endif // ACTIONVIEW_H