diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/Graphics/UMLDialog.py
--- a/eric7/Graphics/UMLDialog.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Graphics/UMLDialog.py Sat May 22 18:51:46 2021 +0200
@@ -14,8 +14,8 @@
from PyQt6.QtGui import QAction
from PyQt6.QtWidgets import QToolBar, QGraphicsScene
-from E5Gui import E5MessageBox, E5FileDialog
-from E5Gui.E5MainWindow import E5MainWindow
+from E5Gui import EricMessageBox, EricFileDialog
+from E5Gui.EricMainWindow import EricMainWindow
import UI.Config
import UI.PixmapCache
@@ -32,7 +32,7 @@
NO_DIAGRAM = 255
-class UMLDialog(E5MainWindow):
+class UMLDialog(EricMainWindow):
"""
Class implementing a dialog showing UML like diagrams.
"""
@@ -238,7 +238,7 @@
@type str
"""
if not filename:
- fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+ fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
self,
self.tr("Save Diagram"),
"",
@@ -246,7 +246,7 @@
"Eric Text Graphics File (*.e5g);;"
"All Files (*)"),
"",
- E5FileDialog.DontConfirmOverwrite)
+ EricFileDialog.DontConfirmOverwrite)
if not fname:
return
ext = QFileInfo(fname).suffix()
@@ -255,12 +255,12 @@
if ex:
fname += ex
if QFileInfo(fname).exists():
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self,
self.tr("Save Diagram"),
self.tr("<p>The file <b>{0}</b> already exists."
" Overwrite it?</p>").format(fname),
- icon=E5MessageBox.Warning)
+ icon=EricMessageBox.Warning)
if not res:
return
filename = fname
@@ -282,7 +282,7 @@
@rtype bool
"""
if not filename:
- filename = E5FileDialog.getOpenFileName(
+ filename = EricFileDialog.getOpenFileName(
self,
self.tr("Load Diagram"),
"",
@@ -319,7 +319,7 @@
with open(filename, "r", encoding="utf-8") as f:
data = f.read()
except OSError as err:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Load Diagram"),
self.tr(
@@ -429,7 +429,7 @@
## f.write("\n".join(lines))
## return True
## except OSError as err:
-## E5MessageBox.critical(
+## EricMessageBox.critical(
## self,
## self.tr("Save Diagram"),
## self.tr(
@@ -454,7 +454,7 @@
""" valid data.</p><p>Invalid line: {1}</p>"""
).format(filename, linenum + 1)
)
- E5MessageBox.critical(self, self.tr("Load Diagram"), msg)
+ EricMessageBox.critical(self, self.tr("Load Diagram"), msg)
#######################################################################
## Methods to read and write eric graphics files of the JSON based
@@ -487,7 +487,7 @@
f.write(jsonString)
return True
except (TypeError, OSError) as err:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Save Diagram"),
self.tr(
@@ -511,7 +511,7 @@
jsonString = f.read()
data = json.loads(jsonString)
except (OSError, json.JSONDecodeError) as err:
- E5MessageBox.critical(
+ EricMessageBox.critical(
None,
self.tr("Load Diagram"),
self.tr(
@@ -544,13 +544,13 @@
ok, msg = self.builder.fromDict(version, data["builder"])
if not ok:
if msg:
- res = E5MessageBox.warning(
+ res = EricMessageBox.warning(
self,
self.tr("Load Diagram"),
msg,
- E5MessageBox.Abort | E5MessageBox.Ignore,
- E5MessageBox.Abort)
- if res == E5MessageBox.Abort:
+ EricMessageBox.Abort | EricMessageBox.Ignore,
+ EricMessageBox.Abort)
+ if res == EricMessageBox.Abort:
return False
else:
self.umlView.setLayoutActionsEnabled(False)
