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

Timestamp:

2024-02-23T17:57:23Z (11 months ago)

Author:

GitHub <noreply@…>

Children:

192019f

Parents:

86f862c (diff), 90ba06c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-02-23 17:57:23)

git-committer:

GitHub <noreply@…> (2024-02-23 17:57:23)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

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

uspace/app/taskbar-cfg/smeedit.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <ui/checkbox.h>
 #include <ui/fixed.h>
 #include <ui/resource.h>
@@ -94 +95 @@
         const char *cmd;
         const char *caption;
+        bool terminal;
         errno_t rc;
 
@@ -101 +103 @@
                 cmd = smenu_entry_get_cmd(smentry->entry);
                 caption = smenu_entry_get_caption(smentry->entry);
+                terminal = smenu_entry_get_terminal(smentry->entry);
         } else {
                 cmd = "";
                 caption = "";
+                terminal = false;
         }
 
@@ -116 +120 @@
 
         ui_wnd_params_init(&params);
-        params.caption = smentry != NULL ? "Edit Start Menu Entry"
-            : "Create Start Menu Entry";
+        params.caption = smentry != NULL ? "Edit Start Menu Entry" :
+            "Create Start Menu Entry";
         if (ui_is_textmode(ui)) {
                 params.rect.p0.x = 0;
                 params.rect.p0.y = 0;
                 params.rect.p1.x = 50;
-                params.rect.p1.y = 12;
+                params.rect.p1.y = 13;
         } else {
                 params.rect.p0.x = 0;
                 params.rect.p0.y = 0;
                 params.rect.p1.x = 370;
-                params.rect.p1.y = 200;
+                params.rect.p1.y = 230;
         }
 
@@ -255 +259 @@
         }
 
+        /* Start in terminal checkbox */
+
+        rc = ui_checkbox_create(res, "Start in terminal", &smee->cbterminal);
+        if (rc != EOK)
+                goto error;
+
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 3;
+                rect.p0.y = 8;
+                rect.p1.x = 6;
+                rect.p1.y = 9;
+        } else {
+                rect.p0.x = 10;
+                rect.p0.y = 155;
+                rect.p1.x = 360;
+                rect.p1.y = 170;
+        }
+
+        ui_checkbox_set_rect(smee->cbterminal, &rect);
+        ui_checkbox_set_checked(smee->cbterminal, terminal);
+
+        rc = ui_fixed_add(smee->fixed, ui_checkbox_ctl(smee->cbterminal));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                goto error;
+        }
+
         /* OK button */
 
@@ -264 +296 @@
         if (ui_is_textmode(ui)) {
                 rect.p0.x = 23;
-                rect.p0.y = 9;
+                rect.p0.y = 10;
                 rect.p1.x = 35;
-                rect.p1.y = 10;
+                rect.p1.y = 11;
         } else {
                 rect.p0.x = 190;
-                rect.p0.y = 155;
+                rect.p0.y = 190;
                 rect.p1.x = 270;
-                rect.p1.y = 180;
+                rect.p1.y = 215;
         }
 
@@ -293 +325 @@
         if (ui_is_textmode(ui)) {
                 rect.p0.x = 36;
-                rect.p0.y = 9;
+                rect.p0.y = 10;
                 rect.p1.x = 48;
-                rect.p1.y = 10;
+                rect.p1.y = 11;
         } else {
                 rect.p0.x = 280;
-                rect.p0.y = 155;
+                rect.p0.y = 190;
                 rect.p1.x = 360;
-                rect.p1.y = 180;
+                rect.p1.y = 215;
         }
 
@@ -345 +377 @@
 {
         smeedit_t *smee;
+        smenu_entry_t *entry;
+        startmenu_entry_t *smentry;
         const char *cmd;
         const char *caption;
+        bool terminal;
         errno_t rc;
 
@@ -354 +389 @@
         cmd = ui_entry_get_text(smee->ecmd);
         caption = ui_entry_get_text(smee->ecaption);
+        terminal = ui_checkbox_get_checked(smee->cbterminal);
 
         if (smee->smentry == NULL) {
                 /* Create new entry */
                 rc = smenu_entry_create(smee->startmenu->tbarcfg->tbarcfg,
-                    caption, cmd);
+                    caption, cmd, terminal, &entry);
                 if (rc != EOK)
                         return;
+
+                rc = startmenu_insert(smee->startmenu, entry, &smentry);
+                if (rc != EOK)
+                        return;
+
+                startmenu_repaint(smee->startmenu);
         } else {
                 /* Edit existing entry */
-
-
                 rc = smenu_entry_set_cmd(smee->smentry->entry, cmd);
                 if (rc != EOK)
@@ -370 +410 @@
 
                 smenu_entry_set_caption(smee->smentry->entry, caption);
+                if (rc != EOK)
+                        return;
+
+                smenu_entry_set_terminal(smee->smentry->entry, terminal);
                 if (rc != EOK)
                         return;