diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat May 22 18:51:46 2021 +0200
@@ -11,12 +11,12 @@
from PyQt6.QtWidgets import QMenu, QToolBar
-from E5Gui import E5MessageBox
-from E5Gui.E5Application import e5App
+from E5Gui import EricMessageBox
+from E5Gui.EricApplication import ericApp
from VCS.ProjectHelper import VcsProjectHelper
-from E5Gui.E5Action import E5Action
+from E5Gui.EricAction import EricAction
import UI.PixmapCache
import Preferences
@@ -103,7 +103,7 @@
"""
Public method to get a list of all actions.
- @return list of all actions (list of E5Action)
+ @return list of all actions (list of EricAction)
"""
actions = self.actions[:]
for extension in self.__extensions.values():
@@ -114,7 +114,7 @@
"""
Public method to generate the action objects.
"""
- self.vcsNewAct = E5Action(
+ self.vcsNewAct = EricAction(
self.tr('New from repository'),
UI.PixmapCache.getIcon("vcsCheckout"),
self.tr('&New from repository...'), 0, 0,
@@ -130,7 +130,7 @@
self.vcsNewAct.triggered.connect(self._vcsCheckout)
self.actions.append(self.vcsNewAct)
- self.hgIncomingAct = E5Action(
+ self.hgIncomingAct = EricAction(
self.tr('Show incoming log'),
UI.PixmapCache.getIcon("vcsUpdate"),
self.tr('Show incoming log'),
@@ -146,7 +146,7 @@
self.hgIncomingAct.triggered.connect(self.__hgIncoming)
self.actions.append(self.hgIncomingAct)
- self.hgPullAct = E5Action(
+ self.hgPullAct = EricAction(
self.tr('Pull changes'),
UI.PixmapCache.getIcon("vcsUpdate"),
self.tr('Pull changes'),
@@ -162,7 +162,7 @@
self.hgPullAct.triggered.connect(self.__hgPull)
self.actions.append(self.hgPullAct)
- self.vcsUpdateAct = E5Action(
+ self.vcsUpdateAct = EricAction(
self.tr('Update from repository'),
UI.PixmapCache.getIcon("vcsUpdate"),
self.tr('&Update from repository'), 0, 0, self,
@@ -178,7 +178,7 @@
self.vcsUpdateAct.triggered.connect(self._vcsUpdate)
self.actions.append(self.vcsUpdateAct)
- self.vcsCommitAct = E5Action(
+ self.vcsCommitAct = EricAction(
self.tr('Commit changes to repository'),
UI.PixmapCache.getIcon("vcsCommit"),
self.tr('&Commit changes to repository...'), 0, 0, self,
@@ -194,7 +194,7 @@
self.vcsCommitAct.triggered.connect(self._vcsCommit)
self.actions.append(self.vcsCommitAct)
- self.hgOutgoingAct = E5Action(
+ self.hgOutgoingAct = EricAction(
self.tr('Show outgoing log'),
UI.PixmapCache.getIcon("vcsCommit"),
self.tr('Show outgoing log'),
@@ -210,7 +210,7 @@
self.hgOutgoingAct.triggered.connect(self.__hgOutgoing)
self.actions.append(self.hgOutgoingAct)
- self.hgPushAct = E5Action(
+ self.hgPushAct = EricAction(
self.tr('Push changes'),
UI.PixmapCache.getIcon("vcsCommit"),
self.tr('Push changes'),
@@ -226,7 +226,7 @@
self.hgPushAct.triggered.connect(self.__hgPush)
self.actions.append(self.hgPushAct)
- self.hgPushForcedAct = E5Action(
+ self.hgPushForcedAct = EricAction(
self.tr('Push changes (force)'),
UI.PixmapCache.getIcon("vcsCommit"),
self.tr('Push changes (force)'),
@@ -242,7 +242,7 @@
self.hgPushForcedAct.triggered.connect(self.__hgPushForced)
self.actions.append(self.hgPushForcedAct)
- self.vcsExportAct = E5Action(
+ self.vcsExportAct = EricAction(
self.tr('Export from repository'),
UI.PixmapCache.getIcon("vcsExport"),
self.tr('&Export from repository...'),
@@ -257,7 +257,7 @@
self.vcsExportAct.triggered.connect(self._vcsExport)
self.actions.append(self.vcsExportAct)
- self.hgLogBrowserAct = E5Action(
+ self.hgLogBrowserAct = EricAction(
self.tr('Show log browser'),
UI.PixmapCache.getIcon("vcsLog"),
self.tr('Show log browser'),
@@ -274,7 +274,7 @@
self.hgLogBrowserAct.triggered.connect(self._vcsLogBrowser)
self.actions.append(self.hgLogBrowserAct)
- self.vcsDiffAct = E5Action(
+ self.vcsDiffAct = EricAction(
self.tr('Show differences'),
UI.PixmapCache.getIcon("vcsDiff"),
self.tr('Show &difference'),
@@ -290,7 +290,7 @@
self.vcsDiffAct.triggered.connect(self._vcsDiff)
self.actions.append(self.vcsDiffAct)
- self.hgExtDiffAct = E5Action(
+ self.hgExtDiffAct = EricAction(
self.tr('Show differences (extended)'),
UI.PixmapCache.getIcon("vcsDiff"),
self.tr('Show differences (extended)'),
@@ -306,7 +306,7 @@
self.hgExtDiffAct.triggered.connect(self.__hgExtendedDiff)
self.actions.append(self.hgExtDiffAct)
- self.vcsStatusAct = E5Action(
+ self.vcsStatusAct = EricAction(
self.tr('Show status'),
UI.PixmapCache.getIcon("vcsStatus"),
self.tr('Show &status...'),
@@ -321,7 +321,7 @@
self.vcsStatusAct.triggered.connect(self._vcsStatus)
self.actions.append(self.vcsStatusAct)
- self.hgSummaryAct = E5Action(
+ self.hgSummaryAct = EricAction(
self.tr('Show Summary'),
UI.PixmapCache.getIcon("vcsSummary"),
self.tr('Show summary...'),
@@ -337,7 +337,7 @@
self.hgSummaryAct.triggered.connect(self.__hgSummary)
self.actions.append(self.hgSummaryAct)
- self.hgHeadsAct = E5Action(
+ self.hgHeadsAct = EricAction(
self.tr('Show heads'),
self.tr('Show heads'),
0, 0, self, 'mercurial_heads')
@@ -351,7 +351,7 @@
self.hgHeadsAct.triggered.connect(self.__hgHeads)
self.actions.append(self.hgHeadsAct)
- self.hgParentsAct = E5Action(
+ self.hgParentsAct = EricAction(
self.tr('Show parents'),
self.tr('Show parents'),
0, 0, self, 'mercurial_parents')
@@ -365,7 +365,7 @@
self.hgParentsAct.triggered.connect(self.__hgParents)
self.actions.append(self.hgParentsAct)
- self.hgTipAct = E5Action(
+ self.hgTipAct = EricAction(
self.tr('Show tip'),
self.tr('Show tip'),
0, 0, self, 'mercurial_tip')
@@ -379,7 +379,7 @@
self.hgTipAct.triggered.connect(self.__hgTip)
self.actions.append(self.hgTipAct)
- self.vcsRevertAct = E5Action(
+ self.vcsRevertAct = EricAction(
self.tr('Revert changes'),
UI.PixmapCache.getIcon("vcsRevert"),
self.tr('Re&vert changes'),
@@ -394,7 +394,7 @@
self.vcsRevertAct.triggered.connect(self.__hgRevert)
self.actions.append(self.vcsRevertAct)
- self.vcsMergeAct = E5Action(
+ self.vcsMergeAct = EricAction(
self.tr('Merge'),
UI.PixmapCache.getIcon("vcsMerge"),
self.tr('Mer&ge changes...'),
@@ -410,7 +410,7 @@
self.vcsMergeAct.triggered.connect(self._vcsMerge)
self.actions.append(self.vcsMergeAct)
- self.hgCommitMergeAct = E5Action(
+ self.hgCommitMergeAct = EricAction(
self.tr('Commit Merge'),
self.tr('Commit Merge'),
0, 0, self, 'mercurial_commit_merge')
@@ -424,7 +424,7 @@
self.hgCommitMergeAct.triggered.connect(self.__hgCommitMerge)
self.actions.append(self.hgCommitMergeAct)
- self.hgAbortMergeAct = E5Action(
+ self.hgAbortMergeAct = EricAction(
self.tr('Abort Merge'),
self.tr('Abort Merge'),
0, 0, self, 'mercurial_cancel_merge')
@@ -439,7 +439,7 @@
self.hgAbortMergeAct.triggered.connect(self.__hgAbortMerge)
self.actions.append(self.hgAbortMergeAct)
- self.hgReMergeAct = E5Action(
+ self.hgReMergeAct = EricAction(
self.tr('Re-Merge'),
UI.PixmapCache.getIcon("vcsMerge"),
self.tr('Re-Merge'),
@@ -455,7 +455,7 @@
self.hgReMergeAct.triggered.connect(self.__hgReMerge)
self.actions.append(self.hgReMergeAct)
- self.hgShowConflictsAct = E5Action(
+ self.hgShowConflictsAct = EricAction(
self.tr('Show conflicts'),
self.tr('Show conflicts...'),
0, 0, self, 'mercurial_show_conflicts')
@@ -470,7 +470,7 @@
self.hgShowConflictsAct.triggered.connect(self.__hgShowConflicts)
self.actions.append(self.hgShowConflictsAct)
- self.vcsResolveAct = E5Action(
+ self.vcsResolveAct = EricAction(
self.tr('Conflicts resolved'),
self.tr('Con&flicts resolved'),
0, 0, self, 'mercurial_resolve')
@@ -485,7 +485,7 @@
self.vcsResolveAct.triggered.connect(self.__hgResolved)
self.actions.append(self.vcsResolveAct)
- self.hgUnresolveAct = E5Action(
+ self.hgUnresolveAct = EricAction(
self.tr('Conflicts unresolved'),
self.tr('Conflicts unresolved'),
0, 0, self, 'mercurial_unresolve')
@@ -500,7 +500,7 @@
self.hgUnresolveAct.triggered.connect(self.__hgUnresolved)
self.actions.append(self.hgUnresolveAct)
- self.vcsTagAct = E5Action(
+ self.vcsTagAct = EricAction(
self.tr('Tag in repository'),
UI.PixmapCache.getIcon("vcsTag"),
self.tr('&Tag in repository...'),
@@ -515,7 +515,7 @@
self.vcsTagAct.triggered.connect(self._vcsTag)
self.actions.append(self.vcsTagAct)
- self.hgTagListAct = E5Action(
+ self.hgTagListAct = EricAction(
self.tr('List tags'),
self.tr('List tags...'),
0, 0, self, 'mercurial_list_tags')
@@ -529,7 +529,7 @@
self.hgTagListAct.triggered.connect(self.__hgTagList)
self.actions.append(self.hgTagListAct)
- self.hgBranchListAct = E5Action(
+ self.hgBranchListAct = EricAction(
self.tr('List branches'),
self.tr('List branches...'),
0, 0, self, 'mercurial_list_branches')
@@ -543,7 +543,7 @@
self.hgBranchListAct.triggered.connect(self.__hgBranchList)
self.actions.append(self.hgBranchListAct)
- self.hgBranchAct = E5Action(
+ self.hgBranchAct = EricAction(
self.tr('Create branch'),
UI.PixmapCache.getIcon("vcsBranch"),
self.tr('Create &branch...'),
@@ -559,7 +559,7 @@
self.hgBranchAct.triggered.connect(self.__hgBranch)
self.actions.append(self.hgBranchAct)
- self.hgPushBranchAct = E5Action(
+ self.hgPushBranchAct = EricAction(
self.tr('Push new branch'),
UI.PixmapCache.getIcon("vcsCommit"),
self.tr('Push new branch'),
@@ -576,7 +576,7 @@
self.hgPushBranchAct.triggered.connect(self.__hgPushNewBranch)
self.actions.append(self.hgPushBranchAct)
- self.hgCloseBranchAct = E5Action(
+ self.hgCloseBranchAct = EricAction(
self.tr('Close branch'),
UI.PixmapCache.getIcon("closehead"),
self.tr('Close branch'),
@@ -591,7 +591,7 @@
self.hgCloseBranchAct.triggered.connect(self.__hgCloseBranch)
self.actions.append(self.hgCloseBranchAct)
- self.hgShowBranchAct = E5Action(
+ self.hgShowBranchAct = EricAction(
self.tr('Show current branch'),
self.tr('Show current branch'),
0, 0, self, 'mercurial_show_branch')
@@ -605,7 +605,7 @@
self.hgShowBranchAct.triggered.connect(self.__hgShowBranch)
self.actions.append(self.hgShowBranchAct)
- self.vcsSwitchAct = E5Action(
+ self.vcsSwitchAct = EricAction(
self.tr('Switch'),
UI.PixmapCache.getIcon("vcsSwitch"),
self.tr('S&witch...'),
@@ -621,7 +621,7 @@
self.vcsSwitchAct.triggered.connect(self._vcsSwitch)
self.actions.append(self.vcsSwitchAct)
- self.vcsCleanupAct = E5Action(
+ self.vcsCleanupAct = EricAction(
self.tr('Cleanup'),
self.tr('Cleanu&p'),
0, 0, self, 'mercurial_cleanup')
@@ -635,7 +635,7 @@
self.vcsCleanupAct.triggered.connect(self._vcsCleanup)
self.actions.append(self.vcsCleanupAct)
- self.vcsCommandAct = E5Action(
+ self.vcsCommandAct = EricAction(
self.tr('Execute command'),
self.tr('E&xecute command...'),
0, 0, self, 'mercurial_command')
@@ -650,7 +650,7 @@
self.vcsCommandAct.triggered.connect(self._vcsCommand)
self.actions.append(self.vcsCommandAct)
- self.hgConfigAct = E5Action(
+ self.hgConfigAct = EricAction(
self.tr('Configure'),
self.tr('Configure...'),
0, 0, self, 'mercurial_configure')
@@ -665,7 +665,7 @@
self.hgConfigAct.triggered.connect(self.__hgConfigure)
self.actions.append(self.hgConfigAct)
- self.hgEditUserConfigAct = E5Action(
+ self.hgEditUserConfigAct = EricAction(
self.tr('Edit user configuration'),
self.tr('Edit user configuration...'),
0, 0, self, 'mercurial_user_configure')
@@ -679,7 +679,7 @@
self.hgEditUserConfigAct.triggered.connect(self.__hgEditUserConfig)
self.actions.append(self.hgEditUserConfigAct)
- self.hgRepoConfigAct = E5Action(
+ self.hgRepoConfigAct = EricAction(
self.tr('Edit repository configuration'),
self.tr('Edit repository configuration...'),
0, 0, self, 'mercurial_repo_configure')
@@ -694,7 +694,7 @@
self.hgRepoConfigAct.triggered.connect(self.__hgEditRepoConfig)
self.actions.append(self.hgRepoConfigAct)
- self.hgShowConfigAct = E5Action(
+ self.hgShowConfigAct = EricAction(
self.tr('Show combined configuration settings'),
self.tr('Show combined configuration settings...'),
0, 0, self, 'mercurial_show_config')
@@ -710,7 +710,7 @@
self.hgShowConfigAct.triggered.connect(self.__hgShowConfig)
self.actions.append(self.hgShowConfigAct)
- self.hgShowPathsAct = E5Action(
+ self.hgShowPathsAct = EricAction(
self.tr('Show paths'),
self.tr('Show paths...'),
0, 0, self, 'mercurial_show_paths')
@@ -724,7 +724,7 @@
self.hgShowPathsAct.triggered.connect(self.__hgShowPaths)
self.actions.append(self.hgShowPathsAct)
- self.hgVerifyAct = E5Action(
+ self.hgVerifyAct = EricAction(
self.tr('Verify repository'),
self.tr('Verify repository...'),
0, 0, self, 'mercurial_verify')
@@ -738,7 +738,7 @@
self.hgVerifyAct.triggered.connect(self.__hgVerify)
self.actions.append(self.hgVerifyAct)
- self.hgRecoverAct = E5Action(
+ self.hgRecoverAct = EricAction(
self.tr('Recover'),
self.tr('Recover...'),
0, 0, self, 'mercurial_recover')
@@ -752,7 +752,7 @@
self.hgRecoverAct.triggered.connect(self.__hgRecover)
self.actions.append(self.hgRecoverAct)
- self.hgIdentifyAct = E5Action(
+ self.hgIdentifyAct = EricAction(
self.tr('Identify'),
self.tr('Identify...'),
0, 0, self, 'mercurial_identify')
@@ -766,7 +766,7 @@
self.hgIdentifyAct.triggered.connect(self.__hgIdentify)
self.actions.append(self.hgIdentifyAct)
- self.hgCreateIgnoreAct = E5Action(
+ self.hgCreateIgnoreAct = EricAction(
self.tr('Create .hgignore'),
self.tr('Create .hgignore'),
0, 0, self, 'mercurial_create ignore')
@@ -780,7 +780,7 @@
self.hgCreateIgnoreAct.triggered.connect(self.__hgCreateIgnore)
self.actions.append(self.hgCreateIgnoreAct)
- self.hgBundleAct = E5Action(
+ self.hgBundleAct = EricAction(
self.tr('Create changegroup'),
UI.PixmapCache.getIcon("vcsCreateChangegroup"),
self.tr('Create changegroup...'),
@@ -796,7 +796,7 @@
self.hgBundleAct.triggered.connect(self.__hgBundle)
self.actions.append(self.hgBundleAct)
- self.hgPreviewBundleAct = E5Action(
+ self.hgPreviewBundleAct = EricAction(
self.tr('Preview changegroup'),
UI.PixmapCache.getIcon("vcsPreviewChangegroup"),
self.tr('Preview changegroup...'),
@@ -812,7 +812,7 @@
self.hgPreviewBundleAct.triggered.connect(self.__hgPreviewBundle)
self.actions.append(self.hgPreviewBundleAct)
- self.hgUnbundleAct = E5Action(
+ self.hgUnbundleAct = EricAction(
self.tr('Apply changegroups'),
UI.PixmapCache.getIcon("vcsApplyChangegroup"),
self.tr('Apply changegroups...'),
@@ -828,7 +828,7 @@
self.hgUnbundleAct.triggered.connect(self.__hgUnbundle)
self.actions.append(self.hgUnbundleAct)
- self.hgBisectGoodAct = E5Action(
+ self.hgBisectGoodAct = EricAction(
self.tr('Mark as "good"'),
self.tr('Mark as "good"...'),
0, 0, self, 'mercurial_bisect_good')
@@ -842,7 +842,7 @@
self.hgBisectGoodAct.triggered.connect(self.__hgBisectGood)
self.actions.append(self.hgBisectGoodAct)
- self.hgBisectBadAct = E5Action(
+ self.hgBisectBadAct = EricAction(
self.tr('Mark as "bad"'),
self.tr('Mark as "bad"...'),
0, 0, self, 'mercurial_bisect_bad')
@@ -856,7 +856,7 @@
self.hgBisectBadAct.triggered.connect(self.__hgBisectBad)
self.actions.append(self.hgBisectBadAct)
- self.hgBisectSkipAct = E5Action(
+ self.hgBisectSkipAct = EricAction(
self.tr('Skip'),
self.tr('Skip...'),
0, 0, self, 'mercurial_bisect_skip')
@@ -870,7 +870,7 @@
self.hgBisectSkipAct.triggered.connect(self.__hgBisectSkip)
self.actions.append(self.hgBisectSkipAct)
- self.hgBisectResetAct = E5Action(
+ self.hgBisectResetAct = EricAction(
self.tr('Reset'),
self.tr('Reset'),
0, 0, self, 'mercurial_bisect_reset')
@@ -884,7 +884,7 @@
self.hgBisectResetAct.triggered.connect(self.__hgBisectReset)
self.actions.append(self.hgBisectResetAct)
- self.hgBackoutAct = E5Action(
+ self.hgBackoutAct = EricAction(
self.tr('Back out changeset'),
self.tr('Back out changeset'),
0, 0, self, 'mercurial_backout')
@@ -898,7 +898,7 @@
self.hgBackoutAct.triggered.connect(self.__hgBackout)
self.actions.append(self.hgBackoutAct)
- self.hgRollbackAct = E5Action(
+ self.hgRollbackAct = EricAction(
self.tr('Rollback last transaction'),
self.tr('Rollback last transaction'),
0, 0, self, 'mercurial_rollback')
@@ -925,7 +925,7 @@
self.hgRollbackAct.triggered.connect(self.__hgRollback)
self.actions.append(self.hgRollbackAct)
- self.hgServeAct = E5Action(
+ self.hgServeAct = EricAction(
self.tr('Serve project repository'),
self.tr('Serve project repository...'),
0, 0, self, 'mercurial_serve')
@@ -939,7 +939,7 @@
self.hgServeAct.triggered.connect(self.__hgServe)
self.actions.append(self.hgServeAct)
- self.hgImportAct = E5Action(
+ self.hgImportAct = EricAction(
self.tr('Import Patch'),
UI.PixmapCache.getIcon("vcsImportPatch"),
self.tr('Import Patch...'),
@@ -955,7 +955,7 @@
self.hgImportAct.triggered.connect(self.__hgImport)
self.actions.append(self.hgImportAct)
- self.hgExportAct = E5Action(
+ self.hgExportAct = EricAction(
self.tr('Export Patches'),
UI.PixmapCache.getIcon("vcsExportPatch"),
self.tr('Export Patches...'),
@@ -970,7 +970,7 @@
self.hgExportAct.triggered.connect(self.__hgExport)
self.actions.append(self.hgExportAct)
- self.hgPhaseAct = E5Action(
+ self.hgPhaseAct = EricAction(
self.tr('Change Phase'),
self.tr('Change Phase...'),
0, 0, self, 'mercurial_change_phase')
@@ -984,7 +984,7 @@
self.hgPhaseAct.triggered.connect(self.__hgPhase)
self.actions.append(self.hgPhaseAct)
- self.hgGraftAct = E5Action(
+ self.hgGraftAct = EricAction(
self.tr('Copy Changesets'),
UI.PixmapCache.getIcon("vcsGraft"),
self.tr('Copy Changesets'),
@@ -1001,7 +1001,7 @@
self.hgGraftAct.triggered.connect(self.__hgGraft)
self.actions.append(self.hgGraftAct)
- self.hgGraftContinueAct = E5Action(
+ self.hgGraftContinueAct = EricAction(
self.tr('Continue Copying Session'),
self.tr('Continue Copying Session'),
0, 0, self, 'mercurial_graft_continue')
@@ -1016,7 +1016,7 @@
self.hgGraftContinueAct.triggered.connect(self.__hgGraftContinue)
self.actions.append(self.hgGraftContinueAct)
- self.hgGraftStopAct = E5Action(
+ self.hgGraftStopAct = EricAction(
self.tr('Stop Copying Session'),
self.tr('Stop Copying Session'),
0, 0, self, 'mercurial_graft_stop')
@@ -1030,7 +1030,7 @@
self.hgGraftStopAct.triggered.connect(self.__hgGraftStop)
self.actions.append(self.hgGraftStopAct)
- self.hgGraftAbortAct = E5Action(
+ self.hgGraftAbortAct = EricAction(
self.tr('Abort Copying Session'),
self.tr('Abort Copying Session'),
0, 0, self, 'mercurial_graft_abort')
@@ -1045,7 +1045,7 @@
self.hgGraftAbortAct.triggered.connect(self.__hgGraftAbort)
self.actions.append(self.hgGraftAbortAct)
- self.hgAddSubrepoAct = E5Action(
+ self.hgAddSubrepoAct = EricAction(
self.tr('Add'),
UI.PixmapCache.getIcon("vcsAdd"),
self.tr('Add...'),
@@ -1060,7 +1060,7 @@
self.hgAddSubrepoAct.triggered.connect(self.__hgAddSubrepository)
self.actions.append(self.hgAddSubrepoAct)
- self.hgRemoveSubreposAct = E5Action(
+ self.hgRemoveSubreposAct = EricAction(
self.tr('Remove'),
UI.PixmapCache.getIcon("vcsRemove"),
self.tr('Remove...'),
@@ -1076,7 +1076,7 @@
self.__hgRemoveSubrepositories)
self.actions.append(self.hgRemoveSubreposAct)
- self.hgArchiveAct = E5Action(
+ self.hgArchiveAct = EricAction(
self.tr('Create unversioned archive'),
UI.PixmapCache.getIcon("vcsExport"),
self.tr('Create unversioned archive...'),
@@ -1092,7 +1092,7 @@
self.hgArchiveAct.triggered.connect(self.__hgArchive)
self.actions.append(self.hgArchiveAct)
- self.hgBookmarksListAct = E5Action(
+ self.hgBookmarksListAct = EricAction(
self.tr('List bookmarks'),
UI.PixmapCache.getIcon("listBookmarks"),
self.tr('List bookmarks...'),
@@ -1107,7 +1107,7 @@
self.hgBookmarksListAct.triggered.connect(self.__hgBookmarksList)
self.actions.append(self.hgBookmarksListAct)
- self.hgBookmarkDefineAct = E5Action(
+ self.hgBookmarkDefineAct = EricAction(
self.tr('Define bookmark'),
UI.PixmapCache.getIcon("addBookmark"),
self.tr('Define bookmark...'),
@@ -1122,7 +1122,7 @@
self.hgBookmarkDefineAct.triggered.connect(self.__hgBookmarkDefine)
self.actions.append(self.hgBookmarkDefineAct)
- self.hgBookmarkDeleteAct = E5Action(
+ self.hgBookmarkDeleteAct = EricAction(
self.tr('Delete bookmark'),
UI.PixmapCache.getIcon("deleteBookmark"),
self.tr('Delete bookmark...'),
@@ -1137,7 +1137,7 @@
self.hgBookmarkDeleteAct.triggered.connect(self.__hgBookmarkDelete)
self.actions.append(self.hgBookmarkDeleteAct)
- self.hgBookmarkRenameAct = E5Action(
+ self.hgBookmarkRenameAct = EricAction(
self.tr('Rename bookmark'),
UI.PixmapCache.getIcon("renameBookmark"),
self.tr('Rename bookmark...'),
@@ -1152,7 +1152,7 @@
self.hgBookmarkRenameAct.triggered.connect(self.__hgBookmarkRename)
self.actions.append(self.hgBookmarkRenameAct)
- self.hgBookmarkMoveAct = E5Action(
+ self.hgBookmarkMoveAct = EricAction(
self.tr('Move bookmark'),
UI.PixmapCache.getIcon("moveBookmark"),
self.tr('Move bookmark...'),
@@ -1168,7 +1168,7 @@
self.hgBookmarkMoveAct.triggered.connect(self.__hgBookmarkMove)
self.actions.append(self.hgBookmarkMoveAct)
- self.hgBookmarkIncomingAct = E5Action(
+ self.hgBookmarkIncomingAct = EricAction(
self.tr('Show incoming bookmarks'),
UI.PixmapCache.getIcon("incomingBookmark"),
self.tr('Show incoming bookmarks'),
@@ -1185,7 +1185,7 @@
self.__hgBookmarkIncoming)
self.actions.append(self.hgBookmarkIncomingAct)
- self.hgBookmarkPullAct = E5Action(
+ self.hgBookmarkPullAct = EricAction(
self.tr('Pull bookmark'),
UI.PixmapCache.getIcon("pullBookmark"),
self.tr('Pull bookmark'),
@@ -1201,7 +1201,7 @@
self.hgBookmarkPullAct.triggered.connect(self.__hgBookmarkPull)
self.actions.append(self.hgBookmarkPullAct)
- self.hgBookmarkPullCurrentAct = E5Action(
+ self.hgBookmarkPullCurrentAct = EricAction(
self.tr('Pull current bookmark'),
UI.PixmapCache.getIcon("pullBookmark"),
self.tr('Pull current bookmark'),
@@ -1217,7 +1217,7 @@
self.hgBookmarkPullCurrentAct.triggered.connect(
self.__hgBookmarkPullCurrent)
- self.hgBookmarkOutgoingAct = E5Action(
+ self.hgBookmarkOutgoingAct = EricAction(
self.tr('Show outgoing bookmarks'),
UI.PixmapCache.getIcon("outgoingBookmark"),
self.tr('Show outgoing bookmarks'),
@@ -1234,7 +1234,7 @@
self.__hgBookmarkOutgoing)
self.actions.append(self.hgBookmarkOutgoingAct)
- self.hgBookmarkPushAct = E5Action(
+ self.hgBookmarkPushAct = EricAction(
self.tr('Push bookmark'),
UI.PixmapCache.getIcon("pushBookmark"),
self.tr('Push bookmark'),
@@ -1250,7 +1250,7 @@
self.hgBookmarkPushAct.triggered.connect(self.__hgBookmarkPush)
self.actions.append(self.hgBookmarkPushAct)
- self.hgBookmarkPushCurrentAct = E5Action(
+ self.hgBookmarkPushCurrentAct = EricAction(
self.tr('Push current bookmark'),
UI.PixmapCache.getIcon("pushBookmark"),
self.tr('Push current bookmark'),
@@ -1267,7 +1267,7 @@
self.__hgBookmarkPushCurrent)
self.actions.append(self.hgBookmarkPushCurrentAct)
- self.hgBookmarkPushAllAct = E5Action(
+ self.hgBookmarkPushAllAct = EricAction(
self.tr('Push all bookmarks'),
UI.PixmapCache.getIcon("pushBookmark"),
self.tr('Push all bookmarks'),
@@ -1283,7 +1283,7 @@
self.hgBookmarkPushAllAct.triggered.connect(
self.__hgBookmarkPushAll)
- self.hgDeleteBackupsAct = E5Action(
+ self.hgDeleteBackupsAct = EricAction(
self.tr('Delete all backups'),
UI.PixmapCache.getIcon("clearPrivateData"),
self.tr('Delete all backups'),
@@ -1526,7 +1526,7 @@
@param ui reference to the main window (UserInterface)
@param toolbarManager reference to a toolbar manager object
- (E5ToolBarManager)
+ (EricToolBarManager)
"""
self.__toolbarManager = toolbarManager
@@ -1597,7 +1597,7 @@
@param ui reference to the main window (UserInterface)
@param toolbarManager reference to a toolbar manager object
- (E5ToolBarManager)
+ (EricToolBarManager)
"""
ui.removeToolBar(self.__toolbar)
ui.unregisterToolbar("mercurial")
@@ -1679,7 +1679,7 @@
"""
shouldReopen = self.vcs.hgPull()
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Pull"),
self.tr("""The project should be reread. Do this now?"""),
@@ -1784,7 +1784,7 @@
"""
Private method to open the configuration dialog.
"""
- e5App().getObject("UserInterface").showPreferences("zzz_mercurialPage")
+ ericApp().getObject("UserInterface").showPreferences("zzz_mercurialPage")
def __hgCloseBranch(self):
"""
@@ -1868,7 +1868,7 @@
"""
shouldReopen = self.vcs.hgUnbundle()
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Apply changegroups"),
self.tr("""The project should be reread. Do this now?"""),
@@ -1924,7 +1924,7 @@
"""
shouldReopen = self.vcs.hgImport()
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Import Patch"),
self.tr("""The project should be reread. Do this now?"""),
@@ -1944,7 +1944,7 @@
"""
shouldReopen = self.vcs.hgRevert(self.project.ppath)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Revert Changes"),
self.tr("""The project should be reread. Do this now?"""),
@@ -1964,7 +1964,7 @@
"""
shouldReopen = self.vcs.hgGraft()
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
None,
self.tr("Copy Changesets"),
self.tr("""The project should be reread. Do this now?"""),
@@ -1979,7 +1979,7 @@
"""
shouldReopen = self.vcs.hgGraftContinue()
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
None,
self.tr("Copy Changesets (Continue)"),
self.tr("""The project should be reread. Do this now?"""),
@@ -1993,7 +1993,7 @@
"""
shouldReopen = self.vcs.hgGraftStop()
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
None,
self.tr("Copy Changesets (Stop)"),
self.tr("""The project should be reread. Do this now?"""),
@@ -2008,7 +2008,7 @@
"""
shouldReopen = self.vcs.hgGraftAbort()
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
None,
self.tr("Copy Changesets (Abort)"),
self.tr("""The project should be reread. Do this now?"""),
