Resolved conflicts in editModels.js
Showing the changes to interface/src/scripting/WindowScriptingInterface.h (1 of 304 files). Show all
Unified · Split
| @@ -31,6 +31,7 @@ public slots: · 30 unmodified lines | ||
| 31 | 31 | QScriptValue form(const QString& title, QScriptValue array); |
| 32 | 32 | QScriptValue prompt(const QString& message = "", const QString& defaultText = ""); |
| 33 | 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 | 35 | QScriptValue s3Browse(const QString& nameFilter = ""); |
| 35 | 36 | |
| 36 | 37 | private slots: |
| @@ -38,7 +39,8 @@ private slots: · 1 unmodified line | ||
| 38 | 39 | QScriptValue showConfirm(const QString& message); |
| 39 | 40 | QScriptValue showForm(const QString& title, QScriptValue form); |
| 40 | 41 | QScriptValue showPrompt(const QString& message, const QString& defaultText); |
| 41 | − QScriptValue showBrowse(const QString& title, const QString& directory, const QString& nameFilter); | |
| 42 | + QScriptValue showBrowse(const QString& title, const QString& directory, const QString& nameFilter, | |
| 43 | + QFileDialog::AcceptMode acceptMode = QFileDialog::AcceptOpen); | |
| 42 | 44 | QScriptValue showS3Browse(const QString& nameFilter); |
| 43 | 45 | void chooseDirectory(); |
| 44 | 46 | |