History

keep signature for askToLoadScript

Stephen Birarda committed 10 years ago

Commit 5bce9241 parent 216e47b2 files · +6 −5Browse files

Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all

Unified · Split

interface/src/Application.cpp+5−4
@@ -4804,16 +4804,17 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 4803 unmodified lines
4804}4804}
4805 4805
4806 4806
4807bool Application::askToLoadScript(QString scriptFilenameOrURL) {4807bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
4808 QMessageBox::StandardButton reply;4808 QMessageBox::StandardButton reply;
4809 4809
4810 static const QString MARKETPLACE_SCRIPT_URL_HOSTNAME_SUFFIX = "mpassets.highfidelity.com";4810 static const QString MARKETPLACE_SCRIPT_URL_HOSTNAME_SUFFIX = "mpassets.highfidelity.com";
4811 4811
4812 if (scriptFilenameOrURL.contains(MARKETPLACE_SCRIPT_URL_HOSTNAME_SUFFIX)) {4812 QString shortName = scriptFilenameOrURL;
4813 scriptFilenameOrURL = scriptFilenameOrURL.mid(scriptFilenameOrURL.lastIndexOf('/') + 1);4813 if (shortName.contains(MARKETPLACE_SCRIPT_URL_HOSTNAME_SUFFIX)) {
4814 shortName = shortName.mid(shortName.lastIndexOf('/') + 1);
4814 }4815 }
4815 4816
4816 QString message = "Would you like to run this script:\n" + scriptFilenameOrURL;4817 QString message = "Would you like to run this script:\n" + shortName;
4817 4818
4818 reply = OffscreenUi::question(getWindow(), "Run Script", message, QMessageBox::Yes | QMessageBox::No);4819 reply = OffscreenUi::question(getWindow(), "Run Script", message, QMessageBox::Yes | QMessageBox::No);
4819 4820

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