Merge pull request #592 from BenediktSeidlSWM/print

Update qwc2 and config

js/appConfig.js

@@ -18,7 +18,6 @@ import BookmarkPlugin from 'qwc2/plugins/Bookmark';
 import BottomBarPlugin from 'qwc2/plugins/BottomBar';
 import CookiePopupPlugin from 'qwc2/plugins/CookiePopup';
 import CyclomediaPlugin from 'qwc2/plugins/Cyclomedia';
-import DxfExportPlugin from 'qwc2/plugins/DxfExport';
 import EditingPlugin from 'qwc2/plugins/Editing';
 import FeatureFormPlugin from 'qwc2/plugins/FeatureForm';
 import FeatureSearchPlugin from 'qwc2/plugins/FeatureSearch';
@@ -44,7 +43,6 @@ import NewsPopupPlugin from 'qwc2/plugins/NewsPopup';
 import PortalPlugin from 'qwc2/plugins/Portal';
 import PrintPlugin from 'qwc2/plugins/Print';
 import ProcessNotificationsPlugin from 'qwc2/plugins/ProcessNotifications';
-import RasterExportPlugin from 'qwc2/plugins/RasterExport';
 import RedliningPlugin from 'qwc2/plugins/Redlining';
 import ReportsPlugin from 'qwc2/plugins/Reports';
 import RoutingPlugin from 'qwc2/plugins/Routing';
