Showing the changes to interface/src/scripting/WindowScriptingInterface.h (1 of 3 files). Show all
Unified · Split
| @@ -20,7 +20,6 @@ class WindowScriptingInterface : public QObject { · 19 unmodified lines | |||
| 20 | Q_OBJECT | 20 | Q_OBJECT |
| 21 | Q_PROPERTY(int innerWidth READ getInnerWidth) | 21 | Q_PROPERTY(int innerWidth READ getInnerWidth) |
| 22 | Q_PROPERTY(int innerHeight READ getInnerHeight) | 22 | Q_PROPERTY(int innerHeight READ getInnerHeight) |
| 23 | WindowScriptingInterface() { }; | ||
| 24 | public: | 23 | public: |
| 25 | static WindowScriptingInterface* getInstance(); | 24 | static WindowScriptingInterface* getInstance(); |
| 26 | int getInnerWidth(); | 25 | int getInnerWidth(); |
| @@ -29,14 +28,19 @@ public: · 2 unmodified lines | |||
| 29 | public slots: | 28 | public slots: |
| 30 | QScriptValue alert(const QString& message = ""); | 29 | QScriptValue alert(const QString& message = ""); |
| 31 | QScriptValue confirm(const QString& message = ""); | 30 | QScriptValue confirm(const QString& message = ""); |
| 31 | QScriptValue arrayEdit(const QString& title, QScriptValue array); | ||
| 32 | QScriptValue prompt(const QString& message = "", const QString& defaultText = ""); | 32 | QScriptValue prompt(const QString& message = "", const QString& defaultText = ""); |
| 33 | QScriptValue browse(const QString& title = "", const QString& directory = "", const QString& nameFilter = ""); | 33 | QScriptValue browse(const QString& title = "", const QString& directory = "", const QString& nameFilter = ""); |
| 34 | 34 | ||
| 35 | private slots: | 35 | private slots: |
| 36 | QScriptValue showAlert(const QString& message); | 36 | QScriptValue showAlert(const QString& message); |
| 37 | QScriptValue showConfirm(const QString& message); | 37 | QScriptValue showConfirm(const QString& message); |
| 38 | QScriptValue showArrayEdit(const QString& title, QScriptValue array); | ||
| 38 | QScriptValue showPrompt(const QString& message, const QString& defaultText); | 39 | QScriptValue showPrompt(const QString& message, const QString& defaultText); |
| 39 | QScriptValue showBrowse(const QString& title, const QString& directory, const QString& nameFilter); | 40 | QScriptValue showBrowse(const QString& title, const QString& directory, const QString& nameFilter); |
| 41 | |||
| 42 | private: | ||
| 43 | WindowScriptingInterface(); | ||
| 40 | }; | 44 | }; |
| 41 | 45 | ||
| 42 | #endif // hifi_WindowScriptingInterface_h | 46 | #endif // hifi_WindowScriptingInterface_h |