Reimplmented prescription signing with cryptography module

[medscript.git] / setting.py

diff --git a/setting.py b/setting.py
index ca4b4ba59c484fd314a18f840714d6296c78f288..243df9a882d0993493841ca5574227caaed64782 100644 (file)
--- a/setting.py
+++ b/setting.py
@@ -9,12 +9,10 @@ from PyQt6.QtWidgets import QWidget, QMainWindow, QFormLayout, QHBoxLayout, QPus
 from PyQt6.QtGui import QIcon
 from PyQt6.QtCore import pyqtSignal
 import os, json
-from config import config, config_file, sign_available
+from config import config, config_file
 
 class EditConfiguration(QMainWindow):
 
-    global sign_available
-
     def select_directory(self):
         d=QFileDialog.getExistingDirectory(self, "Select Directory", config["data_directory"])
         if(d):
@@ -44,11 +42,10 @@ class EditConfiguration(QMainWindow):
             self.input_newline.setChecked(bool(self.config["preset_newline"]))
             self.input_delimiter.setCurrentText(self.config["preset_delimiter"])
             self.input_markdown.setChecked(bool(self.config["markdown"]))
-            if sign_available:
-                self.input_smime.setChecked(bool(self.config["smime"]))
-                self.input_key.setText(self.config["private_key"])
-                self.input_certificate.setText(self.config["certificate"])
-                self.input_root.setText(self.config["root_bundle"])
+            self.input_smime.setChecked(bool(self.config["smime"]))
+            self.input_key.setText(self.config["private_key"])
+            self.input_certificate.setText(self.config["certificate"])
+            self.input_root.setText(self.config["root_bundle"])
         except Exception as e:
             QMessageBox.critical(self,"Failed to load", "Failed to load the data into the application.")
             raise(e)
@@ -61,11 +58,10 @@ class EditConfiguration(QMainWindow):
                 self.config["preset_newline"]=self.input_newline.isChecked()
                 self.config["preset_delimiter"]=self.input_delimiter.currentText()
                 self.config["markdown"]=self.input_markdown.isChecked()
-                if sign_available:
-                    self.config["smime"]=self.input_smime.isChecked()
-                    self.config["private_key"]=self.input_key.text()
-                    self.config["certificate"]=self.input_certificate.text()
-                    self.config["root_bundle"]=self.input_root.text()
+                self.config["smime"]=self.input_smime.isChecked()
+                self.config["private_key"]=self.input_key.text()
+                self.config["certificate"]=self.input_certificate.text()
+                self.config["root_bundle"]=self.input_root.text()
                 with open(config_file, "w") as f:
                     f.write(json.dumps(self.config, indent=4))
                 QMessageBox.information(self,"Saved", "Configuration saved. Please restart MedScript.")
@@ -110,30 +106,29 @@ class EditConfiguration(QMainWindow):
         layout.addRow("Preset Delimiter", self.input_delimiter)
         self.input_markdown=QCheckBox("Enable markdown formatting", self)
         layout.addRow("Markdown", self.input_markdown)
-        if sign_available:
-            self.input_smime=QCheckBox("Enable digital signature (experimental)", self)
-            layout.addRow("S/MIME", self.input_smime)
-            self.input_key=QLineEdit(self)
-            btn_key=QPushButton("Select File", self)
-            btn_key.clicked.connect(self.select_key)
-            layout_key=QHBoxLayout()
-            layout_key.addWidget(self.input_key)
-            layout_key.addWidget(btn_key)
-            layout.addRow("Private Key", layout_key)
-            self.input_certificate=QLineEdit(self)
-            btn_certificate=QPushButton("Select File", self)
-            btn_certificate.clicked.connect(self.select_certificate)
-            layout_certificate=QHBoxLayout()
-            layout_certificate.addWidget(self.input_certificate)
-            layout_certificate.addWidget(btn_certificate)
-            layout.addRow("X509 Certificate", layout_certificate)
-            self.input_root=QLineEdit(self)
-            btn_root=QPushButton("Select File", self)
-            btn_root.clicked.connect(self.select_root)
-            layout_root=QHBoxLayout()
-            layout_root.addWidget(self.input_root)
-            layout_root.addWidget(btn_root)
-            layout.addRow("Root Bundle", layout_root)
+        self.input_smime=QCheckBox("Enable digital signature (experimental)", self)
+        layout.addRow("S/MIME", self.input_smime)
+        self.input_key=QLineEdit(self)
+        btn_key=QPushButton("Select File", self)
+        btn_key.clicked.connect(self.select_key)
+        layout_key=QHBoxLayout()
+        layout_key.addWidget(self.input_key)
+        layout_key.addWidget(btn_key)
+        layout.addRow("Private Key", layout_key)
+        self.input_certificate=QLineEdit(self)
+        btn_certificate=QPushButton("Select File", self)
+        btn_certificate.clicked.connect(self.select_certificate)
+        layout_certificate=QHBoxLayout()
+        layout_certificate.addWidget(self.input_certificate)
+        layout_certificate.addWidget(btn_certificate)
+        layout.addRow("X509 Certificate", layout_certificate)
+        self.input_root=QLineEdit(self)
+        btn_root=QPushButton("Select File", self)
+        btn_root.clicked.connect(self.select_root)
+        layout_root=QHBoxLayout()
+        layout_root.addWidget(self.input_root)
+        layout_root.addWidget(btn_root)
+        layout.addRow("Root Bundle", layout_root)
         button_save=QPushButton("Save")
         button_save.clicked.connect(self.save)
         button_reset=QPushButton("Reset")