@@ -96,7 +94,6 @@ export default {
             BottomBarPlugin: BottomBarPlugin,
             CookiePopupPlugin: CookiePopupPlugin,
             CyclomediaPlugin: CyclomediaPlugin,
-            DxfExportPlugin: DxfExportPlugin,
             EditingPlugin: EditingPlugin(/* CustomEditingInterface */),
             FeatureFormPlugin: FeatureFormPlugin(/* CustomEditingInterface */),
             GeometryDigitizerPlugin: GeometryDigitizerPlugin,
@@ -120,7 +117,6 @@ export default {
             PortalPlugin: PortalPlugin,
             PrintPlugin: PrintPlugin,
             ProcessNotificationsPlugin: ProcessNotificationsPlugin,
-            RasterExportPlugin: RasterExportPlugin,
             RedliningPlugin: RedliningPlugin({
                 BufferSupport: BufferSupport
             }),

static/config.json

@@ -287,6 +287,7 @@
       {
         "name": "Print",
         "cfg": {
+          "displayPrintSeries": true,
           "inlinePrintOutput": false,
           "printExternalLayers": true,
           "gridInitiallyEnabled": false,

static/translations/cs-CZ.json

@@ -11,14 +11,12 @@
         "MapExport": "Export mapu",
         "MapFilter": "",
         "Print": "Tisk",
-        "RasterExport": "Export rastru",
         "Reports": "",
         "Settings": "Nastavení",
         "Share": "Sdílet odkaz",
         "ThemeSwitcher": "Téma",
         "AttributeTable": "Atributy",
         "Cyclomedia": "Cyclomedia",
-        "DxfExport": "DXF Export",
         "FeatureForm": "Editační formulář",
         "FeatureSearch": "",
         "GeometryDigitizer": "",
@@ -141,11 +139,6 @@
       "scalehint": "",
       "title": "Cyclomedia"
     },
-    "dxfexport": {
-      "layers": "Vrstvy",
-      "selectinfo": "Vyberte oblast pro export...",
-      "symbologyscale": "Meřítko symbolů:"
-    },
     "editing": {
       "add": "Přidat",
       "attrtable": "",
@@ -378,6 +371,10 @@
     },
     "print": {
       "atlasfeature": "",
+      "download": "",
+      "download_as_onepdf": "",
+      "download_as_onezip": "",
+      "download_as_single": "",
       "format": "Formát",
       "grid": "Mřížka:",
       "layout": "Rovržení:",
@@ -387,26 +384,19 @@
       "nolayouts": "Vybrané téma nepodporuje tisk",
       "notheme": "Není vybráno téma",
       "output": "",
+      "overlap": "",
       "pickatlasfeature": "",
       "resolution": "Rozlišení",
       "rotation": "Orientace",
       "save": "",
       "scale": "Měřítko",
+      "series": "",
       "submit": "Tisk",
       "wait": "Čekejte..."
     },
     "qtdesignerform": {
       "loading": ""
     },
-    "rasterexport": {
-      "format": "Formát:",
-      "resolution": "Rozlišení:",
-      "scale": "Měřítko",
-      "size": "Velikost",
-      "submit": "Export",
-      "usersize": "Vybrat na mapě...",
-      "wait": "Čekejte..."
-    },
     "redlining": {
       "border": "Okraj",
       "buffer": "",

static/translations/de-CH.json

@@ -11,14 +11,12 @@
         "MapExport": "Karte exportieren",
         "MapFilter": "Kartenfilter",
         "Print": "Drucken",
-        "RasterExport": "Raster-Export",
         "Reports": "Berichte",
         "Settings": "Einstellungen",
         "Share": "Teilen",
         "ThemeSwitcher": "Themen",
         "AttributeTable": "Attributtabelle",
         "Cyclomedia": "Cyclomedia",
-        "DxfExport": "DXF-Export",
         "FeatureForm": "Objektformular",
         "FeatureSearch": "Objektsuche",
         "GeometryDigitizer": "Geometriedigitalisierung",
@@ -141,11 +139,6 @@
       "scalehint": "Die Aufnahmen sind nur ab Massstab 1:{0} auf der Karte sichtbar.",
       "title": "Cyclomedia Viewer"
     },
-    "dxfexport": {
-      "layers": "Ebenen",
-      "selectinfo": "Rechteck um die zu exportierende Region aufziehen",
-      "symbologyscale": "Darstellungsmassstab"
-    },
     "editing": {
       "add": "Hinzufügen",
       "attrtable": "Tabelle",
@@ -378,6 +371,10 @@
     },
     "print": {
       "atlasfeature": "Atlasobjekt",
+      "download": "",
+      "download_as_onepdf": "",
+      "download_as_onezip": "",
+      "download_as_single": "",
       "format": "Format",
       "grid": "Gitter",
       "layout": "Format",
@@ -387,26 +384,19 @@
       "nolayouts": "Das gewählte Thema stellt keine Druck-Vorlagen zur Verfügung.",
       "notheme": "Kein Thema selektiert",
       "output": "Druckausgabe",
+      "overlap": "",
       "pickatlasfeature": "In Ebene {0} auswählen...",
       "resolution": "Auflösung",
       "rotation": "Rotation",
       "save": "Speichern",
       "scale": "Massstab",
+      "series": "",
       "submit": "Erzeugen",
       "wait": "Bitte warten..."
     },
     "qtdesignerform": {
       "loading": "Formular wird geladen..."
     },
-    "rasterexport": {
-      "format": "Format",
-      "resolution": "Auflösung",
-      "scale": "Massstab",
-      "size": "Dimensionen",
-      "submit": "Exportieren",
-      "usersize": "Auf Karte auswählen...",
-      "wait": "Bitte warten..."
-    },
     "redlining": {
       "border": "Rand",
       "buffer": "Puffern",

static/translations/de-DE.json

@@ -11,14 +11,12 @@
         "MapExport": "Karte exportieren",
         "MapFilter": "Kartenfilter",
         "Print": "Drucken",
-        "RasterExport": "Raster-Export",
         "Reports": "Berichte",
         "Settings": "Einstellungen",
         "Share": "Teilen",
         "ThemeSwitcher": "Themen",
         "AttributeTable": "Attributtabelle",
         "Cyclomedia": "Cyclomedia",
-        "DxfExport": "DXF-Export",
         "FeatureForm": "Objektformular",
         "FeatureSearch": "Objektsuche",
         "GeometryDigitizer": "Geometriedigitalisierung",
@@ -141,11 +139,6 @@
       "scalehint": "Die Aufnahmen sind nur ab Maßstab 1:{0} auf der Karte sichtbar.",
       "title": "Cyclomedia Viewer"
     },
-    "dxfexport": {
-      "layers": "Ebenen",
-      "selectinfo": "Rechteck um die zu exportierende Region aufziehen",
-      "symbologyscale": "Darstellungsmaßstab"
-    },
     "editing": {
       "add": "Hinzufügen",
       "attrtable": "Tabelle",
@@ -378,35 +371,32 @@
     },
     "print": {
       "atlasfeature": "Atlasobjekt",
+      "download": "Herunterladen",
+      "download_as_onepdf": "als ein PDF-Dokument",
+      "download_as_onezip": "als ein ZIP-Archiv",
+      "download_as_single": "als einzelne Dateien",
       "format": "Format",
       "grid": "Gitter",
-      "layout": "Format",
+      "layout": "Layout",
       "legend": "Legende",
       "maximize": "Maximieren",
       "minimize": "Minimieren",
       "nolayouts": "Das gewählte Thema stellt keine Druck-Vorlagen zur Verfügung.",
       "notheme": "Kein Thema selektiert",
       "output": "Druckausgabe",
+      "overlap": "Überlappung",
       "pickatlasfeature": "In Ebene {0} auswählen...",
       "resolution": "Auflösung",
       "rotation": "Rotation",
       "save": "Speichern",
       "scale": "Maßstab",
+      "series": "Seriendruck",
       "submit": "Erzeugen",
       "wait": "Bitte warten..."
     },
     "qtdesignerform": {
       "loading": "Formular wird geladen..."
     },
-    "rasterexport": {
-      "format": "Format",
-      "resolution": "Auflösung",
-      "scale": "Maßstab",
-      "size": "Dimensionen",
-      "submit": "Exportieren",
-      "usersize": "Auf Karte auswählen...",
-      "wait": "Bitte warten..."
-    },
     "redlining": {
       "border": "Rand",
       "buffer": "Puffern",

static/translations/en-US.json

@@ -11,14 +11,12 @@
         "MapExport": "Export map",
         "MapFilter": "Map Filter",
         "Print": "Print",
-        "RasterExport": "Raster Export",
         "Reports": "Reports",
         "Settings": "Settings",
         "Share": "Share Link",
         "ThemeSwitcher": "Theme",
         "AttributeTable": "Attribute Table",
         "Cyclomedia": "Cyclomedia",
-        "DxfExport": "DXF Export",
         "FeatureForm": "Feature Form",
         "FeatureSearch": "Feature Search",
         "GeometryDigitizer": "Geometry digitizer",
@@ -141,11 +139,6 @@
       "scalehint": "The recordings are only visible on the map below scale 1:{0}.",
       "title": "Cyclomedia Viewer"
     },
-    "dxfexport": {
-      "layers": "Layers",
-      "selectinfo": "Drag a rectangle around the region to export...",
-      "symbologyscale": "Symbology scale"
-    },
     "editing": {
       "add": "Add",
       "attrtable": "Table",
@@ -378,6 +371,10 @@
     },
     "print": {
       "atlasfeature": "Atlas feature",
+      "download": "Download",
+      "download_as_onepdf": "as one PDF document",
+      "download_as_onezip": "as one ZIP file",
+      "download_as_single": "as single files",
       "format": "Format",
       "grid": "Grid",
       "layout": "Layout",
@@ -387,26 +384,19 @@
       "nolayouts": "The selected theme does not support printing",
       "notheme": "No theme selected",
       "output": "Print output",
+      "overlap": "Overlap",
       "pickatlasfeature": "Pick in layer {0}...",
       "resolution": "Resolution",
       "rotation": "Rotation",
       "save": "Save",
       "scale": "Scale",
+      "series": "Print series",
       "submit": "Print",
       "wait": "Please wait..."
     },
     "qtdesignerform": {
       "loading": "Loading form..."
     },
-    "rasterexport": {
-      "format": "Format",
-      "resolution": "Resolution",
-      "scale": "Scale",
-      "size": "Size",
-      "submit": "Export",
-      "usersize": "Select on map...",
-      "wait": "Please wait..."
-    },
     "redlining": {
       "border": "Border",
       "buffer": "Buffer",

static/translations/es-ES.json

@@ -11,14 +11,12 @@
         "MapExport": "Exportar mapa",
         "MapFilter": "",
         "Print": "Imprimir",
-        "RasterExport": "Exportar trama",
         "Reports": "",
         "Settings": "Opciones",
         "Share": "Compartir enlace",
         "ThemeSwitcher": "Tema",
         "AttributeTable": "Tabla de Atributos",
         "Cyclomedia": "",
-        "DxfExport": "Exportar DXF",
         "FeatureForm": "Formulario de Elemento",
         "FeatureSearch": "",
         "GeometryDigitizer": "",
@@ -141,11 +139,6 @@
       "scalehint": "",
       "title": ""
     },
-    "dxfexport": {
-      "layers": "Capas",
-      "selectinfo": "Arrastre un rectángulo alrededor de la zona para exportar...",
-      "symbologyscale": "Escala de la simbología:"
-    },
     "editing": {
       "add": "Añadir",
       "attrtable": "Tabla",
@@ -378,6 +371,10 @@
     },
     "print": {
       "atlasfeature": "",
+      "download": "",
+      "download_as_onepdf": "",
+      "download_as_onezip": "",
+      "download_as_single": "",
       "format": "Formato:",
       "grid": "Grilla:",
       "layout": "Diseño:",
@@ -387,26 +384,19 @@
       "nolayouts": "El tema seleccionado no admite su impresión",
       "notheme": "No hay tema seleccionado",
       "output": "Salida de impresión",
+      "overlap": "",
       "pickatlasfeature": "",
       "resolution": "Resolución",
       "rotation": "Rotación",
       "save": "",
       "scale": "Escala:",
+      "series": "",
       "submit": "Imprimir",
       "wait": "Por favor espere..."
     },
     "qtdesignerform": {
       "loading": "Cargando formulario..."
     },
-    "rasterexport": {
-      "format": "Formato:",
-      "resolution": "Resolución:",
-      "scale": "",
-      "size": "",
-      "submit": "",
-      "usersize": "",
-      "wait": ""
-    },
     "redlining": {
       "border": "Límite",
       "buffer": "Bufer",