Merge pull request #281 from plc-user/master

add option "transparent background" in SVG-export
This commit is contained in:
Laurent Trinques
2024-03-28 12:49:27 +01:00
committed by GitHub
9 changed files with 102 additions and 70 deletions

Binary file not shown.

View File

@@ -2870,49 +2870,49 @@ Alle Bauteile und Unterordner von diesem Ordner werden ebenso gelöscht.</transl
<translation>Maße</translation> <translation>Maße</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="724"/> <location filename="../sources/exportdialog.cpp" line="731"/>
<source>Noms des fichiers cibles</source> <source>Noms des fichiers cibles</source>
<comment>message box title</comment> <comment>message box title</comment>
<translation>Namen der Zieldateien</translation> <translation>Namen der Zieldateien</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="725"/> <location filename="../sources/exportdialog.cpp" line="732"/>
<source>Vous devez entrer un nom de fichier non vide et unique pour chaque folio à exporter.</source> <source>Vous devez entrer un nom de fichier non vide et unique pour chaque folio à exporter.</source>
<comment>message box content</comment> <comment>message box content</comment>
<translation>Die Dateinamen der zu exportierenden Folien müssen einmalig und nicht leer sein.</translation> <translation>Die Dateinamen der zu exportierenden Folien müssen einmalig und nicht leer sein.</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="740"/> <location filename="../sources/exportdialog.cpp" line="747"/>
<source>Dossier non spécifié</source> <source>Dossier non spécifié</source>
<comment>message box title</comment> <comment>message box title</comment>
<translation>Ordner nicht angegeben</translation> <translation>Ordner nicht angegeben</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="741"/> <location filename="../sources/exportdialog.cpp" line="748"/>
<source>Vous devez spécifier le chemin du dossier dans lequel seront enregistrés les fichiers images.</source> <source>Vous devez spécifier le chemin du dossier dans lequel seront enregistrés les fichiers images.</source>
<comment>message box content</comment> <comment>message box content</comment>
<translation>Geben Sie den Pfad vom Ordner ein, in dem die Bilddateien gespeichert werden.</translation> <translation>Geben Sie den Pfad vom Ordner ein, in dem die Bilddateien gespeichert werden.</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="782"/> <location filename="../sources/exportdialog.cpp" line="789"/>
<source>Impossible d&apos;écrire dans ce fichier</source> <source>Impossible d&apos;écrire dans ce fichier</source>
<comment>message box title</comment> <comment>message box title</comment>
<translation>Schreiben in dieser Datei nicht möglich</translation> <translation>Schreiben in dieser Datei nicht möglich</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="784"/> <location filename="../sources/exportdialog.cpp" line="791"/>
<source>Il semblerait que vous n&apos;ayez pas les permissions nécessaires pour écrire dans le fichier %1.</source> <source>Il semblerait que vous n&apos;ayez pas les permissions nécessaires pour écrire dans le fichier %1.</source>
<comment>message box content</comment> <comment>message box content</comment>
<translation>Sie haben wahrscheinlich nicht die benötigten Rechte, um in die Datei %1 zu schreiben.</translation> <translation>Sie haben wahrscheinlich nicht die benötigten Rechte, um in die Datei %1 zu schreiben.</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="901"/> <location filename="../sources/exportdialog.cpp" line="908"/>
<source>Aperçu</source> <source>Aperçu</source>
<translation>Vorschau</translation> <translation>Vorschau</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="1005"/> <location filename="../sources/exportdialog.cpp" line="1012"/>
<location filename="../sources/exportdialog.cpp" line="1010"/> <location filename="../sources/exportdialog.cpp" line="1017"/>
<source>px</source> <source>px</source>
<translation>px</translation> <translation>px</translation>
</message> </message>
@@ -2920,92 +2920,97 @@ Alle Bauteile und Unterordner von diesem Ordner werden ebenso gelöscht.</transl
<context> <context>
<name>ExportPropertiesWidget</name> <name>ExportPropertiesWidget</name>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="129"/> <location filename="../sources/exportpropertieswidget.cpp" line="131"/>
<source>Exporter dans le dossier</source> <source>Exporter dans le dossier</source>
<comment>dialog title</comment> <comment>dialog title</comment>
<translation>in Ordner exportieren</translation> <translation>in Ordner exportieren</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="150"/> <location filename="../sources/exportpropertieswidget.cpp" line="152"/>
<source>Dossier cible :</source> <source>Dossier cible :</source>
<translation>Zielordner:</translation> <translation>Zielordner:</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="155"/> <location filename="../sources/exportpropertieswidget.cpp" line="157"/>
<source>Parcourir</source> <source>Parcourir</source>
<translation>Durchsuchen</translation> <translation>Durchsuchen</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="165"/> <location filename="../sources/exportpropertieswidget.cpp" line="167"/>
<source>Format :</source> <source>Format :</source>
<translation>Format:</translation> <translation>Format:</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="168"/> <location filename="../sources/exportpropertieswidget.cpp" line="170"/>
<source>PNG (*.png)</source> <source>PNG (*.png)</source>
<translation>PNG (*.png)</translation> <translation>PNG (*.png)</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="169"/> <location filename="../sources/exportpropertieswidget.cpp" line="171"/>
<source>JPEG (*.jpg)</source> <source>JPEG (*.jpg)</source>
<translation>JPEG (*.jpg)</translation> <translation>JPEG (*.jpg)</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="170"/> <location filename="../sources/exportpropertieswidget.cpp" line="172"/>
<source>Bitmap (*.bmp)</source> <source>Bitmap (*.bmp)</source>
<translation>Bitmap (*.bmp)</translation> <translation>Bitmap (*.bmp)</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="171"/> <location filename="../sources/exportpropertieswidget.cpp" line="173"/>
<source>SVG (*.svg)</source> <source>SVG (*.svg)</source>
<translation>SVG (*.svg)</translation> <translation>SVG (*.svg)</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="172"/> <location filename="../sources/exportpropertieswidget.cpp" line="174"/>
<source>DXF (*.dxf)</source> <source>DXF (*.dxf)</source>
<translation>DXF (*.dxf)</translation> <translation>DXF (*.dxf)</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="178"/> <location filename="../sources/exportpropertieswidget.cpp" line="180"/>
<source>Options de rendu</source> <source>Options de rendu</source>
<comment>groupbox title</comment> <comment>groupbox title</comment>
<translation>Renderoptionen</translation> <translation>Renderoptionen</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="183"/> <location filename="../sources/exportpropertieswidget.cpp" line="185"/>
<source>Exporter entièrement le folio</source> <source>Exporter entièrement le folio</source>
<translation>Ganze Folie exportieren</translation> <translation>Ganze Folie exportieren</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="186"/> <location filename="../sources/exportpropertieswidget.cpp" line="188"/>
<source>Exporter seulement les éléments</source> <source>Exporter seulement les éléments</source>
<translation>Nur Bauteile exportieren</translation> <translation>Nur Bauteile exportieren</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="191"/> <location filename="../sources/exportpropertieswidget.cpp" line="193"/>
<source>Dessiner la grille</source> <source>Dessiner la grille</source>
<translation>Raster zeichnen</translation> <translation>Raster zeichnen</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="195"/> <location filename="../sources/exportpropertieswidget.cpp" line="197"/>
<source>Dessiner le cadre</source> <source>Dessiner le cadre</source>
<translation>Zeichnungsrahmen zeichnen</translation> <translation>Zeichnungsrahmen zeichnen</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="199"/> <location filename="../sources/exportpropertieswidget.cpp" line="201"/>
<source>Dessiner le cartouche</source> <source>Dessiner le cartouche</source>
<translation>Schriftfeld zeichnen</translation> <translation>Schriftfeld zeichnen</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="203"/> <location filename="../sources/exportpropertieswidget.cpp" line="205"/>
<source>Dessiner les bornes</source> <source>Dessiner les bornes</source>
<translation>Anschlüsse zeichnen</translation> <translation>Anschlüsse zeichnen</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="207"/> <location filename="../sources/exportpropertieswidget.cpp" line="209"/>
<source>Conserver les couleurs des conducteurs</source> <source>Conserver les couleurs des conducteurs</source>
<translation>Leiterfarben erhalten</translation> <translation>Leiterfarben erhalten</translation>
</message> </message>
<message>
<location filename="../sources/exportpropertieswidget.cpp" line="213"/>
<source>SVG: fond transparent</source>
<translation>SVG-Hintergrund transparent</translation>
</message>
</context> </context>
<context> <context>
<name>FolioAutonumberingW</name> <name>FolioAutonumberingW</name>
@@ -8291,32 +8296,32 @@ Was möchten Sie tun?</translation>
<translation>Text</translation> <translation>Text</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="992"/> <location filename="../sources/exportdialog.cpp" line="999"/>
<source>Folio sans titre</source> <source>Folio sans titre</source>
<translation>Folie ohne Titel</translation> <translation>Folie ohne Titel</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="994"/> <location filename="../sources/exportdialog.cpp" line="1001"/>
<source>schema</source> <source>schema</source>
<translation>Folie</translation> <translation>Folie</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="1019"/> <location filename="../sources/exportdialog.cpp" line="1026"/>
<source>Conserver les proportions</source> <source>Conserver les proportions</source>
<translation>Verhältnis beibehalten</translation> <translation>Verhältnis beibehalten</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="1023"/> <location filename="../sources/exportdialog.cpp" line="1030"/>
<source>Réinitialiser les dimensions</source> <source>Réinitialiser les dimensions</source>
<translation>Größe zurücksetzen</translation> <translation>Größe zurücksetzen</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="1027"/> <location filename="../sources/exportdialog.cpp" line="1034"/>
<source>Aperçu</source> <source>Aperçu</source>
<translation>Vorschau</translation> <translation>Vorschau</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="1031"/> <location filename="../sources/exportdialog.cpp" line="1038"/>
<source>Exporter vers le presse-papier</source> <source>Exporter vers le presse-papier</source>
<translation>In die Zwischenablage kopieren</translation> <translation>In die Zwischenablage kopieren</translation>
</message> </message>
@@ -9206,16 +9211,16 @@ Möchten Sie sie ersetzen?</translation>
<translation>Einfügen</translation> <translation>Einfügen</translation>
</message> </message>
<message> <message>
<location filename="../sources/conductorproperties.cpp" line="826"/>
<location filename="../sources/ElementsCollection/elementslocation.cpp" line="261"/> <location filename="../sources/ElementsCollection/elementslocation.cpp" line="261"/>
<location filename="../sources/ElementsCollection/elementslocation.cpp" line="405"/> <location filename="../sources/ElementsCollection/elementslocation.cpp" line="405"/>
<location filename="../sources/factory/elementpicturefactory.cpp" line="578"/>
<location filename="../sources/qetapp.cpp" line="2180"/>
<location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="351"/> <location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="351"/>
<location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="474"/> <location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="474"/>
<location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="509"/> <location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="509"/>
<location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="538"/> <location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="538"/>
<location filename="../sources/SearchAndReplace/ui/searchandreplacewidget.cpp" line="425"/> <location filename="../sources/SearchAndReplace/ui/searchandreplacewidget.cpp" line="425"/>
<location filename="../sources/conductorproperties.cpp" line="826"/>
<location filename="../sources/factory/elementpicturefactory.cpp" line="578"/>
<location filename="../sources/qetapp.cpp" line="2180"/>
<location filename="../sources/titleblock/templatelocation.cpp" line="108"/> <location filename="../sources/titleblock/templatelocation.cpp" line="108"/>
<source>this is an error in the code</source> <source>this is an error in the code</source>
<translation>dies ist ein Programmfehler</translation> <translation>dies ist ein Programmfehler</translation>

