mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-28 18:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Several fixes/rewording for --tagnames-format CLI and GUI

Browse Source
This commit is contained in:
David Capello 2022-12-23 09:58:00 -03:00
parent 658a583c7b
commit 822a309724
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/strings/en.ini
View File

@ -863,9 +863,9 @@ like {layer}, {frame}, {tag}, {tagframe}, etc.
END END
data_tagname_format = Item Tagname: data_tagname_format = Item Tagname:
data_tagname_format_tooltip = <<<END data_tagname_format_tooltip = <<<END
Each frame tag in the JSON data will have a name Each tag in the JSON data will have a name
field, formatted with the {filename}, {title}, field, you can customize this name using fields
{path}, {tag}, etc. like {filename}, {title}, {path}, {tag}, etc.
END END
preview = Preview preview = Preview
open_sprite_sheet = Open Sprite Sheet open_sprite_sheet = Open Sprite Sheet

13
data/widgets/export_sprite_sheet.xml
View File

@ -129,18 +129,17 @@
</hbox> </hbox>
<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" /> <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" /> tooltip="@.data_filename_format_tooltip" />
<link text="(?)" url="https://www.aseprite.org/docs/cli/#filename-format" /> <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" /> <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" /> tooltip="@.data_tagname_format_tooltip" />
<link text="(?)" url="https://www.aseprite.org/docs/cli/#filename-format" /> <link text="(?)" url="https://www.aseprite.org/docs/cli/#tagname-format" />
</hbox> </grid>
</grid> </grid>
</panel> </panel>

2
src/app/cli/app_options.cpp
View File

@ -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_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_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_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 #ifdef ENABLE_SCRIPTING
, m_script(m_po.add("script").requiresValue("<filename>").description("Execute a specific script")) , 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")) , 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"))

3
src/app/commands/cmd_export_sprite_sheet.cpp
View File

@ -989,8 +989,7 @@ private:
bool state = dataEnabled()->isSelected(); bool state = dataEnabled()->isSelected();
dataFilename()->setVisible(state); dataFilename()->setVisible(state);
dataMeta()->setVisible(state); dataMeta()->setVisible(state);
dataFilenameFormatPlaceholder()->setVisible(state); dataFormatsPlaceholder()->setVisible(state);
dataTagnameFormatPlaceholder()->setVisible(state);
} }
void onGenTimerTick() { void onGenTimerTick() {