Changeset e63e74a in mainline for uspace/app

Timestamp:

2024-02-21T20:26:35Z (20 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

95e2967

Parents:

5f3188b8

Message:

Start menu separator entry support

Location:

uspace/app

Files:

• taskbar-cfg/startmenu.c (modified) (12 diffs)
• taskbar-cfg/startmenu.h (modified) (2 diffs)
• taskbar-cfg/types/startmenu.h (modified) (1 diff)
• taskbar/tbsmenu.c (modified) (3 diffs)
• taskbar/tbsmenu.h (modified) (1 diff)

uspace/app/taskbar-cfg/startmenu.c

@@ -54 +54 @@
 static void startmenu_delete_entry_clicked(ui_pbutton_t *, void *);
 static void startmenu_edit_entry_clicked(ui_pbutton_t *, void *);
+static void startmenu_sep_entry_clicked(ui_pbutton_t *, void *);
 static void startmenu_up_entry_clicked(ui_pbutton_t *, void *);
 static void startmenu_down_entry_clicked(ui_pbutton_t *, void *);
@@ -75 +76 @@
 ui_pbutton_cb_t startmenu_edit_entry_button_cb = {
         .clicked = startmenu_edit_entry_clicked
+};
+
+/** Separator entry button callbacks */
+ui_pbutton_cb_t startmenu_sep_entry_button_cb = {
+        .clicked = startmenu_sep_entry_clicked
 };
 
@@ -275 +281 @@
             &startmenu_edit_entry_button_cb, (void *)smenu);
 
-        /* Move entry up button */
-
-        rc = ui_pbutton_create(ui_res, "Up", &smenu->up_entry);
+        /* Separator entry button */
+
+        rc = ui_pbutton_create(ui_res, "Separator", &smenu->sep_entry);
         if (rc != EOK) {
                 printf("Error creating button.\n");
@@ -285 +291 @@
         if (ui_resource_is_textmode(ui_res)) {
                 rect.p0.x = 58;
-                rect.p0.y = 12;
+                rect.p0.y = 11;
                 rect.p1.x = 68;
-                rect.p1.y = 13;
+                rect.p1.y = 12;
         } else {
                 rect.p0.x = 370;
-                rect.p0.y = 190;
+                rect.p0.y = 170;
                 rect.p1.x = 450;
-                rect.p1.y = 215;
-        }
-
-        ui_pbutton_set_rect(smenu->up_entry, &rect);
-
-        rc = ui_fixed_add(smenu->fixed, ui_pbutton_ctl(smenu->up_entry));
+                rect.p1.y = 195;
+        }
+
+        ui_pbutton_set_rect(smenu->sep_entry, &rect);
+
+        rc = ui_fixed_add(smenu->fixed, ui_pbutton_ctl(smenu->sep_entry));
         if (rc != EOK) {
                 printf("Error adding control to layout.\n");
@@ -303 +309 @@
         }
 
-        ui_pbutton_set_cb(smenu->up_entry,
-            &startmenu_up_entry_button_cb, (void *)smenu);
-
-        /* Move entry down button */
-
-        rc = ui_pbutton_create(ui_res, "Down", &smenu->down_entry);
+        ui_pbutton_set_cb(smenu->sep_entry,
+            &startmenu_sep_entry_button_cb, (void *)smenu);
+
+        /* Move entry up button */
+
+        rc = ui_pbutton_create(ui_res, "Up", &smenu->up_entry);
         if (rc != EOK) {
                 printf("Error creating button.\n");
@@ -316 +322 @@
         if (ui_resource_is_textmode(ui_res)) {
                 rect.p0.x = 58;
-                rect.p0.y = 14;
+                rect.p0.y = 13;
                 rect.p1.x = 68;
-                rect.p1.y = 15;
+                rect.p1.y = 14;
         } else {
                 rect.p0.x = 370;
@@ -324 +330 @@
                 rect.p1.x = 450;
                 rect.p1.y = 245;
+        }
+
+        ui_pbutton_set_rect(smenu->up_entry, &rect);
+
+        rc = ui_fixed_add(smenu->fixed, ui_pbutton_ctl(smenu->up_entry));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                goto error;
+        }
+
+        ui_pbutton_set_cb(smenu->up_entry,
+            &startmenu_up_entry_button_cb, (void *)smenu);
+
+        /* Move entry down button */
+
+        rc = ui_pbutton_create(ui_res, "Down", &smenu->down_entry);
+        if (rc != EOK) {
+                printf("Error creating button.\n");
+                goto error;
+        }
+
+        if (ui_resource_is_textmode(ui_res)) {
+                rect.p0.x = 58;
+                rect.p0.y = 15;
+                rect.p1.x = 68;
+                rect.p1.y = 16;
+        } else {
+                rect.p0.x = 370;
+                rect.p0.y = 250;
+                rect.p1.x = 450;
+                rect.p1.y = 275;
         }
 
@@ -418 +455 @@
         startmenu_entry_t *smentry;
         ui_list_entry_attr_t attr;
+        bool separator;
         errno_t rc;
 
@@ -428 +466 @@
 
         ui_list_entry_attr_init(&attr);
-        attr.caption = smenu_entry_get_caption(entry);
+        separator = smenu_entry_get_separator(entry);
+        if (separator)
+                attr.caption = "-- Separator --";
+        else
+                attr.caption = smenu_entry_get_caption(entry);
+
         attr.arg = (void *)smentry;
