Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py
Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py
- changeset 4115
- 0c70a8f8d54a
- parent 4079
- a3319822d303
- child 4631
- 5c1a96925da4
equal
deleted
inserted
replaced
| 4114:754b17f65aba | 4115:0c70a8f8d54a |
|---|---|
| 550 Public slot to initialize the VCS toolbar. | 550 Public slot to initialize the VCS toolbar. |
| 551 | 551 |
| 552 @param ui reference to the main window (UserInterface) | 552 @param ui reference to the main window (UserInterface) |
| 553 @param toolbarManager reference to a toolbar manager object | 553 @param toolbarManager reference to a toolbar manager object |
| 554 (E5ToolBarManager) | 554 (E5ToolBarManager) |
| 555 @return the toolbar generated (QToolBar) | 555 """ |
| 556 """ | 556 self.__toolbar = QToolBar(self.tr("Subversion (svn)"), ui) |
| 557 tb = QToolBar(self.tr("Subversion (svn)"), ui) | 557 self.__toolbar.setIconSize(UI.Config.ToolBarIconSize) |
| 558 tb.setIconSize(UI.Config.ToolBarIconSize) | 558 self.__toolbar.setObjectName("SubversionToolbar") |
| 559 tb.setObjectName("SubversionToolbar") | 559 self.__toolbar.setToolTip(self.tr('Subversion (svn)')) |
| 560 tb.setToolTip(self.tr('Subversion (svn)')) | 560 |
| 561 | 561 self.__toolbar.addAction(self.svnLogBrowserAct) |
| 562 tb.addAction(self.svnLogBrowserAct) | 562 self.__toolbar.addAction(self.vcsStatusAct) |
| 563 tb.addAction(self.vcsStatusAct) | 563 self.__toolbar.addSeparator() |
| 564 tb.addSeparator() | 564 self.__toolbar.addAction(self.vcsDiffAct) |
| 565 tb.addAction(self.vcsDiffAct) | 565 self.__toolbar.addSeparator() |
| 566 tb.addSeparator() | 566 self.__toolbar.addAction(self.svnRepoBrowserAct) |
| 567 tb.addAction(self.svnRepoBrowserAct) | 567 self.__toolbar.addAction(self.vcsNewAct) |
| 568 tb.addAction(self.vcsNewAct) | 568 self.__toolbar.addAction(self.vcsExportAct) |
| 569 tb.addAction(self.vcsExportAct) | 569 self.__toolbar.addSeparator() |
| 570 tb.addSeparator() | 570 |
| 571 | 571 title = self.__toolbar.windowTitle() |
| 572 title = tb.windowTitle() | 572 toolbarManager.addToolBar(self.__toolbar, title) |
| 573 toolbarManager.addToolBar(tb, title) | |
| 574 toolbarManager.addAction(self.vcsUpdateAct, title) | 573 toolbarManager.addAction(self.vcsUpdateAct, title) |
| 575 toolbarManager.addAction(self.vcsCommitAct, title) | 574 toolbarManager.addAction(self.vcsCommitAct, title) |
| 576 toolbarManager.addAction(self.vcsLogAct, title) | 575 toolbarManager.addAction(self.vcsLogAct, title) |
| 577 toolbarManager.addAction(self.svnExtDiffAct, title) | 576 toolbarManager.addAction(self.svnExtDiffAct, title) |
| 578 toolbarManager.addAction(self.svnUrlDiffAct, title) | 577 toolbarManager.addAction(self.svnUrlDiffAct, title) |
| 581 toolbarManager.addAction(self.vcsRevertAct, title) | 580 toolbarManager.addAction(self.vcsRevertAct, title) |
| 582 toolbarManager.addAction(self.vcsMergeAct, title) | 581 toolbarManager.addAction(self.vcsMergeAct, title) |
| 583 toolbarManager.addAction(self.vcsSwitchAct, title) | 582 toolbarManager.addAction(self.vcsSwitchAct, title) |
| 584 toolbarManager.addAction(self.svnRelocateAct, title) | 583 toolbarManager.addAction(self.svnRelocateAct, title) |
| 585 | 584 |
| 586 tb.setEnabled(False) | 585 self.__toolbar.setEnabled(False) |
| 587 tb.setVisible(False) | 586 self.__toolbar.setVisible(False) |
| 588 | 587 |
| 589 ui.registerToolbar("subversion", tb.windowTitle(), tb) | 588 ui.registerToolbar("subversion", self.__toolbar.windowTitle(), |
| 590 | 589 self.__toolbar) |
| 591 return tb | 590 ui.addToolBar(self.__toolbar) |
| 591 | |
| 592 def removeToolbar(self, ui, toolbarManager): | |
| 593 """ | |
| 594 Public method to remove a toolbar created by initToolbar(). | |
| 595 | |
| 596 @param ui reference to the main window (UserInterface) | |
| 597 @param toolbarManager reference to a toolbar manager object | |
| 598 (E5ToolBarManager) | |
| 599 """ | |
| 600 ui.removeToolBar(self.__toolbar) | |
| 601 ui.unregisterToolbar("subversion") | |
| 602 | |
| 603 title = self.__toolbar.windowTitle() | |
| 604 toolbarManager.removeCategoryActions(title) | |
| 605 toolbarManager.removeToolBar(self.__toolbar) | |
| 606 | |
| 607 self.__toolbar.deleteLater() | |
| 608 self.__toolbar = None | |
| 592 | 609 |
| 593 def __svnResolve(self): | 610 def __svnResolve(self): |
| 594 """ | 611 """ |
| 595 Private slot used to resolve conflicts of the local project. | 612 Private slot used to resolve conflicts of the local project. |
| 596 """ | 613 """ |
