Changeset dcd8214 in mainline

Timestamp:

2023-11-02T08:58:21Z (6 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

40eab9f

Parents:

3e05a69

git-author:

Jiri Svoboda <jiri@…> (2023-11-01 18:58:03)

git-committer:

Jiri Svoboda <jiri@…> (2023-11-02 08:58:21)

Message:

Add dialog window for editing start menu entry

Note it does not do anything yet.

Location:

uspace/app/taskbar-cfg

Files:

• meson.build (modified) (1 diff)
• smeedit.c (added)
• smeedit.h (added)
• startmenu.c (modified) (10 diffs)
• startmenu.h (modified) (1 diff)
• types/smeedit.h (added)

uspace/app/taskbar-cfg/meson.build

@@ -31 +31 @@
         'taskbar-cfg.c',
         'main.c',
+        'smeedit.c',
         'startmenu.c'
 )

uspace/app/taskbar-cfg/startmenu.c

@@ -46 +46 @@
 #include <ui/tab.h>
 #include <ui/window.h>
+#include "smeedit.h"
 #include "startmenu.h"
 #include "taskbar-cfg.h"
@@ -52 +53 @@
 static void startmenu_new_entry_clicked(ui_pbutton_t *, void *);
 static void startmenu_delete_entry_clicked(ui_pbutton_t *, void *);
+static void startmenu_edit_entry_clicked(ui_pbutton_t *, void *);
 
 /** Entry list callbacks */
@@ -63 +65 @@
 };
 
-/** Remove seat button callbacks */
+/** Delete entry button callbacks */
 ui_pbutton_cb_t startmenu_delete_entry_button_cb = {
         .clicked = startmenu_delete_entry_clicked
+};
+
+/** Edit entry button callbacks */
+ui_pbutton_cb_t startmenu_edit_entry_button_cb = {
+        .clicked = startmenu_edit_entry_clicked
 };
 
@@ -163 +170 @@
             (void *)smenu);
 
-        /* 'New Entry' button */
+        /* New entry button */
 
         rc = ui_pbutton_create(ui_res, "New...", &smenu->new_entry);
@@ -194 +201 @@
             (void *)smenu);
 
-        /* 'Delete Entry' button */
+        /* Delete entry button */
 
         rc = ui_pbutton_create(ui_res, "Delete", &smenu->delete_entry);
@@ -224 +231 @@
         ui_pbutton_set_cb(smenu->delete_entry,
             &startmenu_delete_entry_button_cb, (void *)smenu);
+
+        /* Edit entry button */
+
+        rc = ui_pbutton_create(ui_res, "Edit...", &smenu->edit_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 = 9;
+                rect.p1.x = 68;
+                rect.p1.y = 10;
+        } else {
+                rect.p0.x = 370;
+                rect.p0.y = 140;
+                rect.p1.x = 450;
+                rect.p1.y = 165;
+        }
+
+        ui_pbutton_set_rect(smenu->edit_entry, &rect);
+
+        rc = ui_fixed_add(smenu->fixed, ui_pbutton_ctl(smenu->edit_entry));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                goto error;
+        }
+
+        ui_pbutton_set_cb(smenu->edit_entry,
+            &startmenu_edit_entry_button_cb, (void *)smenu);
 
         ui_tab_add(smenu->tab, ui_fixed_ctl(smenu->fixed));
@@ -346 +384 @@
 }
 
+/** Edit selected menu entry.
+ *
+ * @param smenu Start menu
+ */
+void startmenu_edit(startmenu_t *smenu)
+{
+        smeedit_t *smee;
+        errno_t rc;
+
+        rc = smeedit_create(smenu, &smee);
+        if (rc != EOK)
+                return;
+
+        (void)smee;
+}
+
 /** Entry in entry list is selected.
  *
@@ -357 +411 @@
 }
 
-/** New Entry' button clicked.
+/** New entry button clicked.
  *
  * @param pbutton Push button
- * @param arg Argument (dcfg_seats_entry_t *)
+ * @param arg Argument (startmenu_t *)
  */
 static void startmenu_new_entry_clicked(ui_pbutton_t *pbutton, void *arg)
@@ -368 +422 @@
 }
 
-/** "Delete Entry' button clicked.
+/** Delete entry button clicked.
  *
  * @param pbutton Push button
- * @param arg Argument (dcfg_seats_entry_t *)
+ * @param arg Argument (startmenu_t *)
  */
 static void startmenu_delete_entry_clicked(ui_pbutton_t *pbutton, void *arg)
@@ -379 +433 @@
 }
 
+/** Edit entry button clicked.
+ *
+ * @param pbutton Push button
+ * @param arg Argument (startmenu_t *)
+ */
+static void startmenu_edit_entry_clicked(ui_pbutton_t *pbutton, void *arg)
+{
+        startmenu_t *smenu = (startmenu_t *)arg;
+
+        (void)pbutton;
+        startmenu_edit(smenu);
+}
+
 /** @}
  */

uspace/app/taskbar-cfg/startmenu.h

@@ -46 +46 @@
 extern errno_t startmenu_insert(startmenu_t *, const char *, const char *,
     startmenu_entry_t **);
+extern void startmenu_edit(startmenu_t *);
 
 #endif