Binary file not shown.

View File

@@ -2826,7 +2826,7 @@ All the elements and contents file in this folder will be deleted.</translation>
<context> <context>
<name>ExportDialog</name> <name>ExportDialog</name>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="901"/> <location filename="../sources/exportdialog.cpp" line="908"/>
<source>Aperçu</source> <source>Aperçu</source>
<translation>Preview</translation> <translation>Preview</translation>
</message> </message>
@@ -2836,7 +2836,7 @@ All the elements and contents file in this folder will be deleted.</translation>
<translation>Dimensions</translation> <translation>Dimensions</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="782"/> <location filename="../sources/exportdialog.cpp" line="789"/>
<source>Impossible d&apos;écrire dans ce fichier</source> <source>Impossible d&apos;écrire dans ce fichier</source>
<comment>message box title</comment> <comment>message box title</comment>
<translation>Can not write to this file</translation> <translation>Can not write to this file</translation>
@@ -2852,13 +2852,13 @@ All the elements and contents file in this folder will be deleted.</translation>
<translation>Filename</translation> <translation>Filename</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="1005"/> <location filename="../sources/exportdialog.cpp" line="1012"/>
<location filename="../sources/exportdialog.cpp" line="1010"/> <location filename="../sources/exportdialog.cpp" line="1017"/>
<source>px</source> <source>px</source>
<translation>px</translation> <translation>px</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="724"/> <location filename="../sources/exportdialog.cpp" line="731"/>
<source>Noms des fichiers cibles</source> <source>Noms des fichiers cibles</source>
<comment>message box title</comment> <comment>message box title</comment>
<translation>Target files names</translation> <translation>Target files names</translation>
@@ -2890,25 +2890,25 @@ All the elements and contents file in this folder will be deleted.</translation>
<translation>Title of folio</translation> <translation>Title of folio</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="725"/> <location filename="../sources/exportdialog.cpp" line="732"/>
<source>Vous devez entrer un nom de fichier non vide et unique pour chaque folio à exporter.</source> <source>Vous devez entrer un nom de fichier non vide et unique pour chaque folio à exporter.</source>
<comment>message box content</comment> <comment>message box content</comment>
<translation>You must enter a non-empty, unique filename for each folio to export.</translation> <translation>You must enter a non-empty, unique filename for each folio to export.</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="740"/> <location filename="../sources/exportdialog.cpp" line="747"/>
<source>Dossier non spécifié</source> <source>Dossier non spécifié</source>
<comment>message box title</comment> <comment>message box title</comment>
<translation>Directory missing</translation> <translation>Directory missing</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="741"/> <location filename="../sources/exportdialog.cpp" line="748"/>
<source>Vous devez spécifier le chemin du dossier dans lequel seront enregistrés les fichiers images.</source> <source>Vous devez spécifier le chemin du dossier dans lequel seront enregistrés les fichiers images.</source>
<comment>message box content</comment> <comment>message box content</comment>
<translation>You must specify the path of the directory in which the images files will be saved.</translation> <translation>You must specify the path of the directory in which the images files will be saved.</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="784"/> <location filename="../sources/exportdialog.cpp" line="791"/>
<source>Il semblerait que vous n&apos;ayez pas les permissions nécessaires pour écrire dans le fichier %1.</source> <source>Il semblerait que vous n&apos;ayez pas les permissions nécessaires pour écrire dans le fichier %1.</source>
<comment>message box content</comment> <comment>message box content</comment>
<translation>It appears you do not have the required permissions to write the file %1.</translation> <translation>It appears you do not have the required permissions to write the file %1.</translation>
@@ -2917,89 +2917,94 @@ All the elements and contents file in this folder will be deleted.</translation>
<context> <context>
<name>ExportPropertiesWidget</name> <name>ExportPropertiesWidget</name>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="129"/> <location filename="../sources/exportpropertieswidget.cpp" line="131"/>
<source>Exporter dans le dossier</source> <source>Exporter dans le dossier</source>
<comment>dialog title</comment> <comment>dialog title</comment>
<translation>Export in the directory</translation> <translation>Export in the directory</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="150"/> <location filename="../sources/exportpropertieswidget.cpp" line="152"/>
<source>Dossier cible :</source> <source>Dossier cible :</source>
<translation>Target directory:</translation> <translation>Target directory:</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="155"/> <location filename="../sources/exportpropertieswidget.cpp" line="157"/>
<source>Parcourir</source> <source>Parcourir</source>
<translation>Browse</translation> <translation>Browse</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="165"/> <location filename="../sources/exportpropertieswidget.cpp" line="167"/>
<source>Format :</source> <source>Format :</source>
<translation>Format:</translation> <translation>Format:</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="168"/> <location filename="../sources/exportpropertieswidget.cpp" line="170"/>
<source>PNG (*.png)</source> <source>PNG (*.png)</source>
<translation>PNG (*.png)</translation> <translation>PNG (*.png)</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="169"/> <location filename="../sources/exportpropertieswidget.cpp" line="171"/>
<source>JPEG (*.jpg)</source> <source>JPEG (*.jpg)</source>
<translation>JPEG (*.jpg)</translation> <translation>JPEG (*.jpg)</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="170"/> <location filename="../sources/exportpropertieswidget.cpp" line="172"/>
<source>Bitmap (*.bmp)</source> <source>Bitmap (*.bmp)</source>
<translation>Bitmap (*.bmp)</translation> <translation>Bitmap (*.bmp)</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="171"/> <location filename="../sources/exportpropertieswidget.cpp" line="173"/>
<source>SVG (*.svg)</source> <source>SVG (*.svg)</source>
<translation>SVG (*.svg)</translation> <translation>SVG (*.svg)</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="172"/> <location filename="../sources/exportpropertieswidget.cpp" line="174"/>
<source>DXF (*.dxf)</source> <source>DXF (*.dxf)</source>
<translation>DXF (*.dxf)</translation> <translation>DXF (*.dxf)</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="178"/> <location filename="../sources/exportpropertieswidget.cpp" line="180"/>
<source>Options de rendu</source> <source>Options de rendu</source>
<comment>groupbox title</comment> <comment>groupbox title</comment>
<translation>Rendering options</translation> <translation>Rendering options</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="183"/> <location filename="../sources/exportpropertieswidget.cpp" line="185"/>
<source>Exporter entièrement le folio</source> <source>Exporter entièrement le folio</source>
<translation>Export fully folio</translation> <translation>Export fully folio</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="186"/> <location filename="../sources/exportpropertieswidget.cpp" line="188"/>
<source>Exporter seulement les éléments</source> <source>Exporter seulement les éléments</source>
<translation>Export elements only</translation> <translation>Export elements only</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="207"/> <location filename="../sources/exportpropertieswidget.cpp" line="209"/>
<source>Conserver les couleurs des conducteurs</source> <source>Conserver les couleurs des conducteurs</source>
<translation>Keep conductors colors</translation> <translation>Keep conductors colors</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="191"/> <location filename="../sources/exportpropertieswidget.cpp" line="213"/>
<source>SVG: fond transparent</source>
<translation>SVG-background transparent</translation>
</message>
<message>
<location filename="../sources/exportpropertieswidget.cpp" line="193"/>
<source>Dessiner la grille</source> <source>Dessiner la grille</source>
<translation>Draw the grid</translation> <translation>Draw the grid</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="195"/> <location filename="../sources/exportpropertieswidget.cpp" line="197"/>
<source>Dessiner le cadre</source> <source>Dessiner le cadre</source>
<translation>Draw the border</translation> <translation>Draw the border</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="199"/> <location filename="../sources/exportpropertieswidget.cpp" line="201"/>
<source>Dessiner le cartouche</source> <source>Dessiner le cartouche</source>
<translation>Draw the title block</translation> <translation>Draw the title block</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportpropertieswidget.cpp" line="203"/> <location filename="../sources/exportpropertieswidget.cpp" line="205"/>
<source>Dessiner les bornes</source> <source>Dessiner les bornes</source>
<translation>Draw terminals</translation> <translation>Draw terminals</translation>
</message> </message>
@@ -8089,7 +8094,7 @@ What do you wish to do ?</translation>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="1031"/> <location filename="../sources/exportdialog.cpp" line="1038"/>
<source>Exporter vers le presse-papier</source> <source>Exporter vers le presse-papier</source>
<translation>Export to clipboard</translation> <translation>Export to clipboard</translation>
</message> </message>
@@ -8451,27 +8456,27 @@ What do you wish to do ?</translation>
<translation>rectangle</translation> <translation>rectangle</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="992"/> <location filename="../sources/exportdialog.cpp" line="999"/>
<source>Folio sans titre</source> <source>Folio sans titre</source>
<translation>Folio Untitled</translation> <translation>Folio Untitled</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="994"/> <location filename="../sources/exportdialog.cpp" line="1001"/>
<source>schema</source> <source>schema</source>
<translation>diagram</translation> <translation>diagram</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="1019"/> <location filename="../sources/exportdialog.cpp" line="1026"/>
<source>Conserver les proportions</source> <source>Conserver les proportions</source>
<translation>Keep aspect ratio</translation> <translation>Keep aspect ratio</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="1023"/> <location filename="../sources/exportdialog.cpp" line="1030"/>
<source>Réinitialiser les dimensions</source> <source>Réinitialiser les dimensions</source>
<translation>Reset size</translation> <translation>Reset size</translation>
</message> </message>
<message> <message>
<location filename="../sources/exportdialog.cpp" line="1027"/> <location filename="../sources/exportdialog.cpp" line="1034"/>
<source>Aperçu</source> <source>Aperçu</source>
<translation>Preview</translation> <translation>Preview</translation>
</message> </message>
@@ -9400,16 +9405,16 @@ Do you want to replace it ?</translation>
<translation>Default layout</translation> <translation>Default layout</translation>
</message> </message>
<message> <message>
<location filename="../sources/conductorproperties.cpp" line="826"/>
<location filename="../sources/ElementsCollection/elementslocation.cpp" line="261"/> <location filename="../sources/ElementsCollection/elementslocation.cpp" line="261"/>
<location filename="../sources/ElementsCollection/elementslocation.cpp" line="405"/> <location filename="../sources/ElementsCollection/elementslocation.cpp" line="405"/>
<location filename="../sources/factory/elementpicturefactory.cpp" line="578"/>
<location filename="../sources/qetapp.cpp" line="2180"/>
<location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="351"/> <location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="351"/>
<location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="474"/> <location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="474"/>
<location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="509"/> <location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="509"/>
<location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="538"/> <location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="538"/>
<location filename="../sources/SearchAndReplace/ui/searchandreplacewidget.cpp" line="425"/> <location filename="../sources/SearchAndReplace/ui/searchandreplacewidget.cpp" line="425"/>
<location filename="../sources/conductorproperties.cpp" line="826"/>
<location filename="../sources/factory/elementpicturefactory.cpp" line="578"/>
<location filename="../sources/qetapp.cpp" line="2180"/>
<location filename="../sources/titleblock/templatelocation.cpp" line="108"/> <location filename="../sources/titleblock/templatelocation.cpp" line="108"/>
<source>this is an error in the code</source> <source>this is an error in the code</source>
<translation>this is an error in the code</translation> <translation>this is an error in the code</translation>

