Mercurial Repositories > Flask Project / file diff

--- a/ProjectFlask/FlaskBabelExtension/PyBabelConfigDialog.py	Sat May 29 15:04:41 2021 +0200
+++ b/ProjectFlask/FlaskBabelExtension/PyBabelConfigDialog.py	Sun May 30 17:33:37 2021 +0200
@@ -9,11 +9,11 @@
 
 import os
 
-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox
 
-from E5Gui.E5PathPicker import E5PathPickerModes
-from E5Gui.E5Application import e5App
+from EricWidgets.EricPathPicker import EricPathPickerModes
+from EricWidgets.EricApplication import ericApp
 
 from .Ui_PyBabelConfigDialog import Ui_PyBabelConfigDialog
 
@@ -34,48 +34,49 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.__e5project = e5App().getObject("Project")
+        self.__ericProject = ericApp().getObject("Project")
         
         self.configFilePicker.setMode(
-            E5PathPickerModes.SaveFileEnsureExtensionMode)
+            EricPathPickerModes.SAVE_FILE_ENSURE_EXTENSION_MODE)
         self.configFilePicker.setFilters(self.tr(
             "Configuration Files (*.cfg);;"
             "All Files (*)"
         ))
         self.configFilePicker.setDefaultDirectory(
-            self.__e5project.getProjectPath())
+            self.__ericProject.getProjectPath())
         
         self.translationsDirectoryPicker.setMode(
-            E5PathPickerModes.DirectoryMode)
+            EricPathPickerModes.DIRECTORY_MODE)
         self.translationsDirectoryPicker.setDefaultDirectory(
-            self.__e5project.getProjectPath())
+            self.__ericProject.getProjectPath())
         
         self.catalogFilePicker.setMode(
-            E5PathPickerModes.SaveFileEnsureExtensionMode)
+            EricPathPickerModes.SAVE_FILE_ENSURE_EXTENSION_MODE)
         self.catalogFilePicker.setFilters(self.tr(
             "Message Catalog Files (*.pot);;"
             "All Files (*)"
         ))
         self.catalogFilePicker.setDefaultDirectory(
-            self.__e5project.getProjectPath())
+            self.__ericProject.getProjectPath())
         
-        self.configFilePicker.setFocus(Qt.OtherFocusReason)
+        self.configFilePicker.setFocus(Qt.FocusReason.OtherFocusReason)
         
-        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok).setEnabled(False)
         
         if "configFile" in configuration:
             self.configFilePicker.setText(
-                self.__e5project.getAbsoluteUniversalPath(
+                self.__ericProject.getAbsoluteUniversalPath(
                     configuration["configFile"]))
         if "translationsDirectory" in configuration:
             self.translationsDirectoryPicker.setText(
-                self.__e5project.getAbsoluteUniversalPath(
+                self.__ericProject.getAbsoluteUniversalPath(
                     configuration["translationsDirectory"]))
         if "domain" in configuration:
             self.domainEdit.setText(configuration["domain"])
         if "catalogFile" in configuration:
             self.catalogFilePicker.setText(
-                self.__e5project.getAbsoluteUniversalPath(
+                self.__ericProject.getAbsoluteUniversalPath(
                     configuration["catalogFile"]))
         if "markersList" in configuration:
             self.markersEdit.setText(" ".join(configuration["markersList"]))
@@ -91,10 +92,12 @@
         @rtype dict
         """
         configuration = {
-            "configFile": self.__e5project.getRelativeUniversalPath(
-                self.configFilePicker.text()),
-            "translationsDirectory": self.__e5project.getRelativeUniversalPath(
-                self.translationsDirectoryPicker.text()),
+            "configFile":
+                self.__ericProject.getRelativeUniversalPath(
+                    self.configFilePicker.text()),
+            "translationsDirectory":
+                self.__ericProject.getRelativeUniversalPath(
+                    self.translationsDirectoryPicker.text()),
         }
         
         domain = self.domainEdit.text()
@@ -110,7 +113,7 @@
                 configuration["translationsDirectory"],
                 "{0}.pot".format(configuration["domain"]))
         configuration["catalogFile"] = (
-            self.__e5project.getRelativeUniversalPath(catalogFile)
+            self.__ericProject.getRelativeUniversalPath(catalogFile)
         )
         
         if self.markersEdit.text():
@@ -126,7 +129,8 @@
             bool(self.configFilePicker.text()) and
             bool(self.translationsDirectoryPicker.text())
         )
-        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok).setEnabled(enable)
     
     def __updateCatalogPicker(self):
         """