--- a/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sat May 22 17:01:51 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sat May 22 18:51:46 2021 +0200 @@ -12,7 +12,7 @@ QDialog, QDialogButtonBox, QAbstractButton, QListWidgetItem ) -from E5Gui import E5MessageBox +from E5Gui import EricMessageBox from .Ui_HgQueuesDefineGuardsDialog import Ui_HgQueuesDefineGuardsDialog @@ -62,14 +62,14 @@ self.__hgClient.cancel() if self.__dirtyList: - res = E5MessageBox.question( + res = EricMessageBox.question( self, self.tr("Unsaved Changes"), self.tr("""The guards list has been changed.""" """ Shall the changes be applied?"""), - E5MessageBox.Apply | E5MessageBox.Discard, - E5MessageBox.Apply) - if res == E5MessageBox.Apply: + EricMessageBox.Apply | EricMessageBox.Discard, + EricMessageBox.Apply) + if res == EricMessageBox.Apply: self.__applyGuards() else: self.__dirtyList = False @@ -93,14 +93,14 @@ """ patch = self.patchSelector.itemText(index) if self.__dirtyList: - res = E5MessageBox.question( + res = EricMessageBox.question( self, self.tr("Unsaved Changes"), self.tr("""The guards list has been changed.""" """ Shall the changes be applied?"""), - E5MessageBox.Apply | E5MessageBox.Discard, - E5MessageBox.Apply) - if res == E5MessageBox.Apply: + EricMessageBox.Apply | EricMessageBox.Discard, + EricMessageBox.Apply) + if res == EricMessageBox.Apply: self.__applyGuards() else: self.__dirtyList = False @@ -201,7 +201,7 @@ """ Private slot to remove guard definitions from the list. """ - res = E5MessageBox.yesNo( + res = EricMessageBox.yesNo( self, self.tr("Remove Guards"), self.tr( @@ -253,7 +253,7 @@ error = self.__hgClient.runcommand(args)[1] if error: - E5MessageBox.warning( + EricMessageBox.warning( self, self.tr("Apply Guard Definitions"), self.tr("""<p>The defined guards could not be"""