Mercurial Repositories > Flask Project / file diff

diff -r ed33cdfca13d -r d2da14b2a233 ProjectFlask/PyBabelConfigDialog.py
--- a/ProjectFlask/PyBabelConfigDialog.py	Wed Nov 18 20:16:06 2020 +0100
+++ b/ProjectFlask/PyBabelConfigDialog.py	Thu Nov 19 18:34:05 2020 +0100
@@ -32,32 +32,43 @@
         super(PyBabelConfigDialog, self).__init__(parent)
         self.setupUi(self)
         
-        e5project = e5App().getObject("Project")
+        self.__e5project = e5App().getObject("Project")
         
-        self.configFilePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.configFilePicker.setMode(
+            E5PathPickerModes.SaveFileEnsureExtensionMode)
         self.configFilePicker.setFilters(self.tr(
             "Configuration Files (*.cfg);;"
             "All Files (*)"
         ))
-        self.configFilePicker.setDefaultDirectory(e5project.getProjectPath())
+        self.configFilePicker.setDefaultDirectory(
+            self.__e5project.getProjectPath())
         
-        self.catalogFilePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.catalogFilePicker.setMode(
+            E5PathPickerModes.SaveFileEnsureExtensionMode)
         self.catalogFilePicker.setFilters(self.tr(
             "Message Catalog Files (*.pot);;"
             "All Files (*)"
         ))
-        self.catalogFilePicker.setDefaultDirectory(e5project.getProjectPath())
+        self.catalogFilePicker.setDefaultDirectory(
+            self.__e5project.getProjectPath())
         
         self.configFilePicker.setFocus(Qt.OtherFocusReason)
         
         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
         
         if "configFile" in configuration:
-            self.configFilePicker.setText(configuration["configFile"])
+            self.configFilePicker.setText(
+                self.__e5project.getAbsoluteUniversalPath(
+                    configuration["configFile"]))
         if "catalogFile" in configuration:
-            self.catalogFilePicker.setText(configuration["catalogFile"])
+            self.catalogFilePicker.setText(
+                self.__e5project.getAbsoluteUniversalPath(
+                    configuration["catalogFile"]))
         if "markersList" in configuration:
             self.markersEdit.setText(" ".join(configuration["markersList"]))
+        
+        msh = self.minimumSizeHint()
+        self.resize(max(self.width(), msh.width()), msh.height())
     
     def getConfiguration(self):
         """
@@ -67,8 +78,10 @@
         @rtype dict
         """
         configuration = {
-            "configFile": self.configFilePicker.text(),
-            "catalogFile": self.catalogFilePicker.text(),
+            "configFile": self.__e5project.getRelativeUniversalPath(
+                self.configFilePicker.text()),
+            "catalogFile": self.__e5project.getRelativeUniversalPath(
+                self.catalogFilePicker.text()),
         }
         if self.markersEdit.text():
             configuration["markersList"] = self.markersEdit.text().split()