Extract layer menu action planning
This commit is contained in:
@@ -270,6 +270,15 @@ struct PlanLayerOperationArgs {
|
||||
int blend_mode = 0;
|
||||
};
|
||||
|
||||
struct PlanLayerMenuArgs {
|
||||
std::string command = "merge";
|
||||
bool has_current_layer = true;
|
||||
int current_index = 0;
|
||||
int animation_duration = 1;
|
||||
std::string current_name = "Layer";
|
||||
std::string lower_name = "Layer 0";
|
||||
};
|
||||
|
||||
struct PlanAnimationOperationArgs {
|
||||
std::string kind = "goto";
|
||||
int frame_count = 1;
|
||||
@@ -681,6 +690,60 @@ const char* document_layer_operation_name(pp::app::DocumentLayerOperation operat
|
||||
return "select";
|
||||
}
|
||||
|
||||
const char* document_layer_menu_command_name(pp::app::DocumentLayerMenuCommand command) noexcept
|
||||
{
|
||||
switch (command) {
|
||||
case pp::app::DocumentLayerMenuCommand::clear:
|
||||
return "clear";
|
||||
case pp::app::DocumentLayerMenuCommand::rename:
|
||||
return "rename";
|
||||
case pp::app::DocumentLayerMenuCommand::merge_down:
|
||||
return "merge";
|
||||
}
|
||||
|
||||
return "clear";
|
||||
}
|
||||
|
||||
const char* document_layer_menu_action_name(pp::app::DocumentLayerMenuAction action) noexcept
|
||||
{
|
||||
switch (action) {
|
||||
case pp::app::DocumentLayerMenuAction::clear_current_layer:
|
||||
return "clear-current-layer";
|
||||
case pp::app::DocumentLayerMenuAction::show_rename_dialog:
|
||||
return "show-rename-dialog";
|
||||
case pp::app::DocumentLayerMenuAction::merge_with_lower_layer:
|
||||
return "merge-with-lower-layer";
|
||||
case pp::app::DocumentLayerMenuAction::show_merge_animated_not_supported:
|
||||
return "show-merge-animated-not-supported";
|
||||
case pp::app::DocumentLayerMenuAction::no_op_select_layer:
|
||||
return "no-op-select-layer";
|
||||
case pp::app::DocumentLayerMenuAction::no_op_select_upper_layer:
|
||||
return "no-op-select-upper-layer";
|
||||
}
|
||||
|
||||
return "no-op-select-layer";
|
||||
}
|
||||
|
||||
pp::foundation::Result<pp::app::DocumentLayerMenuCommand> parse_document_layer_menu_command(
|
||||
std::string_view command)
|
||||
{
|
||||
if (command == "clear") {
|
||||
return pp::foundation::Result<pp::app::DocumentLayerMenuCommand>::success(
|
||||
pp::app::DocumentLayerMenuCommand::clear);
|
||||
}
|
||||
if (command == "rename") {
|
||||
return pp::foundation::Result<pp::app::DocumentLayerMenuCommand>::success(
|
||||
pp::app::DocumentLayerMenuCommand::rename);
|
||||
}
|
||||
if (command == "merge" || command == "merge-down") {
|
||||
return pp::foundation::Result<pp::app::DocumentLayerMenuCommand>::success(
|
||||
pp::app::DocumentLayerMenuCommand::merge_down);
|
||||
}
|
||||
|
||||
return pp::foundation::Result<pp::app::DocumentLayerMenuCommand>::failure(
|
||||
pp::foundation::Status::invalid_argument("unknown layer menu command"));
|
||||
}
|
||||
|
||||
const char* document_animation_operation_name(pp::app::DocumentAnimationOperation operation) noexcept
|
||||
{
|
||||
switch (operation) {
|
||||
@@ -1205,6 +1268,7 @@ void print_help()
|
||||
<< " plan-image-import --width N --height N\n"
|
||||
<< " plan-document-resize [--current-resolution N] [--selected-resolution-index N]\n"
|
||||
<< " plan-layer-rename --old-name NAME --new-name NAME\n"
|
||||
<< " plan-layer-menu --command clear|rename|merge [--no-current-layer] [--current-index N] [--animation-duration N] [--current-name NAME] [--lower-name NAME]\n"
|
||||
<< " plan-layer-operation --kind add|duplicate|select|reorder|remove|opacity|visibility|alpha-lock|blend-mode|highlight [--layer-count N] [--index N] [--from-index N] [--to-index N] [--source-index N] [--name NAME] [--opacity N] [--blend-mode N] [--enabled]\n"
|
||||
<< " plan-animation-operation --kind add|duplicate|remove|duration|move|goto|next|prev|onion [--frame-count N] [--total-duration N] [--current-frame N] [--selected-frame N] [--current-duration N] [--delta N] [--offset N] [--onion-size N]\n"
|
||||
<< " plan-brush-operation --kind color|tip|pattern|dual|preset|settings [--path FILE] [--thumb FILE] [--r N] [--g N] [--b N] [--a N] [--no-brush]\n"
|
||||
@@ -3085,6 +3149,91 @@ int plan_layer_rename(int argc, char** argv)
|
||||
return 0;
|
||||
}
|
||||
|
||||
pp::foundation::Status parse_plan_layer_menu_args(
|
||||
int argc,
|
||||
char** argv,
|
||||
PlanLayerMenuArgs& args)
|
||||
{
|
||||
for (int i = 2; i < argc; ++i) {
|
||||
const std::string_view key(argv[i]);
|
||||
if (key == "--command" || key == "--current-name" || key == "--lower-name") {
|
||||
if (i + 1 >= argc) {
|
||||
return pp::foundation::Status::invalid_argument("missing value for option");
|
||||
}
|
||||
if (key == "--command") {
|
||||
args.command = argv[++i];
|
||||
} else if (key == "--current-name") {
|
||||
args.current_name = argv[++i];
|
||||
} else {
|
||||
args.lower_name = argv[++i];
|
||||
}
|
||||
} else if (key == "--current-index" || key == "--animation-duration") {
|
||||
if (i + 1 >= argc) {
|
||||
return pp::foundation::Status::invalid_argument("missing value for option");
|
||||
}
|
||||
const auto value = parse_i32_arg(argv[++i]);
|
||||
if (!value) {
|
||||
return value.status();
|
||||
}
|
||||
if (key == "--current-index") {
|
||||
args.current_index = value.value();
|
||||
} else {
|
||||
args.animation_duration = value.value();
|
||||
}
|
||||
} else if (key == "--no-current-layer") {
|
||||
args.has_current_layer = false;
|
||||
} else {
|
||||
return pp::foundation::Status::invalid_argument("unknown option");
|
||||
}
|
||||
}
|
||||
|
||||
return pp::foundation::Status::success();
|
||||
}
|
||||
|
||||
int plan_layer_menu(int argc, char** argv)
|
||||
{
|
||||
PlanLayerMenuArgs args;
|
||||
const auto status = parse_plan_layer_menu_args(argc, argv, args);
|
||||
if (!status.ok()) {
|
||||
print_error("plan-layer-menu", status.message);
|
||||
return 2;
|
||||
}
|
||||
|
||||
const auto command = parse_document_layer_menu_command(args.command);
|
||||
if (!command) {
|
||||
print_error("plan-layer-menu", command.status().message);
|
||||
return 2;
|
||||
}
|
||||
|
||||
const auto plan = pp::app::plan_document_layer_menu(
|
||||
command.value(),
|
||||
args.has_current_layer,
|
||||
args.current_index,
|
||||
args.animation_duration,
|
||||
args.current_name,
|
||||
args.lower_name);
|
||||
if (!plan) {
|
||||
print_error("plan-layer-menu", plan.status().message);
|
||||
return 2;
|
||||
}
|
||||
|
||||
const auto& value = plan.value();
|
||||
std::cout << "{\"ok\":true,\"command\":\"plan-layer-menu\""
|
||||
<< ",\"state\":{\"command\":\"" << json_escape(args.command)
|
||||
<< "\",\"hasCurrentLayer\":" << json_bool(args.has_current_layer)
|
||||
<< ",\"currentIndex\":" << args.current_index
|
||||
<< ",\"animationDuration\":" << args.animation_duration
|
||||
<< ",\"currentName\":\"" << json_escape(args.current_name)
|
||||
<< "\",\"lowerName\":\"" << json_escape(args.lower_name)
|
||||
<< "\"},\"plan\":{\"command\":\"" << document_layer_menu_command_name(value.command)
|
||||
<< "\",\"action\":\"" << document_layer_menu_action_name(value.action)
|
||||
<< "\",\"label\":\"" << json_escape(value.label)
|
||||
<< "\",\"fromIndex\":" << value.from_index
|
||||
<< ",\"toIndex\":" << value.to_index
|
||||
<< "}}\n";
|
||||
return 0;
|
||||
}
|
||||
|
||||
pp::foundation::Status parse_plan_layer_operation_args(
|
||||
int argc,
|
||||
char** argv,
|
||||
@@ -6446,6 +6595,10 @@ int main(int argc, char** argv)
|
||||
return plan_layer_rename(argc, argv);
|
||||
}
|
||||
|
||||
if (command == "plan-layer-menu") {
|
||||
return plan_layer_menu(argc, argv);
|
||||
}
|
||||
|
||||
if (command == "plan-layer-operation") {
|
||||
return plan_layer_operation(argc, argv);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user