+
         rc = ui_list_entry_append(smenu->entries_list, &attr, &smentry->lentry);
         if (rc != EOK) {
@@ -473 +517 @@
 }
 
+/** Create new separator menu entry.
+ *
+ * @param smenu Start menu
+ */
+void startmenu_sep_entry(startmenu_t *smenu)
+{
+        startmenu_entry_t *smentry = NULL;
+        smenu_entry_t *entry;
+        errno_t rc;
+
+        rc = smenu_entry_sep_create(smenu->tbarcfg->tbarcfg, &entry);
+        if (rc != EOK)
+                return;
+
+        (void)startmenu_insert(smenu, entry, &smentry);
+        (void)ui_control_paint(ui_list_ctl(smenu->entries_list));
+}
+
 /** Edit selected menu entry.
  *
@@ -485 +547 @@
         smentry = startmenu_get_selected(smenu);
         if (smentry == NULL)
+                return;
+
+        /* Do not edit separator entries */
+        if (smenu_entry_get_separator(smentry->entry))
                 return;
 
@@ -582 +648 @@
 }
 
-/** Up entry button clicked.
+/** Separator entry button clicked.
  *
  * @param pbutton Push button
  * @param arg Argument (startmenu_t *)
  */
+static void startmenu_sep_entry_clicked(ui_pbutton_t *pbutton, void *arg)
+{
+        startmenu_t *smenu = (startmenu_t *)arg;
+
+        (void)pbutton;
+        startmenu_sep_entry(smenu);
+}
+
+/** Up entry button clicked.
+ *
+ * @param pbutton Push button
+ * @param arg Argument (startmenu_t *)
+ */
 static void startmenu_up_entry_clicked(ui_pbutton_t *pbutton, void *arg)
 {

uspace/app/taskbar-cfg/startmenu.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -48 +48 @@
 extern startmenu_entry_t *startmenu_get_selected(startmenu_t *);
 extern void startmenu_new_entry(startmenu_t *);
+extern void startmenu_sep_entry(startmenu_t *);
 extern void startmenu_edit(startmenu_t *);
 extern errno_t startmenu_entry_update(startmenu_entry_t *);

uspace/app/taskbar-cfg/types/startmenu.h

@@ -62 +62 @@
         /** Edit entry button */
         ui_pbutton_t *edit_entry;
+        /** Separator entry button */
+        ui_pbutton_t *sep_entry;
         /** Move entry up button */
         ui_pbutton_t *up_entry;

uspace/app/taskbar/tbsmenu.c

@@ -129 +129 @@
         tbarcfg_t *tbcfg = NULL;
         smenu_entry_t *sme;
+        bool separator;
         const char *caption;
         const char *cmd;
@@ -140 +141 @@
         sme = tbarcfg_smenu_first(tbcfg);
         while (sme != NULL) {
-                caption = smenu_entry_get_caption(sme);
-                cmd = smenu_entry_get_cmd(sme);
-                terminal = smenu_entry_get_terminal(sme);
-
-                rc = tbsmenu_add(tbsmenu, caption, cmd, terminal, &tentry);
-                if (rc != EOK)
-                        goto error;
+                separator = smenu_entry_get_separator(sme);
+                if (separator == false) {
+                        caption = smenu_entry_get_caption(sme);
+                        cmd = smenu_entry_get_cmd(sme);
+                        terminal = smenu_entry_get_terminal(sme);
+
+                        rc = tbsmenu_add(tbsmenu, caption, cmd, terminal,
+                            &tentry);
+                        if (rc != EOK)
+                                goto error;
+                } else {
+                        rc = tbsmenu_add_sep(tbsmenu, &tentry);
+                        if (rc != EOK)
+                                goto error;
+                }
 
                 (void)tentry;
@@ -272 +281 @@
         if (entry->cmd != NULL)
                 free(entry->cmd);
+        free(entry);
+        return rc;
+}
+
+/** Add separator entry to start menu.
+ *
+ * @param tbsmenu Start menu
+ * @param entry Start menu entry
+ * @return @c EOK on success or an error code
+ */
+errno_t tbsmenu_add_sep(tbsmenu_t *tbsmenu, tbsmenu_entry_t **rentry)
+{
+        errno_t rc;
+        tbsmenu_entry_t *entry;
+
+        entry = calloc(1, sizeof(tbsmenu_entry_t));
+        if (entry == NULL)
+                return ENOMEM;
+
+        rc = ui_menu_entry_sep_create(tbsmenu->smenu, &entry->mentry);
+        if (rc != EOK)
+                goto error;
+
+        ui_menu_entry_set_cb(entry->mentry, tbsmenu_smenu_entry_cb,
+            (void *)entry);
+
+        entry->tbsmenu = tbsmenu;
+        list_append(&entry->lentries, &tbsmenu->entries);
+        *rentry = entry;
+        return EOK;
+error:
         free(entry);
         return rc;

uspace/app/taskbar/tbsmenu.h

@@ -55 +55 @@
 extern errno_t tbsmenu_add(tbsmenu_t *, const char *, const char *, bool,
     tbsmenu_entry_t **);
+extern errno_t tbsmenu_add_sep(tbsmenu_t *, tbsmenu_entry_t **);
 extern void tbsmenu_remove(tbsmenu_t *, tbsmenu_entry_t *, bool);
 extern tbsmenu_entry_t *tbsmenu_first(tbsmenu_t *);