Merge pull request #12552 from vladest/assetbrowser_cosmetics

Wrap text in query dialogs. Add right margins for input field and but…

John Conklin II committed 8 years ago

Commit c61ed692 parents 0bc2345 8723b313 files · +25 −28Browse files

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

Unified · Split

@@ -69,11 +69,11 @@ void AssetMappingsScriptingInterface::getMapping(QString path, QJSValue callback · 68 unmodified lines
69		69
70	void AssetMappingsScriptingInterface::uploadFile(QString path, QString mapping, QJSValue startedCallback, QJSValue completedCallback, bool dropEvent) {	70	void AssetMappingsScriptingInterface::uploadFile(QString path, QString mapping, QJSValue startedCallback, QJSValue completedCallback, bool dropEvent) {
71	static const QString helpText =	71	static const QString helpText =
72	"Upload your asset to a specific folder by entering the full path. Specifying\n"	72	"Upload your asset to a specific folder by entering the full path. Specifying "
73	"a new folder name will automatically create that folder for you.";	73	"a new folder name will automatically create that folder for you.";
74	static const QString dropHelpText =	74	static const QString dropHelpText =
75	"This file will be added to your Asset Server.\n"	75	"This file will be added to your Asset Server.\n"
76	"Use the field below to place your file in a specific folder or to rename it.\n"	76	"Use the field below to place your file in a specific folder or to rename it. "
77	"Specifying a new folder name will automatically create that folder for you.";	77	"Specifying a new folder name will automatically create that folder for you.";
78		78
79	auto offscreenUi = DependencyManager::get<OffscreenUi>();	79	auto offscreenUi = DependencyManager::get<OffscreenUi>();