feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Update getEditorForFileSuffix()

Browse Source 
Change-Id: Ib052d2dd655117492cbb26f03eaa63c8b61466bb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Robert Loehning
2014-09-17 16:46:00 +02:00
parent 74939b1884
commit 98c3a1c331
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/system/shared/editor_utils.py
View File

@@ -275,17 +275,12 @@ def getEditorForFileSuffix(curFile, treeViewSyntax=False):
editor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget") editor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
elif suffix in qmlEditorSuffixes: elif suffix in qmlEditorSuffixes:
editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget") editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget")
elif suffix in proEditorSuffixes: elif suffix in proEditorSuffixes or suffix in glslEditorSuffixes or suffix in pytEditorSuffixes:
editor = waitForObject(":Qt Creator_TextEditor::BaseTextEditorWidget") editor = waitForObject(":Qt Creator_TextEditor::BaseTextEditorWidget")
elif suffix in glslEditorSuffixes:
editor = waitForObject("{type='GLSLEditor::Internal::GLSLTextEditorWidget' unnamed='1' "
"visible='1' window=':Qt Creator_Core::Internal::MainWindow'}")
elif suffix in pytEditorSuffixes:
editor = waitForObject(":Qt Creator_PythonEditor::EditorWidget")
else: else:
test.log("Trying PlainTextEditor (file suffix: %s)" % suffix) test.log("Trying BaseTextEditorWidget (file suffix: %s)" % suffix)
try: try:
editor = waitForObject(":Qt Creator_TextEditor::PlainTextEditorWidget", 3000) editor = waitForObject(":Qt Creator_TextEditor::BaseTextEditorWidget", 3000)
except: except:
test.fatal("Unsupported file suffix for file '%s'" % curFile) test.fatal("Unsupported file suffix for file '%s'" % curFile)
editor = None editor = None