Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py
Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py
- changeset 4079
- a3319822d303
- parent 4058
- 99ec13e695f9
- child 4112
- f15ce9247b7c
equal
deleted
inserted
replaced
| 4078:0e14bef0b47b | 4079:a3319822d303 |
|---|---|
| 9 | 9 |
| 10 from __future__ import unicode_literals | 10 from __future__ import unicode_literals |
| 11 | 11 |
| 12 import os | 12 import os |
| 13 | 13 |
| 14 from PyQt5.QtWidgets import QToolBar | |
| 15 | |
| 16 from VCS.ProjectHelper import VcsProjectHelper | |
| 17 | |
| 18 from E5Gui.E5Action import E5Action | |
| 14 from E5Gui.E5Application import e5App | 19 from E5Gui.E5Application import e5App |
| 15 | 20 |
| 16 from VCS.ProjectHelper import VcsProjectHelper | |
| 17 | |
| 18 from E5Gui.E5Action import E5Action | |
| 19 | |
| 20 import UI.PixmapCache | 21 import UI.PixmapCache |
| 21 | 22 |
| 22 | 23 |
| 23 class SvnProjectHelper(VcsProjectHelper): | 24 class PySvnProjectHelper(VcsProjectHelper): |
| 24 """ | 25 """ |
| 25 Class implementing the VCS project helper for Subversion. | 26 Class implementing the VCS project helper for Subversion. |
| 26 """ | 27 """ |
| 27 def __init__(self, vcsObject, projectObject, parent=None, name=None): | 28 def __init__(self, vcsObject, projectObject, parent=None, name=None): |
| 28 """ | 29 """ |
| 558 menu.addAction(self.svnConfigAct) | 559 menu.addAction(self.svnConfigAct) |
| 559 menu.addSeparator() | 560 menu.addSeparator() |
| 560 menu.addAction(self.vcsNewAct) | 561 menu.addAction(self.vcsNewAct) |
| 561 menu.addAction(self.vcsExportAct) | 562 menu.addAction(self.vcsExportAct) |
| 562 | 563 |
| 564 def initToolbar(self, ui, toolbarManager): | |
| 565 """ | |
| 566 Public slot to initialize the VCS toolbar. | |
| 567 | |
| 568 @param ui reference to the main window (UserInterface) | |
| 569 @param toolbarManager reference to a toolbar manager object | |
| 570 (E5ToolBarManager) | |
| 571 @return the toolbar generated (QToolBar) | |
| 572 """ | |
| 573 tb = QToolBar(self.tr("Subversion (pysvn)"), ui) | |
| 574 tb.setIconSize(UI.Config.ToolBarIconSize) | |
| 575 tb.setObjectName("PySvnToolbar") | |
| 576 tb.setToolTip(self.tr('Subversion (pysvn)')) | |
| 577 | |
| 578 tb.addAction(self.svnLogBrowserAct) | |
| 579 tb.addAction(self.vcsStatusAct) | |
| 580 tb.addSeparator() | |
| 581 tb.addAction(self.vcsDiffAct) | |
| 582 tb.addSeparator() | |
| 583 tb.addAction(self.svnRepoBrowserAct) | |
| 584 tb.addAction(self.vcsNewAct) | |
| 585 tb.addAction(self.vcsExportAct) | |
| 586 tb.addSeparator() | |
| 587 | |
| 588 title = tb.windowTitle() | |
| 589 toolbarManager.addToolBar(tb, title) | |
| 590 toolbarManager.addAction(self.vcsUpdateAct, title) | |
| 591 toolbarManager.addAction(self.vcsCommitAct, title) | |
| 592 toolbarManager.addAction(self.vcsLogAct, title) | |
| 593 toolbarManager.addAction(self.svnExtDiffAct, title) | |
| 594 toolbarManager.addAction(self.svnUrlDiffAct, title) | |
| 595 toolbarManager.addAction(self.svnChangeListsAct, title) | |
| 596 toolbarManager.addAction(self.svnRepoInfoAct, title) | |
| 597 toolbarManager.addAction(self.vcsTagAct, title) | |
| 598 toolbarManager.addAction(self.vcsRevertAct, title) | |
| 599 toolbarManager.addAction(self.vcsMergeAct, title) | |
| 600 toolbarManager.addAction(self.vcsSwitchAct, title) | |
| 601 toolbarManager.addAction(self.svnRelocateAct, title) | |
| 602 | |
| 603 tb.setEnabled(False) | |
| 604 tb.setVisible(False) | |
| 605 | |
| 606 ui.registerToolbar("pysvn", tb.windowTitle(), tb) | |
| 607 | |
| 608 return tb | |
| 609 | |
| 563 def __svnResolve(self): | 610 def __svnResolve(self): |
| 564 """ | 611 """ |
| 565 Private slot used to resolve conflicts of the local project. | 612 Private slot used to resolve conflicts of the local project. |
| 566 """ | 613 """ |
| 567 self.vcs.svnResolve(self.project.ppath) | 614 self.vcs.svnResolve(self.project.ppath) |
