diff -r db95c0104937 -r 06be29a56f8b ui/motif/stock.c --- a/ui/motif/stock.c Tue Apr 01 13:47:29 2014 +0200 +++ b/ui/motif/stock.c Wed Apr 02 09:59:38 2014 +0200 @@ -37,20 +37,22 @@ void ui_stock_init() { stock_items = ucx_map_new(64); - ui_add_stock_item(UI_STOCK_NEW, "New", NULL); - ui_add_stock_item(UI_STOCK_OPEN, "Open", NULL); - ui_add_stock_item(UI_STOCK_SAVE, "Save", NULL); - ui_add_stock_item(UI_STOCK_SAVE_AS, "Save as ...", NULL); - ui_add_stock_item(UI_STOCK_CLOSE, "Close", NULL); - ui_add_stock_item(UI_STOCK_UNDO, "Undo", NULL); - ui_add_stock_item(UI_STOCK_REDO, "Redo", NULL); - ui_add_stock_item(UI_STOCK_GO_BACK, "Back", NULL); - ui_add_stock_item(UI_STOCK_GO_FORWARD, "Forward", NULL); + ui_add_stock_item(UI_STOCK_NEW, "New", "CtrlN", "Ctrl+N", NULL); + ui_add_stock_item(UI_STOCK_OPEN, "Open", "CtrlO", "Ctrl+O", NULL); + ui_add_stock_item(UI_STOCK_SAVE, "Save", "CtrlS", "Ctrl+S", NULL); + ui_add_stock_item(UI_STOCK_SAVE_AS, "Save as ...", NULL, NULL, NULL); + ui_add_stock_item(UI_STOCK_CLOSE, "Close", "CtrlW", "Ctrl+W", NULL); + ui_add_stock_item(UI_STOCK_UNDO, "Undo", "CtrlZ", "Ctrl+Z", NULL); + ui_add_stock_item(UI_STOCK_REDO, "Redo", NULL, NULL, NULL); + ui_add_stock_item(UI_STOCK_GO_BACK, "Back", NULL, NULL, NULL); + ui_add_stock_item(UI_STOCK_GO_FORWARD, "Forward", NULL, NULL, NULL); } -void ui_add_stock_item(char *id, char *label, void *icon) { +void ui_add_stock_item(char *id, char *label, char *accelerator, char *accelerator_label, void *icon) { UiStockItem *i = malloc(sizeof(UiStockItem)); i->label = label; + i->accelerator = accelerator; + i->accelerator_label = accelerator_label; // TODO: icon ucx_map_cstr_put(stock_items, id, i);