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
2020 Q_OBJECT
2121 Q_PROPERTY(int innerWidth READ getInnerWidth)
2222 Q_PROPERTY(int innerHeight READ getInnerHeight)
23− WindowScriptingInterface() { };
2423 public:
2524 static WindowScriptingInterface* getInstance();
2625 int getInnerWidth();
@@ -29,16 +28,23 @@ public: · 2 unmodified lines
2928 public slots:
3029 QScriptValue alert(const QString& message = "");
3130 QScriptValue confirm(const QString& message = "");
31+ QScriptValue form(const QString& title, QScriptValue array);
3232 QScriptValue prompt(const QString& message = "", const QString& defaultText = "");
3333 QScriptValue browse(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");
3434 QScriptValue save(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");
35+ QScriptValue s3Browse(const QString& nameFilter = "");
3536
3637 private slots:
3738 QScriptValue showAlert(const QString& message);
3839 QScriptValue showConfirm(const QString& message);
40+ QScriptValue showForm(const QString& title, QScriptValue form);
3941 QScriptValue showPrompt(const QString& message, const QString& defaultText);
4042 QScriptValue showBrowse(const QString& title, const QString& directory, const QString& nameFilter,
4143 QFileDialog::AcceptMode acceptMode = QFileDialog::AcceptOpen);
44+ QScriptValue showS3Browse(const QString& nameFilter);
45+
46+private:
47+ WindowScriptingInterface();
4248 };
4349
4450 #endif // hifi_WindowScriptingInterface_h