Changeset b8b64a8 in mainline for uspace/app

Timestamp:

2021-04-12T15:52:12Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6186f9f

Parents:

d65accb

Message:

Add column with keyboard shortcuts to menu

Location:

uspace/app

Files:

• calculator/calculator.c (modified) (3 diffs)
• uidemo/uidemo.c (modified) (2 diffs)

uspace/app/calculator/calculator.c

@@ -899 +899 @@
         }
 
-        rc = ui_menu_entry_create(mfile, "Exit", &mexit);
+        rc = ui_menu_entry_create(mfile, "Exit", "Alt-F4", &mexit);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -913 +913 @@
         }
 
-        rc = ui_menu_entry_create(medit, "Copy", &mcopy);
+        rc = ui_menu_entry_create(medit, "Copy", "Ctrl-C", &mcopy);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -921 +921 @@
         ui_menu_entry_set_cb(mcopy, calc_edit_copy, (void *) &calc);
 
-        rc = ui_menu_entry_create(medit, "Paste", &mpaste);
+        rc = ui_menu_entry_create(medit, "Paste", "Ctrl-V", &mpaste);
         if (rc != EOK) {
                 printf("Error creating menu.\n");

uspace/app/uidemo/uidemo.c

@@ -269 +269 @@
         }
 
-        rc = ui_menu_entry_create(demo.mfile, "Foo", &mfoo);
-        if (rc != EOK) {
-                printf("Error creating menu.\n");
-                return rc;
-        }
-
-        rc = ui_menu_entry_create(demo.mfile, "Bar", &mbar);
-        if (rc != EOK) {
-                printf("Error creating menu.\n");
-                return rc;
-        }
-
-        rc = ui_menu_entry_create(demo.mfile, "Foobar", &mfoobar);
-        if (rc != EOK) {
-                printf("Error creating menu.\n");
-                return rc;
-        }
-
-        rc = ui_menu_entry_create(demo.mfile, "Exit", &mexit);
+        rc = ui_menu_entry_create(demo.mfile, "Foo", "Ctrl-Alt-Del", &mfoo);
+        if (rc != EOK) {
+                printf("Error creating menu.\n");
+                return rc;
+        }
+
+        rc = ui_menu_entry_create(demo.mfile, "Bar", "", &mbar);
+        if (rc != EOK) {
+                printf("Error creating menu.\n");
+                return rc;
+        }
+
+        rc = ui_menu_entry_create(demo.mfile, "Foobar", "", &mfoobar);
+        if (rc != EOK) {
+                printf("Error creating menu.\n");
+                return rc;
+        }
+
+        rc = ui_menu_entry_create(demo.mfile, "Exit", "Alt-F4", &mexit);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -313 +313 @@
         }
 
-        rc = ui_menu_entry_create(demo.mhelp, "About", &mabout);
+        rc = ui_menu_entry_create(demo.mhelp, "About", "Ctrl-H, F1", &mabout);
         if (rc != EOK) {
                 printf("Error creating menu.\n");