Changeset b1397ab in mainline for uspace/app/taskbar-cfg/smeedit.c

Timestamp:

2023-11-09T13:02:16Z (6 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, topic/msim-upgrade, topic/simplify-dev-export

Children:

e0d874b7

Parents:

40eab9f

git-author:

Jiri Svoboda <jiri@…> (2023-11-08 18:01:53)

git-committer:

Jiri Svoboda <jiri@…> (2023-11-09 13:02:16)

Message:

Start menu editor is editing

You can change an entry and it will be saved to the configuration repo.
(Cannot create/delete yet). To see the change in the editor, you need
to restart it. To see the change in the taskbar, you need to restart it.

File:

• uspace/app/taskbar-cfg/smeedit.c (modified) (9 diffs)

uspace/app/taskbar-cfg/smeedit.c

@@ -48 +48 @@
 };
 
+static void smeedit_ok_clicked(ui_pbutton_t *, void *);
+static void smeedit_cancel_clicked(ui_pbutton_t *, void *);
+
+/** OK button callbacks */
+ui_pbutton_cb_t smeedit_ok_button_cb = {
+        .clicked = smeedit_ok_clicked
+};
+
+/** Cancel button callbacks */
+ui_pbutton_cb_t smeedit_cancel_button_cb = {
+        .clicked = smeedit_cancel_clicked
+};
+
 /** Window close button was clicked.
  *
@@ -64 +77 @@
  *
  * @param smenu Start menu
+ * @param smentry Start menu entry to edit or @c NULL if creating
+ *                a new entry
  * @param rsmee Place to store pointer to new start menu entry edit window
  * @return EOK on success or an error code
  */
-errno_t smeedit_create(startmenu_t *smenu, smeedit_t **rsmee)
+errno_t smeedit_create(startmenu_t *smenu, startmenu_entry_t *smentry,
+    smeedit_t **rsmee)
 {
         ui_wnd_params_t params;
@@ -75 +91 @@
         gfx_rect_t rect;
         ui_resource_t *res;
+        const char *cmd;
+        const char *caption;
         errno_t rc;
 
         ui = smenu->tbarcfg->ui;
+
+        if (smentry != NULL) {
+                cmd = smenu_entry_get_cmd(smentry->entry);
+                caption = smenu_entry_get_caption(smentry->entry);
+        } else {
+                cmd = "";
+                caption = "";
+        }
 
         smee = calloc(1, sizeof(smeedit_t));
@@ -85 +111 @@
         }
 
+        smee->smentry = smentry;
+
         ui_wnd_params_init(&params);
         params.caption = "Edit Start Menu Entry";
@@ -145 +173 @@
         /* Command entry */
 
-        rc = ui_entry_create(window, "foo", &smee->ecmd);
+        rc = ui_entry_create(window, cmd, &smee->ecmd);
         if (rc != EOK)
                 goto error;
@@ -199 +227 @@
         /* Caption entry */
 
-        rc = ui_entry_create(window, "bar", &smee->ecaption);
+        rc = ui_entry_create(window, caption, &smee->ecaption);
         if (rc != EOK)
                 goto error;
@@ -243 +271 @@
         }
 
+        ui_pbutton_set_cb(smee->bok, &smeedit_ok_button_cb, (void *)smee);
         ui_pbutton_set_rect(smee->bok, &rect);
         ui_pbutton_set_default(smee->bok, true);
@@ -271 +300 @@
         }
 
+        ui_pbutton_set_cb(smee->bcancel, &smeedit_cancel_button_cb,
+            (void *)smee);
         ui_pbutton_set_rect(smee->bcancel, &rect);
 
@@ -303 +334 @@
 }
 
+/** OK button clicked.
+ *
+ * @params bok OK button
+ * @params arg Argument (smeedit_t *)
+ */
+static void smeedit_ok_clicked(ui_pbutton_t *bok, void *arg)
+{
+        smeedit_t *smee;
+        const char *cmd;
+        const char *caption;
+        errno_t rc;
+
+        (void)bok;
+        smee = (smeedit_t *)arg;
+
+        cmd = ui_entry_get_text(smee->ecmd);
+        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);
+
+        smeedit_destroy(smee);
+}
+
+/** Cancel button clicked.
+ *
+ * @params bok OK button
+ * @params arg Argument (smeedit_t *)
+ */
+static void smeedit_cancel_clicked(ui_pbutton_t *bcancel, void *arg)
+{
+        smeedit_t *smee;
+
+        (void)bcancel;
+        smee = (smeedit_t *)arg;
+        smeedit_destroy(smee);
+}
+
 /** @}
  */