Changeset 2b4e02b in mainline

Timestamp:

2023-12-19T15:48:48Z (13 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, topic/simplify-dev-export

Children:

21a65cca

Parents:

f393bc0

Message:

Deleting start menu entry

Location:

uspace

Files:

• app/taskbar-cfg/startmenu.c (modified) (4 diffs)
• lib/tbarcfg/src/tbarcfg.c (modified) (1 diff)
• lib/tbarcfg/test/tbarcfg.c (modified) (1 diff)

uspace/app/taskbar-cfg/startmenu.c

@@ -366 +366 @@
  *
  * @param smenu Start menu
- * @return Selected entry
+ * @return Selected entry or @c NULL if no entry is selected
  */
 startmenu_entry_t *startmenu_get_selected(startmenu_t *smenu)
@@ -373 +373 @@
 
         entry = ui_list_get_cursor(smenu->entries_list);
+        if (entry == NULL)
+                return NULL;
+
         return (startmenu_entry_t *)ui_list_entry_get_arg(entry);
 }
@@ -387 +390 @@
 
         smentry = startmenu_get_selected(smenu);
+        if (smentry == NULL)
+                return;
 
         rc = smeedit_create(smenu, smentry, &smee);
@@ -437 +442 @@
 static void startmenu_delete_entry_clicked(ui_pbutton_t *pbutton, void *arg)
 {
+        startmenu_t *smenu = (startmenu_t *)arg;
+        startmenu_entry_t *smentry;
+        errno_t rc;
+
         (void)pbutton;
-        (void)arg;
+
+        smentry = startmenu_get_selected(smenu);
+        if (smentry == NULL)
+                return;
+
+        rc = smenu_entry_destroy(smentry->entry);
+        if (rc != EOK)
+                return;
+
+        ui_list_entry_delete(smentry->lentry);
+        free(smentry);
+        (void) ui_control_paint(ui_list_ctl(smenu->entries_list));
 }
 

uspace/lib/tbarcfg/src/tbarcfg.c

@@ -441 +441 @@
 
         smenu_entry_delete(entry);
+        return EOK;
 error:
         if (trans != NULL)

uspace/lib/tbarcfg/test/tbarcfg.c

@@ -216 +216 @@
 }
 
+/** Destroy start menu entry */
+PCUT_TEST(entry_destroy)
+{
+        errno_t rc;
+        tbarcfg_t *tbcfg;
+        char fname[L_tmpnam], *p;
+        smenu_entry_t *e;
+
+        p = tmpnam(fname);
+        PCUT_ASSERT_NOT_NULL(p);
+
+        rc = tbarcfg_create(fname, &tbcfg);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = smenu_entry_create(tbcfg, "A", "a");
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        e = tbarcfg_smenu_first(tbcfg);
+        PCUT_ASSERT_NOT_NULL(e);
+
+        rc = smenu_entry_destroy(e);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        e = tbarcfg_smenu_first(tbcfg);
+        PCUT_ASSERT_NULL(e);
+
+        tbarcfg_close(tbcfg);
+        remove(fname);
+}
+
 PCUT_EXPORT(tbarcfg);