Rename FrameTag -> Tag

Rubiniuz · Oct 1, 2019 · 1c8b805 · 1c8b805
1 parent c25c677
commit 1c8b805
Show file tree

Hide file tree

Showing 100 changed files with 994 additions and 959 deletions.
diff --git a/data/gui.xml b/data/gui.xml
@@ -1024,7 +1024,7 @@
       </item>
     </menu>
 
-    <menu id="frame_tag_popup_menu">
+    <menu id="tag_popup_menu">
       <item command="FrameTagProperties" text="@main_menu.frame_tags_tag_properties" />
       <item command="RemoveFrameTag" text="@main_menu.frame_tags_delete_tag" />
     </menu>

diff --git a/data/strings/en.ini b/data/strings/en.ini
@@ -75,7 +75,7 @@ Warning
 ||&Yes||&No
 END
 file_format_alpha_channel = Alpha channel
-file_format_frame_tags = Frame tags
+file_format_tags = Tags
 file_format_frames = Frames
 file_format_grayscale_mode = Grayscale mode
 file_format_indexed_mode = Indexed mode
@@ -273,7 +273,7 @@ Flip_Horizontally = Horizontally
 Flip_Selection = Selection
 Flip_Vertically = Vertically
 FrameProperties = Frame Properties
-FrameTagProperties = Frame Tag Properties
+FrameTagProperties = Tag Properties
 FullscreenPreview = Fullscreen Preview
 GotoFirstFrame = Go to First Frame
 GotoFirstFrameInTag = Go to First Frame In Tag
@@ -340,7 +340,7 @@ NewFrame_NewEmptyFrame = New Empty Frame
 NewFrame_DuplicateCels = Duplicate Cels w/Layer Mode
 NewFrame_DuplicateCelsCopies = Duplicate Cels
 NewFrame_DuplicateCelsLinked = Duplicate Linked Cels
-NewFrameTag = New Frame Tag
+NewFrameTag = New Tag
 NewLayer = New {}
 NewLayer_BeforeActiveLayer = New {} Below
 NewLayer_Layer = Layer
@@ -379,7 +379,7 @@ PlayPreviewAnimation = Play Preview Animation
 Redo = Redo
 Refresh = Refresh
 RemoveFrame = Remove Frame
-RemoveFrameTag = Remove Frame Tag
+RemoveFrameTag = Remove Tag
 RemoveLayer = Remove Layer
 RemoveSlice = Remove Slice
 ReopenClosedFile = Reopen Closed File
@@ -555,7 +555,7 @@ json_data_hash = Hash
 json_data_array = Array
 meta = Meta:
 meta_layers = Layers
-meta_frame_tags = Frame Tags
+meta_tags = Tags
 meta_slices = Slices
 open_sprite_sheet = Open generated sprite sheet
 export = &Export
@@ -588,14 +588,6 @@ title = Frame Properties
 frame_number = Frame number:
 duration = Duration (milliseconds):
 
-[frame_tag_properties]
-title = Frame Tag Properties
-name = Name:
-from = From:
-to = To:
-color = Color:
-ani_dir = Animation Direction:
-
 [general]
 ok = &OK
 close = &Close
@@ -1361,6 +1353,14 @@ pixel_scale = Pixel Scale:
 [tab_popup_menu]
 close = &Close
 
+[tag_properties]
+title = Tag Properties
+name = Name:
+from = From:
+to = To:
+color = Color:
+ani_dir = Animation Direction:
+
 [timeline_conf]
 position = Position:
 left = &Left

diff --git a/data/widgets/export_sprite_sheet.xml b/data/widgets/export_sprite_sheet.xml
@@ -1,5 +1,6 @@
 <!-- Aseprite -->
-<!-- Copyright (C) 2001-2018 by David Capello -->
+<!-- Copyright (C) 2019  Igara Studio S.A. -->
+<!-- Copyright (C) 2001-2018  David Capello -->
 <gui>
   <window id="export_sprite_sheet" text="@.title">
   <grid columns="4">
@@ -61,7 +62,7 @@
       </combobox>
       <label text="@.meta" />
       <check id="list_layers" text="@.meta_layers" />
-      <check id="list_tags" text="@.meta_frame_tags" />
+      <check id="list_tags" text="@.meta_tags" />
       <check id="list_slices" text="@.meta_slices" />
     </hbox>
 

diff --git a/data/widgets/frame_tag_properties.xml → data/widgets/tag_properties.xml b/data/widgets/frame_tag_properties.xml → data/widgets/tag_properties.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Aseprite -->
-<!-- Copyright (C) 2015-2018 by David Capello -->
+<!-- Copyright (C) 2019  Igara Studio S.A. -->
+<!-- Copyright (C) 2015-2018  David Capello -->
 <gui>
