info/xsl-validator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Es wurden kleine Anpassungen im AppSettings-Dialog vorgenommen

Browse Source
This commit is contained in:
Vitali Graf
2025-06-15 19:48:35 +02:00
parent 91098d2a1e
commit 968dee6d85
5 changed files with 187 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/ApacheFopConfigDialog_ui.py
+1 -2
View File
@@ -94,7 +94,6 @@ class Ui_ApacheFopConfigDialog(object):
self.versionLabel.setText(QCoreApplication.translate("ApacheFopConfigDialog", u"Version:", None))
self.pathLabel.setText(QCoreApplication.translate("ApacheFopConfigDialog", u" FOP-Verzeichnis:", None))
self.browseButton.setText(QCoreApplication.translate("ApacheFopConfigDialog", u"Durchsuchen...", None))
self.extensionLabel.setText(QCoreApplication.translate("ApacheFopConfigDialog", u"Output-Dateierweiterung:", None))
self.extensionLabel.setText(QCoreApplication.translate("ApacheFopConfigDialog", u"Dateierweiterung:", None))
self.extensionEdit.setText(QCoreApplication.translate("ApacheFopConfigDialog", u"pdf", None))
# retranslateUi
src/ui/AppSettings.py
+90 -94
View File
@@ -1,4 +1,4 @@
from PySide6.QtWidgets import QDialog, QTableWidgetItem, QFileDialog
from PySide6.QtWidgets import QDialog, QTableWidgetItem, QFileDialog, QHeaderView
from pathlib import Path
from ui.AppSettings_ui import Ui_Dialog
@@ -27,8 +27,7 @@ class JavaVmConfigDialog(QDialog):
def browse_binary_file(self):
"""Öffnet einen Dateidialog für die Binary-Datei."""
file_path, _ = QFileDialog.getOpenFileName(
self, "Java Binary-Datei auswählen", "",
"Executable Files (*.exe);;All Files (*)"
self, "Java Binary-Datei auswählen", "", "Executable Files (*.exe);;All Files (*)"
)
if file_path:
self.ui.pathEdit.setText(file_path)
@@ -36,8 +35,8 @@ class JavaVmConfigDialog(QDialog):
def set_data(self, data):
"""Setzt die Daten in den Dialog."""
if data:
self.ui.versionEdit.setText(data.get('version', ''))
self.ui.pathEdit.setText(str(data.get('path_to_binary_file', '')))
self.ui.versionEdit.setText(data.get("version", ""))
self.ui.pathEdit.setText(str(data.get("path_to_binary_file", "")))
def get_data(self):
"""Gibt die eingegebenen Daten zurück."""
@@ -45,8 +44,8 @@ class JavaVmConfigDialog(QDialog):
return None
return {
'version': self.ui.versionEdit.text().strip(),
'path_to_binary_file': Path(self.ui.pathEdit.text().strip())
"version": self.ui.versionEdit.text().strip(),
"path_to_binary_file": Path(self.ui.pathEdit.text().strip()),
}
@@ -66,8 +65,7 @@ class DiffPdfConfigDialog(QDialog):
def browse_binary_file(self):
"""Öffnet einen Dateidialog für die Binary-Datei."""
file_path, _ = QFileDialog.getOpenFileName(
self, "DiffPdf Binary-Datei auswählen", "",
"Executable Files (*.exe);;All Files (*)"
self, "DiffPdf Binary-Datei auswählen", "", "Executable Files (*.exe);;All Files (*)"
)
if file_path:
self.ui.pathEdit.setText(file_path)
@@ -75,10 +73,10 @@ class DiffPdfConfigDialog(QDialog):
def set_data(self, data):
"""Setzt die Daten in den Dialog."""
if data:
self.ui.versionEdit.setText(data.get('version', ''))
self.ui.pathEdit.setText(str(data.get('path_to_binary_file', '')))
self.ui.paramsEdit.setPlainText('\n'.join(data.get('default_params', [])))
self.ui.extensionEdit.setText(data.get('output_file_extension', 'pdf'))
self.ui.versionEdit.setText(data.get("version", ""))
self.ui.pathEdit.setText(str(data.get("path_to_binary_file", "")))
self.ui.paramsEdit.setPlainText("\n".join(data.get("default_params", [])))
self.ui.extensionEdit.setText(data.get("output_file_extension", "pdf"))
def get_data(self):
"""Gibt die eingegebenen Daten zurück."""
@@ -87,13 +85,13 @@ class DiffPdfConfigDialog(QDialog):
# Parameter aus dem Text extrahieren
params_text = self.ui.paramsEdit.toPlainText().strip()
params = [line.strip() for line in params_text.split('\n') if line.strip()] if params_text else []
params = [line.strip() for line in params_text.split("\n") if line.strip()] if params_text else []
return {
'version': self.ui.versionEdit.text().strip(),
'path_to_binary_file': Path(self.ui.pathEdit.text().strip()),
'default_params': params,
'output_file_extension': self.ui.extensionEdit.text().strip() or "pdf"
"version": self.ui.versionEdit.text().strip(),
"path_to_binary_file": Path(self.ui.pathEdit.text().strip()),
"default_params": params,
"output_file_extension": self.ui.extensionEdit.text().strip() or "pdf",
}
@@ -113,8 +111,7 @@ class SaxonJarConfigDialog(QDialog):
def browse_jar_file(self):
"""Öffnet einen Dateidialog für die JAR-Datei."""
file_path, _ = QFileDialog.getOpenFileName(
self, "Saxon JAR-Datei auswählen", "",
"JAR Files (*.jar);;All Files (*)"
self, "Saxon JAR-Datei auswählen", "", "JAR Files (*.jar);;All Files (*)"
)
if file_path:
self.ui.pathEdit.setText(file_path)
@@ -122,9 +119,9 @@ class SaxonJarConfigDialog(QDialog):
def set_data(self, data):
"""Setzt die Daten in den Dialog."""
if data:
self.ui.versionEdit.setText(data.get('version', ''))
self.ui.pathEdit.setText(str(data.get('path_to_jar_file', '')))
self.ui.extensionEdit.setText(data.get('output_file_extension', 'fo'))
self.ui.versionEdit.setText(data.get("version", ""))
self.ui.pathEdit.setText(str(data.get("path_to_jar_file", "")))
self.ui.extensionEdit.setText(data.get("output_file_extension", "fo"))
def get_data(self):
"""Gibt die eingegebenen Daten zurück."""
@@ -132,9 +129,9 @@ class SaxonJarConfigDialog(QDialog):
return None
return {
'version': self.ui.versionEdit.text().strip(),
'path_to_jar_file': Path(self.ui.pathEdit.text().strip()),
'output_file_extension': self.ui.extensionEdit.text().strip() or "fo"
"version": self.ui.versionEdit.text().strip(),
"path_to_jar_file": Path(self.ui.pathEdit.text().strip()),
"output_file_extension": self.ui.extensionEdit.text().strip() or "fo",
}
@@ -153,18 +150,16 @@ class ApacheFopConfigDialog(QDialog):
def browse_directory(self):
"""Öffnet einen Verzeichnisdialog."""
dir_path = QFileDialog.getExistingDirectory(
self, "Apache FOP Verzeichnis auswählen"
)
dir_path = QFileDialog.getExistingDirectory(self, "Apache FOP Verzeichnis auswählen")
if dir_path:
self.ui.pathEdit.setText(dir_path)
def set_data(self, data):
"""Setzt die Daten in den Dialog."""
if data:
self.ui.versionEdit.setText(data.get('version', ''))
self.ui.pathEdit.setText(str(data.get('path_to_dir', '')))
self.ui.extensionEdit.setText(data.get('output_file_extension', 'pdf'))
self.ui.versionEdit.setText(data.get("version", ""))
self.ui.pathEdit.setText(str(data.get("path_to_dir", "")))
self.ui.extensionEdit.setText(data.get("output_file_extension", "pdf"))
def get_data(self):
"""Gibt die eingegebenen Daten zurück."""
@@ -172,9 +167,9 @@ class ApacheFopConfigDialog(QDialog):
return None
return {
'version': self.ui.versionEdit.text().strip(),
'path_to_dir': Path(self.ui.pathEdit.text().strip()),
'output_file_extension': self.ui.extensionEdit.text().strip() or "pdf"
"version": self.ui.versionEdit.text().strip(),
"path_to_dir": Path(self.ui.pathEdit.text().strip()),
"output_file_extension": self.ui.extensionEdit.text().strip() or "pdf",
}
@@ -193,35 +188,32 @@ class XslDirConfigDialog(QDialog):
def browse_directory(self):
"""Öffnet einen Verzeichnisdialog."""
dir_path = QFileDialog.getExistingDirectory(
self, "XSL Root-Verzeichnis auswählen"
)
dir_path = QFileDialog.getExistingDirectory(self, "XSL Root-Verzeichnis auswählen")
if dir_path:
self.ui.pathEdit.setText(dir_path)
def set_data(self, data):
"""Setzt die Daten in den Dialog."""
if data:
self.ui.nameEdit.setText(data.get('name', ''))
self.ui.pathEdit.setText(str(data.get('path_to_root_dir', '')))
self.ui.nameEdit.setText(data.get("name", ""))
self.ui.pathEdit.setText(str(data.get("path_to_root_dir", "")))
def get_data(self):
"""Gibt die eingegebenen Daten zurück."""
if not self.ui.nameEdit.text().strip() or not self.ui.pathEdit.text().strip():
return None
return {
'name': self.ui.nameEdit.text().strip(),
'path_to_root_dir': Path(self.ui.pathEdit.text().strip())
}
return {"name": self.ui.nameEdit.text().strip(), "path_to_root_dir": Path(self.ui.pathEdit.text().strip())}
class AppSettingsDlg(QDialog):
"""Dialog für die Anwendungseinstellungen mit vollständiger Funktionalität."""
def __init__(self, parent=None, settings: AppSettings = AppSettings(
java_vms=[], diff_pdfs=[], saxon_jars=[], apache_fops=[], xsl_dirs=[]
)):
def __init__(
self,
parent=None,
settings: AppSettings = AppSettings(java_vms=[], diff_pdfs=[], saxon_jars=[], apache_fops=[], xsl_dirs=[]),
):
super().__init__(parent)
# UI einrichten
@@ -287,17 +279,17 @@ class AppSettingsDlg(QDialog):
self.ui.tableJavaVms.doubleClicked.connect(self._edit_java_vm)
# Saxon Tabelle
self.ui.tableSaxons.setHorizontalHeaderLabels(["Version", "JAR-Pfad", "Extension"])
self.ui.tableSaxons.setHorizontalHeaderLabels(["Version", "JAR-Pfad", "Erweiterung"])
self.ui.tableSaxons.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers)
self.ui.tableSaxons.doubleClicked.connect(self._edit_saxon)
# Apache FOP Tabelle
self.ui.tableApacheFops.setHorizontalHeaderLabels(["Version", "Verzeichnis", "Extension"])
self.ui.tableApacheFops.setHorizontalHeaderLabels(["Version", "Pfad", "Erweiterung"])
self.ui.tableApacheFops.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers)
self.ui.tableApacheFops.doubleClicked.connect(self._edit_apache_fop)
# Diff PDF Tabelle
self.ui.tableDiffPdfs.setHorizontalHeaderLabels(["Version", "Binary-Pfad", "Parameter", "Extension"])
self.ui.tableDiffPdfs.setHorizontalHeaderLabels(["Version", "Pfad", "Parameter", "Erweiterung"])
self.ui.tableDiffPdfs.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers)
self.ui.tableDiffPdfs.doubleClicked.connect(self._edit_diff_pdf)
@@ -315,6 +307,7 @@ class AppSettingsDlg(QDialog):
for row, xsl_dir in enumerate(self.temp_xsl_dirs):
self.ui.tableXsls.setItem(row, 0, QTableWidgetItem(xsl_dir.name))
self.ui.tableXsls.setItem(row, 1, QTableWidgetItem(str(xsl_dir.path_to_root_dir)))
self.ui.tableXsls.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeMode.ResizeToContents)
def _populate_java_vm_table(self):
"""Füllt die Java VM Tabelle."""
@@ -322,6 +315,7 @@ class AppSettingsDlg(QDialog):
for row, java_vm in enumerate(self.temp_java_vms):
self.ui.tableJavaVms.setItem(row, 0, QTableWidgetItem(java_vm.version))
self.ui.tableJavaVms.setItem(row, 1, QTableWidgetItem(str(java_vm.path_to_binary_file)))
self.ui.tableJavaVms.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeMode.ResizeToContents)
def _populate_saxon_table(self):
"""Füllt die Saxon Tabelle."""
@@ -330,6 +324,7 @@ class AppSettingsDlg(QDialog):
self.ui.tableSaxons.setItem(row, 0, QTableWidgetItem(saxon.version))
self.ui.tableSaxons.setItem(row, 1, QTableWidgetItem(str(saxon.path_to_jar_file)))
self.ui.tableSaxons.setItem(row, 2, QTableWidgetItem(saxon.output_file_extension))
self.ui.tableSaxons.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeMode.ResizeToContents)
def _populate_apache_fop_table(self):
"""Füllt die Apache FOP Tabelle."""
@@ -338,6 +333,7 @@ class AppSettingsDlg(QDialog):
self.ui.tableApacheFops.setItem(row, 0, QTableWidgetItem(fop.version))
self.ui.tableApacheFops.setItem(row, 1, QTableWidgetItem(str(fop.path_to_dir)))
self.ui.tableApacheFops.setItem(row, 2, QTableWidgetItem(fop.output_file_extension))
self.ui.tableApacheFops.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeMode.ResizeToContents)
def _populate_diff_pdf_table(self):
"""Füllt die Diff PDF Tabelle."""
@@ -347,6 +343,7 @@ class AppSettingsDlg(QDialog):
self.ui.tableDiffPdfs.setItem(row, 1, QTableWidgetItem(str(diff_pdf.path_to_binary_file)))
self.ui.tableDiffPdfs.setItem(row, 2, QTableWidgetItem(", ".join(diff_pdf.default_params)))
self.ui.tableDiffPdfs.setItem(row, 3, QTableWidgetItem(diff_pdf.output_file_extension))
self.ui.tableDiffPdfs.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeMode.ResizeToContents)
# XSL-Ordner Methoden
def _add_xsl_dir(self):
@@ -357,7 +354,7 @@ class AppSettingsDlg(QDialog):
if data:
# Neue ID generieren
new_id = max([x.id for x in self.temp_xsl_dirs], default=0) + 1
new_xsl_dir = XslDir(id=new_id, name=data['name'], path_to_root_dir=data['path_to_root_dir'])
new_xsl_dir = XslDir(id=new_id, name=data["name"], path_to_root_dir=data["path_to_root_dir"])
self.temp_xsl_dirs.append(new_xsl_dir)
self._populate_xsl_table()
@@ -382,7 +379,9 @@ class AppSettingsDlg(QDialog):
data = dialog.get_data()
if data:
new_id = max([x.id for x in self.temp_java_vms], default=0) + 1
new_java_vm = JavaVm(id=new_id, version=data['version'], path_to_binary_file=data['path_to_binary_file'])
new_java_vm = JavaVm(
id=new_id, version=data["version"], path_to_binary_file=data["path_to_binary_file"]
)
self.temp_java_vms.append(new_java_vm)
self._populate_java_vm_table()
@@ -408,9 +407,10 @@ class AppSettingsDlg(QDialog):
if data:
new_id = max([x.id for x in self.temp_saxon_jars], default=0) + 1
new_saxon = SaxonJar(
id=new_id, version=data['version'],
path_to_jar_file=data['path_to_jar_file'],
output_file_extension=data['output_file_extension']
id=new_id,
version=data["version"],
path_to_jar_file=data["path_to_jar_file"],
output_file_extension=data["output_file_extension"],
)
self.temp_saxon_jars.append(new_saxon)
self._populate_saxon_table()
@@ -437,9 +437,10 @@ class AppSettingsDlg(QDialog):
if data:
new_id = max([x.id for x in self.temp_apache_fops], default=0) + 1
new_fop = ApacheFop(
id=new_id, version=data['version'],
path_to_dir=data['path_to_dir'],
output_file_extension=data['output_file_extension']
id=new_id,
version=data["version"],
path_to_dir=data["path_to_dir"],
output_file_extension=data["output_file_extension"],
)
self.temp_apache_fops.append(new_fop)
self._populate_apache_fop_table()
@@ -466,10 +467,11 @@ class AppSettingsDlg(QDialog):
if data:
new_id = max([x.id for x in self.temp_diff_pdfs], default=0) + 1
new_diff_pdf = DiffPdf(
id=new_id, version=data['version'],
path_to_binary_file=data['path_to_binary_file'],
default_params=data['default_params'],
output_file_extension=data['output_file_extension']
id=new_id,
version=data["version"],
path_to_binary_file=data["path_to_binary_file"],
default_params=data["default_params"],
output_file_extension=data["output_file_extension"],
)
self.temp_diff_pdfs.append(new_diff_pdf)
self._populate_diff_pdf_table()
@@ -496,18 +498,15 @@ class AppSettingsDlg(QDialog):
dialog = XslDirConfigDialog(self)
# Vorhandene Daten setzen
data = {
'name': xsl_dir.name,
'path_to_root_dir': xsl_dir.path_to_root_dir
}
data = {"name": xsl_dir.name, "path_to_root_dir": xsl_dir.path_to_root_dir}
dialog.set_data(data)
if dialog.exec() == QDialog.DialogCode.Accepted:
new_data = dialog.get_data()
if new_data:
# Daten aktualisieren
xsl_dir.name = new_data['name']
xsl_dir.path_to_root_dir = new_data['path_to_root_dir']
xsl_dir.name = new_data["name"]
xsl_dir.path_to_root_dir = new_data["path_to_root_dir"]
self._populate_xsl_table()
def _edit_java_vm(self, index):
@@ -518,18 +517,15 @@ class AppSettingsDlg(QDialog):
dialog = JavaVmConfigDialog(self)
# Vorhandene Daten setzen
data = {
'version': java_vm.version,
'path_to_binary_file': java_vm.path_to_binary_file
}
data = {"version": java_vm.version, "path_to_binary_file": java_vm.path_to_binary_file}
dialog.set_data(data)
if dialog.exec() == QDialog.DialogCode.Accepted:
new_data = dialog.get_data()
if new_data:
# Daten aktualisieren
java_vm.version = new_data['version']
java_vm.path_to_binary_file = new_data['path_to_binary_file']
java_vm.version = new_data["version"]
java_vm.path_to_binary_file = new_data["path_to_binary_file"]
self._populate_java_vm_table()
def _edit_saxon(self, index):
@@ -541,9 +537,9 @@ class AppSettingsDlg(QDialog):
# Vorhandene Daten setzen
data = {
'version': saxon.version,
'path_to_jar_file': saxon.path_to_jar_file,
'output_file_extension': saxon.output_file_extension
"version": saxon.version,
"path_to_jar_file": saxon.path_to_jar_file,
"output_file_extension": saxon.output_file_extension,
}
dialog.set_data(data)
@@ -551,9 +547,9 @@ class AppSettingsDlg(QDialog):
new_data = dialog.get_data()
if new_data:
# Daten aktualisieren
saxon.version = new_data['version']
saxon.path_to_jar_file = new_data['path_to_jar_file']
saxon.output_file_extension = new_data['output_file_extension']
saxon.version = new_data["version"]
saxon.path_to_jar_file = new_data["path_to_jar_file"]
saxon.output_file_extension = new_data["output_file_extension"]
self._populate_saxon_table()
def _edit_apache_fop(self, index):
@@ -565,9 +561,9 @@ class AppSettingsDlg(QDialog):
# Vorhandene Daten setzen
data = {
'version': fop.version,
'path_to_dir': fop.path_to_dir,
'output_file_extension': fop.output_file_extension
"version": fop.version,
"path_to_dir": fop.path_to_dir,
"output_file_extension": fop.output_file_extension,
}
dialog.set_data(data)
@@ -575,9 +571,9 @@ class AppSettingsDlg(QDialog):
new_data = dialog.get_data()
if new_data:
# Daten aktualisieren
fop.version = new_data['version']
fop.path_to_dir = new_data['path_to_dir']
fop.output_file_extension = new_data['output_file_extension']
fop.version = new_data["version"]
fop.path_to_dir = new_data["path_to_dir"]
fop.output_file_extension = new_data["output_file_extension"]
self._populate_apache_fop_table()
def _edit_diff_pdf(self, index):
@@ -589,10 +585,10 @@ class AppSettingsDlg(QDialog):
# Vorhandene Daten setzen
data = {
'version': diff_pdf.version,
'path_to_binary_file': diff_pdf.path_to_binary_file,
'default_params': diff_pdf.default_params,
'output_file_extension': diff_pdf.output_file_extension
"version": diff_pdf.version,
"path_to_binary_file": diff_pdf.path_to_binary_file,
"default_params": diff_pdf.default_params,
"output_file_extension": diff_pdf.output_file_extension,
}
dialog.set_data(data)
@@ -600,10 +596,10 @@ class AppSettingsDlg(QDialog):
new_data = dialog.get_data()
if new_data:
# Daten aktualisieren
diff_pdf.version = new_data['version']
diff_pdf.path_to_binary_file = new_data['path_to_binary_file']
diff_pdf.default_params = new_data['default_params']
diff_pdf.output_file_extension = new_data['output_file_extension']
diff_pdf.version = new_data["version"]
diff_pdf.path_to_binary_file = new_data["path_to_binary_file"]
diff_pdf.default_params = new_data["default_params"]
diff_pdf.output_file_extension = new_data["output_file_extension"]
self._populate_diff_pdf_table()
def accept(self):
src/ui/AppSettings_ui.py
+1 -1
View File
@@ -3,7 +3,7 @@
################################################################################
## Form generated from reading UI file 'AppSettings.ui'
##
## Created by: Qt User Interface Compiler version 6.9.0
## Created by: Qt User Interface Compiler version 6.9.1
##
## WARNING! All changes made in this file will be lost when recompiling UI file!
################################################################################
src/ui/DiffPdfConfigDialog_ui.py
+1 -2
View File
@@ -111,7 +111,6 @@ class Ui_DiffPdfConfigDialog(object):
self.browseButton.setText(QCoreApplication.translate("DiffPdfConfigDialog", u"Durchsuchen...", None))
self.paramsLabel.setText(QCoreApplication.translate("DiffPdfConfigDialog", u"Standard-Parameter\n"
"(ein Parameter pro Zeile):", None))
self.extensionLabel.setText(QCoreApplication.translate("DiffPdfConfigDialog", u"Output-Dateierweiterung:", None))
self.extensionLabel.setText(QCoreApplication.translate("DiffPdfConfigDialog", u"Dateierweiterung:", None))
self.extensionEdit.setText(QCoreApplication.translate("DiffPdfConfigDialog", u"pdf", None))
# retranslateUi
src/ui/SaxonJarConfigDialog_ui.py
+1 -2
View File
@@ -92,7 +92,6 @@ class Ui_SaxonJarConfigDialog(object):
self.versionLabel.setText(QCoreApplication.translate("SaxonJarConfigDialog", u"Version:", None))
self.pathLabel.setText(QCoreApplication.translate("SaxonJarConfigDialog", u"Pfad zur JAR-Datei:", None))
self.browseButton.setText(QCoreApplication.translate("SaxonJarConfigDialog", u"Durchsuchen...", None))
self.extensionLabel.setText(QCoreApplication.translate("SaxonJarConfigDialog", u"Output-Dateierweiterung:", None))
self.extensionLabel.setText(QCoreApplication.translate("SaxonJarConfigDialog", u"Dateierweiterung:", None))
self.extensionEdit.setText(QCoreApplication.translate("SaxonJarConfigDialog", u"fo", None))
# retranslateUi