Commit 9afe6fa1 authored by Robert Loehning's avatar Robert Loehning

Squish: Update texts of message boxes

Change-Id: I3ca17bb62201d6271c0e98d07a99f7344faba439
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent 5c0b21d7
......@@ -178,7 +178,7 @@
:QtVersionLabel_KitPage {container=':qt_tabwidget_stackedwidget_QWidget' text='Qt version:' type='QLabel' unnamed='1' visible='1'}
:Remove_QPushButton {container=':qt_tabwidget_stackedwidget_QScrollArea' text='Remove' type='QPushButton' unnamed='1' visible='1'}
:Restart required.OK_QPushButton {text='OK' type='QPushButton' unnamed='1' visible='1' window=':Restart required_QMessageBox'}
:Restart required_QMessageBox {text='The language change will take effect after a restart of Qt Creator.' type='QMessageBox' unnamed='1' visible='1'}
:Restart required_QMessageBox {text='The language change will take effect after restart.' type='QMessageBox' unnamed='1' visible='1'}
:Revert to Saved.Proceed_QPushButton {text='Proceed' type='QPushButton' unnamed='1' visible='1' window=':Revert to Saved_QMessageBox'}
:Revert to Saved_QMessageBox {text?='You will lose your current changes if you proceed reverting*' type='QMessageBox' unnamed='1' visible='1'}
:RunSettingsEnvironmentDetails_Utils::DetailsButton {leftWidget=':RunSettingsUseBuildEnvironment_QLabel' text='Details' type='Utils::DetailsButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
......
......@@ -45,7 +45,8 @@ def main():
contentBefore = readFile(currentFile)
os.remove(currentFile)
if not currentFile.endswith(".bin"):
popupText = "The file %s was removed. Do you want to save it under a different name, or close the editor?"
popupText = ("The file %s has been removed from disk. Do you want to "
"save it under a different name, or close the editor?")
test.compare(waitForObject(":File has been removed_QMessageBox").text,
popupText % currentFile)
clickButton(waitForObject(":File has been removed.Save_QPushButton"))
......@@ -56,11 +57,10 @@ def main():
test.compare(readFile(currentFile), contentBefore,
"Verifying that file '%s' was restored correctly" % currentFile)
# Different warning because of QTCREATORBUG-8130
popupText2 = "The file %s has been removed outside Qt Creator. Do you want to save it under a different name, or close the editor?"
# Test for QTCREATORBUG-8130
os.remove(currentFile)
test.compare(waitForObject(":File has been removed_QMessageBox").text,
popupText2 % currentFile)
popupText % currentFile)
clickButton(waitForObject(":File has been removed.Close_QPushButton"))
test.verify(checkIfObjectExists(objectMap.realName(editor), False),
"Was the editor closed after deleting the file?")
......
......@@ -45,9 +45,9 @@ def main():
if not startedWithoutPluginError():
return
mBox = ("{text?='The file * has changed outside Qt Creator. Do you want to reload it?' "
mBox = ("{text?='The file * has been changed on disk. Do you want to reload it?' "
"type='QMessageBox' unnamed='1' visible='1'}")
popupText = "The file <i>%s</i> has changed outside Qt Creator. Do you want to reload it?"
popupText = "The file <i>%s</i> has been changed on disk. Do you want to reload it?"
formerContent = None
for i, currentFile in enumerate(files):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment