diff --git a/lang/qet_de.qm b/lang/qet_de.qm index c37b0fbca..5f05bf1c0 100644 Binary files a/lang/qet_de.qm and b/lang/qet_de.qm differ diff --git a/lang/qet_de.ts b/lang/qet_de.ts index 759fb7a4a..040c6b0e8 100644 --- a/lang/qet_de.ts +++ b/lang/qet_de.ts @@ -2870,49 +2870,49 @@ Alle Bauteile und Unterordner von diesem Ordner werden ebenso gelöscht.Maße - + Noms des fichiers cibles message box title Namen der Zieldateien - + Vous devez entrer un nom de fichier non vide et unique pour chaque folio à exporter. message box content Die Dateinamen der zu exportierenden Folien müssen einmalig und nicht leer sein. - + Dossier non spécifié message box title Ordner nicht angegeben - + Vous devez spécifier le chemin du dossier dans lequel seront enregistrés les fichiers images. message box content Geben Sie den Pfad vom Ordner ein, in dem die Bilddateien gespeichert werden. - + Impossible d'écrire dans ce fichier message box title Schreiben in dieser Datei nicht möglich - + Il semblerait que vous n'ayez pas les permissions nécessaires pour écrire dans le fichier %1. message box content Sie haben wahrscheinlich nicht die benötigten Rechte, um in die Datei %1 zu schreiben. - + Aperçu Vorschau - - + + px px @@ -2920,92 +2920,97 @@ Alle Bauteile und Unterordner von diesem Ordner werden ebenso gelöscht. ExportPropertiesWidget - + Exporter dans le dossier dialog title in Ordner exportieren - + Dossier cible : Zielordner: - + Parcourir Durchsuchen - + Format : Format: - + PNG (*.png) PNG (*.png) - + JPEG (*.jpg) JPEG (*.jpg) - + Bitmap (*.bmp) Bitmap (*.bmp) - + SVG (*.svg) SVG (*.svg) - + DXF (*.dxf) DXF (*.dxf) - + Options de rendu groupbox title Renderoptionen - + Exporter entièrement le folio Ganze Folie exportieren - + Exporter seulement les éléments Nur Bauteile exportieren - + Dessiner la grille Raster zeichnen - + Dessiner le cadre Zeichnungsrahmen zeichnen - + Dessiner le cartouche Schriftfeld zeichnen - + Dessiner les bornes Anschlüsse zeichnen - + Conserver les couleurs des conducteurs Leiterfarben erhalten + + + SVG: fond transparent + SVG-Hintergrund transparent + FolioAutonumberingW @@ -8291,32 +8296,32 @@ Was möchten Sie tun? Text - + Folio sans titre Folie ohne Titel - + schema Folie - + Conserver les proportions Verhältnis beibehalten - + Réinitialiser les dimensions Größe zurücksetzen - + Aperçu Vorschau - + Exporter vers le presse-papier In die Zwischenablage kopieren @@ -9206,16 +9211,16 @@ Möchten Sie sie ersetzen? Einfügen + + + - - - this is an error in the code dies ist ein Programmfehler diff --git a/lang/qet_en.qm b/lang/qet_en.qm index d5fc868f5..eb4272f9c 100644 Binary files a/lang/qet_en.qm and b/lang/qet_en.qm differ diff --git a/lang/qet_en.ts b/lang/qet_en.ts index 31caa2cef..214650866 100644 --- a/lang/qet_en.ts +++ b/lang/qet_en.ts @@ -2826,7 +2826,7 @@ All the elements and contents file in this folder will be deleted. ExportDialog - + Aperçu Preview @@ -2836,7 +2836,7 @@ All the elements and contents file in this folder will be deleted. Dimensions - + Impossible d'écrire dans ce fichier message box title Can not write to this file @@ -2852,13 +2852,13 @@ All the elements and contents file in this folder will be deleted. Filename - - + + px px - + Noms des fichiers cibles message box title Target files names @@ -2890,25 +2890,25 @@ All the elements and contents file in this folder will be deleted. Title of folio - + Vous devez entrer un nom de fichier non vide et unique pour chaque folio à exporter. message box content You must enter a non-empty, unique filename for each folio to export. - + Dossier non spécifié message box title Directory missing - + Vous devez spécifier le chemin du dossier dans lequel seront enregistrés les fichiers images. message box content You must specify the path of the directory in which the images files will be saved. - + Il semblerait que vous n'ayez pas les permissions nécessaires pour écrire dans le fichier %1. message box content It appears you do not have the required permissions to write the file %1. @@ -2917,89 +2917,94 @@ All the elements and contents file in this folder will be deleted. ExportPropertiesWidget - + Exporter dans le dossier dialog title Export in the directory - + Dossier cible : Target directory: - + Parcourir Browse - + Format : Format: - + PNG (*.png) PNG (*.png) - + JPEG (*.jpg) JPEG (*.jpg) - + Bitmap (*.bmp) Bitmap (*.bmp) - + SVG (*.svg) SVG (*.svg) - + DXF (*.dxf) DXF (*.dxf) - + Options de rendu groupbox title Rendering options - + Exporter entièrement le folio Export fully folio - + Exporter seulement les éléments Export elements only - + Conserver les couleurs des conducteurs Keep conductors colors - + + SVG: fond transparent + SVG-background transparent + + + Dessiner la grille Draw the grid - + Dessiner le cadre Draw the border - + Dessiner le cartouche Draw the title block - + Dessiner les bornes Draw terminals @@ -8089,7 +8094,7 @@ What do you wish to do ? QObject - + Exporter vers le presse-papier Export to clipboard @@ -8451,27 +8456,27 @@ What do you wish to do ? rectangle - + Folio sans titre Folio Untitled - + schema diagram - + Conserver les proportions Keep aspect ratio - + Réinitialiser les dimensions Reset size - + Aperçu Preview @@ -9400,16 +9405,16 @@ Do you want to replace it ? Default layout + + + - - - this is an error in the code this is an error in the code diff --git a/sources/exportdialog.cpp b/sources/exportdialog.cpp index 6588ecbc3..8ffe36d37 100644 --- a/sources/exportdialog.cpp +++ b/sources/exportdialog.cpp @@ -399,6 +399,13 @@ void ExportDialog::generateSvg( QIODevice &io_device) { 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 QPicture picture; diff --git a/sources/exportproperties.cpp b/sources/exportproperties.cpp index 2a9b068e2..a04314593 100644 --- a/sources/exportproperties.cpp +++ b/sources/exportproperties.cpp @@ -36,6 +36,7 @@ ExportProperties::ExportProperties() : draw_border(true), draw_titleblock(true), draw_terminals(false), + draw_bg_transparent(false), draw_colored_conductors(true), exported_area(QET::BorderArea) { @@ -69,6 +70,8 @@ void ExportProperties::toSettings(QSettings &settings, draw_titleblock); settings.setValue(prefix + "drawterminals", draw_terminals); + settings.setValue(prefix + "drawbgtransparent", + draw_bg_transparent); settings.setValue(prefix + "drawcoloredconductors", draw_colored_conductors); settings.setValue(prefix + "area", @@ -101,6 +104,8 @@ void ExportProperties::fromSettings(QSettings &settings, true ).toBool(); draw_terminals = settings.value(prefix + "drawterminals", false).toBool(); + draw_bg_transparent = settings.value(prefix + "drawbgtransparent", + false).toBool(); draw_colored_conductors = settings.value( prefix + "drawcoloredconductors", true ).toBool(); diff --git a/sources/exportproperties.h b/sources/exportproperties.h index ad8919fbc..73c0a6702 100644 --- a/sources/exportproperties.h +++ b/sources/exportproperties.h @@ -46,6 +46,7 @@ class ExportProperties { bool draw_border; ///< Whether to render the border (along with rows/columns headers) bool draw_titleblock; ///< Whether to render the title block 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 QET::DiagramArea exported_area; ///< Area of diagrams to be rendered }; diff --git a/sources/exportpropertieswidget.cpp b/sources/exportpropertieswidget.cpp index 578b0e748..fe9467096 100644 --- a/sources/exportpropertieswidget.cpp +++ b/sources/exportpropertieswidget.cpp @@ -63,6 +63,7 @@ ExportProperties ExportPropertiesWidget::exportProperties() const export_properties.draw_border = draw_border -> isChecked(); export_properties.draw_titleblock = draw_titleblock -> 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.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_titleblock -> setChecked(export_properties.draw_titleblock); 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); 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); 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); setLayout(vboxLayout); @@ -220,6 +226,7 @@ void ExportPropertiesWidget::build() setTabOrder(draw_grid, draw_titleblock); setTabOrder(draw_titleblock, draw_terminals); setTabOrder(draw_terminals, draw_colored_conductors); + setTabOrder(draw_colored_conductors, draw_bg_transparent); // connexion du bouton permettant le choix du repertoire 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_titleblock, 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())); } diff --git a/sources/exportpropertieswidget.h b/sources/exportpropertieswidget.h index 6f870a8ac..ab6517dfb 100644 --- a/sources/exportpropertieswidget.h +++ b/sources/exportpropertieswidget.h @@ -62,6 +62,7 @@ class ExportPropertiesWidget : public QWidget { QCheckBox *draw_border; QCheckBox *draw_titleblock; QCheckBox *draw_terminals; + QCheckBox *draw_bg_transparent; QCheckBox *draw_colored_conductors; QRadioButton *export_border; QRadioButton *export_elements;