Mercurial Repositories > eric / file diff

--- a/eric6/HexEdit/HexEditMainWindow.py	Sat Mar 06 10:00:52 2021 +0100
+++ b/eric6/HexEdit/HexEditMainWindow.py	Sun Mar 28 15:00:11 2021 +0200
@@ -607,7 +607,7 @@
             """ with your prefered values.</p>"""
         ))
         self.prefAct.triggered.connect(self.__showPreferences)
-        self.prefAct.setMenuRole(QAction.PreferencesRole)
+        self.prefAct.setMenuRole(QAction.MenuRole.PreferencesRole)
         self.__actions.append(self.prefAct)
     
     def __setReadOnlyActionTexts(self):
@@ -775,7 +775,8 @@
             """<p>This part of the status bar displays the cursor"""
             """ address.</p>"""
         ))
-        self.__sbAddress.setFrameStyle(QFrame.StyledPanel | QFrame.Plain)
+        self.__sbAddress.setFrameStyle(
+            QFrame.Shape.StyledPanel | QFrame.Shadow.Plain)
         
         self.__sbSelection = QLabel(self.__statusBar)
         self.__statusBar.addPermanentWidget(self.__sbSelection)
@@ -783,7 +784,8 @@
             """<p>This part of the status bar displays some selection"""
             """ information.</p>"""
         ))
-        self.__sbSelection.setFrameStyle(QFrame.StyledPanel | QFrame.Plain)
+        self.__sbSelection.setFrameStyle(
+            QFrame.Shape.StyledPanel | QFrame.Shadow.Plain)
         
         self.__sbSize = QLabel(self.__statusBar)
         self.__statusBar.addPermanentWidget(self.__sbSize)
@@ -791,14 +793,16 @@
             """<p>This part of the status bar displays the size of the"""
             """ binary data.</p>"""
         ))
-        self.__sbSize.setFrameStyle(QFrame.StyledPanel | QFrame.Plain)
+        self.__sbSize.setFrameStyle(
+            QFrame.Shape.StyledPanel | QFrame.Shadow.Plain)
         
         self.__sbEditMode = E5ClickableLabel(self.__statusBar)
         self.__statusBar.addPermanentWidget(self.__sbEditMode)
         self.__sbEditMode.setWhatsThis(self.tr(
             """<p>This part of the status bar displays the edit mode.</p>"""
         ))
-        self.__sbEditMode.setFrameStyle(QFrame.StyledPanel | QFrame.Plain)
+        self.__sbEditMode.setFrameStyle(
+            QFrame.Shape.StyledPanel | QFrame.Shadow.Plain)
         self.__sbEditMode.clicked.connect(self.__toggleEditMode)
         
         self.__sbReadOnly = E5ClickableLabel(self.__statusBar)
@@ -807,7 +811,8 @@
             """<p>This part of the status bar displays the read"""
             """ only mode.</p>"""
         ))
-        self.__sbReadOnly.setFrameStyle(QFrame.StyledPanel | QFrame.Plain)
+        self.__sbReadOnly.setFrameStyle(
+            QFrame.Shape.StyledPanel | QFrame.Shadow.Plain)
         self.__sbReadOnly.clicked.connect(self.__toggleReadOnlyMode)
 
         self.__showEditMode(self.__editor.overwriteMode())
@@ -1370,7 +1375,7 @@
         dlg.showConfigurationPageByName("hexEditorPage")
         dlg.exec()
         QCoreApplication.processEvents()
-        if dlg.result() == QDialog.Accepted:
+        if dlg.result() == QDialog.DialogCode.Accepted:
             dlg.setPreferences()
             Preferences.syncPreferences()
             self.__preferencesChangedByLocalPreferencesDialog()