diff -r 79094fb72c18 -r 506c78268b18 ProjectFlask/ServerStartOptionsDialog.py --- a/ProjectFlask/ServerStartOptionsDialog.py Sat Nov 14 19:56:06 2020 +0100 +++ b/ProjectFlask/ServerStartOptionsDialog.py Sun Nov 15 17:35:48 2020 +0100 @@ -9,6 +9,9 @@ from PyQt5.QtWidgets import QDialog +from E5Gui.E5PathPicker import E5PathPickerModes +from E5Gui.E5Application import e5App + from .Ui_ServerStartOptionsDialog import Ui_ServerStartOptionsDialog @@ -28,6 +31,21 @@ super(ServerStartOptionsDialog, self).__init__(parent) self.setupUi(self) + e5project = e5App().getObject("Project") + + self.certFilePicker.setMode(E5PathPickerModes.OpenFileMode) + self.certFilePicker.setFilters(self.tr( + "Certificate Files (*.pem);;" + "Certificate Files (*.cert *.cer *.crt)" + )) + self.certFilePicker.setDefaultDirectory(e5project.getProjectPath()) + + self.keyFilePicker.setMode(E5PathPickerModes.OpenFileMode) + self.keyFilePicker.setFilters(self.tr( + "Key Files (*.pem *.key)" + )) + self.keyFilePicker.setDefaultDirectory(e5project.getProjectPath()) + self.developmentCheckBox.setChecked(options.get("development", False)) self.hostEdit.setText(options.get("host", "")) self.portSpinBox.setValue(int(options.get("port", "5000"))) @@ -51,5 +69,9 @@ port = self.portSpinBox.value() if port != 5000: options["port"] = str(port) + if self.certFilePicker.text(): + options["cert"] = self.certFilePicker.text() + if self.keyFilePicker.text(): + options["key"] = self.keyFilePicker.text() return options