diff --git a/data/gui.xml b/data/gui.xml index 841fc4e4d..cbc67e228 100644 --- a/data/gui.xml +++ b/data/gui.xml @@ -664,7 +664,7 @@ - + diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 903cb3bbc..ef4b1525c 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -228,8 +228,8 @@ add_library(app-lib commands/cmd_new_file.cpp commands/cmd_new_frame.cpp commands/cmd_new_frame_tag.cpp + commands/cmd_new_group.cpp commands/cmd_new_layer.cpp - commands/cmd_new_layer_set.cpp commands/cmd_new_sprite_from_selection.cpp commands/cmd_onionskin.cpp commands/cmd_open_file.cpp diff --git a/src/app/commands/cmd_new_layer_set.cpp b/src/app/commands/cmd_new_group.cpp similarity index 77% rename from src/app/commands/cmd_new_layer_set.cpp rename to src/app/commands/cmd_new_group.cpp index ae85fce87..a19ee2076 100644 --- a/src/app/commands/cmd_new_layer_set.cpp +++ b/src/app/commands/cmd_new_group.cpp @@ -27,30 +27,30 @@ namespace app { using namespace ui; -class NewLayerGroupCommand : public Command { +class NewGroupCommand : public Command { public: - NewLayerGroupCommand(); - Command* clone() const override { return new NewLayerGroupCommand(*this); } + NewGroupCommand(); + Command* clone() const override { return new NewGroupCommand(*this); } protected: bool onEnabled(Context* context) override; void onExecute(Context* context) override; }; -NewLayerGroupCommand::NewLayerGroupCommand() - : Command("NewLayerGroup", +NewGroupCommand::NewGroupCommand() + : Command("NewGroup", "New Layer Group", CmdRecordableFlag) { } -bool NewLayerGroupCommand::onEnabled(Context* context) +bool NewGroupCommand::onEnabled(Context* context) { return context->checkFlags(ContextFlags::ActiveDocumentIsWritable | ContextFlags::HasActiveSprite); } -void NewLayerGroupCommand::onExecute(Context* context) +void NewGroupCommand::onExecute(Context* context) { ContextWriter writer(context); Document* document(writer.document()); @@ -76,12 +76,12 @@ void NewLayerGroupCommand::onExecute(Context* context) update_screen_for_document(document); StatusBar::instance()->invalidate(); - StatusBar::instance()->showTip(1000, "Layer `%s' created", name.c_str()); + StatusBar::instance()->showTip(1000, "Group `%s' created", name.c_str()); } -Command* CommandFactory::createNewLayerGroupCommand() +Command* CommandFactory::createNewGroupCommand() { - return new NewLayerGroupCommand; + return new NewGroupCommand; } } // namespace app diff --git a/src/app/commands/commands_list.h b/src/app/commands/commands_list.h index a8c826e8e..0c0bda2b7 100644 --- a/src/app/commands/commands_list.h +++ b/src/app/commands/commands_list.h @@ -78,8 +78,8 @@ FOR_EACH_COMMAND(NewBrush) FOR_EACH_COMMAND(NewFile) FOR_EACH_COMMAND(NewFrame) FOR_EACH_COMMAND(NewFrameTag) +FOR_EACH_COMMAND(NewGroup) FOR_EACH_COMMAND(NewLayer) -FOR_EACH_COMMAND(NewLayerGroup) FOR_EACH_COMMAND(NewSpriteFromSelection) FOR_EACH_COMMAND(OpenFile) FOR_EACH_COMMAND(OpenInFolder)