Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/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.hgHisteditStartAct = E5Action(
+        self.hgHisteditStartAct = EricAction(
             self.tr('Start'),
             UI.PixmapCache.getIcon("vcsEditHistory"),
             self.tr('Start'),
@@ -47,7 +47,7 @@
         self.hgHisteditStartAct.triggered.connect(self.__hgHisteditStart)
         self.actions.append(self.hgHisteditStartAct)
         
-        self.hgHisteditContinueAct = E5Action(
+        self.hgHisteditContinueAct = EricAction(
             self.tr('Continue'),
             self.tr('Continue'),
             0, 0, self, 'mercurial_histedit_continue')
@@ -61,7 +61,7 @@
         self.hgHisteditContinueAct.triggered.connect(self.__hgHisteditContinue)
         self.actions.append(self.hgHisteditContinueAct)
         
-        self.hgHisteditAbortAct = E5Action(
+        self.hgHisteditAbortAct = EricAction(
             self.tr('Abort'),
             self.tr('Abort'),
             0, 0, self, 'mercurial_histedit_abort')
@@ -75,7 +75,7 @@
         self.hgHisteditAbortAct.triggered.connect(self.__hgHisteditAbort)
         self.actions.append(self.hgHisteditAbortAct)
         
-        self.hgHisteditEditPlanAct = E5Action(
+        self.hgHisteditEditPlanAct = EricAction(
             self.tr('Edit Plan'),
             self.tr('Edit Plan'),
             0, 0, self, 'mercurial_histedit_edit_plan')
@@ -128,7 +128,7 @@
             self.vcs.getExtensionObject("histedit").hgHisteditStart()
         )
         if shouldReopen:
-            res = E5MessageBox.yesNo(
+            res = EricMessageBox.yesNo(
                 None,
                 self.tr("Start History Editing"),
                 self.tr("""The project should be reread. Do this now?"""),
@@ -144,7 +144,7 @@
             self.vcs.getExtensionObject("histedit").hgHisteditContinue()
         )
         if shouldReopen:
-            res = E5MessageBox.yesNo(
+            res = EricMessageBox.yesNo(
                 None,
                 self.tr("Continue History Editing"),
                 self.tr("""The project should be reread. Do this now?"""),
@@ -160,7 +160,7 @@
             self.vcs.getExtensionObject("histedit").hgHisteditAbort()
         )
         if shouldReopen:
-            res = E5MessageBox.yesNo(
+            res = EricMessageBox.yesNo(
                 None,
                 self.tr("Abort History Editing"),
                 self.tr("""The project should be reread. Do this now?"""),
@@ -177,7 +177,7 @@
             self.vcs.getExtensionObject("histedit").hgHisteditEditPlan()
         )
         if shouldReopen:
-            res = E5MessageBox.yesNo(
+            res = EricMessageBox.yesNo(
                 None,
                 self.tr("Edit Plan"),
                 self.tr("""The project should be reread. Do this now?"""),