Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 06:59:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12184 from ctrlaltdavid/21700

Browse source 
Add Window browseChanged signal as replacement for openFileChanged
This commit is contained in:
Ryan Downe Karpf 2018-01-19 10:45:27 -08:00 committed by GitHub
commit f1b18ccc00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/scripting/WindowScriptingInterface.cpp
View file

@ -277,7 +277,8 @@ void WindowScriptingInterface::browseAsync(const QString& title, const QString&
if (!result.isEmpty()) { if (!result.isEmpty()) {
setPreviousBrowseLocation(QFileInfo(result).absolutePath()); setPreviousBrowseLocation(QFileInfo(result).absolutePath());
} }
emit openFileChanged(result); emit browseChanged(result);
emit openFileChanged(result); // Deprecated signal; to be removed in due course.
}); });
} }

16
interface/src/scripting/WindowScriptingInterface.h
View file

@ -197,18 +197,19 @@ public slots:
/**jsdoc /**jsdoc
* Prompt the user to choose a file. Displays a non-modal dialog that navigates the directory tree. A * Prompt the user to choose a file. Displays a non-modal dialog that navigates the directory tree. A
* {@link Window.openFileChanged|openFileChanged} signal is emitted when a file is chosen; no signal is emitted if the user * {@link Window.browseChanged|browseChanged} signal is emitted when a file is chosen; no signal is emitted if the user
* cancels the dialog. * cancels the dialog.
* @deprecated A deprecated {@link Window.openFileChanged|openFileChanged} signal is also emitted when a file is chosen.
* @function Window.browseAsync * @function Window.browseAsync
* @param {string} title="" - The title to display at the top of the dialog. * @param {string} title="" - The title to display at the top of the dialog.
* @param {string} directory="" - The initial directory to start browsing at. * @param {string} directory="" - The initial directory to start browsing at.
* @param {string} nameFilter="" - The types of files to display. Examples: <code>"*.json"</code> and * @param {string} nameFilter="" - The types of files to display. Examples: <code>"*.json"</code> and
* <code>"Images (*.png *.jpg *.svg)"</code>. All files are displayed if a filter isn't specified. * <code>"Images (*.png *.jpg *.svg)"</code>. All files are displayed if a filter isn't specified.
* @example <caption>Ask the user to choose an image file without waiting for the answer.</caption> * @example <caption>Ask the user to choose an image file without waiting for the answer.</caption>
* function onOpenFileChanged(filename) { * function onBrowseChanged(filename) {
* print("File: " + filename); * print("File: " + filename);
* } * }
* Window.openFileChanged.connect(onOpenFileChanged); * Window.browseChanged.connect(onBrowseChanged);
* *
* Window.browseAsync("Select Image File", Paths.resources, "Images (*.png *.jpg *.svg)"); * Window.browseAsync("Select Image File", Paths.resources, "Images (*.png *.jpg *.svg)");
* print("Script continues without waiting"); * print("Script continues without waiting");
@ -659,9 +660,18 @@ signals:
*/ */
void saveFileChanged(QString filename); void saveFileChanged(QString filename);
/**jsdoc
* Triggered when the user chooses a file in a {@link Window.browseAsync|browseAsync} dialog.
* @function Window.browseChanged
* @param {string} filename - The path and name of the file the user chose in the dialog.
* @returns {Signal}
*/
void browseChanged(QString filename);
/**jsdoc /**jsdoc
* Triggered when the user chooses a file in a {@link Window.browseAsync|browseAsync} dialog. * Triggered when the user chooses a file in a {@link Window.browseAsync|browseAsync} dialog.
* @function Window.openFileChanged * @function Window.openFileChanged
* @deprecated This signal is being replaced with {@link Window.browseChanged|browseChanged} and will be removed.
* @param {string} filename - The path and name of the file the user chose in the dialog. * @param {string} filename - The path and name of the file the user chose in the dialog.
* @returns {Signal} * @returns {Signal}
*/ */

6
scripts/system/edit.js
View file

@ -448,7 +448,7 @@ var toolBar = (function () {
}); });
addButton("importEntitiesButton", "assets-01.svg", function() { addButton("importEntitiesButton", "assets-01.svg", function() {
Window.openFileChanged.connect(onFileOpenChanged); Window.browseChanged.connect(onFileOpenChanged);
Window.browseAsync("Select Model to Import", "", "*.json"); Window.browseAsync("Select Model to Import", "", "*.json");
}); });
@ -1497,7 +1497,7 @@ function onFileOpenChanged(filename) {
// disconnect the event, otherwise the requests will stack up // disconnect the event, otherwise the requests will stack up
try { try {
// Not all calls to onFileOpenChanged() connect an event. // Not all calls to onFileOpenChanged() connect an event.
Window.openFileChanged.disconnect(onFileOpenChanged); Window.browseChanged.disconnect(onFileOpenChanged);
} catch (e) { } catch (e) {
// Ignore. // Ignore.
} }
@ -1549,7 +1549,7 @@ function handeMenuEvent(menuItem) {
} }
} else if (menuItem === "Import Entities" || menuItem === "Import Entities from URL") { } else if (menuItem === "Import Entities" || menuItem === "Import Entities from URL") {
if (menuItem === "Import Entities") { if (menuItem === "Import Entities") {
Window.openFileChanged.connect(onFileOpenChanged); Window.browseChanged.connect(onFileOpenChanged);
Window.browseAsync("Select Model to Import", "", "*.json"); Window.browseAsync("Select Model to Import", "", "*.json");
} else { } else {
Window.promptTextChanged.connect(onPromptTextChanged); Window.promptTextChanged.connect(onPromptTextChanged);