berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

require command title

This commit is contained in:
nakst 2021-09-26 13:33:23 +01:00
parent 583ef2c383
commit 422b61e557
8 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/file_manager/commands.cpp
View File

@ -464,7 +464,7 @@ void CommandPaste(Instance *instance, EsElement *, EsCommand *) {
void InstanceRegisterCommands(Instance *instance) { void InstanceRegisterCommands(Instance *instance) {
uint32_t stableCommandID = 1; uint32_t stableCommandID = 1;
EsCommandRegister(&instance->commandGoBackwards, instance, [] (Instance *instance, EsElement *, EsCommand *) { EsCommandRegister(&instance->commandGoBackwards, instance, INTERFACE_STRING(FileManagerGoBack), [] (Instance *instance, EsElement *, EsCommand *) {
EsAssert(instance->pathBackwardHistory.Length()); EsAssert(instance->pathBackwardHistory.Length());
HistoryEntry entry = instance->pathBackwardHistory.Pop(); HistoryEntry entry = instance->pathBackwardHistory.Pop();
StringDestroy(&instance->delayedFocusItem); StringDestroy(&instance->delayedFocusItem);
@ -472,7 +472,7 @@ void InstanceRegisterCommands(Instance *instance) {
InstanceLoadFolder(instance, entry.path, LOAD_FOLDER_BACK); InstanceLoadFolder(instance, entry.path, LOAD_FOLDER_BACK);
}, stableCommandID++, "Backspace|Alt+Left"); }, stableCommandID++, "Backspace|Alt+Left");
EsCommandRegister(&instance->commandGoForwards, instance, [] (Instance *instance, EsElement *, EsCommand *) { EsCommandRegister(&instance->commandGoForwards, instance, INTERFACE_STRING(FileManagerGoForwards), [] (Instance *instance, EsElement *, EsCommand *) {
EsAssert(instance->pathForwardHistory.Length()); EsAssert(instance->pathForwardHistory.Length());
HistoryEntry entry = instance->pathForwardHistory.Pop(); HistoryEntry entry = instance->pathForwardHistory.Pop();
StringDestroy(&instance->delayedFocusItem); StringDestroy(&instance->delayedFocusItem);
@ -480,31 +480,31 @@ void InstanceRegisterCommands(Instance *instance) {
InstanceLoadFolder(instance, entry.path, LOAD_FOLDER_FORWARD); InstanceLoadFolder(instance, entry.path, LOAD_FOLDER_FORWARD);
}, stableCommandID++, "Alt+Right"); }, stableCommandID++, "Alt+Right");
EsCommandRegister(&instance->commandGoParent, instance, [] (Instance *instance, EsElement *, EsCommand *) { EsCommandRegister(&instance->commandGoParent, instance, INTERFACE_STRING(FileManagerGoUp), [] (Instance *instance, EsElement *, EsCommand *) {
String parent = PathGetParent(instance->folder->path); String parent = PathGetParent(instance->folder->path);
InstanceLoadFolder(instance, StringDuplicate(parent)); InstanceLoadFolder(instance, StringDuplicate(parent));
}, stableCommandID++, "Alt+Up"); }, stableCommandID++, "Alt+Up");
EsCommandRegister(&instance->commandRefresh, instance, [] (Instance *instance, EsElement *, EsCommand *) { EsCommandRegister(&instance->commandRefresh, instance, INTERFACE_STRING(FileManagerRefresh), [] (Instance *instance, EsElement *, EsCommand *) {
FolderRefresh(instance->folder); FolderRefresh(instance->folder);
}, stableCommandID++, "F5"); }, stableCommandID++, "F5");
EsCommandRegister(&instance->commandNewFolder, instance, CommandNewFolder, stableCommandID++, "Ctrl+Shift+N"); EsCommandRegister(&instance->commandNewFolder, instance, INTERFACE_STRING(FileManagerNewFolderToolbarItem), CommandNewFolder, stableCommandID++, "Ctrl+Shift+N");
EsCommandRegister(&instance->commandRename, instance, CommandRename, stableCommandID++, "F2"); EsCommandRegister(&instance->commandRename, instance, INTERFACE_STRING(FileManagerRenameAction), CommandRename, stableCommandID++, "F2");
EsCommandRegister(&instance->commandViewDetails, instance, [] (Instance *instance, EsElement *, EsCommand *) { EsCommandRegister(&instance->commandViewDetails, instance, INTERFACE_STRING(CommonListViewTypeDetails), [] (Instance *instance, EsElement *, EsCommand *) {
instance->viewSettings.viewType = VIEW_DETAILS; instance->viewSettings.viewType = VIEW_DETAILS;
InstanceRefreshViewType(instance); InstanceRefreshViewType(instance);
InstanceViewSettingsUpdated(instance); InstanceViewSettingsUpdated(instance);
}, stableCommandID++); }, stableCommandID++);
EsCommandRegister(&instance->commandViewTiles, instance, [] (Instance *instance, EsElement *, EsCommand *) { EsCommandRegister(&instance->commandViewTiles, instance, INTERFACE_STRING(CommonListViewTypeTiles), [] (Instance *instance, EsElement *, EsCommand *) {
instance->viewSettings.viewType = VIEW_TILES; instance->viewSettings.viewType = VIEW_TILES;
InstanceRefreshViewType(instance); InstanceRefreshViewType(instance);
InstanceViewSettingsUpdated(instance); InstanceViewSettingsUpdated(instance);
}, stableCommandID++); }, stableCommandID++);
EsCommandRegister(&instance->commandViewThumbnails, instance, [] (Instance *instance, EsElement *, EsCommand *) { EsCommandRegister(&instance->commandViewThumbnails, instance, INTERFACE_STRING(CommonListViewTypeThumbnails), [] (Instance *instance, EsElement *, EsCommand *) {
instance->viewSettings.viewType = VIEW_THUMBNAILS; instance->viewSettings.viewType = VIEW_THUMBNAILS;
InstanceRefreshViewType(instance); InstanceRefreshViewType(instance);
InstanceViewSettingsUpdated(instance); InstanceViewSettingsUpdated(instance);

10
apps/image_editor.cpp
View File

@ -704,11 +704,11 @@ void InstanceCreate(EsMessage *message) {
// Register commands. // Register commands.
EsCommandRegister(&instance->commandBrush, instance, CommandSelectTool, 1, "N", true); EsCommandRegister(&instance->commandBrush, instance, INTERFACE_STRING(ImageEditorToolBrush), CommandSelectTool, 1, "N", true);
EsCommandRegister(&instance->commandFill, instance, CommandSelectTool, 2, "Shift+B", true); EsCommandRegister(&instance->commandFill, instance, INTERFACE_STRING(ImageEditorToolFill), CommandSelectTool, 2, "Shift+B", true);
EsCommandRegister(&instance->commandRectangle, instance, CommandSelectTool, 3, "Shift+R", true); EsCommandRegister(&instance->commandRectangle, instance, INTERFACE_STRING(ImageEditorToolRectangle), CommandSelectTool, 3, "Shift+R", true);
EsCommandRegister(&instance->commandSelect, instance, CommandSelectTool, 4, "R", false); EsCommandRegister(&instance->commandSelect, instance, INTERFACE_STRING(ImageEditorToolSelect), CommandSelectTool, 4, "R", false);
EsCommandRegister(&instance->commandText, instance, CommandSelectTool, 5, "T", false); EsCommandRegister(&instance->commandText, instance, INTERFACE_STRING(ImageEditorToolText), CommandSelectTool, 5, "T", false);
EsCommandSetCheck(&instance->commandBrush, ES_CHECK_CHECKED, false); EsCommandSetCheck(&instance->commandBrush, ES_CHECK_CHECKED, false);

2
apps/system_monitor.cpp
View File

@ -372,7 +372,7 @@ void ProcessApplicationMessage(EsMessage *message) {
if (message->type == ES_MSG_INSTANCE_CREATE) { if (message->type == ES_MSG_INSTANCE_CREATE) {
Instance *instance = EsInstanceCreate(message, "System Monitor"); Instance *instance = EsInstanceCreate(message, "System Monitor");
EsCommandRegister(&instance->commandTerminateProcess, instance, TerminateProcess, 1, "Del", false); EsCommandRegister(&instance->commandTerminateProcess, instance, EsLiteral("Terminate process"), TerminateProcess, 1, "Del", false);
EsWindow *window = instance->window; EsWindow *window = instance->window;
EsWindowSetIcon(window, ES_ICON_UTILITIES_SYSTEM_MONITOR); EsWindowSetIcon(window, ES_ICON_UTILITIES_SYSTEM_MONITOR);

8
apps/text_editor.cpp
View File

@ -202,20 +202,20 @@ void ProcessApplicationMessage(EsMessage *message) {
uint32_t stableID = 1; uint32_t stableID = 1;
EsCommandRegister(&instance->commandFindNext, instance, [] (Instance *instance, EsElement *, EsCommand *) { EsCommandRegister(&instance->commandFindNext, instance, INTERFACE_STRING(CommonSearchNext), [] (Instance *instance, EsElement *, EsCommand *) {
Find(instance, false); Find(instance, false);
}, stableID++, "F3"); }, stableID++, "F3");
EsCommandRegister(&instance->commandFindPrevious, instance, [] (Instance *instance, EsElement *, EsCommand *) { EsCommandRegister(&instance->commandFindPrevious, instance, INTERFACE_STRING(CommonSearchPrevious), [] (Instance *instance, EsElement *, EsCommand *) {
Find(instance, true); Find(instance, true);
}, stableID++, "Shift+F3"); }, stableID++, "Shift+F3");
EsCommandRegister(&instance->commandFind, instance, [] (Instance *instance, EsElement *, EsCommand *) { EsCommandRegister(&instance->commandFind, instance, INTERFACE_STRING(CommonSearchOpen), [] (Instance *instance, EsElement *, EsCommand *) {
EsWindowSwitchToolbar(instance->window, instance->toolbarSearch, ES_TRANSITION_ZOOM_OUT); EsWindowSwitchToolbar(instance->window, instance->toolbarSearch, ES_TRANSITION_ZOOM_OUT);
EsElementFocus(instance->textboxSearch); EsElementFocus(instance->textboxSearch);
}, stableID++, "Ctrl+F"); }, stableID++, "Ctrl+F");
EsCommandRegister(&instance->commandFormat, instance, [] (Instance *instance, EsElement *, EsCommand *) { EsCommandRegister(&instance->commandFormat, instance, INTERFACE_STRING(CommonFormatPopup), [] (Instance *instance, EsElement *, EsCommand *) {
FormatPopupCreate(instance); FormatPopupCreate(instance);
}, stableID++, "Ctrl+Alt+T"); }, stableID++, "Ctrl+Alt+T");

34
desktop/api.cpp
View File

@ -656,7 +656,7 @@ void InstanceSave(EsInstance *_instance) {
} }
void InstanceClose(EsInstance *instance) { void InstanceClose(EsInstance *instance) {
if (EsCommandByID(instance, ES_COMMAND_SAVE)->disabled) { if (!EsCommandByID(instance, ES_COMMAND_SAVE)->enabled) {
EsInstanceDestroy(instance); EsInstanceDestroy(instance);
return; return;
} }
@ -803,15 +803,15 @@ APIInstance *InstanceSetup(EsInstance *instance) {
instance->undoManager->instance = instance; instance->undoManager->instance = instance;
apiInstance->activeUndoManager = instance->undoManager; apiInstance->activeUndoManager = instance->undoManager;
EsCommandRegister(&apiInstance->commandDelete, instance, nullptr, ES_COMMAND_DELETE, "Del"); EsCommandRegister(&apiInstance->commandDelete, instance, INTERFACE_STRING(CommonSelectionDelete), nullptr, ES_COMMAND_DELETE, "Del");
EsCommandRegister(&apiInstance->commandSelectAll, instance, nullptr, ES_COMMAND_SELECT_ALL, "Ctrl+A"); EsCommandRegister(&apiInstance->commandSelectAll, instance, INTERFACE_STRING(CommonSelectionSelectAll), nullptr, ES_COMMAND_SELECT_ALL, "Ctrl+A");
EsCommandRegister(&apiInstance->commandCopy, instance, nullptr, ES_COMMAND_COPY, "Ctrl+C|Ctrl+Ins"); EsCommandRegister(&apiInstance->commandCopy, instance, INTERFACE_STRING(CommonClipboardCopy), nullptr, ES_COMMAND_COPY, "Ctrl+C|Ctrl+Ins");
EsCommandRegister(&apiInstance->commandCut, instance, nullptr, ES_COMMAND_CUT, "Ctrl+X|Shift+Del"); EsCommandRegister(&apiInstance->commandCut, instance, INTERFACE_STRING(CommonClipboardCut), nullptr, ES_COMMAND_CUT, "Ctrl+X|Shift+Del");
EsCommandRegister(&apiInstance->commandPaste, instance, nullptr, ES_COMMAND_PASTE, "Ctrl+V|Shift+Ins"); EsCommandRegister(&apiInstance->commandPaste, instance, INTERFACE_STRING(CommonClipboardPaste), nullptr, ES_COMMAND_PASTE, "Ctrl+V|Shift+Ins");
EsCommandRegister(&apiInstance->commandUndo, instance, nullptr, ES_COMMAND_UNDO, "Ctrl+Z"); EsCommandRegister(&apiInstance->commandUndo, instance, INTERFACE_STRING(CommonUndo), nullptr, ES_COMMAND_UNDO, "Ctrl+Z");
EsCommandRegister(&apiInstance->commandRedo, instance, nullptr, ES_COMMAND_REDO, "Ctrl+Y"); EsCommandRegister(&apiInstance->commandRedo, instance, INTERFACE_STRING(CommonRedo), nullptr, ES_COMMAND_REDO, "Ctrl+Y");
EsCommandRegister(&apiInstance->commandSave, instance, nullptr, ES_COMMAND_SAVE, "Ctrl+S"); EsCommandRegister(&apiInstance->commandSave, instance, INTERFACE_STRING(CommonFileSave), nullptr, ES_COMMAND_SAVE, "Ctrl+S");
EsCommandRegister(&apiInstance->commandShowInFileManager, instance, nullptr, ES_COMMAND_SHOW_IN_FILE_MANAGER, "Ctrl+Shift+O"); EsCommandRegister(&apiInstance->commandShowInFileManager, instance, INTERFACE_STRING(CommonFileShowInFileManager), nullptr, ES_COMMAND_SHOW_IN_FILE_MANAGER, "Ctrl+Shift+O");
EsCommandSetCallback(&apiInstance->commandUndo, [] (EsInstance *instance, EsElement *, EsCommand *) { EsCommandSetCallback(&apiInstance->commandUndo, [] (EsInstance *instance, EsElement *, EsCommand *) {
EsUndoInvokeGroup(((APIInstance *) instance->_private)->activeUndoManager, false); EsUndoInvokeGroup(((APIInstance *) instance->_private)->activeUndoManager, false);
@ -1566,11 +1566,13 @@ void EsCommandAddButton(EsCommand *command, EsButton *button) {
command->elements = elements.array; command->elements = elements.array;
EsButtonOnCommand(button, command->callback, command); EsButtonOnCommand(button, command->callback, command);
button->state |= UI_STATE_COMMAND_BUTTON; button->state |= UI_STATE_COMMAND_BUTTON;
EsElementSetDisabled(button, command->disabled); EsElementSetEnabled(button, command->enabled);
EsButtonSetCheck(button, command->check); EsButtonSetCheck(button, command->check);
} }
EsCommand *EsCommandRegister(EsCommand *command, EsInstance *_instance, EsCommandCallback callback, uint32_t stableID, EsCommand *EsCommandRegister(EsCommand *command, EsInstance *_instance,
const char *title, ptrdiff_t titleBytes,
EsCommandCallback callback, uint32_t stableID,
const char *cDefaultKeyboardShortcut, bool enabled) { const char *cDefaultKeyboardShortcut, bool enabled) {
if (!command) { if (!command) {
command = (EsCommand *) EsHeapAllocate(sizeof(EsCommand), true); command = (EsCommand *) EsHeapAllocate(sizeof(EsCommand), true);
@ -1583,7 +1585,9 @@ EsCommand *EsCommandRegister(EsCommand *command, EsInstance *_instance, EsComman
command->registered = true; command->registered = true;
command->stableID = stableID; command->stableID = stableID;
command->cKeyboardShortcut = cDefaultKeyboardShortcut; command->cKeyboardShortcut = cDefaultKeyboardShortcut;
command->disabled = !enabled; command->enabled = enabled;
command->title = title;
command->titleBytes = titleBytes == -1 ? EsCStringLength(title) : titleBytes;
EsAssert(!instance->commands.Get(&stableID)); // Command already registered. EsAssert(!instance->commands.Get(&stableID)); // Command already registered.
*instance->commands.Put(&stableID) = command; *instance->commands.Put(&stableID) = command;
return command; return command;
@ -1592,8 +1596,8 @@ EsCommand *EsCommandRegister(EsCommand *command, EsInstance *_instance, EsComman
void EsCommandSetDisabled(EsCommand *command, bool disabled) { void EsCommandSetDisabled(EsCommand *command, bool disabled) {
EsAssert(command->registered); // Command has not been registered. EsAssert(command->registered); // Command has not been registered.
if (disabled != command->disabled) { if (command->enabled != !disabled) {
command->disabled = disabled; command->enabled = !disabled;
for (uintptr_t i = 0; i < ArrayLength(command->elements); i++) { for (uintptr_t i = 0; i < ArrayLength(command->elements); i++) {
EsElementSetDisabled(command->elements[i], disabled); EsElementSetDisabled(command->elements[i], disabled);

4
desktop/gui.cpp
View File

@ -5550,7 +5550,7 @@ void FileMenuCreate(EsInstance *_instance, EsElement *element, EsCommand *) {
if (instance->instanceClass == ES_INSTANCE_CLASS_EDITOR) { if (instance->instanceClass == ES_INSTANCE_CLASS_EDITOR) {
EsMenuAddSeparator(menu); EsMenuAddSeparator(menu);
if (instance->commandSave.disabled && !newDocument) { if (!instance->commandSave.enabled && !newDocument) {
EsMenuAddItem(menu, ES_ELEMENT_DISABLED, INTERFACE_STRING(CommonFileUnchanged)); EsMenuAddItem(menu, ES_ELEMENT_DISABLED, INTERFACE_STRING(CommonFileUnchanged));
} else { } else {
EsMenuAddCommand(menu, ES_FLAGS_DEFAULT, INTERFACE_STRING(CommonFileSave), &instance->commandSave); EsMenuAddCommand(menu, ES_FLAGS_DEFAULT, INTERFACE_STRING(CommonFileSave), &instance->commandSave);
@ -6905,7 +6905,7 @@ bool UIHandleKeyMessage(EsWindow *window, EsMessage *message) {
for (uintptr_t i = 0; i < instance->commands.Count(); i++) { for (uintptr_t i = 0; i < instance->commands.Count(); i++) {
EsCommand *command = instance->commands[i]; EsCommand *command = instance->commands[i];
if (!command->cKeyboardShortcut || command->disabled) continue; if (!command->cKeyboardShortcut || !command->enabled) continue;
const char *position = EsCRTstrstr(command->cKeyboardShortcut, keyboardShortcutString); const char *position = EsCRTstrstr(command->cKeyboardShortcut, keyboardShortcutString);
if (!position) continue; if (!position) continue;

5
desktop/os.header
View File

@ -1393,11 +1393,12 @@ function_pointer void EsCommandCallback(ES_INSTANCE_TYPE *instance, EsElement *e
struct EsCommand { struct EsCommand {
EsElement **elements; EsElement **elements;
EsCommandCallback callback; EsCommandCallback callback;
bool disabled, registered, allocated; bool enabled, registered, allocated;
EsCheckState check; EsCheckState check;
uint32_t stableID; uint32_t stableID;
EsCString cKeyboardShortcut; EsCString cKeyboardShortcut;
EsGeneric data; EsGeneric data;
STRING title;
}; };
struct EsListViewColumn { struct EsListViewColumn {
@ -2298,7 +2299,7 @@ function ES_INSTANCE_TYPE *EsUndoGetInstance(EsUndoManager *manager);
function void EsCommandAddButton(EsCommand *command, EsButton *button); function void EsCommandAddButton(EsCommand *command, EsButton *button);
function EsCommand *EsCommandByID(EsInstance *instance, uint32_t stableID); function EsCommand *EsCommandByID(EsInstance *instance, uint32_t stableID);
function EsCommand *EsCommandRegister(EsCommand *command, EsInstance *instance, EsCommandCallback callback, uint32_t stableID, EsCString cDefaultKeyboardShortcut = ES_NULL, bool enabled = false); // IDs >= 0xF0000000 reserved by the system. function EsCommand *EsCommandRegister(EsCommand *command, EsInstance *instance, STRING title, EsCommandCallback callback, uint32_t stableID, EsCString cDefaultKeyboardShortcut = ES_NULL, bool enabled = false); // IDs >= 0xF0000000 reserved by the system.
function void EsCommandSetCallback(EsCommand *command, EsCommandCallback callback); function void EsCommandSetCallback(EsCommand *command, EsCommandCallback callback);
function void EsCommandSetDisabled(EsCommand *command, bool disabled); function void EsCommandSetDisabled(EsCommand *command, bool disabled);
function void EsCommandSetCheck(EsCommand *command, EsCheckState check, bool sendUpdatedMessage); function void EsCommandSetCheck(EsCommand *command, EsCheckState check, bool sendUpdatedMessage);

3
shared/strings.cpp
View File

@ -298,6 +298,9 @@ DEFINE_INTERFACE_STRING(FileManagerRefresh, "Refresh");
DEFINE_INTERFACE_STRING(FileManagerListContextActions, "Actions"); DEFINE_INTERFACE_STRING(FileManagerListContextActions, "Actions");
DEFINE_INTERFACE_STRING(FileManagerCopyTask, "Copying" ELLIPSIS); DEFINE_INTERFACE_STRING(FileManagerCopyTask, "Copying" ELLIPSIS);
DEFINE_INTERFACE_STRING(FileManagerMoveTask, "Moving" ELLIPSIS); DEFINE_INTERFACE_STRING(FileManagerMoveTask, "Moving" ELLIPSIS);
DEFINE_INTERFACE_STRING(FileManagerGoBack, "Go back");
DEFINE_INTERFACE_STRING(FileManagerGoForwards, "Go forwards");
DEFINE_INTERFACE_STRING(FileManagerGoUp, "Go to containing folder");
// 2048. // 2048.