History

Reworked WindowScriptingInterface browse method for async methods

vladest committed 9 years ago

Commit 273261e1 parent 8afdb273 files · +42 −32Browse files

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

Unified · Split

interface/src/scripting/WindowScriptingInterface.h+3−2
@@ -54,7 +54,7 @@ public slots: · 53 unmodified lines
54 QScriptValue prompt(const QString& message = "", const QString& defaultText = "");54 QScriptValue prompt(const QString& message = "", const QString& defaultText = "");
55 CustomPromptResult customPrompt(const QVariant& config);55 CustomPromptResult customPrompt(const QVariant& config);
56 void browseDir(const QString& title = "", const QString& directory = "");56 void browseDir(const QString& title = "", const QString& directory = "");
57 QScriptValue browse(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");57 void browse(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");
58 void save(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");58 void save(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");
59 void browseAssets(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");59 void browseAssets(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");
60 void showAssetServer(const QString& upload = "");60 void showAssetServer(const QString& upload = "");
@@ -89,7 +89,8 @@ signals: · 28 unmodified lines
89 void messageBoxClosed(int id, int button);89 void messageBoxClosed(int id, int button);
90 void browseDirChanged(QString browseDir);90 void browseDirChanged(QString browseDir);
91 void assetsDirChanged(QString assetsDir);91 void assetsDirChanged(QString assetsDir);
92 void saveFileChanged(QString saveFile);92 void saveFileChanged(QString filename);
93 void openFileChanged(QString filename);
93 94
94 // triggered when window size or position changes95 // triggered when window size or position changes
95 void geometryChanged(QRect geometry);96 void geometryChanged(QRect geometry);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t