History

Merge branch 'master' of git://github.com/highfidelity/hifi into 19783

Ryan Huffman committed 12 years ago

Commit d777e4b2 parents ade1903 f5dbc54238 files · +12133 −3304Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.h (1 of 238 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.h+7−1
@@ -20,7 +20,6 @@ class WindowScriptingInterface : public QObject { · 19 unmodified lines
20 Q_OBJECT20 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() { };
24public:23public:
25 static WindowScriptingInterface* getInstance();24 static WindowScriptingInterface* getInstance();
26 int getInnerWidth();25 int getInnerWidth();
@@ -29,16 +28,23 @@ public: · 2 unmodified lines
29public slots:28public 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 form(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 QScriptValue save(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");34 QScriptValue save(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");
35 QScriptValue s3Browse(const QString& nameFilter = "");
35 36
36private slots:37private slots:
37 QScriptValue showAlert(const QString& message);38 QScriptValue showAlert(const QString& message);
38 QScriptValue showConfirm(const QString& message);39 QScriptValue showConfirm(const QString& message);
40 QScriptValue showForm(const QString& title, QScriptValue form);
39 QScriptValue showPrompt(const QString& message, const QString& defaultText);41 QScriptValue showPrompt(const QString& message, const QString& defaultText);
40 QScriptValue showBrowse(const QString& title, const QString& directory, const QString& nameFilter,42 QScriptValue showBrowse(const QString& title, const QString& directory, const QString& nameFilter,
41 QFileDialog::AcceptMode acceptMode = QFileDialog::AcceptOpen);43 QFileDialog::AcceptMode acceptMode = QFileDialog::AcceptOpen);
44 QScriptValue showS3Browse(const QString& nameFilter);
45
46private:
47 WindowScriptingInterface();
42};48};
43 49
44#endif // hifi_WindowScriptingInterface_h50#endif // hifi_WindowScriptingInterface_h