Changes in uspace/app/nav/menu.c [f6304727:accdf882] in mainline

File:

• uspace/app/nav/menu.c (modified) (8 diffs)

uspace/app/nav/menu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2026 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -54 +54 @@
         nav_menu_t *menu;
         ui_menu_t *mfile;
-        ui_menu_entry_t *mnew;
-        ui_menu_entry_t *mnewdir;
         ui_menu_entry_t *mopen;
         ui_menu_entry_t *medit;
-        ui_menu_entry_t *mverify;
-        ui_menu_entry_t *mcopy;
-        ui_menu_entry_t *mrename;
-        ui_menu_entry_t *mmove;
-        ui_menu_entry_t *mdelete;
         ui_menu_entry_t *mfsep;
         ui_menu_entry_t *mexit;
+        gfx_rect_t arect;
+        gfx_rect_t rect;
         errno_t rc;
 
@@ -83 +78 @@
                 goto error;
 
-        rc = ui_menu_entry_create(mfile, "~N~ew File", "Ctrl-M", &mnew);
-        if (rc != EOK)
-                goto error;
-
-        ui_menu_entry_set_cb(mnew, nav_menu_file_new_file, (void *) menu);
-
-        rc = ui_menu_entry_create(mfile, "New D~i~rectory", "Ctrl-N", &mnewdir);
-        if (rc != EOK)
-                goto error;
-
-        ui_menu_entry_set_cb(mnewdir, nav_menu_file_new_dir, (void *) menu);
-
         rc = ui_menu_entry_create(mfile, "~O~pen", "Enter", &mopen);
         if (rc != EOK)
@@ -107 +90 @@
         ui_menu_entry_set_cb(medit, nav_menu_file_edit, (void *) menu);
 
-        rc = ui_menu_entry_create(mfile, "~V~erify", "Ctrl-V", &mverify);
-        if (rc != EOK)
-                goto error;
-
-        ui_menu_entry_set_cb(mverify, nav_menu_file_verify, (void *) menu);
-
-        rc = ui_menu_entry_create(mfile, "~C~opy", "Ctrl-C", &mcopy);
-        if (rc != EOK)
-                goto error;
-
-        ui_menu_entry_set_cb(mcopy, nav_menu_file_copy, (void *) menu);
-
-        rc = ui_menu_entry_create(mfile, "~R~ename", "Ctrl-R", &mrename);
-        if (rc != EOK)
-                goto error;
-
-        ui_menu_entry_set_cb(mrename, nav_menu_file_rename, (void *) menu);
-
-        rc = ui_menu_entry_create(mfile, "~M~ove", "Ctrl-X", &mmove);
-        if (rc != EOK)
-                goto error;
-
-        ui_menu_entry_set_cb(mmove, nav_menu_file_move, (void *) menu);
-
-        rc = ui_menu_entry_create(mfile, "~D~elete", "Ctrl-D", &mdelete);
-        if (rc != EOK)
-                goto error;
-
-        ui_menu_entry_set_cb(mdelete, nav_menu_file_delete, (void *) menu);
-
         rc = ui_menu_entry_sep_create(mfile, &mfsep);
         if (rc != EOK)
@@ -146 +99 @@
 
         ui_menu_entry_set_cb(mexit, nav_menu_file_exit, (void *) menu);
-        nav_menu_resize(menu);
-
-        *rmenu = menu;
-        return EOK;
-error:
-        nav_menu_destroy(menu);
-        return rc;
-}
-
-/** Resize navigator menu.
- *
- * @param menu Menu
- */
-void nav_menu_resize(nav_menu_t *menu)
-{
-        gfx_rect_t arect;
-        gfx_rect_t rect;
 
         ui_window_get_app_rect(menu->window, &arect);
@@ -170 +106 @@
         rect.p1.y = arect.p0.y + 1;
         ui_menu_bar_set_rect(menu->menubar, &rect);
+
+        *rmenu = menu;
+        return EOK;
+error:
+        nav_menu_destroy(menu);
+        return rc;
 }
 
@@ -206 +148 @@
 }
 
-/** File / New File menu entry selected.
- *
- * @param mentry Menu entry
- * @param arg Argument (navigator_t *)
- */
-void nav_menu_file_new_file(ui_menu_entry_t *mentry, void *arg)
-{
-        nav_menu_t *menu = (nav_menu_t *)arg;
-
-        if (menu->cb != NULL && menu->cb->file_new_file != NULL)
-                menu->cb->file_new_file(menu->cb_arg);
-}
-
-/** File / New Directory menu entry selected.
- *
- * @param mentry Menu entry
- * @param arg Argument (navigator_t *)
- */
-void nav_menu_file_new_dir(ui_menu_entry_t *mentry, void *arg)
-{
-        nav_menu_t *menu = (nav_menu_t *)arg;
-
-        if (menu->cb != NULL && menu->cb->file_new_dir != NULL)
-                menu->cb->file_new_dir(menu->cb_arg);
-}
-
 /** File / Open menu entry selected.
  *
@@ -258 +174 @@
 }
 
-/** File / Verify menu entry selected.
- *
- * @param mentry Menu entry
- * @param arg Argument (navigator_t *)
- */
-void nav_menu_file_verify(ui_menu_entry_t *mentry, void *arg)
-{
-        nav_menu_t *menu = (nav_menu_t *)arg;
-
-        if (menu->cb != NULL && menu->cb->file_verify != NULL)
-                menu->cb->file_verify(menu->cb_arg);
-}
-
-/** File / Copy menu entry selected.
- *
- * @param mentry Menu entry
- * @param arg Argument (navigator_t *)
- */
-void nav_menu_file_copy(ui_menu_entry_t *mentry, void *arg)
-{
-        nav_menu_t *menu = (nav_menu_t *)arg;
-
-        if (menu->cb != NULL && menu->cb->file_copy != NULL)
-                menu->cb->file_copy(menu->cb_arg);
-}
-
-/** File / Rename menu entry selected.
- *
- * @param mentry Menu entry
- * @param arg Argument (navigator_t *)
- */
-void nav_menu_file_rename(ui_menu_entry_t *mentry, void *arg)
-{
-        nav_menu_t *menu = (nav_menu_t *)arg;
-
-        if (menu->cb != NULL && menu->cb->file_rename != NULL)
-                menu->cb->file_rename(menu->cb_arg);
-}
-
-/** File / Move menu entry selected.
- *
- * @param mentry Menu entry
- * @param arg Argument (navigator_t *)
- */
-void nav_menu_file_move(ui_menu_entry_t *mentry, void *arg)
-{
-        nav_menu_t *menu = (nav_menu_t *)arg;
-
-        if (menu->cb != NULL && menu->cb->file_move != NULL)
-                menu->cb->file_move(menu->cb_arg);
-}
-
-/** File / Delete menu entry selected.
- *
- * @param mentry Menu entry
- * @param arg Argument (navigator_t *)
- */
-void nav_menu_file_delete(ui_menu_entry_t *mentry, void *arg)
-{
-        nav_menu_t *menu = (nav_menu_t *)arg;
-
-        if (menu->cb != NULL && menu->cb->file_delete != NULL)
-                menu->cb->file_delete(menu->cb_arg);
-}
-
 /** File / Exit menu entry selected.
  *