521 # now finalize the plugin manager setup |
521 # now finalize the plugin manager setup |
522 self.pluginManager.finalizeSetup() |
522 self.pluginManager.finalizeSetup() |
523 # now activate plugins having autoload set to True |
523 # now activate plugins having autoload set to True |
524 splash.showMessage(self.tr("Activating Plugins...")) |
524 splash.showMessage(self.tr("Activating Plugins...")) |
525 self.pluginManager.activatePlugins() |
525 self.pluginManager.activatePlugins() |
|
526 splash.showMessage(self.tr("Generating Plugins Toolbars...")) |
|
527 self.pluginManager.initOnDemandPlugins() |
|
528 for name, ref in e5App().getPluginObjects(): |
|
529 try: |
|
530 tb = ref.initToolbar(self, self.toolbarManager) |
|
531 if tb is not None: |
|
532 self.addToolBar(tb) |
|
533 except AttributeError: |
|
534 # ignore it |
|
535 pass |
526 |
536 |
527 # now read the keyboard shortcuts for all the actions |
537 # now read the keyboard shortcuts for all the actions |
528 from Preferences import Shortcuts |
538 from Preferences import Shortcuts |
529 Shortcuts.readShortcuts() |
539 Shortcuts.readShortcuts() |
530 |
540 |
2557 searchtb, quicksearchtb = self.viewmanager.initSearchToolbars( |
2567 searchtb, quicksearchtb = self.viewmanager.initSearchToolbars( |
2558 self.toolbarManager) |
2568 self.toolbarManager) |
2559 viewtb = self.viewmanager.initViewToolbar(self.toolbarManager) |
2569 viewtb = self.viewmanager.initViewToolbar(self.toolbarManager) |
2560 starttb, debugtb = self.debuggerUI.initToolbars(self.toolbarManager) |
2570 starttb, debugtb = self.debuggerUI.initToolbars(self.toolbarManager) |
2561 multiprojecttb = self.multiProject.initToolbar(self.toolbarManager) |
2571 multiprojecttb = self.multiProject.initToolbar(self.toolbarManager) |
2562 projecttb = self.project.initToolbar(self.toolbarManager) |
2572 projecttb, vcstb = self.project.initToolbars(self.toolbarManager) |
2563 toolstb = QToolBar(self.tr("Tools"), self) |
2573 toolstb = QToolBar(self.tr("Tools"), self) |
2564 unittesttb = QToolBar(self.tr("Unittest"), self) |
2574 unittesttb = QToolBar(self.tr("Unittest"), self) |
2565 bookmarktb = self.viewmanager.initBookmarkToolbar(self.toolbarManager) |
2575 bookmarktb = self.viewmanager.initBookmarkToolbar(self.toolbarManager) |
2566 spellingtb = self.viewmanager.initSpellingToolbar(self.toolbarManager) |
2576 spellingtb = self.viewmanager.initSpellingToolbar(self.toolbarManager) |
2567 settingstb = QToolBar(self.tr("Settings"), self) |
2577 settingstb = QToolBar(self.tr("Settings"), self) |
2664 self.addToolBar(viewtb) |
2674 self.addToolBar(viewtb) |
2665 self.addToolBar(starttb) |
2675 self.addToolBar(starttb) |
2666 self.addToolBar(debugtb) |
2676 self.addToolBar(debugtb) |
2667 self.addToolBar(multiprojecttb) |
2677 self.addToolBar(multiprojecttb) |
2668 self.addToolBar(projecttb) |
2678 self.addToolBar(projecttb) |
|
2679 self.addToolBar(vcstb) |
2669 self.addToolBar(Qt.RightToolBarArea, settingstb) |
2680 self.addToolBar(Qt.RightToolBarArea, settingstb) |
2670 self.addToolBar(Qt.RightToolBarArea, toolstb) |
2681 self.addToolBar(Qt.RightToolBarArea, toolstb) |
2671 self.addToolBar(helptb) |
2682 self.addToolBar(helptb) |
2672 self.addToolBar(bookmarktb) |
2683 self.addToolBar(bookmarktb) |
2673 self.addToolBar(spellingtb) |
2684 self.addToolBar(spellingtb) |
2706 self.__toolbars["quicksearch"] = [quicksearchtb.windowTitle(), |
2717 self.__toolbars["quicksearch"] = [quicksearchtb.windowTitle(), |
2707 quicksearchtb] |
2718 quicksearchtb] |
2708 self.__toolbars["multiproject"] = [multiprojecttb.windowTitle(), |
2719 self.__toolbars["multiproject"] = [multiprojecttb.windowTitle(), |
2709 multiprojecttb] |
2720 multiprojecttb] |
2710 self.__toolbars["spelling"] = [spellingtb.windowTitle(), spellingtb] |
2721 self.__toolbars["spelling"] = [spellingtb.windowTitle(), spellingtb] |
|
2722 self.__toolbars["vcs"] = [vcstb.windowTitle(), vcstb] |
2711 |
2723 |
2712 def __initDebugToolbarsLayout(self): |
2724 def __initDebugToolbarsLayout(self): |
2713 """ |
2725 """ |
2714 Private slot to initialize the toolbars layout for the debug profile. |
2726 Private slot to initialize the toolbars layout for the debug profile. |
2715 """ |
2727 """ |
5264 def __configViewProfiles(self): |
5276 def __configViewProfiles(self): |
5265 """ |
5277 """ |
5266 Private slot to configure the various view profiles. |
5278 Private slot to configure the various view profiles. |
5267 """ |
5279 """ |
5268 from Preferences.ViewProfileDialog import ViewProfileDialog |
5280 from Preferences.ViewProfileDialog import ViewProfileDialog |
5269 dlg = ViewProfileDialog( |
5281 dlg = ViewProfileDialog(self.layoutType, self.profiles['edit'][1], |
5270 self.layoutType, self.profiles['edit'][1], self.profiles['debug'][1]) |
5282 self.profiles['debug'][1]) |
5271 if dlg.exec_() == QDialog.Accepted: |
5283 if dlg.exec_() == QDialog.Accepted: |
5272 edit, debug = dlg.getVisibilities() |
5284 edit, debug = dlg.getVisibilities() |
5273 self.profiles['edit'][1] = edit |
5285 self.profiles['edit'][1] = edit |
5274 self.profiles['debug'][1] = debug |
5286 self.profiles['debug'][1] = debug |
5275 Preferences.setUI("ViewProfiles2", self.profiles) |
5287 Preferences.setUI("ViewProfiles2", self.profiles) |