Changeset 46bd63c9 in mainline for uspace/app

Timestamp:

2023-09-08T08:47:30Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1af103e

Parents:

0b6fad9

git-author:

Jiri Svoboda <jiri@…> (2023-09-07 18:47:09)

git-committer:

Jiri Svoboda <jiri@…> (2023-09-08 08:47:30)

Message:

Split drop-down menu into two classes: drop-down and menu

Naming is clearly the hardest problem in computer science.

Location:

uspace/app

Files:

• calculator/calculator.c (modified) (4 diffs)
• edit/edit.c (modified) (5 diffs)
• nav/menu.c (modified) (3 diffs)
• uidemo/uidemo.c (modified) (5 diffs)

uspace/app/calculator/calculator.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2016 Martin Decky
  * All rights reserved.
@@ -46 +46 @@
 #include <ui/entry.h>
 #include <ui/fixed.h>
+#include <ui/menu.h>
 #include <ui/menubar.h>
-#include <ui/menu.h>
+#include <ui/menudd.h>
 #include <ui/menuentry.h>
 #include <ui/pbutton.h>
@@ -896 +897 @@
         }
 
-        rc = ui_menu_create(calc.menubar, "~F~ile", &mfile);
+        rc = ui_menu_dd_create(calc.menubar, "~F~ile", NULL, &mfile);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -910 +911 @@
         ui_menu_entry_set_cb(mexit, calc_file_exit, (void *) &calc);
 
-        rc = ui_menu_create(calc.menubar, "~E~dit", &medit);
+        rc = ui_menu_dd_create(calc.menubar, "~E~dit", NULL, &medit);
         if (rc != EOK) {
                 printf("Error creating menu.\n");

uspace/app/edit/edit.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2012 Martin Sucha
  * All rights reserved.
@@ -60 +60 @@
 #include <ui/menu.h>
 #include <ui/menubar.h>
+#include <ui/menudd.h>
 #include <ui/menuentry.h>
 #include <ui/promptdialog.h>
@@ -430 +431 @@
         }
 
-        rc = ui_menu_create(edit->menubar, "~F~ile", &mfile);
+        rc = ui_menu_dd_create(edit->menubar, "~F~ile", NULL, &mfile);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -466 +467 @@
         ui_menu_entry_set_cb(mexit, edit_file_exit, (void *) edit);
 
-        rc = ui_menu_create(edit->menubar, "~E~dit", &medit);
+        rc = ui_menu_dd_create(edit->menubar, "~E~dit", NULL, &medit);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -518 +519 @@
         ui_menu_entry_set_cb(mselall, edit_edit_select_all, (void *) edit);
 
-        rc = ui_menu_create(edit->menubar, "~S~earch", &msearch);
+        rc = ui_menu_dd_create(edit->menubar, "~S~earch", NULL, &msearch);
         if (rc != EOK) {
                 printf("Error creating menu.\n");

uspace/app/nav/menu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <ui/menu.h>
 #include <ui/menubar.h>
+#include <ui/menudd.h>
 #include <ui/menuentry.h>
 #include "menu.h"
@@ -72 +73 @@
                 goto error;
 
-        rc = ui_menu_create(menu->menubar, "~F~ile", &mfile);
+        rc = ui_menu_dd_create(menu->menubar, "~F~ile", NULL, &mfile);
         if (rc != EOK)
                 goto error;

uspace/app/uidemo/uidemo.c

@@ -45 +45 @@
 #include <ui/label.h>
 #include <ui/list.h>
+#include <ui/menu.h>
 #include <ui/menubar.h>
+#include <ui/menudd.h>
 #include <ui/menuentry.h>
-#include <ui/menu.h>
 #include <ui/msgdialog.h>
 #include <ui/pbutton.h>
@@ -764 +765 @@
         }
 
-        rc = ui_menu_create(demo.mbar, "~F~ile", &demo.mfile);
+        rc = ui_menu_dd_create(demo.mbar, "~F~ile", NULL, &demo.mfile);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -818 +819 @@
         ui_menu_entry_set_cb(mexit, uidemo_file_exit, (void *) &demo);
 
-        rc = ui_menu_create(demo.mbar, "~E~dit", &demo.medit);
+        rc = ui_menu_dd_create(demo.mbar, "~E~dit", NULL, &demo.medit);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -842 +843 @@
             (void *) &demo);
 
-        rc = ui_menu_create(demo.mbar, "~P~references", &demo.mpreferences);
+        rc = ui_menu_dd_create(demo.mbar, "~P~references", NULL,
+            &demo.mpreferences);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -848 +850 @@
         }
 
-        rc = ui_menu_create(demo.mbar, "~H~elp", &demo.mhelp);
+        rc = ui_menu_dd_create(demo.mbar, "~H~elp", NULL, &demo.mhelp);
         if (rc != EOK) {
                 printf("Error creating menu.\n");