-<window id="frame_tag_properties" text="@.title">
+<window id="tag_properties" text="@.title">
   <grid columns="2">
     <label text="@.name" />
     <entry maxsize="256" id="name" magnet="true" />

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -347,7 +347,6 @@ if(ENABLE_UI)
     ui/file_selector.cpp
     ui/filename_field.cpp
     ui/font_popup.cpp
-    ui/frame_tag_window.cpp
     ui/hex_color_entry.cpp
     ui/home_view.cpp
     ui/icon_button.cpp
@@ -377,6 +376,7 @@ if(ENABLE_UI)
     ui/slider2.cpp
     ui/status_bar.cpp
     ui/tabs.cpp
+    ui/tag_window.cpp
     ui/task_widget.cpp
     ui/timeline/ani_controls.cpp
     ui/timeline/timeline.cpp
@@ -411,10 +411,10 @@ add_library(app-lib
   cmd.cpp
   cmd/add_cel.cpp
   cmd/add_frame.cpp
-  cmd/add_frame_tag.cpp
   cmd/add_layer.cpp
   cmd/add_palette.cpp
   cmd/add_slice.cpp
+  cmd/add_tag.cpp
   cmd/assign_color_profile.cpp
   cmd/background_from_layer.cpp
   cmd/clear_cel.cpp
@@ -440,10 +440,10 @@ add_library(app-lib
   cmd/remap_colors.cpp
   cmd/remove_cel.cpp
   cmd/remove_frame.cpp
-  cmd/remove_frame_tag.cpp
   cmd/remove_layer.cpp
   cmd/remove_palette.cpp
   cmd/remove_slice.cpp
+  cmd/remove_tag.cpp
   cmd/replace_image.cpp
   cmd/reselect_mask.cpp
   cmd/set_cel_bounds.cpp
@@ -452,10 +452,6 @@ add_library(app-lib
   cmd/set_cel_opacity.cpp
   cmd/set_cel_position.cpp
   cmd/set_frame_duration.cpp
-  cmd/set_frame_tag_anidir.cpp
-  cmd/set_frame_tag_color.cpp
-  cmd/set_frame_tag_name.cpp
-  cmd/set_frame_tag_range.cpp
   cmd/set_last_point.cpp
   cmd/set_layer_blend_mode.cpp
   cmd/set_layer_flags.cpp
@@ -469,6 +465,10 @@ add_library(app-lib
   cmd/set_slice_key.cpp
   cmd/set_slice_name.cpp
   cmd/set_sprite_size.cpp
+  cmd/set_tag_anidir.cpp
+  cmd/set_tag_color.cpp
+  cmd/set_tag_name.cpp
+  cmd/set_tag_range.cpp
   cmd/set_total_frames.cpp
   cmd/set_transparent_color.cpp
   cmd/set_user_data.cpp
@@ -477,11 +477,11 @@ add_library(app-lib
   cmd/unlink_cel.cpp
   cmd/with_cel.cpp
   cmd/with_document.cpp
-  cmd/with_frame_tag.cpp
   cmd/with_image.cpp
   cmd/with_layer.cpp
   cmd/with_slice.cpp
   cmd/with_sprite.cpp
+  cmd/with_tag.cpp
   cmd_sequence.cpp
   cmd_transaction.cpp
   color.cpp

diff --git a/src/app/app_menus.cpp b/src/app/app_menus.cpp
@@ -343,7 +343,7 @@ void AppMenus::reload()
   m_framePopupMenu.reset(loadMenuById(handle, "frame_popup_menu"));
   m_celPopupMenu.reset(loadMenuById(handle, "cel_popup_menu"));
   m_celMovementPopupMenu.reset(loadMenuById(handle, "cel_movement_popup_menu"));
-  m_frameTagPopupMenu.reset(loadMenuById(handle, "frame_tag_popup_menu"));
+  m_tagPopupMenu.reset(loadMenuById(handle, "tag_popup_menu"));
   m_slicePopupMenu.reset(loadMenuById(handle, "slice_popup_menu"));
   m_palettePopupMenu.reset(loadMenuById(handle, "palette_popup_menu"));
   m_inkPopupMenu.reset(loadMenuById(handle, "ink_popup_menu"));
@@ -706,7 +706,7 @@ void AppMenus::updateMenusList()
   m_menus.push_back(m_framePopupMenu.get());
   m_menus.push_back(m_celPopupMenu.get());
   m_menus.push_back(m_celMovementPopupMenu.get());
-  m_menus.push_back(m_frameTagPopupMenu.get());
+  m_menus.push_back(m_tagPopupMenu.get());
   m_menus.push_back(m_slicePopupMenu.get());
   m_menus.push_back(m_palettePopupMenu.get());
   m_menus.push_back(m_inkPopupMenu.get());

diff --git a/src/app/app_menus.h b/src/app/app_menus.h
@@ -56,7 +56,7 @@ namespace app {
     Menu* getFramePopupMenu() { return m_framePopupMenu.get(); }
     Menu* getCelPopupMenu() { return m_celPopupMenu.get(); }
     Menu* getCelMovementPopupMenu() { return m_celMovementPopupMenu.get(); }
-    Menu* getFrameTagPopupMenu() { return m_frameTagPopupMenu.get(); }
+    Menu* getTagPopupMenu() { return m_tagPopupMenu.get(); }
     Menu* getSlicePopupMenu() { return m_slicePopupMenu.get(); }
     Menu* getPalettePopupMenu() { return m_palettePopupMenu.get(); }
     Menu* getInkPopupMenu() { return m_inkPopupMenu.get(); }
@@ -92,7 +92,7 @@ namespace app {
     std::unique_ptr<Menu> m_framePopupMenu;
     std::unique_ptr<Menu> m_celPopupMenu;
     std::unique_ptr<Menu> m_celMovementPopupMenu;
-    std::unique_ptr<Menu> m_frameTagPopupMenu;
+    std::unique_ptr<Menu> m_tagPopupMenu;
     std::unique_ptr<Menu> m_slicePopupMenu;
     std::unique_ptr<Menu> m_palettePopupMenu;
     std::unique_ptr<Menu> m_inkPopupMenu;

diff --git a/src/app/cli/app_options.cpp b/src/app/cli/app_options.cpp
@@ -52,7 +52,7 @@ AppOptions::AppOptions(int argc, const char* argv[])
   , m_layer(m_po.add("layer").alias("import-layer").requiresValue("<name>").description("Include just the given layer in the sheet\nor save as operation"))
   , m_allLayers(m_po.add("all-layers").description("Make all layers visible\nBy default hidden layers will be ignored"))
   , m_ignoreLayer(m_po.add("ignore-layer").requiresValue("<name>").description("Exclude the given layer in the sheet\nor save as operation"))
-  , m_frameTag(m_po.add("frame-tag").requiresValue("<name>").description("Include tagged frames in the sheet"))
+  , m_tag(m_po.add("tag").alias("frame-tag").requiresValue("<name>").description("Include tagged frames in the sheet"))
   , m_frameRange(m_po.add("frame-range").requiresValue("from,to").description("Only export frames in the [from,to] range"))
   , m_ignoreEmpty(m_po.add("ignore-empty").description("Do not export empty frames/cels"))
   , m_borderPadding(m_po.add("border-padding").requiresValue("<value>").description("Add padding on the texture borders"))

diff --git a/src/app/cli/app_options.h b/src/app/cli/app_options.h
@@ -66,7 +66,7 @@ class AppOptions {
   const Option& layer() const { return m_layer; }
   const Option& allLayers() const { return m_allLayers; }
   const Option& ignoreLayer() const { return m_ignoreLayer; }
-  const Option& frameTag() const { return m_frameTag; }
+  const Option& tag() const { return m_tag; }
   const Option& frameRange() const { return m_frameRange; }
   const Option& ignoreEmpty() const { return m_ignoreEmpty; }
   const Option& borderPadding() const { return m_borderPadding; }
@@ -126,7 +126,7 @@ class AppOptions {
   Option& m_layer;
   Option& m_allLayers;
   Option& m_ignoreLayer;
-  Option& m_frameTag;
+  Option& m_tag;
   Option& m_frameRange;
   Option& m_ignoreEmpty;
   Option& m_borderPadding;

diff --git a/src/app/cli/cli_open_file.cpp b/src/app/cli/cli_open_file.cpp
@@ -13,9 +13,9 @@
 
 #include "app/doc.h"
 #include "app/file/file.h"
-#include "doc/frame_tag.h"
-#include "doc/frame_tags.h"
 #include "doc/sprite.h"
+#include "doc/tag.h"
+#include "doc/tags.h"
 
 namespace app {
 
@@ -48,7 +48,7 @@ FileOpROI CliOpenFile::roi() const
 
   return FileOpROI(document,
                    slice,
-                   frameTag,
+                   tag,
                    selFrames,
                    true);
 }

diff --git a/src/app/cli/cli_open_file.h b/src/app/cli/cli_open_file.h
@@ -24,7 +24,7 @@ namespace app {
     Doc* document;
     std::string filename;
     std::string filenameFormat;
-    std::string frameTag;
+    std::string tag;
     std::string slice;
     std::vector<std::string> includeLayers;
     std::vector<std::string> excludeLayers;
@@ -44,8 +44,8 @@ namespace app {
 
     CliOpenFile();
 
-    bool hasFrameTag() const {
-      return (!frameTag.empty());
+    bool hasTag() const {
+      return (!tag.empty());
     }
 
     bool hasSlice() const {