Extract main toolbar action planning

This commit is contained in:
2026-06-03 12:37:32 +02:00
parent b5bd6d42f7
commit 62561624ed
8 changed files with 536 additions and 15 deletions

View File

@@ -18,6 +18,7 @@
#include "app_core/file_menu.h"
#include "app_core/grid_ui.h"
#include "app_core/history_ui.h"
#include "app_core/main_toolbar.h"
#include "app_core/quick_ui.h"
#include "app_core/tools_menu.h"
#include "assets/image_format.h"
@@ -322,6 +323,14 @@ struct PlanHistoryOperationArgs {
int memory_bytes = 0;
};
struct PlanMainToolbarArgs {
std::string command = "undo";
int undo_count = 0;
int redo_count = 0;
int memory_bytes = 0;
bool has_canvas = true;
};
struct PlanCanvasToolArgs {
std::string kind = "draw";
bool current_mode_draw = false;
@@ -1107,6 +1116,56 @@ const char* history_ui_operation_name(pp::app::HistoryUiOperation operation) noe
return "undo";
}
const char* main_toolbar_command_name(pp::app::MainToolbarCommand command) noexcept
{
switch (command) {
case pp::app::MainToolbarCommand::open_document:
return "open";
case pp::app::MainToolbarCommand::save_document:
return "save";
case pp::app::MainToolbarCommand::undo:
return "undo";
case pp::app::MainToolbarCommand::redo:
return "redo";
case pp::app::MainToolbarCommand::clear_history:
return "clear-history";
case pp::app::MainToolbarCommand::clear_canvas:
return "clear-canvas";
case pp::app::MainToolbarCommand::show_message_box:
return "message-box";
case pp::app::MainToolbarCommand::show_settings:
return "settings";
}
return "open";
}
const char* main_toolbar_action_name(pp::app::MainToolbarAction action) noexcept
{
switch (action) {
case pp::app::MainToolbarAction::show_open_dialog:
return "show-open-dialog";
case pp::app::MainToolbarAction::show_save_dialog:
return "show-save-dialog";
case pp::app::MainToolbarAction::invoke_undo:
return "invoke-undo";
case pp::app::MainToolbarAction::invoke_redo:
return "invoke-redo";
case pp::app::MainToolbarAction::clear_history:
return "clear-history";
case pp::app::MainToolbarAction::clear_canvas:
return "clear-canvas";
case pp::app::MainToolbarAction::show_message_box:
return "show-message-box";
case pp::app::MainToolbarAction::show_settings_dialog:
return "show-settings-dialog";
case pp::app::MainToolbarAction::no_op_unavailable:
return "no-op-unavailable";
}
return "no-op-unavailable";
}
const char* quick_ui_slot_kind_name(pp::app::QuickUiSlotKind kind) noexcept
{
switch (kind) {
@@ -1494,6 +1553,7 @@ void print_help()
<< " plan-canvas-tool-state [--mode draw|erase|line|camera|grid|copy|cut|fill|mask-free|mask-line|bucket] [--picking] [--touch-lock]\n"
<< " plan-grid-operation --kind pick|load|reload|clear|render|commit [--path FILE] [--no-heightmap] [--no-canvas] [--float32] [--float16] [--texture-resolution N] [--samples N]\n"
<< " plan-history-operation --kind undo|redo|clear [--undo-count N] [--redo-count N] [--memory-bytes N]\n"
<< " plan-main-toolbar --command open|save|undo|redo|clear-history|clear-canvas|message-box|settings [--undo-count N] [--redo-count N] [--memory-bytes N] [--no-canvas]\n"
<< " plan-quick-operation --kind brush|color|restore|reset [--current-index N] [--slot-index N] [--brush-index N] [--color-index N] [--slot-count N] [--fire-event]\n"
<< " plan-share-file [--path FILE]\n"
<< " plan-picked-path [--path FILE]\n"
@@ -4458,6 +4518,128 @@ int plan_history_operation(int argc, char** argv)
return 0;
}
pp::foundation::Result<pp::app::MainToolbarCommand> parse_main_toolbar_command(std::string_view command)
{
if (command == "open") {
return pp::foundation::Result<pp::app::MainToolbarCommand>::success(
pp::app::MainToolbarCommand::open_document);
}
if (command == "save") {
return pp::foundation::Result<pp::app::MainToolbarCommand>::success(
pp::app::MainToolbarCommand::save_document);
}
if (command == "undo") {
return pp::foundation::Result<pp::app::MainToolbarCommand>::success(
pp::app::MainToolbarCommand::undo);
}
if (command == "redo") {
return pp::foundation::Result<pp::app::MainToolbarCommand>::success(
pp::app::MainToolbarCommand::redo);
}
if (command == "clear-history") {
return pp::foundation::Result<pp::app::MainToolbarCommand>::success(
pp::app::MainToolbarCommand::clear_history);
}
if (command == "clear-canvas") {
return pp::foundation::Result<pp::app::MainToolbarCommand>::success(
pp::app::MainToolbarCommand::clear_canvas);
}
if (command == "message-box") {
return pp::foundation::Result<pp::app::MainToolbarCommand>::success(
pp::app::MainToolbarCommand::show_message_box);
}
if (command == "settings") {
return pp::foundation::Result<pp::app::MainToolbarCommand>::success(
pp::app::MainToolbarCommand::show_settings);
}
return pp::foundation::Result<pp::app::MainToolbarCommand>::failure(
pp::foundation::Status::invalid_argument("unknown main toolbar command"));
}
pp::foundation::Status parse_plan_main_toolbar_args(
int argc,
char** argv,
PlanMainToolbarArgs& args)
{
for (int i = 2; i < argc; ++i) {
const std::string_view key(argv[i]);
if (key == "--command") {
if (i + 1 >= argc) {
return pp::foundation::Status::invalid_argument("missing value for option");
}
args.command = argv[++i];
} else if (key == "--undo-count" || key == "--redo-count" || key == "--memory-bytes") {
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 == "--undo-count") {
args.undo_count = value.value();
} else if (key == "--redo-count") {
args.redo_count = value.value();
} else {
args.memory_bytes = value.value();
}
} else if (key == "--no-canvas") {
args.has_canvas = false;
} else {
return pp::foundation::Status::invalid_argument("unknown option");
}
}
return pp::foundation::Status::success();
}
int plan_main_toolbar(int argc, char** argv)
{
PlanMainToolbarArgs args;
const auto status = parse_plan_main_toolbar_args(argc, argv, args);
if (!status.ok()) {
print_error("plan-main-toolbar", status.message);
return 2;
}
const auto command = parse_main_toolbar_command(args.command);
if (!command) {
print_error("plan-main-toolbar", command.status().message);
return 2;
}
const auto plan = pp::app::plan_main_toolbar_command(
command.value(),
args.undo_count,
args.redo_count,
args.memory_bytes,
args.has_canvas);
if (!plan) {
print_error("plan-main-toolbar", plan.status().message);
return 2;
}
const auto& value = plan.value();
std::cout << "{\"ok\":true,\"command\":\"plan-main-toolbar\""
<< ",\"state\":{\"command\":\"" << json_escape(args.command)
<< "\",\"undoCount\":" << args.undo_count
<< ",\"redoCount\":" << args.redo_count
<< ",\"memoryBytes\":" << args.memory_bytes
<< ",\"hasCanvas\":" << json_bool(args.has_canvas)
<< "},\"plan\":{\"command\":\"" << main_toolbar_command_name(value.command)
<< "\",\"action\":\"" << main_toolbar_action_name(value.action)
<< "\",\"label\":\"" << json_escape(value.label)
<< "\",\"requiresCanvas\":" << json_bool(value.requires_canvas)
<< ",\"updatesMemoryLabel\":" << json_bool(value.updates_memory_label)
<< ",\"updatesTitle\":" << json_bool(value.updates_title)
<< ",\"recordsUndo\":" << json_bool(value.records_undo)
<< ",\"marksUnsaved\":" << json_bool(value.marks_unsaved)
<< ",\"noOp\":" << json_bool(value.no_op)
<< "}}\n";
return 0;
}
pp::foundation::Status parse_plan_quick_operation_args(
int argc,
char** argv,
@@ -7042,6 +7224,10 @@ int main(int argc, char** argv)
return plan_history_operation(argc, argv);
}
if (command == "plan-main-toolbar") {
return plan_main_toolbar(argc, argv);
}
if (command == "plan-quick-operation") {
return plan_quick_operation(argc, argv);
}