From 8d21b286b45f294beaab3300683f753b4383adf6 Mon Sep 17 00:00:00 2001 From: Liv Date: Thu, 31 Aug 2017 19:34:01 -0700 Subject: [PATCH 1/2] string fix --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 88003bb10f..c67ad991d0 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -6360,7 +6360,7 @@ bool Application::askToReplaceDomainContent(const QString& url) { } } else { methodDetails = "UserDoesNotHavePermissionToReplaceContent"; - OffscreenUi::warning("Unable to replace content", "You do not have permissions to replace domain content", + OffscreenUi::warning("You do not have permissions to replace domain content", "Enable 'Replace Content' in the domain server settings to continue.", QMessageBox::Ok, QMessageBox::Ok); } QJsonObject messageProperties = { From 7eab80e49467e7ced186e75611c5cd7e4ca7004d Mon Sep 17 00:00:00 2001 From: Liv Date: Fri, 1 Sep 2017 13:17:37 -0700 Subject: [PATCH 2/2] change message when permissions to replace domain content are not present --- interface/src/Application.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index c67ad991d0..ceb4a75133 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -6320,11 +6320,11 @@ bool Application::askToWearAvatarAttachmentUrl(const QString& url) { bool Application::askToReplaceDomainContent(const QString& url) { QString methodDetails; + const int MAX_CHARACTERS_PER_LINE = 90; if (DependencyManager::get()->getThisNodeCanReplaceContent()) { QUrl originURL { url }; if (originURL.host().endsWith(MARKETPLACE_CDN_HOSTNAME)) { // Create a confirmation dialog when this call is made - const int MAX_CHARACTERS_PER_LINE = 90; static const QString infoText = simpleWordWrap("Your domain's content will be replaced with a new content set. " "If you want to save what you have now, create a backup before proceeding. For more information about backing up " "and restoring content, visit the documentation page at: ", MAX_CHARACTERS_PER_LINE) + @@ -6360,7 +6360,9 @@ bool Application::askToReplaceDomainContent(const QString& url) { } } else { methodDetails = "UserDoesNotHavePermissionToReplaceContent"; - OffscreenUi::warning("You do not have permissions to replace domain content", "Enable 'Replace Content' in the domain server settings to continue.", + static const QString warningMessage = simpleWordWrap("The domain owner must enable 'Replace Content' " + "permissions for you in this domain's server settings before you can continue.", MAX_CHARACTERS_PER_LINE); + OffscreenUi::warning("You do not have permissions to replace domain content", warningMessage, QMessageBox::Ok, QMessageBox::Ok); } QJsonObject messageProperties = {