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

Die Werte der PdfProjects werden in Tabelle eingetragen

Browse Source
This commit is contained in:
Vitali Graf
2025-06-18 19:49:31 +02:00
parent fc7f7cf314
commit 6901333213
4 changed files with 69 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conf.py
+30
View File
@@ -66,6 +66,36 @@ class PdfProject(BaseModel):
xsl_dir_id: int
default_xslt_params: dict[str, str] = {}
def getXsl(self) -> str:
global app_settings
value = [x.name for x in app_settings.xsl_dirs if x.id == self.xsl_dir_id]
return value[0] if len(value) else ""
def getJavaVm(self) -> str:
global app_settings
value = [x.version for x in app_settings.java_vms if x.id == self.java_vm_id]
return value[0] if len(value) else ""
def getSaxon(self) -> str:
global app_settings
value = [x.version for x in app_settings.saxon_jars if x.id == self.saxon_jar_id]
return value[0] if len(value) else ""
def getApacheFop(self) -> str:
global app_settings
value = [x.version for x in app_settings.apache_fops if x.id == self.apache_fop_id]
return value[0] if len(value) else ""
def getDiffPdf(self) -> str:
global app_settings
value = [x.version for x in app_settings.diff_pdfs if x.id == self.diff_pdf_id]
return value[0] if len(value) else ""
class AppSettings(BaseSettings):
java_vms: list[JavaVm] = []
src/ui/AppSettings.py
+23 -5
View File
@@ -34,6 +34,7 @@ class AppSettingsDlg(QDialog):
self.temp_saxon_jars = self.settings.saxon_jars.copy()
self.temp_apache_fops = self.settings.apache_fops.copy()
self.temp_xsl_dirs = self.settings.xsl_dirs.copy()
self.temp_pdf_projects = self.settings.pdf_projects.copy()
# Signale verbinden
self._connect_signals()
@@ -69,6 +70,11 @@ class AppSettingsDlg(QDialog):
self.ui.removeDiffPdf.clicked.connect(self._remove_diff_pdf)
self.ui.tableDiffPdfs.itemSelectionChanged.connect(self._update_diff_pdf_buttons)
# PDF-Projekte Tab
self.ui.removeProject.clicked.connect(self._add_pdf_project)
self.ui.addProject.clicked.connect(self._remove_pdf_project)
self.ui.tablePdfProjects.itemSelectionChanged.connect(self._update_pdf_project_buttons)
def _setup_tables(self):
"""Richtet die Tabellen-Header ein und macht sie unveränderbar."""
from PySide6.QtWidgets import QAbstractItemView
@@ -98,6 +104,11 @@ class AppSettingsDlg(QDialog):
self.ui.tableDiffPdfs.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers)
self.ui.tableDiffPdfs.doubleClicked.connect(self._edit_diff_pdf)
# PDF-Projekte Tabelle
self.ui.tablePdfProjects.setHorizontalHeaderLabels(["Name", "Projekt-Ordner", "XSL-Ordner", "Java-VM", "Saxon", "Apache FOP", "Diff-PDF", ""])
self.ui.tablePdfProjects.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers)
self.ui.tablePdfProjects.doubleClicked.connect(self._edit_pdf_project)
def _populate_tables(self):
"""Füllt alle Tabellen mit den aktuellen Einstellungen."""
self._populate_xsl_table()
@@ -105,6 +116,7 @@ class AppSettingsDlg(QDialog):
self._populate_saxon_table()
self._populate_apache_fop_table()
self._populate_diff_pdf_table()
self._populate_pdf_project_table()
def _populate_xsl_table(self):
"""Füllt die XSL-Ordner Tabelle."""
@@ -152,10 +164,16 @@ class AppSettingsDlg(QDialog):
def _populate_pdf_project_table(self):
"""Füllt die PDF-Projekte Tabelle."""
self.ui.tablePdfProjekts.setRowCount(len(self.temp_pdf_projects))
self.ui.tablePdfProjects.setRowCount(len(self.temp_pdf_projects))
for row, pdf_project in enumerate(self.temp_pdf_projects):
self.ui.tablePdfProjekts.setItem(row, 0, QTableWidgetItem(pdf_project.name))
self.ui.tablePdfProjekts.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeMode.ResizeToContents)
self.ui.tablePdfProjects.setItem(row, 0, QTableWidgetItem(pdf_project.name))
self.ui.tablePdfProjects.setItem(row, 1, QTableWidgetItem(str(pdf_project.project_dir)))
self.ui.tablePdfProjects.setItem(row, 2, QTableWidgetItem(pdf_project.getXsl()))
self.ui.tablePdfProjects.setItem(row, 3, QTableWidgetItem(pdf_project.getJavaVm()))
self.ui.tablePdfProjects.setItem(row, 4, QTableWidgetItem(pdf_project.getSaxon()))
self.ui.tablePdfProjects.setItem(row, 5, QTableWidgetItem(pdf_project.getApacheFop()))
self.ui.tablePdfProjects.setItem(row, 6, QTableWidgetItem(pdf_project.getDiffPdf()))
self.ui.tablePdfProjects.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeMode.ResizeToContents)
# XSL-Ordner Methoden
def _add_xsl_dir(self):
@@ -442,7 +460,7 @@ class AppSettingsDlg(QDialog):
def _remove_pdf_project(self):
"""Entfernt das ausgewählte PDF-Projekt."""
current_row = self.ui.tablePdfProjekts.currentRow()
current_row = self.ui.tablePdfProjects.currentRow()
if current_row >= 0:
del self.temp_pdf_projects[current_row]
self._populate_pdf_project_table()
@@ -450,7 +468,7 @@ class AppSettingsDlg(QDialog):
def _update_pdf_project_buttons(self):
"""Aktualisiert den Status der PDF-Projekt-Buttons."""
has_selection = self.ui.tablePdfProjekts.currentRow() >= 0
has_selection = self.ui.tablePdfProjects.currentRow() >= 0
self.ui.removeProject.setEnabled(has_selection)
def _edit_pdf_project(self, index):
src/ui/AppSettings.ui
+11 -5
View File
@@ -22,6 +22,9 @@
<property name="currentIndex">
<number>0</number>
</property>
<property name="elideMode">
<enum>Qt::TextElideMode::ElideRight</enum>
</property>
<widget class="QWidget" name="tabXsls">
<attribute name="title">
<string>XSL-Ordner</string>
@@ -84,9 +87,6 @@
<property name="icon">
<iconset theme="QIcon::ThemeIcon::ListRemove"/>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
@@ -382,9 +382,15 @@
<item>
<widget class="QTableWidget" name="tablePdfProjects">
<property name="columnCount">
<number>1</number>
<number>7</number>
</property>
<column/>
<column/>
<column/>
<column/>
<column/>
<column/>
<column/>
</widget>
</item>
<item>
@@ -396,7 +402,7 @@
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Shape::StyledPanel</enum>
<enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Shadow::Raised</enum>
src/ui/AppSettings_ui.py
+5 -5
View File
@@ -30,6 +30,7 @@ class Ui_Dialog(object):
self.tabSettings = QTabWidget(Dialog)
self.tabSettings.setObjectName(u"tabSettings")
self.tabSettings.setEnabled(True)
self.tabSettings.setElideMode(Qt.TextElideMode.ElideRight)
self.tabXsls = QWidget()
self.tabXsls.setObjectName(u"tabXsls")
self.verticalLayout_5 = QVBoxLayout(self.tabXsls)
@@ -66,7 +67,6 @@ class Ui_Dialog(object):
self.removeXsl.setEnabled(False)
icon1 = QIcon(QIcon.fromTheme(QIcon.ThemeIcon.ListRemove))
self.removeXsl.setIcon(icon1)
self.removeXsl.setFlat(True)
self.horizontalLayout_2.addWidget(self.removeXsl)
@@ -231,10 +231,10 @@ class Ui_Dialog(object):
self.verticalLayout_7 = QVBoxLayout(self.tabPdfProject)
self.verticalLayout_7.setObjectName(u"verticalLayout_7")
self.tablePdfProjects = QTableWidget(self.tabPdfProject)
if (self.tablePdfProjects.columnCount() < 1):
self.tablePdfProjects.setColumnCount(1)
if (self.tablePdfProjects.columnCount() < 7):
self.tablePdfProjects.setColumnCount(7)
self.tablePdfProjects.setObjectName(u"tablePdfProjects")
self.tablePdfProjects.setColumnCount(1)
self.tablePdfProjects.setColumnCount(7)
self.verticalLayout_7.addWidget(self.tablePdfProjects)
@@ -242,7 +242,7 @@ class Ui_Dialog(object):
self.frame_6.setObjectName(u"frame_6")
sizePolicy.setHeightForWidth(self.frame_6.sizePolicy().hasHeightForWidth())
self.frame_6.setSizePolicy(sizePolicy)
self.frame_6.setFrameShape(QFrame.Shape.StyledPanel)
self.frame_6.setFrameShape(QFrame.Shape.NoFrame)
self.frame_6.setFrameShadow(QFrame.Shadow.Raised)
self.horizontalLayout_6 = QHBoxLayout(self.frame_6)
self.horizontalLayout_6.setObjectName(u"horizontalLayout_6")