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

Squish: Close "Take a tour" popup after startup

Browse Source 
Change-Id: Ie5edf4a3a9a90b52e3a5e74e7e17e2bd66c38841
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2019-02-04 13:49:14 +01:00
parent 99a883527b
commit 2cb872a192
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/system/objects.map
View File

@@ -196,6 +196,8 @@
:Send to Codepaster_CodePaster::PasteView {name='CodePaster__Internal__ViewDialog' type='CodePaster::PasteView' visible='1' windowTitle='Send to Codepaster'} :Send to Codepaster_CodePaster::PasteView {name='CodePaster__Internal__ViewDialog' type='CodePaster::PasteView' visible='1' windowTitle='Send to Codepaster'}
:Session Manager_ProjectExplorer::Internal::SessionDialog {name='ProjectExplorer__Internal__SessionDialog' type='ProjectExplorer::Internal::SessionDialog' visible='1' windowTitle='Session Manager'} :Session Manager_ProjectExplorer::Internal::SessionDialog {name='ProjectExplorer__Internal__SessionDialog' type='ProjectExplorer::Internal::SessionDialog' visible='1' windowTitle='Session Manager'}
:Startup.contextHelpComboBox_QComboBox {container=':Form.Startup_QGroupBox' name='contextHelpComboBox' type='QComboBox' visible='1'} :Startup.contextHelpComboBox_QComboBox {container=':Form.Startup_QGroupBox' name='contextHelpComboBox' type='QComboBox' visible='1'}
:Take a UI Tour.Cancel_QPushButton {text='Cancel' type='QPushButton' unnamed='1' visible='1' window=':Take a UI Tour_Utils::CheckableMessageBox'}
:Take a UI Tour_Utils::CheckableMessageBox {type='Utils::CheckableMessageBox' unnamed='1' visible='1' windowTitle='Take a UI Tour'}
:User Interface.languageBox_QComboBox {container=':Core__Internal__GeneralSettings.User Interface_QGroupBox' name='languageBox' type='QComboBox' visible='1'} :User Interface.languageBox_QComboBox {container=':Core__Internal__GeneralSettings.User Interface_QGroupBox' name='languageBox' type='QComboBox' visible='1'}
:Widget Box_qdesigner_internal::WidgetBoxTreeWidget {container=':*Qt Creator.Widget Box_QDockWidget' type='qdesigner_internal::WidgetBoxTreeWidget' unnamed='1' visible='1'} :Widget Box_qdesigner_internal::WidgetBoxTreeWidget {container=':*Qt Creator.Widget Box_QDockWidget' type='qdesigner_internal::WidgetBoxTreeWidget' unnamed='1' visible='1'}
:Working Copy_Utils::BaseValidatingLineEdit {type='Utils::FancyLineEdit' unnamed='1' visible='1' window=':New Text File_ProjectExplorer::JsonWizard'} :Working Copy_Utils::BaseValidatingLineEdit {type='Utils::FancyLineEdit' unnamed='1' visible='1' window=':New Text File_ProjectExplorer::JsonWizard'}

7
tests/system/shared/qtcreator.py
View File

@@ -55,7 +55,7 @@ source("../../shared/welcome.py")
source("../../shared/workarounds.py") # include this at last source("../../shared/workarounds.py") # include this at last
# additionalParameters must be a list or tuple of strings or None # additionalParameters must be a list or tuple of strings or None
def startQC(additionalParameters=None, withPreparedSettingsPath=True): def startQC(additionalParameters=None, withPreparedSettingsPath=True, cancelTour=True):
global SettingsPath global SettingsPath
appWithOptions = ['"Qt Creator"' if platform.system() == 'Darwin' else "qtcreator"] appWithOptions = ['"Qt Creator"' if platform.system() == 'Darwin' else "qtcreator"]
if withPreparedSettingsPath: if withPreparedSettingsPath:
@@ -65,7 +65,10 @@ def startQC(additionalParameters=None, withPreparedSettingsPath=True):
if platform.system() in ('Microsoft', 'Windows'): # for hooking into native file dialog if platform.system() in ('Microsoft', 'Windows'): # for hooking into native file dialog
appWithOptions.extend(('-platform', 'windows:dialogs=none')) appWithOptions.extend(('-platform', 'windows:dialogs=none'))
test.log("Starting now: %s" % ' '.join(appWithOptions)) test.log("Starting now: %s" % ' '.join(appWithOptions))
return startApplication(' '.join(appWithOptions)) appContext = startApplication(' '.join(appWithOptions))
if cancelTour:
clickButton(waitForObject(":Take a UI Tour.Cancel_QPushButton"))
return appContext;
def startedWithoutPluginError(): def startedWithoutPluginError():
try: try:

2
tests/system/suite_general/tst_installed_languages/test.py
View File

@@ -46,7 +46,7 @@ def main():
invokeMenuItem("File", "Exit") invokeMenuItem("File", "Exit")
waitForCleanShutdown() waitForCleanShutdown()
snooze(4) # wait for complete unloading of Creator snooze(4) # wait for complete unloading of Creator
startQC() startQC(cancelTour=False)
try: try:
# Use Locator for menu items which wouldn't work on macOS # Use Locator for menu items which wouldn't work on macOS
exitCommand = testData.field(lang, "Exit") exitCommand = testData.field(lang, "Exit")