Changeset cd0dce3 in mainline for uspace/app

Timestamp:

2026-02-11T23:17:49Z (5 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

00d26202

Parents:

f9c30b9a

Message:

Create new directory (Navigator + command line utility).

Location:

uspace/app

Files:

• meson.build (modified) (1 diff)
• nav/dlg/newdirdlg.c (added)
• nav/dlg/newdirdlg.h (added)
• nav/menu.c (modified) (3 diffs)
• nav/menu.h (modified) (1 diff)
• nav/meson.build (modified) (5 diffs)
• nav/nav.c (modified) (5 diffs)
• nav/newdir.c (added)
• nav/newdir.h (added)
• nav/test/dlg/newdirdlg.c (added)
• nav/types/dlg/newdirdlg.h (added)
• nav/types/menu.h (modified) (1 diff)
• nav/types/newdir.h (added)
• newdir/doc/doxygroups.h (added)
• newdir/meson.build (added)
• newdir/newdir.c (added)

uspace/app/meson.build

@@ -72 +72 @@
         'nav',
         'netecho',
+        'newdir',
         'newfile',
         'nic',

uspace/app/nav/menu.c

@@ -55 +55 @@
         ui_menu_t *mfile;
         ui_menu_entry_t *mnew;
+        ui_menu_entry_t *mnewdir;
         ui_menu_entry_t *mopen;
         ui_menu_entry_t *medit;
@@ -88 +89 @@
         ui_menu_entry_set_cb(mnew, nav_menu_file_new_file, (void *) menu);
 
+        rc = ui_menu_entry_create(mfile, "New Di~r~ectory", "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)
@@ -189 +196 @@
 }
 
+/** 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.
  *

uspace/app/nav/menu.h

@@ -46 +46 @@
 extern void nav_menu_destroy(nav_menu_t *);
 extern ui_control_t *nav_menu_ctl(nav_menu_t *);
+extern void nav_menu_file_new_dir(ui_menu_entry_t *, void *);
 extern void nav_menu_file_new_file(ui_menu_entry_t *, void *);
 extern void nav_menu_file_open(ui_menu_entry_t *, void *);

uspace/app/nav/meson.build

@@ -33 +33 @@
         'dlg/ioerrdlg.c',
         'dlg/movedlg.c',
+        'dlg/newdirdlg.c',
         'dlg/newfiledlg.c',
         'dlg/progress.c',
@@ -41 +42 @@
         'move.c',
         'nav.c',
+        'newdir.c',
         'newfile.c',
         'panel.c',
@@ -51 +53 @@
         'dlg/ioerrdlg.c',
         'dlg/movedlg.c',
+        'dlg/newdirdlg.c',
         'dlg/newfiledlg.c',
         'dlg/progress.c',
@@ -58 +61 @@
         'move.c',
         'nav.c',
+        'newdir.c',
         'newfile.c',
         'panel.c',
@@ -65 +69 @@
         'test/dlg/ioerrdlg.c',
         'test/dlg/movedlg.c',
+        'test/dlg/newdirdlg.c',
         'test/dlg/newfiledlg.c',
         'test/dlg/progress.c',

uspace/app/nav/nav.c

@@ -53 +53 @@
 #include "menu.h"
 #include "move.h"
+#include "newdir.h"
 #include "newfile.h"
 #include "nav.h"
@@ -69 +70 @@
 
 static void navigator_file_new_file(void *);
+static void navigator_file_new_dir(void *);
 static void navigator_file_open(void *);
 static void navigator_file_edit(void *);
@@ -78 +80 @@
 static nav_menu_cb_t navigator_menu_cb = {
         .file_new_file = navigator_file_new_file,
+        .file_new_dir = navigator_file_new_dir,
         .file_open = navigator_file_open,
         .file_edit = navigator_file_edit,
@@ -153 +156 @@
                 case KC_M:
                         navigator_new_file_dlg(navigator);
+                        break;
+                case KC_N:
+                        navigator_new_dir_dlg(navigator);
                         break;
                 case KC_E:
@@ -448 +454 @@
 }
 
+/** File / New Directory menu entry selected */
+static void navigator_file_new_dir(void *arg)
+{
+        navigator_t *navigator = (navigator_t *)arg;
+
+        navigator_new_dir_dlg(navigator);
+}
+
 /** File / Open menu entry selected */
 static void navigator_file_open(void *arg)

uspace/app/nav/types/menu.h

@@ -45 +45 @@
         /** File / New File */
         void (*file_new_file)(void *);
+        /** File / New Directory */
+        void (*file_new_dir)(void *);
         /** File / Open */
         void (*file_open)(void *);