From 58b2e971d37adf6d9308ca89ea033385dd1ded13 Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Tue, 17 Oct 2023 19:33:55 +0200
Subject: zip: expose file name option better (#2555)

---
 lib/extensions/zip.py | 1 -
 templates/zip.xml     | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/extensions/zip.py b/lib/extensions/zip.py
index b3183a9a..a12efd93 100644
--- a/lib/extensions/zip.py
+++ b/lib/extensions/zip.py
@@ -30,7 +30,6 @@ class Zip(InkstitchExtension):
         self.arg_parser.add_argument('--notebook', type=Boolean, default=True)
         self.arg_parser.add_argument('--file-formats', type=Boolean, default=True)
         self.arg_parser.add_argument('--panelization', type=Boolean, default=True)
-        self.arg_parser.add_argument('--output-options', type=Boolean, default=True)
 
         # it's kind of obnoxious that I have to do this...
         self.formats = []
diff --git a/templates/zip.xml b/templates/zip.xml
index 86be0e65..d6f4fbb2 100644
--- a/templates/zip.xml
+++ b/templates/zip.xml
@@ -9,6 +9,9 @@
         <filetypetooltip>Create a ZIP with multiple embroidery file formats using Ink/Stitch</filetypetooltip>
         <dataloss>true</dataloss>
     </output>
+    <param name="custom-file-name" type="string" gui-text="Custom file name"
+       gui-description="Defines the file names inside the zip archive. Leave empty for default file name."></param>
+    <spacer />
     <param name="notebook" type="notebook">
       <page name="file-formats" gui-text="File Formats">
         <label>Output formats:</label>
@@ -29,10 +32,6 @@
         <param name="y-repeats" type="int" min="1" max="20" gui-text="Vertical repeats">1</param>
         <param name="y-spacing" type="float" min="-1000" max="1000" gui-text="Vertical spacing (mm)">100</param>
       </page>
-      <page name="output-options" gui-text="Output Options">
-          <param name="custom-file-name" type="string" gui-text="Custom file name"
-                 gui-description="Defines the file names inside the zip archive. Leave empty for default file name."></param>
-      </page>
     </param>
     <script>
         {{ command_tag | safe }}
-- 
cgit v1.2.3