Changeset f87ff8e in mainline

Timestamp:

2023-12-19T16:19:24Z (4 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, topic/simplify-dev-export

Children:

550ed86, dc5c303

Parents:

82d3c28

Message:

Creating new start menu entry

Location:

uspace

Files:

• app/taskbar-cfg/smeedit.c (modified) (2 diffs)
• app/taskbar-cfg/startmenu.c (modified) (2 diffs)
• app/taskbar-cfg/startmenu.h (modified) (1 diff)
• lib/tbarcfg/src/tbarcfg.c (modified) (1 diff)

uspace/app/taskbar-cfg/smeedit.c

@@ -116 +116 @@
 
         ui_wnd_params_init(&params);
-        params.caption = "Edit Start Menu Entry";
+        params.caption = smentry != NULL ? "Edit Start Menu Entry"
+            : "Create Start Menu Entry";
         if (ui_is_textmode(ui)) {
                 params.rect.p0.x = 0;
@@ -354 +355 @@
         caption = ui_entry_get_text(smee->ecaption);
 
-        rc = smenu_entry_set_cmd(smee->smentry->entry, cmd);
-        if (rc != EOK)
-                return;
-
-        smenu_entry_set_caption(smee->smentry->entry, caption);
-        if (rc != EOK)
-                return;
-
-        (void)smenu_entry_save(smee->smentry->entry);
-        startmenu_entry_update(smee->smentry);
+        if (smee->smentry == NULL) {
+                /* Create new entry */
+                rc = smenu_entry_create(smee->startmenu->tbarcfg->tbarcfg,
+                    caption, cmd);
+                if (rc != EOK)
+                        return;
+        } else {
+                /* Edit existing entry */
+
+
+                rc = smenu_entry_set_cmd(smee->smentry->entry, cmd);
+                if (rc != EOK)
+                        return;
+
+                smenu_entry_set_caption(smee->smentry->entry, caption);
+                if (rc != EOK)
+                        return;
+
+                (void)smenu_entry_save(smee->smentry->entry);
+                startmenu_entry_update(smee->smentry);
+        }
+
         smeedit_destroy(smee);
 }

uspace/app/taskbar-cfg/startmenu.c

@@ -379 +379 @@
 }
 
+/** Create new menu entry.
+ *
+ * @param smenu Start menu
+ */
+void startmenu_new_entry(startmenu_t *smenu)
+{
+        smeedit_t *smee;
+        errno_t rc;
+
+        rc = smeedit_create(smenu, NULL, &smee);
+        if (rc != EOK)
+                return;
+
+        (void)smee;
+}
+
 /** Edit selected menu entry.
  *
@@ -431 +447 @@
 static void startmenu_new_entry_clicked(ui_pbutton_t *pbutton, void *arg)
 {
+        startmenu_t *smenu = (startmenu_t *)arg;
+
         (void)pbutton;
-        (void)arg;
+        startmenu_new_entry(smenu);
 }
 

uspace/app/taskbar-cfg/startmenu.h

@@ -47 +47 @@
     startmenu_entry_t **);
 extern startmenu_entry_t *startmenu_get_selected(startmenu_t *);
+extern void startmenu_new_entry(startmenu_t *);
 extern void startmenu_edit(startmenu_t *);
 extern errno_t startmenu_entry_update(startmenu_entry_t *);

uspace/lib/tbarcfg/src/tbarcfg.c

@@ -405 +405 @@
                 goto error;
 
+        rc = sif_node_set_attr(trans, nentry, "cmd", cmd);
+        if (rc != EOK)
+                goto error;
+
+        rc = sif_node_set_attr(trans, nentry, "caption", caption);
+        if (rc != EOK)
+                goto error;
+
         rc = smenu_entry_new(smenu, nentry, caption, cmd);
         if (rc != EOK)