--- a/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/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.hgQueueInitAct = E5Action(
+ self.hgQueueInitAct = EricAction(
self.tr('Init Queue Repository'),
self.tr('Init Queue Repository'),
0, 0, self, 'mercurial_queues_init')
@@ -46,7 +46,7 @@
self.hgQueueInitAct.triggered.connect(self.__hgQueueInit)
self.actions.append(self.hgQueueInitAct)
- self.hgQueueCommitAct = E5Action(
+ self.hgQueueCommitAct = EricAction(
self.tr('Commit changes'),
self.tr('Commit changes...'),
0, 0, self, 'mercurial_queues_commit')
@@ -60,7 +60,7 @@
self.hgQueueCommitAct.triggered.connect(self.__hgQueueCommit)
self.actions.append(self.hgQueueCommitAct)
- self.hgQueueNewAct = E5Action(
+ self.hgQueueNewAct = EricAction(
self.tr('New Patch'),
self.tr('New Patch...'),
0, 0, self, 'mercurial_queues_new')
@@ -74,7 +74,7 @@
self.hgQueueNewAct.triggered.connect(self.__hgQueueNewPatch)
self.actions.append(self.hgQueueNewAct)
- self.hgQueueRefreshAct = E5Action(
+ self.hgQueueRefreshAct = EricAction(
self.tr('Update Current Patch'),
self.tr('Update Current Patch'),
0, 0, self, 'mercurial_queues_refresh')
@@ -89,7 +89,7 @@
self.__hgQueueRefreshPatch)
self.actions.append(self.hgQueueRefreshAct)
- self.hgQueueRefreshMessageAct = E5Action(
+ self.hgQueueRefreshMessageAct = EricAction(
self.tr('Update Current Patch (with Message)'),
self.tr('Update Current Patch (with Message)'),
0, 0, self, 'mercurial_queues_refresh_message')
@@ -105,7 +105,7 @@
self.__hgQueueRefreshPatchMessage)
self.actions.append(self.hgQueueRefreshMessageAct)
- self.hgQueueDiffAct = E5Action(
+ self.hgQueueDiffAct = EricAction(
self.tr('Show Current Patch'),
self.tr('Show Current Patch...'),
0, 0, self, 'mercurial_queues_show')
@@ -121,7 +121,7 @@
self.hgQueueDiffAct.triggered.connect(self.__hgQueueShowPatch)
self.actions.append(self.hgQueueDiffAct)
- self.hgQueueHeaderAct = E5Action(
+ self.hgQueueHeaderAct = EricAction(
self.tr('Show Current Message'),
self.tr('Show Current Message...'),
0, 0, self, 'mercurial_queues_show_message')
@@ -135,7 +135,7 @@
self.hgQueueHeaderAct.triggered.connect(self.__hgQueueShowHeader)
self.actions.append(self.hgQueueHeaderAct)
- self.hgQueueListAct = E5Action(
+ self.hgQueueListAct = EricAction(
self.tr('List Patches'),
self.tr('List Patches...'),
0, 0, self, 'mercurial_queues_list')
@@ -149,7 +149,7 @@
self.hgQueueListAct.triggered.connect(self.__hgQueueListPatches)
self.actions.append(self.hgQueueListAct)
- self.hgQueueFinishAct = E5Action(
+ self.hgQueueFinishAct = EricAction(
self.tr('Finish Applied Patches'),
self.tr('Finish Applied Patches'),
0, 0, self, 'mercurial_queues_finish_applied')
@@ -165,7 +165,7 @@
self.__hgQueueFinishAppliedPatches)
self.actions.append(self.hgQueueFinishAct)
- self.hgQueueRenameAct = E5Action(
+ self.hgQueueRenameAct = EricAction(
self.tr('Rename Patch'),
self.tr('Rename Patch'),
0, 0, self, 'mercurial_queues_rename')
@@ -179,7 +179,7 @@
self.hgQueueRenameAct.triggered.connect(self.__hgQueueRenamePatch)
self.actions.append(self.hgQueueRenameAct)
- self.hgQueueDeleteAct = E5Action(
+ self.hgQueueDeleteAct = EricAction(
self.tr('Delete Patch'),
self.tr('Delete Patch'),
0, 0, self, 'mercurial_queues_delete')
@@ -193,7 +193,7 @@
self.hgQueueDeleteAct.triggered.connect(self.__hgQueueDeletePatch)
self.actions.append(self.hgQueueDeleteAct)
- self.hgQueueFoldAct = E5Action(
+ self.hgQueueFoldAct = EricAction(
self.tr('Fold Patches'),
self.tr('Fold Patches'),
0, 0, self, 'mercurial_queues_fold')
@@ -208,7 +208,7 @@
self.__hgQueueFoldUnappliedPatches)
self.actions.append(self.hgQueueFoldAct)
- self.hgQueueStatusAct = E5Action(
+ self.hgQueueStatusAct = EricAction(
self.tr('Show Status'),
self.tr('Show &Status...'),
0, 0, self, 'mercurial_queues_status')
@@ -222,7 +222,7 @@
self.hgQueueStatusAct.triggered.connect(self.__hgQueueStatus)
self.actions.append(self.hgQueueStatusAct)
- self.hgQueueSummaryAct = E5Action(
+ self.hgQueueSummaryAct = EricAction(
self.tr('Show Summary'),
self.tr('Show summary...'),
0, 0, self, 'mercurial_queues_summary')
@@ -246,7 +246,7 @@
"""
Private method to generate the push and pop action objects.
"""
- self.hgQueuePushAct = E5Action(
+ self.hgQueuePushAct = EricAction(
self.tr('Push Next Patch'),
self.tr('Push Next Patch'),
0, 0, self, 'mercurial_queues_push_next')
@@ -261,7 +261,7 @@
self.hgQueuePushAct.triggered.connect(self.__hgQueuePushPatch)
self.actions.append(self.hgQueuePushAct)
- self.hgQueuePushAllAct = E5Action(
+ self.hgQueuePushAllAct = EricAction(
self.tr('Push All Patches'),
self.tr('Push All Patches'),
0, 0, self, 'mercurial_queues_push_all')
@@ -277,7 +277,7 @@
self.__hgQueuePushAllPatches)
self.actions.append(self.hgQueuePushAllAct)
- self.hgQueuePushUntilAct = E5Action(
+ self.hgQueuePushUntilAct = EricAction(
self.tr('Push Patches'),
self.tr('Push Patches'),
0, 0, self, 'mercurial_queues_push_until')
@@ -293,7 +293,7 @@
self.__hgQueuePushPatches)
self.actions.append(self.hgQueuePushUntilAct)
- self.hgQueuePopAct = E5Action(
+ self.hgQueuePopAct = EricAction(
self.tr('Pop Current Patch'),
self.tr('Pop Current Patch'),
0, 0, self, 'mercurial_queues_pop_current')
@@ -308,7 +308,7 @@
self.hgQueuePopAct.triggered.connect(self.__hgQueuePopPatch)
self.actions.append(self.hgQueuePopAct)
- self.hgQueuePopAllAct = E5Action(
+ self.hgQueuePopAllAct = EricAction(
self.tr('Pop All Patches'),
self.tr('Pop All Patches'),
0, 0, self, 'mercurial_queues_pop_all')
@@ -324,7 +324,7 @@
self.__hgQueuePopAllPatches)
self.actions.append(self.hgQueuePopAllAct)
- self.hgQueuePopUntilAct = E5Action(
+ self.hgQueuePopUntilAct = EricAction(
self.tr('Pop Patches'),
self.tr('Pop Patches'),
0, 0, self, 'mercurial_queues_pop_until')
@@ -339,7 +339,7 @@
self.hgQueuePopUntilAct.triggered.connect(self.__hgQueuePopPatches)
self.actions.append(self.hgQueuePopUntilAct)
- self.hgQueueGotoAct = E5Action(
+ self.hgQueueGotoAct = EricAction(
self.tr('Go to Patch'),
self.tr('Go to Patch'),
0, 0, self, 'mercurial_queues_goto')
@@ -358,7 +358,7 @@
"""
Private method to generate the push and pop (force) action objects.
"""
- self.hgQueuePushForceAct = E5Action(
+ self.hgQueuePushForceAct = EricAction(
self.tr('Push Next Patch'),
self.tr('Push Next Patch'),
0, 0, self, 'mercurial_queues_push_next_force')
@@ -374,7 +374,7 @@
self.__hgQueuePushPatchForced)
self.actions.append(self.hgQueuePushForceAct)
- self.hgQueuePushAllForceAct = E5Action(
+ self.hgQueuePushAllForceAct = EricAction(
self.tr('Push All Patches'),
self.tr('Push All Patches'),
0, 0, self, 'mercurial_queues_push_all_force')
@@ -390,7 +390,7 @@
self.__hgQueuePushAllPatchesForced)
self.actions.append(self.hgQueuePushAllForceAct)
- self.hgQueuePushUntilForceAct = E5Action(
+ self.hgQueuePushUntilForceAct = EricAction(
self.tr('Push Patches'),
self.tr('Push Patches'),
0, 0, self, 'mercurial_queues_push_until_force')
@@ -407,7 +407,7 @@
self.__hgQueuePushPatchesForced)
self.actions.append(self.hgQueuePushUntilForceAct)
- self.hgQueuePopForceAct = E5Action(
+ self.hgQueuePopForceAct = EricAction(
self.tr('Pop Current Patch'),
self.tr('Pop Current Patch'),
0, 0, self, 'mercurial_queues_pop_current_force')
@@ -424,7 +424,7 @@
self.__hgQueuePopPatchForced)
self.actions.append(self.hgQueuePopForceAct)
- self.hgQueuePopAllForceAct = E5Action(
+ self.hgQueuePopAllForceAct = EricAction(
self.tr('Pop All Patches'),
self.tr('Pop All Patches'),
0, 0, self, 'mercurial_queues_pop_all_force')
@@ -440,7 +440,7 @@
self.__hgQueuePopAllPatchesForced)
self.actions.append(self.hgQueuePopAllForceAct)
- self.hgQueuePopUntilForceAct = E5Action(
+ self.hgQueuePopUntilForceAct = EricAction(
self.tr('Pop Patches'),
self.tr('Pop Patches'),
0, 0, self, 'mercurial_queues_pop_until_force')
@@ -457,7 +457,7 @@
self.__hgQueuePopPatchesForced)
self.actions.append(self.hgQueuePopUntilForceAct)
- self.hgQueueGotoForceAct = E5Action(
+ self.hgQueueGotoForceAct = EricAction(
self.tr('Go to Patch'),
self.tr('Go to Patch'),
0, 0, self, 'mercurial_queues_goto_force')
@@ -478,7 +478,7 @@
"""
Private method to generate the guards action objects.
"""
- self.hgQueueDefineGuardsAct = E5Action(
+ self.hgQueueDefineGuardsAct = EricAction(
self.tr('Define Guards'),
self.tr('Define Guards...'),
0, 0, self, 'mercurial_queues_guards_define')
@@ -494,7 +494,7 @@
self.__hgQueueGuardsDefine)
self.actions.append(self.hgQueueDefineGuardsAct)
- self.hgQueueDropAllGuardsAct = E5Action(
+ self.hgQueueDropAllGuardsAct = EricAction(
self.tr('Drop All Guards'),
self.tr('Drop All Guards...'),
0, 0, self, 'mercurial_queues_guards_drop_all')
@@ -509,7 +509,7 @@
self.__hgQueueGuardsDropAll)
self.actions.append(self.hgQueueDropAllGuardsAct)
- self.hgQueueListGuardsAct = E5Action(
+ self.hgQueueListGuardsAct = EricAction(
self.tr('List Guards'),
self.tr('List Guards...'),
0, 0, self, 'mercurial_queues_guards_list')
@@ -524,7 +524,7 @@
self.__hgQueueGuardsList)
self.actions.append(self.hgQueueListGuardsAct)
- self.hgQueueListAllGuardsAct = E5Action(
+ self.hgQueueListAllGuardsAct = EricAction(
self.tr('List All Guards'),
self.tr('List All Guards...'),
0, 0, self, 'mercurial_queues_guards_list_all')
@@ -539,7 +539,7 @@
self.__hgQueueGuardsListAll)
self.actions.append(self.hgQueueListAllGuardsAct)
- self.hgQueueActivateGuardsAct = E5Action(
+ self.hgQueueActivateGuardsAct = EricAction(
self.tr('Set Active Guards'),
self.tr('Set Active Guards...'),
0, 0, self, 'mercurial_queues_guards_set_active')
@@ -554,7 +554,7 @@
self.__hgQueueGuardsSetActive)
self.actions.append(self.hgQueueActivateGuardsAct)
- self.hgQueueDeactivateGuardsAct = E5Action(
+ self.hgQueueDeactivateGuardsAct = EricAction(
self.tr('Deactivate Guards'),
self.tr('Deactivate Guards...'),
0, 0, self, 'mercurial_queues_guards_deactivate')
@@ -569,7 +569,7 @@
self.__hgQueueGuardsDeactivate)
self.actions.append(self.hgQueueDeactivateGuardsAct)
- self.hgQueueIdentifyActiveGuardsAct = E5Action(
+ self.hgQueueIdentifyActiveGuardsAct = EricAction(
self.tr('Identify Active Guards'),
self.tr('Identify Active Guards...'),
0, 0, self, 'mercurial_queues_guards_identify_active')
@@ -588,7 +588,7 @@
"""
Private method to generate the queues management action objects.
"""
- self.hgQueueCreateQueueAct = E5Action(
+ self.hgQueueCreateQueueAct = EricAction(
self.tr('Create Queue'),
self.tr('Create Queue'),
0, 0, self, 'mercurial_queues_create_queue')
@@ -603,7 +603,7 @@
self.__hgQueueCreateQueue)
self.actions.append(self.hgQueueCreateQueueAct)
- self.hgQueueRenameQueueAct = E5Action(
+ self.hgQueueRenameQueueAct = EricAction(
self.tr('Rename Queue'),
self.tr('Rename Queue'),
0, 0, self, 'mercurial_queues_rename_queue')
@@ -618,7 +618,7 @@
self.__hgQueueRenameQueue)
self.actions.append(self.hgQueueRenameQueueAct)
- self.hgQueueDeleteQueueAct = E5Action(
+ self.hgQueueDeleteQueueAct = EricAction(
self.tr('Delete Queue'),
self.tr('Delete Queue'),
0, 0, self, 'mercurial_queues_delete_queue')
@@ -633,7 +633,7 @@
self.__hgQueueDeleteQueue)
self.actions.append(self.hgQueueDeleteQueueAct)
- self.hgQueuePurgeQueueAct = E5Action(
+ self.hgQueuePurgeQueueAct = EricAction(
self.tr('Purge Queue'),
self.tr('Purge Queue'),
0, 0, self, 'mercurial_queues_purge_queue')
@@ -650,7 +650,7 @@
self.__hgQueuePurgeQueue)
self.actions.append(self.hgQueuePurgeQueueAct)
- self.hgQueueActivateQueueAct = E5Action(
+ self.hgQueueActivateQueueAct = EricAction(
self.tr('Activate Queue'),
self.tr('Activate Queue'),
0, 0, self, 'mercurial_queues_activate_queue')
@@ -665,7 +665,7 @@
self.__hgQueueActivateQueue)
self.actions.append(self.hgQueueActivateQueueAct)
- self.hgQueueListQueuesAct = E5Action(
+ self.hgQueueListQueuesAct = EricAction(
self.tr('List Queues'),
self.tr('List Queues...'),
0, 0, self, 'mercurial_queues_list_queues')
@@ -823,7 +823,7 @@
shouldReopen = self.vcs.getExtensionObject("mq").hgQueuePushPopPatches(
operation=operation, doAll=doAll, named=named, force=force)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
None,
self.tr("Changing Applied Patches"),
self.tr("""The project should be reread. Do this now?"""),
