Mercurial Repositories > eric / file comparison
comparison: eric7/UI/UserInterface.py
eric7/UI/UserInterface.py
- branch
- unittest
- changeset 9066
- a219ade50f7c
- parent 9065
- 39405e6eba20
- child 9072
- 8d3ae97ee666
equal
deleted
inserted
replaced
| 9065:39405e6eba20 | 9066:a219ade50f7c |
|---|---|
| 339 self.stderr = Redirector(True, self) | 339 self.stderr = Redirector(True, self) |
| 340 | 340 |
| 341 # set a few dialog members for non-modal dialogs created on demand | 341 # set a few dialog members for non-modal dialogs created on demand |
| 342 self.programsDialog = None | 342 self.programsDialog = None |
| 343 self.shortcutsDialog = None | 343 self.shortcutsDialog = None |
| 344 self.__unittestWidget = None | 344 self.__testingWidget = None |
| 345 self.findFileNameDialog = None | 345 self.findFileNameDialog = None |
| 346 self.diffDlg = None | 346 self.diffDlg = None |
| 347 self.compareDlg = None | 347 self.compareDlg = None |
| 348 self.findFilesDialog = None | 348 self.findFilesDialog = None |
| 349 self.replaceFilesDialog = None | 349 self.replaceFilesDialog = None |
| 370 self.viewmanager.openSourceFile) | 370 self.viewmanager.openSourceFile) |
| 371 self.projectBrowser.psBrowser.sourceFile[str, int, str].connect( | 371 self.projectBrowser.psBrowser.sourceFile[str, int, str].connect( |
| 372 self.viewmanager.openSourceFile) | 372 self.viewmanager.openSourceFile) |
| 373 self.projectBrowser.psBrowser.closeSourceWindow.connect( | 373 self.projectBrowser.psBrowser.closeSourceWindow.connect( |
| 374 self.viewmanager.closeWindow) | 374 self.viewmanager.closeWindow) |
| 375 self.projectBrowser.psBrowser.unittestOpen.connect( | 375 self.projectBrowser.psBrowser.testFile.connect( |
| 376 self.__unittestScript) | 376 self.__startTestScript) |
| 377 | 377 |
| 378 self.projectBrowser.pfBrowser.designerFile.connect(self.__designer) | 378 self.projectBrowser.pfBrowser.designerFile.connect(self.__designer) |
| 379 self.projectBrowser.pfBrowser.sourceFile.connect( | 379 self.projectBrowser.pfBrowser.sourceFile.connect( |
| 380 self.viewmanager.openSourceFile) | 380 self.viewmanager.openSourceFile) |
| 381 self.projectBrowser.pfBrowser.uipreview.connect(self.__UIPreviewer) | 381 self.projectBrowser.pfBrowser.uipreview.connect(self.__UIPreviewer) |
| 529 self.browser.pixmapEditFile.connect(self.__editPixmap) | 529 self.browser.pixmapEditFile.connect(self.__editPixmap) |
| 530 self.browser.pixmapFile.connect(self.__showPixmap) | 530 self.browser.pixmapFile.connect(self.__showPixmap) |
| 531 self.browser.svgFile.connect(self.__showSvg) | 531 self.browser.svgFile.connect(self.__showSvg) |
| 532 self.browser.umlFile.connect(self.__showUml) | 532 self.browser.umlFile.connect(self.__showUml) |
| 533 self.browser.binaryFile.connect(self.__openHexEditor) | 533 self.browser.binaryFile.connect(self.__openHexEditor) |
| 534 self.browser.unittestOpen.connect(self.__unittestScript) | 534 self.browser.testFile.connect(self.__startTestScript) |
| 535 self.browser.trpreview.connect(self.__TRPreviewer) | 535 self.browser.trpreview.connect(self.__TRPreviewer) |
| 536 | 536 |
| 537 self.debuggerUI.debuggingStarted.connect( | 537 self.debuggerUI.debuggingStarted.connect( |
| 538 self.browser.handleProgramChange) | 538 self.browser.handleProgramChange) |
| 539 | 539 |
| 659 app.focusChanged.connect(self.viewmanager.appFocusChanged) | 659 app.focusChanged.connect(self.viewmanager.appFocusChanged) |
| 660 | 660 |
| 661 # Initialize the instance variables. | 661 # Initialize the instance variables. |
| 662 self.currentProg = None | 662 self.currentProg = None |
| 663 self.isProg = False | 663 self.isProg = False |
| 664 # TODO: rename/eliminate/rework these two related to unittest | |
| 664 self.utEditorOpen = False | 665 self.utEditorOpen = False |
| 665 self.utProjectOpen = False | 666 self.utProjectOpen = False |
| 666 | 667 |
| 667 self.inDragDrop = False | 668 self.inDragDrop = False |
| 668 self.setAcceptDrops(True) | 669 self.setAcceptDrops(True) |
| 2508 """<p>Opens a dialog to send a feature request.</p>""" | 2509 """<p>Opens a dialog to send a feature request.</p>""" |
| 2509 )) | 2510 )) |
| 2510 self.requestFeatureAct.triggered.connect(self.__requestFeature) | 2511 self.requestFeatureAct.triggered.connect(self.__requestFeature) |
| 2511 self.actions.append(self.requestFeatureAct) | 2512 self.actions.append(self.requestFeatureAct) |
| 2512 | 2513 |
| 2513 self.utActGrp = createActionGroup(self) | 2514 self.testingActGrp = createActionGroup(self) |
| 2514 | 2515 |
| 2515 self.utDialogAct = EricAction( | 2516 self.testingDialogAct = EricAction( |
| 2516 self.tr('Unittest'), | 2517 self.tr('Testing'), |
| 2517 UI.PixmapCache.getIcon("unittest"), | 2518 UI.PixmapCache.getIcon("unittest"), |
| 2518 self.tr('&Unittest...'), | 2519 self.tr('&Testing...'), |
| 2519 0, 0, self.utActGrp, 'unittest') | 2520 0, 0, self.testingActGrp, 'unittest') |
| 2520 self.utDialogAct.setStatusTip(self.tr('Start unittest dialog')) | 2521 self.testingDialogAct.setStatusTip(self.tr('Start the testing dialog')) |
| 2521 self.utDialogAct.setWhatsThis(self.tr( | 2522 self.testingDialogAct.setWhatsThis(self.tr( |
| 2522 """<b>Unittest</b>""" | 2523 """<b>Testing</b>""" |
| 2523 """<p>Perform unit tests. The dialog gives the""" | 2524 """<p>Perform test runss. The dialog gives the""" |
| 2524 """ ability to select and run a unittest suite or""" | 2525 """ ability to select and run a test suite or""" |
| 2525 """auto discover them.</p>""" | 2526 """auto discover them.</p>""" |
| 2526 )) | 2527 )) |
| 2527 self.utDialogAct.triggered.connect(self.__unittest) | 2528 self.testingDialogAct.triggered.connect(self.__startTesting) |
| 2528 self.actions.append(self.utDialogAct) | 2529 self.actions.append(self.testingDialogAct) |
| 2529 | 2530 |
| 2530 self.utRestartAct = EricAction( | 2531 self.restartTestAct = EricAction( |
| 2531 self.tr('Unittest Restart'), | 2532 self.tr('Restart Last Test'), |
| 2532 UI.PixmapCache.getIcon("unittestRestart"), | 2533 UI.PixmapCache.getIcon("unittestRestart"), |
| 2533 self.tr('&Restart Unittest...'), | 2534 self.tr('&Restart Last Test...'), |
| 2534 0, 0, self.utActGrp, 'unittest_restart') | 2535 0, 0, self.testingActGrp, 'unittest_restart') |
| 2535 self.utRestartAct.setStatusTip(self.tr('Restart last unittest')) | 2536 self.restartTestAct.setStatusTip(self.tr('Restarts the last test')) |
| 2536 self.utRestartAct.setWhatsThis(self.tr( | 2537 self.restartTestAct.setWhatsThis(self.tr( |
| 2537 """<b>Restart Unittest</b>""" | 2538 """<b>Restart Last Test</b>""" |
| 2538 """<p>Restart the unittest performed last.</p>""" | 2539 """<p>Restarts the test performed last.</p>""" |
| 2539 )) | 2540 )) |
| 2540 self.utRestartAct.triggered.connect(self.__unittestRestart) | 2541 self.restartTestAct.triggered.connect(self.__restartTest) |
| 2541 self.utRestartAct.setEnabled(False) | 2542 self.restartTestAct.setEnabled(False) |
| 2542 self.actions.append(self.utRestartAct) | 2543 self.actions.append(self.restartTestAct) |
| 2543 | 2544 |
| 2544 self.utRerunFailedAct = EricAction( | 2545 self.rerunFailedTestsAct = EricAction( |
| 2545 self.tr('Unittest Rerun Failed'), | 2546 self.tr('Rerun Failed Tests'), |
| 2546 UI.PixmapCache.getIcon("unittestRerunFailed"), | 2547 UI.PixmapCache.getIcon("unittestRerunFailed"), |
| 2547 self.tr('Rerun Failed Tests...'), | 2548 self.tr('Rerun Failed Tests...'), |
| 2548 0, 0, self.utActGrp, 'unittest_rerun_failed') | 2549 0, 0, self.testingActGrp, 'unittest_rerun_failed') |
| 2549 self.utRerunFailedAct.setStatusTip(self.tr( | 2550 self.rerunFailedTestsAct.setStatusTip(self.tr( |
| 2550 'Rerun failed tests of the last run')) | 2551 'Rerun failed tests of the last run')) |
| 2551 self.utRerunFailedAct.setWhatsThis(self.tr( | 2552 self.rerunFailedTestsAct.setWhatsThis(self.tr( |
| 2552 """<b>Rerun Failed Tests</b>""" | 2553 """<b>Rerun Failed Tests</b>""" |
| 2553 """<p>Rerun all tests that failed during the last unittest""" | 2554 """<p>Rerun all tests that failed during the last test run.</p>""" |
| 2554 """ run.</p>""" | |
| 2555 )) | 2555 )) |
| 2556 self.utRerunFailedAct.triggered.connect(self.__unittestRerunFailed) | 2556 self.rerunFailedTestsAct.triggered.connect(self.__rerunFailedTests) |
| 2557 self.utRerunFailedAct.setEnabled(False) | 2557 self.rerunFailedTestsAct.setEnabled(False) |
| 2558 self.actions.append(self.utRerunFailedAct) | 2558 self.actions.append(self.rerunFailedTestsAct) |
| 2559 | 2559 |
| 2560 self.utScriptAct = EricAction( | 2560 self.testScriptAct = EricAction( |
| 2561 self.tr('Unittest Script'), | 2561 self.tr('Test Script'), |
| 2562 UI.PixmapCache.getIcon("unittestScript"), | 2562 UI.PixmapCache.getIcon("unittestScript"), |
| 2563 self.tr('Unittest &Script...'), | 2563 self.tr('Test &Script...'), |
| 2564 0, 0, self.utActGrp, 'unittest_script') | 2564 0, 0, self.testingActGrp, 'unittest_script') |
| 2565 self.utScriptAct.setStatusTip(self.tr( | 2565 self.testScriptAct.setStatusTip(self.tr( |
| 2566 'Run unittest with current script')) | 2566 'Run tests of the current script')) |
| 2567 self.utScriptAct.setWhatsThis(self.tr( | 2567 self.testScriptAct.setWhatsThis(self.tr( |
| 2568 """<b>Unittest Script</b>""" | 2568 """<b>Test Script</b>""" |
| 2569 """<p>Run unittest with current script.</p>""" | 2569 """<p>Run tests with the current script.</p>""" |
| 2570 )) | 2570 )) |
| 2571 self.utScriptAct.triggered.connect(self.__unittestScript) | 2571 self.testScriptAct.triggered.connect(self.__startTestScript) |
| 2572 self.utScriptAct.setEnabled(False) | 2572 self.testScriptAct.setEnabled(False) |
| 2573 self.actions.append(self.utScriptAct) | 2573 self.actions.append(self.testScriptAct) |
| 2574 | 2574 |
| 2575 self.utProjectAct = EricAction( | 2575 self.testProjectAct = EricAction( |
| 2576 self.tr('Unittest Project'), | 2576 self.tr('Test Project'), |
| 2577 UI.PixmapCache.getIcon("unittestProject"), | 2577 UI.PixmapCache.getIcon("unittestProject"), |
| 2578 self.tr('Unittest &Project...'), | 2578 self.tr('Test &Project...'), |
| 2579 0, 0, self.utActGrp, 'unittest_project') | 2579 0, 0, self.testingActGrp, 'unittest_project') |
| 2580 self.utProjectAct.setStatusTip(self.tr( | 2580 self.testProjectAct.setStatusTip(self.tr( |
| 2581 'Run unittest with current project')) | 2581 'Run tests of the current project')) |
| 2582 self.utProjectAct.setWhatsThis(self.tr( | 2582 self.testProjectAct.setWhatsThis(self.tr( |
| 2583 """<b>Unittest Project</b>""" | 2583 """<b>Test Project</b>""" |
| 2584 """<p>Run unittest with current project.</p>""" | 2584 """<p>Run test of the current project.</p>""" |
| 2585 )) | 2585 )) |
| 2586 self.utProjectAct.triggered.connect(self.__unittestProject) | 2586 self.testProjectAct.triggered.connect(self.__startTestProject) |
| 2587 self.utProjectAct.setEnabled(False) | 2587 self.testProjectAct.setEnabled(False) |
| 2588 self.actions.append(self.utProjectAct) | 2588 self.actions.append(self.testProjectAct) |
| 2589 | 2589 |
| 2590 # check for Qt5 designer and linguist | 2590 # check for Qt5 designer and linguist |
| 2591 if Utilities.isWindowsPlatform(): | 2591 if Utilities.isWindowsPlatform(): |
| 2592 designerExe = os.path.join( | 2592 designerExe = os.path.join( |
| 2593 Utilities.getQtBinariesPath(), | 2593 Utilities.getQtBinariesPath(), |
| 3398 | 3398 |
| 3399 ############################################################## | 3399 ############################################################## |
| 3400 ## Extras/Unittest menu | 3400 ## Extras/Unittest menu |
| 3401 ############################################################## | 3401 ############################################################## |
| 3402 | 3402 |
| 3403 self.__menus["unittest"] = QMenu(self.tr('&Unittest'), self) | 3403 self.__menus["testing"] = QMenu(self.tr('&Testing'), self) |
| 3404 self.__menus["unittest"].setTearOffEnabled(True) | 3404 self.__menus["testing"].setTearOffEnabled(True) |
| 3405 self.__menus["unittest"].addAction(self.utDialogAct) | 3405 self.__menus["testing"].addAction(self.testingDialogAct) |
| 3406 self.__menus["unittest"].addSeparator() | 3406 self.__menus["testing"].addSeparator() |
| 3407 self.__menus["unittest"].addAction(self.utRestartAct) | 3407 self.__menus["testing"].addAction(self.restartTestAct) |
| 3408 self.__menus["unittest"].addAction(self.utRerunFailedAct) | 3408 self.__menus["testing"].addAction(self.rerunFailedTestsAct) |
| 3409 self.__menus["unittest"].addSeparator() | 3409 self.__menus["testing"].addSeparator() |
| 3410 self.__menus["unittest"].addAction(self.utScriptAct) | 3410 self.__menus["testing"].addAction(self.testScriptAct) |
| 3411 self.__menus["unittest"].addAction(self.utProjectAct) | 3411 self.__menus["testing"].addAction(self.testProjectAct) |
| 3412 | 3412 |
| 3413 self.__menus["extras"].addMenu(self.__menus["unittest"]) | 3413 self.__menus["extras"].addMenu(self.__menus["testing"]) |
| 3414 self.__menus["extras"].addSeparator() | 3414 self.__menus["extras"].addSeparator() |
| 3415 | 3415 |
| 3416 ############################################################## | 3416 ############################################################## |
| 3417 ## Extras/Builtin,Plugin,User tools menus | 3417 ## Extras/Builtin,Plugin,User tools menus |
| 3418 ############################################################## | 3418 ############################################################## |
| 3596 viewtb = self.viewmanager.initViewToolbar(self.toolbarManager) | 3596 viewtb = self.viewmanager.initViewToolbar(self.toolbarManager) |
| 3597 starttb, debugtb = self.debuggerUI.initToolbars(self.toolbarManager) | 3597 starttb, debugtb = self.debuggerUI.initToolbars(self.toolbarManager) |
| 3598 multiprojecttb = self.multiProject.initToolbar(self.toolbarManager) | 3598 multiprojecttb = self.multiProject.initToolbar(self.toolbarManager) |
| 3599 projecttb, vcstb = self.project.initToolbars(self.toolbarManager) | 3599 projecttb, vcstb = self.project.initToolbars(self.toolbarManager) |
| 3600 toolstb = QToolBar(self.tr("Tools"), self) | 3600 toolstb = QToolBar(self.tr("Tools"), self) |
| 3601 unittesttb = QToolBar(self.tr("Unittest"), self) | 3601 testingtb = QToolBar(self.tr("Testing"), self) |
| 3602 bookmarktb = self.viewmanager.initBookmarkToolbar(self.toolbarManager) | 3602 bookmarktb = self.viewmanager.initBookmarkToolbar(self.toolbarManager) |
| 3603 spellingtb = self.viewmanager.initSpellingToolbar(self.toolbarManager) | 3603 spellingtb = self.viewmanager.initSpellingToolbar(self.toolbarManager) |
| 3604 settingstb = QToolBar(self.tr("Settings"), self) | 3604 settingstb = QToolBar(self.tr("Settings"), self) |
| 3605 helptb = QToolBar(self.tr("Help"), self) | 3605 helptb = QToolBar(self.tr("Help"), self) |
| 3606 profilestb = QToolBar(self.tr("Profiles"), self) | 3606 profilestb = QToolBar(self.tr("Profiles"), self) |
| 3607 pluginstb = QToolBar(self.tr("Plugins"), self) | 3607 pluginstb = QToolBar(self.tr("Plugins"), self) |
| 3608 | 3608 |
| 3609 toolstb.setIconSize(Config.ToolBarIconSize) | 3609 toolstb.setIconSize(Config.ToolBarIconSize) |
| 3610 unittesttb.setIconSize(Config.ToolBarIconSize) | 3610 testingtb.setIconSize(Config.ToolBarIconSize) |
| 3611 settingstb.setIconSize(Config.ToolBarIconSize) | 3611 settingstb.setIconSize(Config.ToolBarIconSize) |
| 3612 helptb.setIconSize(Config.ToolBarIconSize) | 3612 helptb.setIconSize(Config.ToolBarIconSize) |
| 3613 profilestb.setIconSize(Config.ToolBarIconSize) | 3613 profilestb.setIconSize(Config.ToolBarIconSize) |
| 3614 pluginstb.setIconSize(Config.ToolBarIconSize) | 3614 pluginstb.setIconSize(Config.ToolBarIconSize) |
| 3615 | 3615 |
| 3616 toolstb.setObjectName("ToolsToolbar") | 3616 toolstb.setObjectName("ToolsToolbar") |
| 3617 unittesttb.setObjectName("UnittestToolbar") | 3617 testingtb.setObjectName("UnittestToolbar") |
| 3618 settingstb.setObjectName("SettingsToolbar") | 3618 settingstb.setObjectName("SettingsToolbar") |
| 3619 helptb.setObjectName("HelpToolbar") | 3619 helptb.setObjectName("HelpToolbar") |
| 3620 profilestb.setObjectName("ProfilesToolbar") | 3620 profilestb.setObjectName("ProfilesToolbar") |
| 3621 pluginstb.setObjectName("PluginsToolbar") | 3621 pluginstb.setObjectName("PluginsToolbar") |
| 3622 | 3622 |
| 3623 toolstb.setToolTip(self.tr("Tools")) | 3623 toolstb.setToolTip(self.tr("Tools")) |
| 3624 unittesttb.setToolTip(self.tr("Unittest")) | 3624 testingtb.setToolTip(self.tr("Unittest")) |
| 3625 settingstb.setToolTip(self.tr("Settings")) | 3625 settingstb.setToolTip(self.tr("Settings")) |
| 3626 helptb.setToolTip(self.tr("Help")) | 3626 helptb.setToolTip(self.tr("Help")) |
| 3627 profilestb.setToolTip(self.tr("Profiles")) | 3627 profilestb.setToolTip(self.tr("Profiles")) |
| 3628 pluginstb.setToolTip(self.tr("Plugins")) | 3628 pluginstb.setToolTip(self.tr("Plugins")) |
| 3629 | 3629 |
| 3633 act = filetb.actions()[0] | 3633 act = filetb.actions()[0] |
| 3634 sep = filetb.insertSeparator(act) | 3634 sep = filetb.insertSeparator(act) |
| 3635 filetb.insertAction(sep, self.newWindowAct) | 3635 filetb.insertAction(sep, self.newWindowAct) |
| 3636 self.toolbarManager.addToolBar(filetb, filetb.windowTitle()) | 3636 self.toolbarManager.addToolBar(filetb, filetb.windowTitle()) |
| 3637 | 3637 |
| 3638 # setup the unittest toolbar | 3638 # setup the testing toolbar |
| 3639 unittesttb.addAction(self.utDialogAct) | 3639 testingtb.addAction(self.testingDialogAct) |
| 3640 unittesttb.addSeparator() | 3640 testingtb.addSeparator() |
| 3641 unittesttb.addAction(self.utRestartAct) | 3641 testingtb.addAction(self.restartTestAct) |
| 3642 unittesttb.addAction(self.utRerunFailedAct) | 3642 testingtb.addAction(self.rerunFailedTestsAct) |
| 3643 unittesttb.addSeparator() | 3643 testingtb.addSeparator() |
| 3644 unittesttb.addAction(self.utScriptAct) | 3644 testingtb.addAction(self.testScriptAct) |
| 3645 unittesttb.addAction(self.utProjectAct) | 3645 testingtb.addAction(self.testProjectAct) |
| 3646 self.toolbarManager.addToolBar(unittesttb, unittesttb.windowTitle()) | 3646 self.toolbarManager.addToolBar(testingtb, testingtb.windowTitle()) |
| 3647 | 3647 |
| 3648 # setup the tools toolbar | 3648 # setup the tools toolbar |
| 3649 if self.designer4Act is not None: | 3649 if self.designer4Act is not None: |
| 3650 toolstb.addAction(self.designer4Act) | 3650 toolstb.addAction(self.designer4Act) |
| 3651 if self.linguist4Act is not None: | 3651 if self.linguist4Act is not None: |
| 3721 self.addToolBar(Qt.ToolBarArea.RightToolBarArea, settingstb) | 3721 self.addToolBar(Qt.ToolBarArea.RightToolBarArea, settingstb) |
| 3722 self.addToolBar(Qt.ToolBarArea.RightToolBarArea, toolstb) | 3722 self.addToolBar(Qt.ToolBarArea.RightToolBarArea, toolstb) |
| 3723 self.addToolBar(helptb) | 3723 self.addToolBar(helptb) |
| 3724 self.addToolBar(bookmarktb) | 3724 self.addToolBar(bookmarktb) |
| 3725 self.addToolBar(spellingtb) | 3725 self.addToolBar(spellingtb) |
| 3726 self.addToolBar(unittesttb) | 3726 self.addToolBar(testingtb) |
| 3727 self.addToolBar(profilestb) | 3727 self.addToolBar(profilestb) |
| 3728 self.addToolBar(pluginstb) | 3728 self.addToolBar(pluginstb) |
| 3729 | 3729 |
| 3730 # hide toolbars not wanted in the initial layout | 3730 # hide toolbars not wanted in the initial layout |
| 3731 searchtb.hide() | 3731 searchtb.hide() |
| 3732 viewtb.hide() | 3732 viewtb.hide() |
| 3733 debugtb.hide() | 3733 debugtb.hide() |
| 3734 multiprojecttb.hide() | 3734 multiprojecttb.hide() |
| 3735 helptb.hide() | 3735 helptb.hide() |
| 3736 spellingtb.hide() | 3736 spellingtb.hide() |
| 3737 unittesttb.hide() | 3737 testingtb.hide() |
| 3738 pluginstb.hide() | 3738 pluginstb.hide() |
| 3739 | 3739 |
| 3740 # just add new toolbars to the end of the list | 3740 # just add new toolbars to the end of the list |
| 3741 self.__toolbars = {} | 3741 self.__toolbars = {} |
| 3742 self.__toolbars["file"] = [filetb.windowTitle(), filetb, ""] | 3742 self.__toolbars["file"] = [filetb.windowTitle(), filetb, ""] |
| 3750 self.__toolbars["help"] = [helptb.windowTitle(), helptb, ""] | 3750 self.__toolbars["help"] = [helptb.windowTitle(), helptb, ""] |
| 3751 self.__toolbars["settings"] = [settingstb.windowTitle(), settingstb, | 3751 self.__toolbars["settings"] = [settingstb.windowTitle(), settingstb, |
| 3752 ""] | 3752 ""] |
| 3753 self.__toolbars["bookmarks"] = [bookmarktb.windowTitle(), bookmarktb, | 3753 self.__toolbars["bookmarks"] = [bookmarktb.windowTitle(), bookmarktb, |
| 3754 ""] | 3754 ""] |
| 3755 self.__toolbars["unittest"] = [unittesttb.windowTitle(), unittesttb, | 3755 self.__toolbars["testing"] = [testingtb.windowTitle(), testingtb, ""] |
| 3756 ""] | |
| 3757 self.__toolbars["view_profiles"] = [profilestb.windowTitle(), | 3756 self.__toolbars["view_profiles"] = [profilestb.windowTitle(), |
| 3758 profilestb, ""] | 3757 profilestb, ""] |
| 3759 self.__toolbars["plugins"] = [pluginstb.windowTitle(), pluginstb, ""] | 3758 self.__toolbars["plugins"] = [pluginstb.windowTitle(), pluginstb, ""] |
| 3760 self.__toolbars["multiproject"] = [multiprojecttb.windowTitle(), | 3759 self.__toolbars["multiproject"] = [multiprojecttb.windowTitle(), |
| 3761 multiprojecttb, ""] | 3760 multiprojecttb, ""] |
| 5331 dlg = ToolGroupConfigurationDialog( | 5330 dlg = ToolGroupConfigurationDialog( |
| 5332 self.toolGroups, self.currentToolGroup, self) | 5331 self.toolGroups, self.currentToolGroup, self) |
| 5333 if dlg.exec() == QDialog.DialogCode.Accepted: | 5332 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 5334 self.toolGroups, self.currentToolGroup = dlg.getToolGroups() | 5333 self.toolGroups, self.currentToolGroup = dlg.getToolGroups() |
| 5335 | 5334 |
| 5336 def __createUnitTestDialog(self): | 5335 def __createTestingDialog(self): |
| 5337 """ | 5336 """ |
| 5338 Private slot to generate the unit test dialog on demand. | 5337 Private slot to generate the testing dialog on demand. |
| 5339 """ | 5338 """ |
| 5340 if self.__unittestWidget is None: | 5339 if self.__testingWidget is None: |
| 5341 from Unittest.UnittestWidget import UnittestWidget | 5340 from Testing.TestingWidget import TestingWidget |
| 5342 self.__unittestWidget = UnittestWidget() | 5341 self.__testingWidget = TestingWidget() |
| 5343 self.__unittestWidget.unittestFile.connect( | 5342 self.__testingWidget.testFile.connect( |
| 5344 self.viewmanager.setFileLine) | 5343 self.viewmanager.setFileLine) |
| 5345 self.__unittestWidget.unittestStopped.connect( | 5344 self.__testingWidget.testRunStopped.connect( |
| 5346 self.__unittestStopped) | 5345 self.__testingStopped) |
| 5347 | 5346 |
| 5348 def __unittestStopped(self): | 5347 def __testingStopped(self): |
| 5349 """ | 5348 """ |
| 5350 Private slot to handle the end of a unit test run. | 5349 Private slot to handle the end of a test run. |
| 5351 """ | 5350 """ |
| 5352 self.utRerunFailedAct.setEnabled( | 5351 self.rerunFailedTestsAct.setEnabled( |
| 5353 self.__unittestWidget.hasFailedTests()) | 5352 self.__testingWidget.hasFailedTests()) |
| 5354 self.utRestartAct.setEnabled(True) | 5353 self.restartTestAct.setEnabled(True) |
| 5355 | 5354 |
| 5356 def __unittest(self): | 5355 def __startTesting(self): |
| 5357 """ | 5356 """ |
| 5358 Private slot for displaying the unittest dialog. | 5357 Private slot for displaying the testing dialog. |
| 5359 """ | 5358 """ |
| 5360 self.__createUnitTestDialog() | 5359 self.__createTestingDialog() |
| 5361 self.__unittestWidget.show() | 5360 self.__testingWidget.show() |
| 5362 self.__unittestWidget.raise_() | 5361 self.__testingWidget.raise_() |
| 5363 | 5362 |
| 5364 @pyqtSlot() | 5363 @pyqtSlot() |
| 5365 @pyqtSlot(str) | 5364 @pyqtSlot(str) |
| 5366 def __unittestScript(self, testFile=None): | 5365 def __startTestScript(self, testFile=None): |
| 5367 """ | 5366 """ |
| 5368 Private slot for displaying the unittest dialog and run the current | 5367 Private slot for displaying the testing dialog and run the current |
| 5369 script. | 5368 script. |
| 5370 | 5369 |
| 5371 @param testFile file containing the unit tests to be run | 5370 @param testFile file containing the tests to be run |
| 5372 @type str | 5371 @type str |
| 5373 """ | 5372 """ |
| 5374 if testFile is None: | 5373 if testFile is None: |
| 5375 aw = self.viewmanager.activeWindow() | 5374 aw = self.viewmanager.activeWindow() |
| 5376 fn = aw.getFileName() | 5375 fn = aw.getFileName() |
| 5378 if os.path.exists(tfn): | 5377 if os.path.exists(tfn): |
| 5379 testFile = tfn | 5378 testFile = tfn |
| 5380 else: | 5379 else: |
| 5381 testFile = fn | 5380 testFile = fn |
| 5382 | 5381 |
| 5383 self.__unittest() | 5382 self.__startTesting() |
| 5384 self.__unittestWidget.setTestFile(testFile) | 5383 self.__testingWidget.setTestFile(testFile) |
| 5385 self.utRestartAct.setEnabled(False) | 5384 self.restartTestAct.setEnabled(False) |
| 5386 self.utRerunFailedAct.setEnabled(False) | 5385 self.rerunFailedTestsAct.setEnabled(False) |
| 5387 | 5386 |
| 5388 @pyqtSlot() | 5387 @pyqtSlot() |
| 5389 def __unittestProject(self): | 5388 def __startTestProject(self): |
| 5390 """ | 5389 """ |
| 5391 Private slot for displaying the unittest dialog and run the current | 5390 Private slot for displaying the testing dialog and run the test for |
| 5392 project. | 5391 the current project. |
| 5393 """ | 5392 """ |
| 5394 testFile = None | 5393 testFile = None |
| 5395 fn = self.project.getMainScript(True) | 5394 fn = self.project.getMainScript(True) |
| 5396 if fn: | 5395 if fn: |
| 5397 tfn = Utilities.getTestFileName(fn) | 5396 tfn = Utilities.getTestFileName(fn) |
| 5398 if os.path.exists(tfn): | 5397 if os.path.exists(tfn): |
| 5399 testFile = tfn | 5398 testFile = tfn |
| 5400 | 5399 |
| 5401 self.__unittest() | 5400 self.__startTesting() |
| 5402 self.__unittestWidget.setTestFile(testFile) | 5401 self.__testingWidget.setTestFile(testFile) |
| 5403 self.utRestartAct.setEnabled(False) | 5402 self.restartTestAct.setEnabled(False) |
| 5404 self.utRerunFailedAct.setEnabled(False) | 5403 self.rerunFailedTestsAct.setEnabled(False) |
| 5405 | 5404 |
| 5406 def __unittestRestart(self): | 5405 def __restartTest(self): |
| 5407 """ | 5406 """ |
| 5408 Private slot to display the unittest dialog and rerun the last | 5407 Private slot to display the testing dialog and rerun the last |
| 5409 unit test. | 5408 test run. |
| 5410 """ | 5409 """ |
| 5411 self.__unittest() | 5410 self.__startTesting() |
| 5412 self.__unittestWidget.startTests() | 5411 self.__testingWidget.startTests() |
| 5413 | 5412 |
| 5414 def __unittestRerunFailed(self): | 5413 def __rerunFailedTests(self): |
| 5415 """ | 5414 """ |
| 5416 Private slot to display the unittest dialog and rerun all failed tests | 5415 Private slot to display the testing dialog and rerun all failed tests |
| 5417 of the last run. | 5416 of the last run. |
| 5418 """ | 5417 """ |
| 5419 self.__unittest() | 5418 self.__startTesting() |
| 5420 self.__unittestWidget.startTests(failedOnly=True) | 5419 self.__testingWidget.startTests(failedOnly=True) |
| 5421 | 5420 |
| 5422 @pyqtSlot() | 5421 @pyqtSlot() |
| 5423 @pyqtSlot(str) | 5422 @pyqtSlot(str) |
| 5424 def __designer(self, fn=None): | 5423 def __designer(self, fn=None): |
| 5425 """ | 5424 """ |
| 6814 from .ClearPrivateDataDialog import ClearPrivateDataDialog | 6813 from .ClearPrivateDataDialog import ClearPrivateDataDialog |
| 6815 dlg = ClearPrivateDataDialog(self) | 6814 dlg = ClearPrivateDataDialog(self) |
| 6816 if dlg.exec() == QDialog.DialogCode.Accepted: | 6815 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 6817 # recent files, recent projects, recent multi projects, | 6816 # recent files, recent projects, recent multi projects, |
| 6818 # debug histories, shell histories | 6817 # debug histories, shell histories |
| 6819 (files, projects, multiProjects, debug, shell, unittests, vcs, | 6818 (files, projects, multiProjects, debug, shell, testing, vcs, |
| 6820 plugins) = dlg.getData() | 6819 plugins) = dlg.getData() |
| 6821 if files: | 6820 if files: |
| 6822 # clear list of recently opened files | 6821 # clear list of recently opened files |
| 6823 self.viewmanager.clearRecent() | 6822 self.viewmanager.clearRecent() |
| 6824 if projects: | 6823 if projects: |
| 6831 # clear the various debug histories | 6830 # clear the various debug histories |
| 6832 self.debuggerUI.clearHistories() | 6831 self.debuggerUI.clearHistories() |
| 6833 if shell: | 6832 if shell: |
| 6834 # clear the shell histories | 6833 # clear the shell histories |
| 6835 self.shell.clearAllHistories() | 6834 self.shell.clearAllHistories() |
| 6836 if unittests: | 6835 if testing: |
| 6837 # clear the unit test histories | 6836 # clear the unit test histories |
| 6838 if self.__unittestWidget is None: | 6837 if self.__testingWidget is None: |
| 6839 from Unittest.UnittestWidget import clearSavedHistories | 6838 from Testing.UnittestWidget import clearSavedHistories |
| 6840 clearSavedHistories() | 6839 clearSavedHistories() |
| 6841 else: | 6840 else: |
| 6842 self.__unittestWidget.clearRecent() | 6841 self.__testingWidget.clearRecent() |
| 6843 if vcs: | 6842 if vcs: |
| 6844 # clear the VCS related histories | 6843 # clear the VCS related histories |
| 6845 self.pluginManager.clearPluginsPrivateData("version_control") | 6844 self.pluginManager.clearPluginsPrivateData("version_control") |
| 6846 if plugins: | 6845 if plugins: |
| 6847 # clear private data of plug-ins not covered above | 6846 # clear private data of plug-ins not covered above |
| 6861 """ | 6860 """ |
| 6862 from Debugger.DebugClientCapabilities import HasUnittest | 6861 from Debugger.DebugClientCapabilities import HasUnittest |
| 6863 self.__setWindowCaption(project=self.project.name) | 6862 self.__setWindowCaption(project=self.project.name) |
| 6864 cap = self.__debugServer.getClientCapabilities( | 6863 cap = self.__debugServer.getClientCapabilities( |
| 6865 self.project.getProjectLanguage()) | 6864 self.project.getProjectLanguage()) |
| 6866 self.utProjectAct.setEnabled(cap & HasUnittest) | 6865 self.testProjectAct.setEnabled(cap & HasUnittest) |
| 6867 self.utProjectOpen = cap & HasUnittest | 6866 self.utProjectOpen = cap & HasUnittest |
| 6868 | 6867 |
| 6869 def __projectClosed(self): | 6868 def __projectClosed(self): |
| 6870 """ | 6869 """ |
| 6871 Private slot to handle the projectClosed signal. | 6870 Private slot to handle the projectClosed signal. |
| 6872 """ | 6871 """ |
| 6873 self.__setWindowCaption(project="") | 6872 self.__setWindowCaption(project="") |
| 6874 self.utProjectAct.setEnabled(False) | 6873 self.testProjectAct.setEnabled(False) |
| 6875 if not self.utEditorOpen: | 6874 if not self.utEditorOpen: |
| 6876 self.utRestartAct.setEnabled(False) | 6875 self.restartTestAct.setEnabled(False) |
| 6877 self.utRerunFailedAct.setEnabled(False) | 6876 self.rerunFailedTestsAct.setEnabled(False) |
| 6878 self.utProjectOpen = False | 6877 self.utProjectOpen = False |
| 6879 | 6878 |
| 6880 def __programChange(self, fn): | 6879 def __programChange(self, fn): |
| 6881 """ | 6880 """ |
| 6882 Private slot to handle the programChange signal. | 6881 Private slot to handle the programChange signal. |
| 6894 def __lastEditorClosed(self): | 6893 def __lastEditorClosed(self): |
| 6895 """ | 6894 """ |
| 6896 Private slot to handle the lastEditorClosed signal. | 6895 Private slot to handle the lastEditorClosed signal. |
| 6897 """ | 6896 """ |
| 6898 self.wizardsMenuAct.setEnabled(False) | 6897 self.wizardsMenuAct.setEnabled(False) |
| 6899 self.utScriptAct.setEnabled(False) | 6898 self.testScriptAct.setEnabled(False) |
| 6900 self.utEditorOpen = False | 6899 self.utEditorOpen = False |
| 6901 if not self.utProjectOpen: | 6900 if not self.utProjectOpen: |
| 6902 self.utRestartAct.setEnabled(False) | 6901 self.restartTestAct.setEnabled(False) |
| 6903 self.utRerunFailedAct.setEnabled(False) | 6902 self.rerunFailedTestsAct.setEnabled(False) |
| 6904 self.__setWindowCaption(editor="") | 6903 self.__setWindowCaption(editor="") |
| 6905 | 6904 |
| 6906 def __editorOpened(self, fn): | 6905 def __editorOpened(self, fn): |
| 6907 """ | 6906 """ |
| 6908 Private slot to handle the editorOpened signal. | 6907 Private slot to handle the editorOpened signal. |
| 6917 for language in dbs.getSupportedLanguages(): | 6916 for language in dbs.getSupportedLanguages(): |
| 6918 exts = dbs.getExtensions(language) | 6917 exts = dbs.getExtensions(language) |
| 6919 if fn.endswith(exts): | 6918 if fn.endswith(exts): |
| 6920 from Debugger.DebugClientCapabilities import HasUnittest | 6919 from Debugger.DebugClientCapabilities import HasUnittest |
| 6921 cap = dbs.getClientCapabilities(language) | 6920 cap = dbs.getClientCapabilities(language) |
| 6922 self.utScriptAct.setEnabled(cap & HasUnittest) | 6921 self.testScriptAct.setEnabled(cap & HasUnittest) |
| 6923 self.utEditorOpen = cap & HasUnittest | 6922 self.utEditorOpen = cap & HasUnittest |
| 6924 return | 6923 return |
| 6925 | 6924 |
| 6926 if self.viewmanager.getOpenEditor(fn).isPyFile(): | 6925 if self.viewmanager.getOpenEditor(fn).isPyFile(): |
| 6927 self.utScriptAct.setEnabled(True) | 6926 self.testScriptAct.setEnabled(True) |
| 6928 self.utEditorOpen = True | 6927 self.utEditorOpen = True |
| 6929 | 6928 |
| 6930 def __checkActions(self, editor): | 6929 def __checkActions(self, editor): |
| 6931 """ | 6930 """ |
| 6932 Private slot to check some actions for their enable/disable status. | 6931 Private slot to check some actions for their enable/disable status. |
| 6940 for language in dbs.getSupportedLanguages(): | 6939 for language in dbs.getSupportedLanguages(): |
| 6941 exts = dbs.getExtensions(language) | 6940 exts = dbs.getExtensions(language) |
| 6942 if fn.endswith(exts): | 6941 if fn.endswith(exts): |
| 6943 from Debugger.DebugClientCapabilities import HasUnittest | 6942 from Debugger.DebugClientCapabilities import HasUnittest |
| 6944 cap = dbs.getClientCapabilities(language) | 6943 cap = dbs.getClientCapabilities(language) |
| 6945 self.utScriptAct.setEnabled(cap & HasUnittest) | 6944 self.testScriptAct.setEnabled(cap & HasUnittest) |
| 6946 self.utEditorOpen = cap & HasUnittest | 6945 self.utEditorOpen = cap & HasUnittest |
| 6947 return | 6946 return |
| 6948 | 6947 |
| 6949 if editor.isPyFile(): | 6948 if editor.isPyFile(): |
| 6950 self.utScriptAct.setEnabled(True) | 6949 self.testScriptAct.setEnabled(True) |
| 6951 self.utEditorOpen = True | 6950 self.utEditorOpen = True |
| 6952 return | 6951 return |
| 6953 | 6952 |
| 6954 self.utScriptAct.setEnabled(False) | 6953 self.testScriptAct.setEnabled(False) |
| 6955 | 6954 |
| 6956 def __writeTasks(self): | 6955 def __writeTasks(self): |
| 6957 """ | 6956 """ |
| 6958 Private slot to write the tasks data to a JSON file (.etj). | 6957 Private slot to write the tasks data to a JSON file (.etj). |
| 6959 """ | 6958 """ |
