Update export layers enhanced to include group-as-layer changes

Built-in Export Layers plugin was updated to allow exporting groups,
which is very useful for working files where the top level group
represents 1 page of output.

export_layers_enhanced/Manual.html

@@ -27,6 +27,9 @@
 <dt>Export in batchmode</dt>
 <dd>Don’t show the options dialog for each function.
 </dd>
+<dt>Group as layer</dt>
+<dd>Groups are treated as merged layers.
+</dd>
 <dt>Ignore invisible Layers</dt>
 <dd>Don’t save out layers that are invisible
 </dd>

export_layers_enhanced/uiexportlayers.py

@@ -42,6 +42,7 @@ class UIExportLayers(object):
         self.exportFilterLayersCheckBox = QCheckBox(
             i18n("Export filter layers"))
         self.batchmodeCheckBox = QCheckBox(i18n("Export in batchmode"))
+        self.groupAsLayer = QCheckBox(i18n("Group as layer"))
         self.ignoreInvisibleLayersCheckBox = QCheckBox(
             i18n("Ignore invisible layers"))
         self.cropToImageBounds = QCheckBox(
@@ -78,8 +79,8 @@ class UIExportLayers(object):
         self.rectHeightSpinBox.setRange(1, 10000)
         self.resSpinBox.setRange(20, 1200)
 
-        self.formatsComboBox.addItem(i18n("JPEG"))
         self.formatsComboBox.addItem(i18n("PNG"))
+        self.formatsComboBox.addItem(i18n("JPEG"))
 
         self.documentLayout.addWidget(self.widgetDocuments)
         self.documentLayout.addWidget(self.refreshButton)
@@ -89,6 +90,7 @@ class UIExportLayers(object):
 
         self.optionsLayout.addWidget(self.exportFilterLayersCheckBox)
         self.optionsLayout.addWidget(self.batchmodeCheckBox)
+        self.optionsLayout.addWidget(self.groupAsLayer)
         self.optionsLayout.addWidget(self.ignoreInvisibleLayersCheckBox)
         self.optionsLayout.addWidget(self.cropToImageBounds)
 
@@ -182,7 +184,7 @@ class UIExportLayers(object):
 
         for node in parentNode.childNodes():
             newDir = ''
-            if node.type() == 'grouplayer':
+            if node.type() == 'grouplayer' and not self.groupAsLayer.isChecked():
                 newDir = os.path.join(parentDir, node.name())
                 self.mkdir(newDir)
             elif (not self.exportFilterLayersCheckBox.isChecked()
@@ -218,7 +220,7 @@ class UIExportLayers(object):
                 node.save(layerFileName, self.resSpinBox.value() / 72.,
                           self.resSpinBox.value() / 72., exportConfig, bounds)
 
-            if node.childNodes():
+            if node.childNodes() and not self.groupAsLayer.isChecked():
                 self._exportLayers(node, fileFormat, newDir)
 
     def _selectDir(self):