Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-16 23:26:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix up script editor's "reload script?" message box

Browse source
This commit is contained in:
David Rowe 2016-03-15 09:04:23 +13:00
parent f75aa97728
commit ab963b4a4b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/dialogs/MessageDialog.qml
View file

@ -88,7 +88,7 @@ ModalWindow {
RalewaySemiBold {
id: mainTextContainer
onTextChanged: d.resize();
wrapMode: Text.WordWrap
wrapMode: Text.contains("\n") ? Text.NoWrap : Text.WordWrap
size: hifi.fontSizes.menuItem
color: hifi.colors.baseGrayHighlight
anchors {

4
interface/src/ui/ScriptEditorWidget.cpp
View file

@ -226,8 +226,8 @@ void ScriptEditorWidget::onWindowActivated() {
if (QFileInfo(_currentScript).lastModified() > _currentScriptModified) {
if (static_cast<ScriptEditorWindow*>(this->parent()->parent()->parent())->autoReloadScripts()
|| OffscreenUi::warning(this, _currentScript,
tr("This file has been modified outside of the Interface editor.") + "\n\n"
|| OffscreenUi::question(this, tr("Reload Script"),
tr("The following file has been modified outside of the Interface editor:") + "\n" + _currentScript + "\n"
+ (isModified()
? tr("Do you want to reload it and lose the changes you've made in the Interface editor?")
: tr("Do you want to reload it?")),