diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py --- a/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Sat May 22 17:01:51 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Sat May 22 18:51:46 2021 +0200 @@ -9,7 +9,7 @@ from PyQt6.QtWidgets import QDialog, QApplication, QInputDialog -from E5Gui import E5MessageBox +from E5Gui import EricMessageBox from ..HgExtension import HgExtension from ..HgDialog import HgDialog @@ -315,7 +315,7 @@ else: return False else: - E5MessageBox.information( + EricMessageBox.information( None, self.tr("Select Patch"), self.tr("""No patches to select from.""")) @@ -396,7 +396,7 @@ if res: dia.exec() else: - E5MessageBox.information( + EricMessageBox.information( None, self.tr("Select Patch"), self.tr("""No patches to select from.""")) @@ -424,12 +424,12 @@ if res: dia.exec() else: - E5MessageBox.information( + EricMessageBox.information( None, self.tr("Fold Patches"), self.tr("""No patches selected.""")) else: - E5MessageBox.information( + EricMessageBox.information( None, self.tr("Fold Patches"), self.tr("""No patches available to be folded.""")) @@ -446,7 +446,7 @@ self.queuesListGuardsDialog.show() self.queuesListGuardsDialog.start() else: - E5MessageBox.information( + EricMessageBox.information( None, self.tr("List Guards"), self.tr("""No patches available to list guards for.""")) @@ -472,7 +472,7 @@ self.queuesDefineGuardsDialog.show() self.queuesDefineGuardsDialog.start() else: - E5MessageBox.information( + EricMessageBox.information( None, self.tr("Define Guards"), self.tr("""No patches available to define guards for.""")) @@ -500,7 +500,7 @@ client = self.vcs.getClient() client.runcommand(args) else: - E5MessageBox.information( + EricMessageBox.information( None, self.tr("Drop All Guards"), self.tr("""No patches available to define guards for.""")) @@ -528,7 +528,7 @@ if res: dia.exec() else: - E5MessageBox.information( + EricMessageBox.information( None, self.tr("Set Active Guards"), self.tr("""No guards available to select from.""")) @@ -596,7 +596,7 @@ else: errMsg = self.tr( "Error while renaming the active queue.") - E5MessageBox.warning( + EricMessageBox.warning( None, title, """<p>{0}</p><p>{1}</p>""".format(errMsg, error)) @@ -654,7 +654,7 @@ elif operation == Queues.QUEUE_ACTIVATE: errMsg = self.tr( "Error while setting the active queue.") - E5MessageBox.warning( + EricMessageBox.warning( None, title, """<p>{0}</p><p>{1}</p>""".format(errMsg, error))