History

Merge branch 'master' of https://github.com/highfidelity/hifi into 20170

Stojce Slavkovski committed 12 years ago

Commit cc487d72 parents 06da1bd 8b4b2c5207 files · +13014 −5580Browse files

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

Unified · Split

interface/src/scripting/WindowScriptingInterface.h+7−0
@@ -15,6 +15,11 @@ · 14 unmodified lines
15#include <QObject>15#include <QObject>
16#include <QScriptValue>16#include <QScriptValue>
17#include <QString>17#include <QString>
18#include <QFileDialog>
19#include <QComboBox>
20#include <QLineEdit>
21
22#include "WebWindowClass.h"
18 23
19class WindowScriptingInterface : public QObject {24class WindowScriptingInterface : public QObject {
20 Q_OBJECT25 Q_OBJECT
@@ -72,6 +77,8 @@ private slots: · 51 unmodified lines
72 77
73 void nonBlockingFormAccepted() { _nonBlockingFormActive = false; _formResult = QDialog::Accepted; emit nonBlockingFormClosed(); }78 void nonBlockingFormAccepted() { _nonBlockingFormActive = false; _formResult = QDialog::Accepted; emit nonBlockingFormClosed(); }
74 void nonBlockingFormRejected() { _nonBlockingFormActive = false; _formResult = QDialog::Rejected; emit nonBlockingFormClosed(); }79 void nonBlockingFormRejected() { _nonBlockingFormActive = false; _formResult = QDialog::Rejected; emit nonBlockingFormClosed(); }
80
81 WebWindowClass* doCreateWebWindow(const QString& title, const QString& url, int width, int height);
75 82
76private:83private:
77 WindowScriptingInterface();84 WindowScriptingInterface();