Changeset 5e758e4 in mainline

Timestamp:

2023-11-19T12:22:11Z (6 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, topic/simplify-dev-export

Children:

69935a8

Parents:

e8a6279f

Message:

When start menu entry is edited, editor list needs updating

We need to update the entry caption in the UI list to reflect
any changes made while the entry was being edited.

Location:

uspace

Files:

• app/taskbar-cfg/smeedit.c (modified) (3 diffs)
• app/taskbar-cfg/startmenu.c (modified) (1 diff)
• app/taskbar-cfg/startmenu.h (modified) (1 diff)
• lib/ui/include/ui/list.h (modified) (1 diff)
• lib/ui/src/list.c (modified) (1 diff)
• lib/ui/test/list.c (modified) (1 diff)

uspace/app/taskbar-cfg/smeedit.c

@@ -41 +41 @@
 #include "taskbar-cfg.h"
 #include "smeedit.h"
+#include "startmenu.h"
 
 static void wnd_close(ui_window_t *, void *);
@@ -111 +112 @@
         }
 
+        smee->startmenu = smenu;
         smee->smentry = smentry;
 
@@ -361 +363 @@
 
         (void)smenu_entry_save(smee->smentry->entry);
-
+        startmenu_entry_update(smee->smentry);
         smeedit_destroy(smee);
 }

uspace/app/taskbar-cfg/startmenu.c

@@ -398 +398 @@
 }
 
+/** Update start menu entry caption.
+ *
+ * When editing an entry the entry's label might change. We need
+ * to update the list entry caption to reflect that.
+ *
+ * @param entry Start menu entry
+ */
+errno_t startmenu_entry_update(startmenu_entry_t *entry)
+{
+        return ui_list_entry_set_caption(entry->lentry,
+            smenu_entry_get_caption(entry->entry));
+}
+
 /** Entry in entry list is selected.
  *

uspace/app/taskbar-cfg/startmenu.h

@@ -48 +48 @@
 extern startmenu_entry_t *startmenu_get_selected(startmenu_t *);
 extern void startmenu_edit(startmenu_t *);
+extern errno_t startmenu_entry_update(startmenu_entry_t *);
 
 #endif

uspace/lib/ui/include/ui/list.h

@@ -60 +60 @@
 extern void *ui_list_entry_get_arg(ui_list_entry_t *);
 extern ui_list_t *ui_list_entry_get_list(ui_list_entry_t *);
+extern errno_t ui_list_entry_set_caption(ui_list_entry_t *, const char *);
 extern size_t ui_list_entries_cnt(ui_list_t *);
 extern errno_t ui_list_sort(ui_list_t *);

uspace/lib/ui/src/list.c

@@ -800 +800 @@
 }
 
+/** Change list entry caption.
+ *
+ * @param entry UI list entry
+ * @param caption New caption
+ *
+ * @return EOK on success, ENOMEM if out of memory
+ */
+errno_t ui_list_entry_set_caption(ui_list_entry_t *entry, const char *caption)
+{
+        char *dcaption;
+
+        dcaption = str_dup(caption);
+        if (dcaption == NULL)
+                return ENOMEM;
+
+        free(entry->caption);
+        entry->caption = dcaption;
+
+        (void)ui_list_entry_paint(entry, ui_list_entry_get_idx(entry));
+        return EOK;
+}
+
 /** Clear UI list entry list.
  *

uspace/lib/ui/test/list.c

@@ -1039 +1039 @@
 }
 
+/** ui_list_entry_set_caption() sets entry captino */
+PCUT_TEST(entry_set_caption)
+{
+        ui_t *ui;
+        ui_window_t *window;
+        ui_wnd_params_t params;
+        ui_list_t *list;
+        ui_list_entry_attr_t attr;
+        ui_list_entry_t *entry;
+        errno_t rc;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Test";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_list_create(window, true, &list);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_list_entry_attr_init(&attr);
+
+        /* Append entry and get pointer to it */
+        attr.caption = "a";
+        attr.arg = (void *)1;
+        entry = NULL;
+        rc = ui_list_entry_append(list, &attr, &entry);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(entry);
+
+        /* Change caption */
+        rc = ui_list_entry_set_caption(entry, "b");
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_STR_EQUALS("b", entry->caption);
+
+        ui_list_destroy(list);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
 /** ui_list_entries_cnt() returns the number of entries */
 PCUT_TEST(entries_cnt)