Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/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
 
@@ -29,7 +29,7 @@
         """
         Public method to generate the action objects.
         """
-        self.hgShelveAct = E5Action(
+        self.hgShelveAct = EricAction(
             self.tr('Shelve changes'),
             self.tr('Shelve changes...'),
             0, 0, self, 'mercurial_shelve')
@@ -43,7 +43,7 @@
         self.hgShelveAct.triggered.connect(self.__hgShelve)
         self.actions.append(self.hgShelveAct)
         
-        self.hgShelveBrowserAct = E5Action(
+        self.hgShelveBrowserAct = EricAction(
             self.tr('Show shelve browser'),
             self.tr('Show shelve browser...'),
             0, 0, self, 'mercurial_shelve_browser')
@@ -60,7 +60,7 @@
             self.__hgShelveBrowser)
         self.actions.append(self.hgShelveBrowserAct)
         
-        self.hgUnshelveAct = E5Action(
+        self.hgUnshelveAct = EricAction(
             self.tr('Restore shelved change'),
             self.tr('Restore shelved change...'),
             0, 0, self, 'mercurial_unshelve')
@@ -75,7 +75,7 @@
         self.hgUnshelveAct.triggered.connect(self.__hgUnshelve)
         self.actions.append(self.hgUnshelveAct)
         
-        self.hgUnshelveAbortAct = E5Action(
+        self.hgUnshelveAbortAct = EricAction(
             self.tr('Abort restore'),
             self.tr('Abort restore...'),
             0, 0, self, 'mercurial_unshelve_abort')
@@ -90,7 +90,7 @@
         self.hgUnshelveAbortAct.triggered.connect(self.__hgUnshelveAbort)
         self.actions.append(self.hgUnshelveAbortAct)
         
-        self.hgUnshelveContinueAct = E5Action(
+        self.hgUnshelveContinueAct = EricAction(
             self.tr('Continue restore'),
             self.tr('Continue restore...'),
             0, 0, self, 'mercurial_unshelve_continue')
@@ -105,7 +105,7 @@
             self.__hgUnshelveContinue)
         self.actions.append(self.hgUnshelveContinueAct)
         
-        self.hgShelveDeleteAct = E5Action(
+        self.hgShelveDeleteAct = EricAction(
             self.tr('Delete shelved changes'),
             self.tr('Delete shelved changes...'),
             0, 0, self, 'mercurial_shelve_delete')
@@ -118,7 +118,7 @@
             self.__hgDeleteShelves)
         self.actions.append(self.hgShelveDeleteAct)
         
-        self.hgShelveCleanupAct = E5Action(
+        self.hgShelveCleanupAct = EricAction(
             self.tr('Delete ALL shelved changes'),
             self.tr('Delete ALL shelved changes'),
             0, 0, self, 'mercurial_shelve_cleanup')
@@ -170,7 +170,7 @@
         @param title title of the message box (string)
         """
         if shouldReopen:
-            res = E5MessageBox.yesNo(
+            res = EricMessageBox.yesNo(
                 None,
                 title,
                 self.tr("""The project should be reread. Do this now?"""),