Changeset ec8a1bf in mainline

Timestamp:

2021-11-03T18:27:47Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

552b69f

Parents:

b48e680f

Message:

Add Text Editor to launcher

Location:

uspace/app/launcher

Files:

• launcher.c (modified) (6 diffs)
• launcher.h (modified) (1 diff)

uspace/app/launcher/launcher.c

@@ -96 +96 @@
                 app_launchl("/app/terminal", "-c", "/app/nav", NULL);
         } else if (pbutton == launcher->pb2) {
+                app_launchl("/app/terminal", "-c", "/app/edit", NULL);
+        } else if (pbutton == launcher->pb3) {
                 app_launchl("/app/terminal", NULL);
-        } else if (pbutton == launcher->pb3) {
+        } else if (pbutton == launcher->pb4) {
                 app_launchl("/app/calculator", NULL);
-        } else if (pbutton == launcher->pb4) {
+        } else if (pbutton == launcher->pb5) {
                 app_launchl("/app/uidemo", NULL);
-        } else if (pbutton == launcher->pb5) {
+        } else if (pbutton == launcher->pb6) {
                 app_launchl("/app/gfxdemo", "ui", NULL);
         }
@@ -222 +224 @@
         params.rect.p0.y = 0;
         params.rect.p1.x = 210;
-        params.rect.p1.y = 310;
+        params.rect.p1.y = 345;
 
         memset((void *) &launcher, 0, sizeof(launcher));
@@ -318 +320 @@
         }
 
+        /* Text Editor */
+
+        rc = ui_pbutton_create(ui_res, "Text Editor", &launcher.pb2);
+        if (rc != EOK) {
+                printf("Error creating button.\n");
+                return rc;
+        }
+
+        ui_pbutton_set_cb(launcher.pb2, &pbutton_cb, (void *) &launcher);
+
+        rect.p0.x = 15;
+        rect.p0.y = 130 + 35;
+        rect.p1.x = 190;
+        rect.p1.y = rect.p0.y + 28;
+        ui_pbutton_set_rect(launcher.pb2, &rect);
+
+        rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb2));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
         /* Terminal */
 
-        rc = ui_pbutton_create(ui_res, "Terminal", &launcher.pb2);
-        if (rc != EOK) {
-                printf("Error creating button.\n");
-                return rc;
-        }
-
-        ui_pbutton_set_cb(launcher.pb2, &pbutton_cb, (void *) &launcher);
-
-        rect.p0.x = 15;
-        rect.p0.y = 130 + 35;
-        rect.p1.x = 190;
-        rect.p1.y = rect.p0.y + 28;
-        ui_pbutton_set_rect(launcher.pb2, &rect);
-
-        rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb2));
+        rc = ui_pbutton_create(ui_res, "Terminal", &launcher.pb3);
+        if (rc != EOK) {
+                printf("Error creating button.\n");
+                return rc;
+        }
+
+        ui_pbutton_set_cb(launcher.pb3, &pbutton_cb, (void *) &launcher);
+
+        rect.p0.x = 15;
+        rect.p0.y = 130 + 2 * 35;
+        rect.p1.x = 190;
+        rect.p1.y = rect.p0.y + 28;
+        ui_pbutton_set_rect(launcher.pb3, &rect);
+
+        rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb3));
         if (rc != EOK) {
                 printf("Error adding control to layout.\n");
@@ -342 +366 @@
         /* Calculator */
 
-        rc = ui_pbutton_create(ui_res, "Calculator", &launcher.pb3);
-        if (rc != EOK) {
-                printf("Error creating button.\n");
-                return rc;
-        }
-
-        ui_pbutton_set_cb(launcher.pb3, &pbutton_cb, (void *) &launcher);
-
-        rect.p0.x = 15;
-        rect.p0.y = 130 + 2 * 35;
-        rect.p1.x = 190;
-        rect.p1.y = rect.p0.y + 28;
-        ui_pbutton_set_rect(launcher.pb3, &rect);
-
-        rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb3));
+        rc = ui_pbutton_create(ui_res, "Calculator", &launcher.pb4);
+        if (rc != EOK) {
+                printf("Error creating button.\n");
+                return rc;
+        }
+
+        ui_pbutton_set_cb(launcher.pb4, &pbutton_cb, (void *) &launcher);
+
+        rect.p0.x = 15;
+        rect.p0.y = 130 + 3 * 35;
+        rect.p1.x = 190;
+        rect.p1.y = rect.p0.y + 28;
+        ui_pbutton_set_rect(launcher.pb4, &rect);
+
+        rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb4));
         if (rc != EOK) {
                 printf("Error adding control to layout.\n");
@@ -364 +388 @@
         /* UI Demo */
 
-        rc = ui_pbutton_create(ui_res, "UI Demo", &launcher.pb4);
-        if (rc != EOK) {
-                printf("Error creating button.\n");
-                return rc;
-        }
-
-        ui_pbutton_set_cb(launcher.pb4, &pbutton_cb, (void *) &launcher);
-
-        rect.p0.x = 15;
-        rect.p0.y = 130 + 3 * 35;
-        rect.p1.x = 190;
-        rect.p1.y = rect.p0.y + 28;
-        ui_pbutton_set_rect(launcher.pb4, &rect);
-
-        rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb4));
+        rc = ui_pbutton_create(ui_res, "UI Demo", &launcher.pb5);
+        if (rc != EOK) {
+                printf("Error creating button.\n");
+                return rc;
+        }
+
+        ui_pbutton_set_cb(launcher.pb5, &pbutton_cb, (void *) &launcher);
+
+        rect.p0.x = 15;
+        rect.p0.y = 130 + 4 * 35;
+        rect.p1.x = 190;
+        rect.p1.y = rect.p0.y + 28;
+        ui_pbutton_set_rect(launcher.pb5, &rect);
+
+        rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb5));
         if (rc != EOK) {
                 printf("Error adding control to layout.\n");
@@ -386 +410 @@
         /* GFX Demo */
 
-        rc = ui_pbutton_create(ui_res, "GFX Demo", &launcher.pb5);
-        if (rc != EOK) {
-                printf("Error creating button.\n");
-                return rc;
-        }
-
-        ui_pbutton_set_cb(launcher.pb5, &pbutton_cb, (void *) &launcher);
-
-        rect.p0.x = 15;
-        rect.p0.y = 130 + 4 * 35;
-        rect.p1.x = 190;
-        rect.p1.y = rect.p0.y + 28;
-        ui_pbutton_set_rect(launcher.pb5, &rect);
-
-        rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb5));
+        rc = ui_pbutton_create(ui_res, "GFX Demo", &launcher.pb6);
+        if (rc != EOK) {
+                printf("Error creating button.\n");
+                return rc;
+        }
+
+        ui_pbutton_set_cb(launcher.pb6, &pbutton_cb, (void *) &launcher);
+
+        rect.p0.x = 15;
+        rect.p0.y = 130 + 5 * 35;
+        rect.p1.x = 190;
+        rect.p1.y = rect.p0.y + 28;
+        ui_pbutton_set_rect(launcher.pb6, &rect);
+
+        rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb6));
         if (rc != EOK) {
                 printf("Error adding control to layout.\n");

uspace/app/launcher/launcher.h

@@ -57 +57 @@
         ui_pbutton_t *pb4;
         ui_pbutton_t *pb5;
+        ui_pbutton_t *pb6;
 } launcher_t;