--- a/eric7/Plugins/VcsPlugins/vcsGit/ProjectHelper.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/ProjectHelper.py Sat May 22 18:51:46 2021 +0200
@@ -12,12 +12,12 @@
from PyQt6.QtCore import QFileInfo
from PyQt6.QtWidgets import QMenu, QInputDialog, 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
@@ -59,7 +59,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[:]
return actions
@@ -68,7 +68,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,
@@ -84,7 +84,7 @@
self.vcsNewAct.triggered.connect(self._vcsCheckout)
self.actions.append(self.vcsNewAct)
- self.gitFetchAct = E5Action(
+ self.gitFetchAct = EricAction(
self.tr('Fetch changes'),
UI.PixmapCache.getIcon("vcsUpdate"),
self.tr('Fetch changes'),
@@ -100,7 +100,7 @@
self.gitFetchAct.triggered.connect(self.__gitFetch)
self.actions.append(self.gitFetchAct)
- self.gitPullAct = E5Action(
+ self.gitPullAct = EricAction(
self.tr('Pull changes'),
UI.PixmapCache.getIcon("vcsUpdate"),
self.tr('Pull changes'),
@@ -116,7 +116,7 @@
self.gitPullAct.triggered.connect(self.__gitPull)
self.actions.append(self.gitPullAct)
- 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,
@@ -132,7 +132,7 @@
self.vcsCommitAct.triggered.connect(self._vcsCommit)
self.actions.append(self.vcsCommitAct)
- self.gitPushAct = E5Action(
+ self.gitPushAct = EricAction(
self.tr('Push changes'),
UI.PixmapCache.getIcon("vcsCommit"),
self.tr('Push changes'),
@@ -148,7 +148,7 @@
self.gitPushAct.triggered.connect(self.__gitPush)
self.actions.append(self.gitPushAct)
- self.vcsExportAct = E5Action(
+ self.vcsExportAct = EricAction(
self.tr('Export from repository'),
UI.PixmapCache.getIcon("vcsExport"),
self.tr('&Export from repository...'),
@@ -163,7 +163,7 @@
self.vcsExportAct.triggered.connect(self._vcsExport)
self.actions.append(self.vcsExportAct)
- self.gitLogBrowserAct = E5Action(
+ self.gitLogBrowserAct = EricAction(
self.tr('Show log browser'),
UI.PixmapCache.getIcon("vcsLog"),
self.tr('Show log browser'),
@@ -180,7 +180,7 @@
self.gitLogBrowserAct.triggered.connect(self._vcsLogBrowser)
self.actions.append(self.gitLogBrowserAct)
- self.gitReflogBrowserAct = E5Action(
+ self.gitReflogBrowserAct = EricAction(
self.tr('Show reflog browser'),
UI.PixmapCache.getIcon("vcsLog"),
self.tr('Show reflog browser'),
@@ -197,7 +197,7 @@
self.gitReflogBrowserAct.triggered.connect(self.__gitReflogBrowser)
self.actions.append(self.gitReflogBrowserAct)
- self.vcsDiffAct = E5Action(
+ self.vcsDiffAct = EricAction(
self.tr('Show differences'),
UI.PixmapCache.getIcon("vcsDiff"),
self.tr('Show &differences...'),
@@ -213,7 +213,7 @@
self.vcsDiffAct.triggered.connect(self._vcsDiff)
self.actions.append(self.vcsDiffAct)
- self.gitExtDiffAct = E5Action(
+ self.gitExtDiffAct = EricAction(
self.tr('Show differences (extended)'),
UI.PixmapCache.getIcon("vcsDiff"),
self.tr('Show differences (extended) ...'),
@@ -229,7 +229,7 @@
self.gitExtDiffAct.triggered.connect(self.__gitExtendedDiff)
self.actions.append(self.gitExtDiffAct)
- self.vcsStatusAct = E5Action(
+ self.vcsStatusAct = EricAction(
self.tr('Show status'),
UI.PixmapCache.getIcon("vcsStatus"),
self.tr('Show &status...'),
@@ -244,7 +244,7 @@
self.vcsStatusAct.triggered.connect(self._vcsStatus)
self.actions.append(self.vcsStatusAct)
- self.vcsSwitchAct = E5Action(
+ self.vcsSwitchAct = EricAction(
self.tr('Switch'),
UI.PixmapCache.getIcon("vcsSwitch"),
self.tr('S&witch...'),
@@ -260,7 +260,7 @@
self.vcsSwitchAct.triggered.connect(self._vcsSwitch)
self.actions.append(self.vcsSwitchAct)
- self.vcsTagAct = E5Action(
+ self.vcsTagAct = EricAction(
self.tr('Tag in repository'),
UI.PixmapCache.getIcon("vcsTag"),
self.tr('&Tag in repository...'),
@@ -276,7 +276,7 @@
self.vcsTagAct.triggered.connect(self._vcsTag)
self.actions.append(self.vcsTagAct)
- self.gitTagListAct = E5Action(
+ self.gitTagListAct = EricAction(
self.tr('List tags'),
self.tr('&List tags...'),
0, 0, self, 'git_list_tags')
@@ -290,7 +290,7 @@
self.gitTagListAct.triggered.connect(self.__gitTagList)
self.actions.append(self.gitTagListAct)
- self.gitDescribeTagAct = E5Action(
+ self.gitDescribeTagAct = EricAction(
self.tr('Show most recent tag'),
self.tr('Show most recent tag'),
0, 0, self, 'git_describe_tag')
@@ -305,7 +305,7 @@
self.gitDescribeTagAct.triggered.connect(self.__gitDescribeTag)
self.actions.append(self.gitDescribeTagAct)
- self.gitBranchListAct = E5Action(
+ self.gitBranchListAct = EricAction(
self.tr('List branches'),
self.tr('&List branches...'),
0, 0, self, 'git_list_branches')
@@ -319,7 +319,7 @@
self.gitBranchListAct.triggered.connect(self.__gitBranchList)
self.actions.append(self.gitBranchListAct)
- self.gitMergedBranchListAct = E5Action(
+ self.gitMergedBranchListAct = EricAction(
self.tr('List merged branches'),
self.tr('List &merged branches...'),
0, 0, self, 'git_list_merged_branches')
@@ -334,7 +334,7 @@
self.__gitMergedBranchList)
self.actions.append(self.gitMergedBranchListAct)
- self.gitNotMergedBranchListAct = E5Action(
+ self.gitNotMergedBranchListAct = EricAction(
self.tr('List non-merged branches'),
self.tr('List &non-merged branches...'),
0, 0, self, 'git_list_non_merged_branches')
@@ -349,7 +349,7 @@
self.__gitNotMergedBranchList)
self.actions.append(self.gitNotMergedBranchListAct)
- self.gitBranchAct = E5Action(
+ self.gitBranchAct = EricAction(
self.tr('Branch in repository'),
UI.PixmapCache.getIcon("vcsBranch"),
self.tr('&Branch in repository...'),
@@ -365,7 +365,7 @@
self.gitBranchAct.triggered.connect(self.__gitBranch)
self.actions.append(self.gitBranchAct)
- self.gitDeleteRemoteBranchAct = E5Action(
+ self.gitDeleteRemoteBranchAct = EricAction(
self.tr('Delete Remote Branch'),
self.tr('&Delete Remote Branch...'),
0, 0, self, 'git_delete_remote_branch')
@@ -379,7 +379,7 @@
self.gitDeleteRemoteBranchAct.triggered.connect(self.__gitDeleteBranch)
self.actions.append(self.gitDeleteRemoteBranchAct)
- self.gitShowBranchAct = E5Action(
+ self.gitShowBranchAct = EricAction(
self.tr('Show current branch'),
self.tr('Show current branch'),
0, 0, self, 'git_show_branch')
@@ -393,7 +393,7 @@
self.gitShowBranchAct.triggered.connect(self.__gitShowBranch)
self.actions.append(self.gitShowBranchAct)
- self.vcsRevertAct = E5Action(
+ self.vcsRevertAct = EricAction(
self.tr('Revert changes'),
UI.PixmapCache.getIcon("vcsRevert"),
self.tr('Re&vert changes'),
@@ -408,7 +408,7 @@
self.vcsRevertAct.triggered.connect(self.__gitRevert)
self.actions.append(self.vcsRevertAct)
- self.gitUnstageAct = E5Action(
+ self.gitUnstageAct = EricAction(
self.tr('Unstage changes'),
UI.PixmapCache.getIcon("vcsRevert"),
self.tr('&Unstage changes'),
@@ -423,7 +423,7 @@
self.gitUnstageAct.triggered.connect(self.__gitUnstage)
self.actions.append(self.gitUnstageAct)
- self.vcsMergeAct = E5Action(
+ self.vcsMergeAct = EricAction(
self.tr('Merge'),
UI.PixmapCache.getIcon("vcsMerge"),
self.tr('Mer&ge changes...'),
@@ -438,7 +438,7 @@
self.vcsMergeAct.triggered.connect(self._vcsMerge)
self.actions.append(self.vcsMergeAct)
- self.gitCancelMergeAct = E5Action(
+ self.gitCancelMergeAct = EricAction(
self.tr('Cancel uncommitted/failed merge'),
self.tr('Cancel uncommitted/failed merge'),
0, 0, self, 'git_cancel_merge')
@@ -453,7 +453,7 @@
self.gitCancelMergeAct.triggered.connect(self.__gitCancelMerge)
self.actions.append(self.gitCancelMergeAct)
- self.gitCommitMergeAct = E5Action(
+ self.gitCommitMergeAct = EricAction(
self.tr('Commit failed merge'),
self.tr('Commit failed merge'),
0, 0, self, 'git_commit_merge')
@@ -468,7 +468,7 @@
self.gitCommitMergeAct.triggered.connect(self.__gitCommitMerge)
self.actions.append(self.gitCommitMergeAct)
- self.vcsCleanupAct = E5Action(
+ self.vcsCleanupAct = EricAction(
self.tr('Cleanup'),
self.tr('Cleanu&p'),
0, 0, self, 'git_cleanup')
@@ -482,7 +482,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, 'git_command')
@@ -497,7 +497,7 @@
self.vcsCommandAct.triggered.connect(self._vcsCommand)
self.actions.append(self.vcsCommandAct)
- self.gitConfigAct = E5Action(
+ self.gitConfigAct = EricAction(
self.tr('Configure'),
self.tr('Configure...'),
0, 0, self, 'git_configure')
@@ -512,7 +512,7 @@
self.gitConfigAct.triggered.connect(self.__gitConfigure)
self.actions.append(self.gitConfigAct)
- self.gitRemotesShowAct = E5Action(
+ self.gitRemotesShowAct = EricAction(
self.tr('Show Remotes'),
self.tr('Show Remotes...'),
0, 0, self, 'git_show_remotes')
@@ -527,7 +527,7 @@
self.gitRemotesShowAct.triggered.connect(self.__gitShowRemotes)
self.actions.append(self.gitRemotesShowAct)
- self.gitRemoteShowAct = E5Action(
+ self.gitRemoteShowAct = EricAction(
self.tr('Show Remote Info'),
self.tr('Show Remote Info...'),
0, 0, self, 'git_show_remote_info')
@@ -542,7 +542,7 @@
self.gitRemoteShowAct.triggered.connect(self.__gitShowRemote)
self.actions.append(self.gitRemoteShowAct)
- self.gitRemoteAddAct = E5Action(
+ self.gitRemoteAddAct = EricAction(
self.tr('Add'),
self.tr('Add...'),
0, 0, self, 'git_add_remote')
@@ -556,7 +556,7 @@
self.gitRemoteAddAct.triggered.connect(self.__gitAddRemote)
self.actions.append(self.gitRemoteAddAct)
- self.gitRemoteRemoveAct = E5Action(
+ self.gitRemoteRemoveAct = EricAction(
self.tr('Remove'),
self.tr('Remove...'),
0, 0, self, 'git_remove_remote')
@@ -570,7 +570,7 @@
self.gitRemoteRemoveAct.triggered.connect(self.__gitRemoveRemote)
self.actions.append(self.gitRemoteRemoveAct)
- self.gitRemotePruneAct = E5Action(
+ self.gitRemotePruneAct = EricAction(
self.tr('Prune'),
self.tr('Prune...'),
0, 0, self, 'git_prune_remote')
@@ -585,7 +585,7 @@
self.gitRemotePruneAct.triggered.connect(self.__gitPruneRemote)
self.actions.append(self.gitRemotePruneAct)
- self.gitRemoteRenameAct = E5Action(
+ self.gitRemoteRenameAct = EricAction(
self.tr('Rename'),
self.tr('Rename...'),
0, 0, self, 'git_rename_remote')
@@ -599,7 +599,7 @@
self.gitRemoteRenameAct.triggered.connect(self.__gitRenameRemote)
self.actions.append(self.gitRemoteRenameAct)
- self.gitRemoteChangeUrlAct = E5Action(
+ self.gitRemoteChangeUrlAct = EricAction(
self.tr('Change URL'),
self.tr('Change URL...'),
0, 0, self, 'git_change_remote_url')
@@ -613,7 +613,7 @@
self.gitRemoteChangeUrlAct.triggered.connect(self.__gitChangeRemoteUrl)
self.actions.append(self.gitRemoteChangeUrlAct)
- self.gitRemoteCredentialsAct = E5Action(
+ self.gitRemoteCredentialsAct = EricAction(
self.tr('Credentials'),
self.tr('Credentials...'),
0, 0, self, 'git_remote_credentials')
@@ -629,7 +629,7 @@
self.__gitRemoteCredentials)
self.actions.append(self.gitRemoteCredentialsAct)
- self.gitCherryPickAct = E5Action(
+ self.gitCherryPickAct = EricAction(
self.tr('Copy Commits'),
UI.PixmapCache.getIcon("vcsGraft"),
self.tr('Copy Commits'),
@@ -644,7 +644,7 @@
self.gitCherryPickAct.triggered.connect(self.__gitCherryPick)
self.actions.append(self.gitCherryPickAct)
- self.gitCherryPickContinueAct = E5Action(
+ self.gitCherryPickContinueAct = EricAction(
self.tr('Continue Copying Session'),
self.tr('Continue Copying Session'),
0, 0, self, 'git_cherrypick_continue')
@@ -660,7 +660,7 @@
self.__gitCherryPickContinue)
self.actions.append(self.gitCherryPickContinueAct)
- self.gitCherryPickQuitAct = E5Action(
+ self.gitCherryPickQuitAct = EricAction(
self.tr('Quit Copying Session'),
self.tr('Quit Copying Session'),
0, 0, self, 'git_cherrypick_quit')
@@ -674,7 +674,7 @@
self.gitCherryPickQuitAct.triggered.connect(self.__gitCherryPickQuit)
self.actions.append(self.gitCherryPickQuitAct)
- self.gitCherryPickAbortAct = E5Action(
+ self.gitCherryPickAbortAct = EricAction(
self.tr('Cancel Copying Session'),
self.tr('Cancel Copying Session'),
0, 0, self, 'git_cherrypick_abort')
@@ -690,7 +690,7 @@
self.gitCherryPickAbortAct.triggered.connect(self.__gitCherryPickAbort)
self.actions.append(self.gitCherryPickAbortAct)
- self.gitStashAct = E5Action(
+ self.gitStashAct = EricAction(
self.tr('Stash changes'),
self.tr('Stash changes...'),
0, 0, self, 'git_stash')
@@ -704,7 +704,7 @@
self.gitStashAct.triggered.connect(self.__gitStashSave)
self.actions.append(self.gitStashAct)
- self.gitStashBrowserAct = E5Action(
+ self.gitStashBrowserAct = EricAction(
self.tr('Show stash browser'),
self.tr('Show stash browser...'),
0, 0, self, 'git_stash_browser')
@@ -720,7 +720,7 @@
self.gitStashBrowserAct.triggered.connect(self.__gitStashBrowser)
self.actions.append(self.gitStashBrowserAct)
- self.gitStashShowAct = E5Action(
+ self.gitStashShowAct = EricAction(
self.tr('Show stash'),
self.tr('Show stash...'),
0, 0, self, 'git_stash_show')
@@ -735,7 +735,7 @@
self.gitStashShowAct.triggered.connect(self.__gitStashShow)
self.actions.append(self.gitStashShowAct)
- self.gitStashApplyAct = E5Action(
+ self.gitStashApplyAct = EricAction(
self.tr('Restore && Keep'),
self.tr('Restore && Keep'),
0, 0, self, 'git_stash_apply')
@@ -749,7 +749,7 @@
self.gitStashApplyAct.triggered.connect(self.__gitStashApply)
self.actions.append(self.gitStashApplyAct)
- self.gitStashPopAct = E5Action(
+ self.gitStashPopAct = EricAction(
self.tr('Restore && Delete'),
self.tr('Restore && Delete'),
0, 0, self, 'git_stash_pop')
@@ -763,7 +763,7 @@
self.gitStashPopAct.triggered.connect(self.__gitStashPop)
self.actions.append(self.gitStashPopAct)
- self.gitStashBranchAct = E5Action(
+ self.gitStashBranchAct = EricAction(
self.tr('Create Branch'),
self.tr('Create Branch'),
0, 0, self, 'git_stash_branch')
@@ -778,7 +778,7 @@
self.gitStashBranchAct.triggered.connect(self.__gitStashBranch)
self.actions.append(self.gitStashBranchAct)
- self.gitStashDropAct = E5Action(
+ self.gitStashDropAct = EricAction(
self.tr('Delete'),
self.tr('Delete'),
0, 0, self, 'git_stash_delete')
@@ -792,7 +792,7 @@
self.gitStashDropAct.triggered.connect(self.__gitStashDrop)
self.actions.append(self.gitStashDropAct)
- self.gitStashClearAct = E5Action(
+ self.gitStashClearAct = EricAction(
self.tr('Delete All'),
self.tr('Delete All'),
0, 0, self, 'git_stash_delete_all')
@@ -806,7 +806,7 @@
self.gitStashClearAct.triggered.connect(self.__gitStashClear)
self.actions.append(self.gitStashClearAct)
- self.gitEditUserConfigAct = E5Action(
+ self.gitEditUserConfigAct = EricAction(
self.tr('Edit user configuration'),
self.tr('Edit user configuration...'),
0, 0, self, 'git_user_configure')
@@ -820,7 +820,7 @@
self.gitEditUserConfigAct.triggered.connect(self.__gitEditUserConfig)
self.actions.append(self.gitEditUserConfigAct)
- self.gitRepoConfigAct = E5Action(
+ self.gitRepoConfigAct = EricAction(
self.tr('Edit repository configuration'),
self.tr('Edit repository configuration...'),
0, 0, self, 'git_repo_configure')
@@ -835,7 +835,7 @@
self.gitRepoConfigAct.triggered.connect(self.__gitEditRepoConfig)
self.actions.append(self.gitRepoConfigAct)
- self.gitCreateIgnoreAct = E5Action(
+ self.gitCreateIgnoreAct = EricAction(
self.tr('Create .gitignore'),
self.tr('Create .gitignore'),
0, 0, self, 'git_create_ignore')
@@ -849,7 +849,7 @@
self.gitCreateIgnoreAct.triggered.connect(self.__gitCreateIgnore)
self.actions.append(self.gitCreateIgnoreAct)
- self.gitShowConfigAct = E5Action(
+ self.gitShowConfigAct = EricAction(
self.tr('Show combined configuration settings'),
self.tr('Show combined configuration settings...'),
0, 0, self, 'git_show_config')
@@ -865,7 +865,7 @@
self.gitShowConfigAct.triggered.connect(self.__gitShowConfig)
self.actions.append(self.gitShowConfigAct)
- self.gitVerifyAct = E5Action(
+ self.gitVerifyAct = EricAction(
self.tr('Verify repository'),
self.tr('Verify repository...'),
0, 0, self, 'git_verify')
@@ -880,7 +880,7 @@
self.gitVerifyAct.triggered.connect(self.__gitVerify)
self.actions.append(self.gitVerifyAct)
- self.gitHouseKeepingAct = E5Action(
+ self.gitHouseKeepingAct = EricAction(
self.tr('Optimize repository'),
self.tr('Optimize repository...'),
0, 0, self, 'git_housekeeping')
@@ -894,7 +894,7 @@
self.gitHouseKeepingAct.triggered.connect(self.__gitHouseKeeping)
self.actions.append(self.gitHouseKeepingAct)
- self.gitStatisticsAct = E5Action(
+ self.gitStatisticsAct = EricAction(
self.tr('Repository Statistics'),
self.tr('Repository Statistics...'),
0, 0, self, 'git_statistics')
@@ -908,7 +908,7 @@
self.gitStatisticsAct.triggered.connect(self.__gitStatistics)
self.actions.append(self.gitStatisticsAct)
- self.gitCreateArchiveAct = E5Action(
+ self.gitCreateArchiveAct = EricAction(
self.tr('Create Archive'),
self.tr('Create Archive'),
0, 0, self, 'git_create_archive')
@@ -922,7 +922,7 @@
self.gitCreateArchiveAct.triggered.connect(self.__gitCreateArchive)
self.actions.append(self.gitCreateArchiveAct)
- self.gitBundleAct = E5Action(
+ self.gitBundleAct = EricAction(
self.tr('Create bundle'),
self.tr('Create bundle...'),
0, 0, self, 'mercurial_bundle_create')
@@ -937,7 +937,7 @@
self.gitBundleAct.triggered.connect(self.__gitBundle)
self.actions.append(self.gitBundleAct)
- self.gitBundleVerifyAct = E5Action(
+ self.gitBundleVerifyAct = EricAction(
self.tr('Verify bundle'),
self.tr('Verify bundle...'),
0, 0, self, 'mercurial_bundle_verify')
@@ -952,7 +952,7 @@
self.gitBundleVerifyAct.triggered.connect(self.__gitVerifyBundle)
self.actions.append(self.gitBundleVerifyAct)
- self.gitBundleListHeadsAct = E5Action(
+ self.gitBundleListHeadsAct = EricAction(
self.tr('List bundle heads'),
self.tr('List bundle heads...'),
0, 0, self, 'mercurial_bundle_list_heads')
@@ -966,7 +966,7 @@
self.gitBundleListHeadsAct.triggered.connect(self.__gitBundleListHeads)
self.actions.append(self.gitBundleListHeadsAct)
- self.gitBundleApplyFetchAct = E5Action(
+ self.gitBundleApplyFetchAct = EricAction(
self.tr('Apply Bundle (fetch)'),
self.tr('Apply Bundle (fetch)...'),
0, 0, self, 'mercurial_bundle_apply_fetch')
@@ -980,7 +980,7 @@
self.gitBundleApplyFetchAct.triggered.connect(self.__gitBundleFetch)
self.actions.append(self.gitBundleApplyFetchAct)
- self.gitBundleApplyPullAct = E5Action(
+ self.gitBundleApplyPullAct = EricAction(
self.tr('Apply Bundle (pull)'),
self.tr('Apply Bundle (pull)...'),
0, 0, self, 'mercurial_bundle_apply_pull')
@@ -994,7 +994,7 @@
self.gitBundleApplyPullAct.triggered.connect(self.__gitBundlePull)
self.actions.append(self.gitBundleApplyPullAct)
- self.gitBisectStartAct = E5Action(
+ self.gitBisectStartAct = EricAction(
self.tr('Start'),
self.tr('Start'),
0, 0, self, 'git_bisect_start')
@@ -1008,7 +1008,7 @@
self.gitBisectStartAct.triggered.connect(self.__gitBisectStart)
self.actions.append(self.gitBisectStartAct)
- self.gitBisectStartExtendedAct = E5Action(
+ self.gitBisectStartExtendedAct = EricAction(
self.tr('Start (Extended)'),
self.tr('Start (Extended)'),
0, 0, self, 'git_bisect_start_extended')
@@ -1024,7 +1024,7 @@
self.__gitBisectStartExtended)
self.actions.append(self.gitBisectStartExtendedAct)
- self.gitBisectGoodAct = E5Action(
+ self.gitBisectGoodAct = EricAction(
self.tr('Mark as "good"'),
self.tr('Mark as "good"...'),
0, 0, self, 'git_bisect_good')
@@ -1038,7 +1038,7 @@
self.gitBisectGoodAct.triggered.connect(self.__gitBisectGood)
self.actions.append(self.gitBisectGoodAct)
- self.gitBisectBadAct = E5Action(
+ self.gitBisectBadAct = EricAction(
self.tr('Mark as "bad"'),
self.tr('Mark as "bad"...'),
0, 0, self, 'git_bisect_bad')
@@ -1052,7 +1052,7 @@
self.gitBisectBadAct.triggered.connect(self.__gitBisectBad)
self.actions.append(self.gitBisectBadAct)
- self.gitBisectSkipAct = E5Action(
+ self.gitBisectSkipAct = EricAction(
self.tr('Skip'),
self.tr('Skip...'),
0, 0, self, 'git_bisect_skip')
@@ -1066,7 +1066,7 @@
self.gitBisectSkipAct.triggered.connect(self.__gitBisectSkip)
self.actions.append(self.gitBisectSkipAct)
- self.gitBisectResetAct = E5Action(
+ self.gitBisectResetAct = EricAction(
self.tr('Reset'),
self.tr('Reset...'),
0, 0, self, 'git_bisect_reset')
@@ -1080,7 +1080,7 @@
self.gitBisectResetAct.triggered.connect(self.__gitBisectReset)
self.actions.append(self.gitBisectResetAct)
- self.gitBisectLogBrowserAct = E5Action(
+ self.gitBisectLogBrowserAct = EricAction(
self.tr('Show bisect log browser'),
UI.PixmapCache.getIcon("vcsLog"),
self.tr('Show bisect log browser'),
@@ -1097,7 +1097,7 @@
self.__gitBisectLogBrowser)
self.actions.append(self.gitBisectLogBrowserAct)
- self.gitBisectCreateReplayAct = E5Action(
+ self.gitBisectCreateReplayAct = EricAction(
self.tr('Create replay file'),
self.tr('Create replay file'),
0, 0, self, 'git_bisect_create_replay')
@@ -1113,7 +1113,7 @@
self.__gitBisectCreateReplay)
self.actions.append(self.gitBisectCreateReplayAct)
- self.gitBisectEditReplayAct = E5Action(
+ self.gitBisectEditReplayAct = EricAction(
self.tr('Edit replay file'),
self.tr('Edit replay file'),
0, 0, self, 'git_bisect_edit_replay')
@@ -1128,7 +1128,7 @@
self.__gitBisectEditReplay)
self.actions.append(self.gitBisectEditReplayAct)
- self.gitBisectReplayAct = E5Action(
+ self.gitBisectReplayAct = EricAction(
self.tr('Replay session'),
self.tr('Replay session'),
0, 0, self, 'git_bisect_replay')
@@ -1142,7 +1142,7 @@
self.gitBisectReplayAct.triggered.connect(self.__gitBisectReplay)
self.actions.append(self.gitBisectReplayAct)
- self.gitCheckPatchesAct = E5Action(
+ self.gitCheckPatchesAct = EricAction(
self.tr('Check patch files'),
self.tr('Check patch files'),
0, 0, self, 'git_check_patches')
@@ -1157,7 +1157,7 @@
self.gitCheckPatchesAct.triggered.connect(self.__gitCheckPatches)
self.actions.append(self.gitCheckPatchesAct)
- self.gitApplyPatchesAct = E5Action(
+ self.gitApplyPatchesAct = EricAction(
self.tr('Apply patch files'),
self.tr('Apply patch files'),
0, 0, self, 'git_apply_patches')
@@ -1171,7 +1171,7 @@
self.gitApplyPatchesAct.triggered.connect(self.__gitApplyPatches)
self.actions.append(self.gitApplyPatchesAct)
- self.gitShowPatcheStatisticsAct = E5Action(
+ self.gitShowPatcheStatisticsAct = EricAction(
self.tr('Show patch statistics'),
self.tr('Show patch statistics'),
0, 0, self, 'git_show_patches_statistics')
@@ -1186,7 +1186,7 @@
self.__gitShowPatchStatistics)
self.actions.append(self.gitShowPatcheStatisticsAct)
- self.gitSubmoduleAddAct = E5Action(
+ self.gitSubmoduleAddAct = EricAction(
self.tr('Add'),
self.tr('Add'),
0, 0, self, 'git_submodule_add')
@@ -1201,7 +1201,7 @@
self.__gitSubmoduleAdd)
self.actions.append(self.gitSubmoduleAddAct)
- self.gitSubmodulesListAct = E5Action(
+ self.gitSubmodulesListAct = EricAction(
self.tr('List'),
self.tr('List'),
0, 0, self, 'git_submodules_list')
@@ -1216,7 +1216,7 @@
self.__gitSubmodulesList)
self.actions.append(self.gitSubmodulesListAct)
- self.gitSubmodulesInitAct = E5Action(
+ self.gitSubmodulesInitAct = EricAction(
self.tr('Initialize'),
self.tr('Initialize'),
0, 0, self, 'git_submodules_init')
@@ -1232,7 +1232,7 @@
self.__gitSubmodulesInit)
self.actions.append(self.gitSubmodulesInitAct)
- self.gitSubmodulesDeinitAct = E5Action(
+ self.gitSubmodulesDeinitAct = EricAction(
self.tr('Unregister'),
self.tr('Unregister'),
0, 0, self, 'git_submodules_deinit')
@@ -1247,7 +1247,7 @@
self.__gitSubmodulesDeinit)
self.actions.append(self.gitSubmodulesDeinitAct)
- self.gitSubmodulesUpdateAct = E5Action(
+ self.gitSubmodulesUpdateAct = EricAction(
self.tr('Update'),
self.tr('Update'),
0, 0, self, 'git_submodules_update')
@@ -1262,7 +1262,7 @@
self.__gitSubmodulesUpdate)
self.actions.append(self.gitSubmodulesUpdateAct)
- self.gitSubmodulesUpdateInitAct = E5Action(
+ self.gitSubmodulesUpdateInitAct = EricAction(
self.tr('Initialize and Update'),
self.tr('Initialize and Update'),
0, 0, self, 'git_submodules_update_init')
@@ -1278,7 +1278,7 @@
self.__gitSubmodulesUpdateInit)
self.actions.append(self.gitSubmodulesUpdateInitAct)
- self.gitSubmodulesUpdateRemoteAct = E5Action(
+ self.gitSubmodulesUpdateRemoteAct = EricAction(
self.tr('Fetch and Update'),
self.tr('Fetch and Update'),
0, 0, self, 'git_submodules_update_remote')
@@ -1294,7 +1294,7 @@
self.__gitSubmodulesUpdateRemote)
self.actions.append(self.gitSubmodulesUpdateRemoteAct)
- self.gitSubmodulesUpdateOptionsAct = E5Action(
+ self.gitSubmodulesUpdateOptionsAct = EricAction(
self.tr('Update with Options'),
self.tr('Update with Options'),
0, 0, self, 'git_submodules_update_options')
@@ -1311,7 +1311,7 @@
self.__gitSubmodulesUpdateOptions)
self.actions.append(self.gitSubmodulesUpdateOptionsAct)
- self.gitSubmodulesSyncAct = E5Action(
+ self.gitSubmodulesSyncAct = EricAction(
self.tr('Synchronize URLs'),
self.tr('Synchronize URLs'),
0, 0, self, 'git_submodules_sync')
@@ -1327,7 +1327,7 @@
self.__gitSubmodulesSync)
self.actions.append(self.gitSubmodulesSyncAct)
- self.gitSubmodulesStatusAct = E5Action(
+ self.gitSubmodulesStatusAct = EricAction(
self.tr('Show Status'),
self.tr('Show Status'),
0, 0, self, 'git_submodules_status')
@@ -1343,7 +1343,7 @@
self.__gitSubmodulesStatus)
self.actions.append(self.gitSubmodulesStatusAct)
- self.gitSubmodulesSummaryAct = E5Action(
+ self.gitSubmodulesSummaryAct = EricAction(
self.tr('Show Summary'),
self.tr('Show Summary'),
0, 0, self, 'git_submodules_summary')
@@ -1563,7 +1563,7 @@
@param ui reference to the main window (UserInterface)
@param toolbarManager reference to a toolbar manager object
- (E5ToolBarManager)
+ (EricToolBarManager)
"""
self.__toolbar = QToolBar(self.tr("Git"), ui)
self.__toolbar.setIconSize(UI.Config.ToolBarIconSize)
@@ -1609,7 +1609,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("git")
@@ -1673,7 +1673,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Branch"),
self.tr("""The project should be reread. Do this now?"""),
@@ -1717,7 +1717,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Pull"),
self.tr("""The project should be reread. Do this now?"""),
@@ -1742,7 +1742,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Revert Changes"),
self.tr("""The project should be reread. Do this now?"""),
@@ -1761,7 +1761,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Unstage Changes"),
self.tr("""The project should be reread. Do this now?"""),
@@ -1890,7 +1890,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
None,
self.tr("Copy Commits"),
self.tr("""The project should be reread. Do this now?"""),
@@ -1910,7 +1910,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
None,
self.tr("Copy Commits (Continue)"),
self.tr("""The project should be reread. Do this now?"""),
@@ -1929,7 +1929,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
None,
self.tr("Copy Commits (Quit)"),
self.tr("""The project should be reread. Do this now?"""),
@@ -1949,7 +1949,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
None,
self.tr("Copy Commits (Cancel)"),
self.tr("""The project should be reread. Do this now?"""),
@@ -1968,7 +1968,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Save Stash"),
self.tr("""The project should be reread. Do this now?"""),
@@ -1999,7 +1999,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Restore Stash"),
self.tr("""The project should be reread. Do this now?"""),
@@ -2018,7 +2018,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Restore Stash"),
self.tr("""The project should be reread. Do this now?"""),
@@ -2037,7 +2037,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Create Branch"),
self.tr("""The project should be reread. Do this now?"""),
@@ -2061,7 +2061,7 @@
"""
Private method to open the configuration dialog.
"""
- e5App().getObject("UserInterface").showPreferences("zzz_gitPage")
+ ericApp().getObject("UserInterface").showPreferences("zzz_gitPage")
def __gitEditUserConfig(self):
"""
@@ -2154,7 +2154,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Apply Bundle (pull)"),
self.tr("""The project should be reread. Do this now?"""),
@@ -2180,7 +2180,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Bisect"),
self.tr("""The project should be reread. Do this now?"""),
@@ -2199,7 +2199,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Bisect"),
self.tr("""The project should be reread. Do this now?"""),
@@ -2218,7 +2218,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Bisect"),
self.tr("""The project should be reread. Do this now?"""),
@@ -2237,7 +2237,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Bisect"),
self.tr("""The project should be reread. Do this now?"""),
@@ -2256,7 +2256,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Bisect"),
self.tr("""The project should be reread. Do this now?"""),
@@ -2294,7 +2294,7 @@
QFileInfo(pfile).lastModified().toString() != lastModified
)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Bisect"),
self.tr("""The project should be reread. Do this now?"""),
@@ -2318,7 +2318,7 @@
lastModified = QFileInfo(pfile).lastModified().toString()
self.vcs.gitApplyCheckPatches(self.project.getProjectPath())
if QFileInfo(pfile).lastModified().toString() != lastModified:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Apply patch files"),
self.tr("""The project should be reread. Do this now?"""),
