Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py
Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py
- changeset 4079
- a3319822d303
- parent 4058
- 99ec13e695f9
- child 4115
- 0c70a8f8d54a
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 | |
| 16 from VCS.ProjectHelper import VcsProjectHelper | |
| 17 | |
| 18 from E5Gui.E5Action import E5Action | |
| 19 | 20 |
| 20 import UI.PixmapCache | 21 import UI.PixmapCache |
| 21 | 22 |
| 22 | 23 |
| 23 class SvnProjectHelper(VcsProjectHelper): | 24 class SvnProjectHelper(VcsProjectHelper): |
| 542 menu.addAction(self.svnConfigAct) | 543 menu.addAction(self.svnConfigAct) |
| 543 menu.addSeparator() | 544 menu.addSeparator() |
| 544 menu.addAction(self.vcsNewAct) | 545 menu.addAction(self.vcsNewAct) |
| 545 menu.addAction(self.vcsExportAct) | 546 menu.addAction(self.vcsExportAct) |
| 546 | 547 |
| 548 def initToolbar(self, ui, toolbarManager): | |
| 549 """ | |
| 550 Public slot to initialize the VCS toolbar. | |
| 551 | |
| 552 @param ui reference to the main window (UserInterface) | |
| 553 @param toolbarManager reference to a toolbar manager object | |
| 554 (E5ToolBarManager) | |
| 555 @return the toolbar generated (QToolBar) | |
| 556 """ | |
| 557 tb = QToolBar(self.tr("Subversion (svn)"), ui) | |
| 558 tb.setIconSize(UI.Config.ToolBarIconSize) | |
| 559 tb.setObjectName("SubversionToolbar") | |
| 560 tb.setToolTip(self.tr('Subversion (svn)')) | |
| 561 | |
| 562 tb.addAction(self.svnLogBrowserAct) | |
| 563 tb.addAction(self.vcsStatusAct) | |
| 564 tb.addSeparator() | |
| 565 tb.addAction(self.vcsDiffAct) | |
| 566 tb.addSeparator() | |
| 567 tb.addAction(self.svnRepoBrowserAct) | |
| 568 tb.addAction(self.vcsNewAct) | |
| 569 tb.addAction(self.vcsExportAct) | |
| 570 tb.addSeparator() | |
| 571 | |
| 572 title = tb.windowTitle() | |
| 573 toolbarManager.addToolBar(tb, title) | |
| 574 toolbarManager.addAction(self.vcsUpdateAct, title) | |
| 575 toolbarManager.addAction(self.vcsCommitAct, title) | |
| 576 toolbarManager.addAction(self.vcsLogAct, title) | |
| 577 toolbarManager.addAction(self.svnExtDiffAct, title) | |
| 578 toolbarManager.addAction(self.svnUrlDiffAct, title) | |
| 579 toolbarManager.addAction(self.svnChangeListsAct, title) | |
| 580 toolbarManager.addAction(self.vcsTagAct, title) | |
| 581 toolbarManager.addAction(self.vcsRevertAct, title) | |
| 582 toolbarManager.addAction(self.vcsMergeAct, title) | |
| 583 toolbarManager.addAction(self.vcsSwitchAct, title) | |
| 584 toolbarManager.addAction(self.svnRelocateAct, title) | |
| 585 | |
| 586 tb.setEnabled(False) | |
| 587 tb.setVisible(False) | |
| 588 | |
| 589 ui.registerToolbar("subversion", tb.windowTitle(), tb) | |
| 590 | |
| 591 return tb | |
| 592 | |
| 547 def __svnResolve(self): | 593 def __svnResolve(self): |
| 548 """ | 594 """ |
| 549 Private slot used to resolve conflicts of the local project. | 595 Private slot used to resolve conflicts of the local project. |
| 550 """ | 596 """ |
| 551 self.vcs.svnResolve(self.project.ppath) | 597 self.vcs.svnResolve(self.project.ppath) |
