From 822a30972454d29f10dca05fa4b7c9a1f54fe121 Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Fri, 23 Dec 2022 09:58:00 -0300
Subject: [PATCH] Several fixes/rewording for --tagnames-format CLI and GUI

---
 data/strings/en.ini                          |  6 +++---
 data/widgets/export_sprite_sheet.xml         | 13 ++++++-------
 src/app/cli/app_options.cpp                  |  2 +-
 src/app/commands/cmd_export_sprite_sheet.cpp |  3 +--
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/data/strings/en.ini b/data/strings/en.ini
index 1ab872be0..1706941f3 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -863,9 +863,9 @@ like {layer}, {frame}, {tag}, {tagframe}, etc.
 END
 data_tagname_format = Item Tagname:
 data_tagname_format_tooltip = <<<END
-Each frame tag in the JSON data will have a name
-field, formatted with the {filename}, {title},
-{path}, {tag}, etc.
+Each tag in the JSON data will have a name
+field, you can customize this name using fields
+like {filename}, {title}, {path}, {tag}, etc.
 END
 preview = Preview
 open_sprite_sheet = Open Sprite Sheet
diff --git a/data/widgets/export_sprite_sheet.xml b/data/widgets/export_sprite_sheet.xml
index 5aec4317a..ea9592a97 100644
--- a/data/widgets/export_sprite_sheet.xml
+++ b/data/widgets/export_sprite_sheet.xml
@@ -129,18 +129,17 @@
       </hbox>
 
       <hbox />
-      <hbox id="data_filename_format_placeholder" cell_hspan="3" cell_align="horizontal">
+      <grid id="data_formats_placeholder" columns="3" cell_hspan="3" cell_align="horizontal">
         <label text="@.data_filename_format" />
-        <entry id="data_filename_format" maxsize="1024" maxwidth="256" expansive="true"
+        <entry id="data_filename_format" maxsize="1024" maxwidth="256" cell_align="horizontal"
                tooltip="@.data_filename_format_tooltip" />
         <link text="(?)" url="https://www.aseprite.org/docs/cli/#filename-format" />
-      </hbox>
-      <hbox id="data_tagname_format_placeholder" cell_hspan="3" cell_align="horizontal">
+
         <label text="@.data_tagname_format" />
-        <entry id="data_tagname_format" maxsize="1024" maxwidth="256" expansive="true"
+        <entry id="data_tagname_format" maxsize="1024" maxwidth="256" cell_align="horizontal"
                tooltip="@.data_tagname_format_tooltip" />
-        <link text="(?)" url="https://www.aseprite.org/docs/cli/#filename-format" />
-      </hbox>
+        <link text="(?)" url="https://www.aseprite.org/docs/cli/#tagname-format" />
+      </grid>
     </grid>
 
     </panel>
diff --git a/src/app/cli/app_options.cpp b/src/app/cli/app_options.cpp
index 1cf80f0d7..86767337e 100644
--- a/src/app/cli/app_options.cpp
+++ b/src/app/cli/app_options.cpp
@@ -67,7 +67,7 @@ AppOptions::AppOptions(int argc, const char* argv[])
   , m_crop(m_po.add("crop").requiresValue("x,y,width,height").description("Crop all the images to the given rectangle"))
   , m_slice(m_po.add("slice").requiresValue("<name>").description("Crop the sprite to the given slice area"))
   , m_filenameFormat(m_po.add("filename-format").requiresValue("<fmt>").description("Special format to generate filenames"))
-  , m_tagnameFormat(m_po.add("tagname-format").requiresValue("<fmt>").description("Special format to generate tagnames"))
+  , m_tagnameFormat(m_po.add("tagname-format").requiresValue("<fmt>").description("Special format to generate tagnames in JSON data"))
 #ifdef ENABLE_SCRIPTING
   , m_script(m_po.add("script").requiresValue("<filename>").description("Execute a specific script"))
   , m_scriptParam(m_po.add("script-param").requiresValue("name=value").description("Parameter for a script executed from the\nCLI that you can access with app.params"))
diff --git a/src/app/commands/cmd_export_sprite_sheet.cpp b/src/app/commands/cmd_export_sprite_sheet.cpp
index e483b176e..5c5458f83 100644
--- a/src/app/commands/cmd_export_sprite_sheet.cpp
+++ b/src/app/commands/cmd_export_sprite_sheet.cpp
@@ -989,8 +989,7 @@ private:
     bool state = dataEnabled()->isSelected();
     dataFilename()->setVisible(state);
     dataMeta()->setVisible(state);
-    dataFilenameFormatPlaceholder()->setVisible(state);
-    dataTagnameFormatPlaceholder()->setVisible(state);
+    dataFormatsPlaceholder()->setVisible(state);
   }
 
   void onGenTimerTick() {