Mercurial > hg > toolkit / file diff

--- a/ui/cocoa/stock.m	Wed Apr 02 09:59:38 2014 +0200
+++ b/ui/cocoa/stock.m	Wed Apr 02 13:21:11 2014 +0200
@@ -36,21 +36,22 @@
 void ui_stock_init() {
     stock_items = ucx_map_new(64);
     
-    ui_add_stock_item(UI_STOCK_NEW, @"New", nil);
-    ui_add_stock_item(UI_STOCK_OPEN, @"Open", nil);
-    ui_add_stock_item(UI_STOCK_SAVE, @"Save", nil);
-    ui_add_stock_item(UI_STOCK_SAVE_AS, @"Save as ...", nil);
-    ui_add_stock_item(UI_STOCK_CLOSE, @"Close", nil);
-    ui_add_stock_item(UI_STOCK_UNDO, @"Undo", nil);
-    ui_add_stock_item(UI_STOCK_REDO, @"Redo", nil);
+    ui_add_stock_item(UI_STOCK_NEW, @"New", @"n", nil);
+    ui_add_stock_item(UI_STOCK_OPEN, @"Open", @"o", nil);
+    ui_add_stock_item(UI_STOCK_SAVE, @"Save", @"s", nil);
+    ui_add_stock_item(UI_STOCK_SAVE_AS, @"Save as ...", @"", nil);
+    ui_add_stock_item(UI_STOCK_CLOSE, @"Close", @"w", nil);
+    ui_add_stock_item(UI_STOCK_UNDO, @"Undo", @"z", nil);
+    ui_add_stock_item(UI_STOCK_REDO, @"Redo", @"", nil);
     
-    ui_add_stock_item(UI_STOCK_GO_BACK, @"Back", [NSImage imageNamed: NSImageNameGoLeftTemplate]);
-    ui_add_stock_item(UI_STOCK_GO_FORWARD, @"Forward", [NSImage imageNamed: NSImageNameGoRightTemplate]);
+    ui_add_stock_item(UI_STOCK_GO_BACK, @"Back", @"", [NSImage imageNamed: NSImageNameGoLeftTemplate]);
+    ui_add_stock_item(UI_STOCK_GO_FORWARD, @"Forward", @"", [NSImage imageNamed: NSImageNameGoRightTemplate]);
 }
 
-void ui_add_stock_item(char *stock_id, NSString *label, NSImage *image) {
+void ui_add_stock_item(char *stock_id, NSString *label, NSString *keyEquivalent, NSImage *image) {
     UiStockItem *i = malloc(sizeof(UiStockItem));
     i->label = label;
+    i->keyEquivalent = keyEquivalent;
     i->image = image;
     
     ucx_map_cstr_put(stock_items, stock_id, i);