diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py Sat May 22 18:51:46 2021 +0200
@@ -9,8 +9,8 @@
from PyQt6.QtWidgets import QMenu
-from E5Gui.E5Action import E5Action
-from E5Gui import E5MessageBox
+from E5Gui.EricAction import EricAction
+from E5Gui import EricMessageBox
from ..HgExtensionProjectHelper import HgExtensionProjectHelper
@@ -31,7 +31,7 @@
"""
Public method to generate the action objects.
"""
- self.hgRebaseAct = E5Action(
+ self.hgRebaseAct = EricAction(
self.tr('Rebase Changesets'),
UI.PixmapCache.getIcon("vcsRebase"),
self.tr('Rebase Changesets'),
@@ -46,7 +46,7 @@
self.hgRebaseAct.triggered.connect(self.__hgRebase)
self.actions.append(self.hgRebaseAct)
- self.hgRebaseContinueAct = E5Action(
+ self.hgRebaseContinueAct = EricAction(
self.tr('Continue Rebase Session'),
self.tr('Continue Rebase Session'),
0, 0, self, 'mercurial_rebase_continue')
@@ -60,7 +60,7 @@
self.hgRebaseContinueAct.triggered.connect(self.__hgRebaseContinue)
self.actions.append(self.hgRebaseContinueAct)
- self.hgRebaseAbortAct = E5Action(
+ self.hgRebaseAbortAct = EricAction(
self.tr('Abort Rebase Session'),
self.tr('Abort Rebase Session'),
0, 0, self, 'mercurial_rebase_abort')
@@ -105,7 +105,7 @@
"""
shouldReopen = self.vcs.getExtensionObject("rebase").hgRebase()
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
None,
self.tr("Rebase Changesets"),
self.tr("""The project should be reread. Do this now?"""),
@@ -119,7 +119,7 @@
"""
shouldReopen = self.vcs.getExtensionObject("rebase").hgRebaseContinue()
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
None,
self.tr("Rebase Changesets (Continue)"),
self.tr("""The project should be reread. Do this now?"""),
@@ -133,7 +133,7 @@
"""
shouldReopen = self.vcs.getExtensionObject("rebase").hgRebaseAbort()
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
None,
self.tr("Rebase Changesets (Abort)"),
self.tr("""The project should be reread. Do this now?"""),