View File

@@ -400,6 +400,13 @@ void ExportDialog::generateSvg(
{ {
saveReloadDiagramParameters(diagram, true); saveReloadDiagramParameters(diagram, true);
// set the transparency for the SVG-Background:
if (epw->exportProperties().draw_bg_transparent == true) {
diagram->background_color.setAlpha(0);
} else {
diagram->background_color.setAlpha(255);
}
// genere une QPicture a partir du schema // genere une QPicture a partir du schema
QPicture picture; QPicture picture;
diagram -> toPaintDevice( diagram -> toPaintDevice(

View File

@@ -36,6 +36,7 @@ ExportProperties::ExportProperties() :
draw_border(true), draw_border(true),
draw_titleblock(true), draw_titleblock(true),
draw_terminals(false), draw_terminals(false),
draw_bg_transparent(false),
draw_colored_conductors(true), draw_colored_conductors(true),
exported_area(QET::BorderArea) exported_area(QET::BorderArea)
{ {
@@ -69,6 +70,8 @@ void ExportProperties::toSettings(QSettings &settings,
draw_titleblock); draw_titleblock);
settings.setValue(prefix + "drawterminals", settings.setValue(prefix + "drawterminals",
draw_terminals); draw_terminals);
settings.setValue(prefix + "drawbgtransparent",
draw_bg_transparent);
settings.setValue(prefix + "drawcoloredconductors", settings.setValue(prefix + "drawcoloredconductors",
draw_colored_conductors); draw_colored_conductors);
settings.setValue(prefix + "area", settings.setValue(prefix + "area",
@@ -101,6 +104,8 @@ void ExportProperties::fromSettings(QSettings &settings,
true ).toBool(); true ).toBool();
draw_terminals = settings.value(prefix + "drawterminals", draw_terminals = settings.value(prefix + "drawterminals",
false).toBool(); false).toBool();
draw_bg_transparent = settings.value(prefix + "drawbgtransparent",
false).toBool();
draw_colored_conductors = settings.value( draw_colored_conductors = settings.value(
prefix + "drawcoloredconductors", prefix + "drawcoloredconductors",
true ).toBool(); true ).toBool();

View File

@@ -46,6 +46,7 @@ class ExportProperties {
bool draw_border; ///< Whether to render the border (along with rows/columns headers) bool draw_border; ///< Whether to render the border (along with rows/columns headers)
bool draw_titleblock; ///< Whether to render the title block bool draw_titleblock; ///< Whether to render the title block
bool draw_terminals; ///< Whether to render terminals bool draw_terminals; ///< Whether to render terminals
bool draw_bg_transparent; ///< Whether to use transparency for SVG-Export
bool draw_colored_conductors; ///< Whether to render conductors colors bool draw_colored_conductors; ///< Whether to render conductors colors
QET::DiagramArea exported_area; ///< Area of diagrams to be rendered QET::DiagramArea exported_area; ///< Area of diagrams to be rendered
}; };

View File

@@ -63,6 +63,7 @@ ExportProperties ExportPropertiesWidget::exportProperties() const
export_properties.draw_border = draw_border -> isChecked(); export_properties.draw_border = draw_border -> isChecked();
export_properties.draw_titleblock = draw_titleblock -> isChecked(); export_properties.draw_titleblock = draw_titleblock -> isChecked();
export_properties.draw_terminals = draw_terminals -> isChecked(); export_properties.draw_terminals = draw_terminals -> isChecked();
export_properties.draw_bg_transparent = draw_bg_transparent -> isChecked();
export_properties.draw_colored_conductors = draw_colored_conductors -> isChecked(); export_properties.draw_colored_conductors = draw_colored_conductors -> isChecked();
export_properties.exported_area = export_border -> isChecked() ? QET::BorderArea : QET::ElementsArea; export_properties.exported_area = export_border -> isChecked() ? QET::BorderArea : QET::ElementsArea;
@@ -84,6 +85,7 @@ void ExportPropertiesWidget::setExportProperties(const ExportProperties &export_
draw_border -> setChecked(export_properties.draw_border); draw_border -> setChecked(export_properties.draw_border);
draw_titleblock -> setChecked(export_properties.draw_titleblock); draw_titleblock -> setChecked(export_properties.draw_titleblock);
draw_terminals -> setChecked(export_properties.draw_terminals); draw_terminals -> setChecked(export_properties.draw_terminals);
draw_bg_transparent -> setChecked(export_properties.draw_bg_transparent);
draw_colored_conductors -> setChecked(export_properties.draw_colored_conductors); draw_colored_conductors -> setChecked(export_properties.draw_colored_conductors);
if (export_properties.exported_area == QET::BorderArea) { if (export_properties.exported_area == QET::BorderArea) {
@@ -207,6 +209,10 @@ void ExportPropertiesWidget::build()
draw_colored_conductors = new QCheckBox(tr("Conserver les couleurs des conducteurs"), groupbox_options); draw_colored_conductors = new QCheckBox(tr("Conserver les couleurs des conducteurs"), groupbox_options);
optionshlayout -> addWidget(draw_colored_conductors, 3, 0); optionshlayout -> addWidget(draw_colored_conductors, 3, 0);
// use transparent background for SVG-Export
draw_bg_transparent = new QCheckBox(tr("SVG: fond transparent"), groupbox_options);
optionshlayout -> addWidget(draw_bg_transparent, 3, 1);
vboxLayout -> addWidget(groupbox_options); vboxLayout -> addWidget(groupbox_options);
setLayout(vboxLayout); setLayout(vboxLayout);
@@ -220,6 +226,7 @@ void ExportPropertiesWidget::build()
setTabOrder(draw_grid, draw_titleblock); setTabOrder(draw_grid, draw_titleblock);
setTabOrder(draw_titleblock, draw_terminals); setTabOrder(draw_titleblock, draw_terminals);
setTabOrder(draw_terminals, draw_colored_conductors); setTabOrder(draw_terminals, draw_colored_conductors);
setTabOrder(draw_colored_conductors, draw_bg_transparent);
// connexion du bouton permettant le choix du repertoire // connexion du bouton permettant le choix du repertoire
connect(button_browse, SIGNAL(released()), this, SLOT(slot_chooseADirectory())); connect(button_browse, SIGNAL(released()), this, SLOT(slot_chooseADirectory()));
@@ -231,5 +238,6 @@ void ExportPropertiesWidget::build()
connect(draw_border, SIGNAL(stateChanged(int)), this, SIGNAL(optionChanged())); connect(draw_border, SIGNAL(stateChanged(int)), this, SIGNAL(optionChanged()));
connect(draw_titleblock, SIGNAL(stateChanged(int)), this, SIGNAL(optionChanged())); connect(draw_titleblock, SIGNAL(stateChanged(int)), this, SIGNAL(optionChanged()));
connect(draw_terminals, SIGNAL(stateChanged(int)), this, SIGNAL(optionChanged())); connect(draw_terminals, SIGNAL(stateChanged(int)), this, SIGNAL(optionChanged()));
connect(draw_bg_transparent, SIGNAL(stateChanged(int)), this, SIGNAL(optionChanged()));
connect(draw_colored_conductors, SIGNAL(stateChanged(int)), this, SIGNAL(optionChanged())); connect(draw_colored_conductors, SIGNAL(stateChanged(int)), this, SIGNAL(optionChanged()));
} }

View File

@@ -62,6 +62,7 @@ class ExportPropertiesWidget : public QWidget {
QCheckBox *draw_border; QCheckBox *draw_border;
QCheckBox *draw_titleblock; QCheckBox *draw_titleblock;
QCheckBox *draw_terminals; QCheckBox *draw_terminals;
QCheckBox *draw_bg_transparent;
QCheckBox *draw_colored_conductors; QCheckBox *draw_colored_conductors;
QRadioButton *export_border; QRadioButton *export_border;
QRadioButton *export_elements; QRadioButton *export_elements;