Changeset bdfdc51c in mainline

Timestamp:

2016-08-31T19:52:21Z (8 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8b6aa39, f126c87

Parents:

10cb47e

Message:

very naive integer GUI calculator

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/vcalc/Makefile (added)
• uspace/app/vcalc/vcalc.c (added)
• uspace/app/vlaunch/vlaunch.c (modified) (3 diffs)

boot/Makefile.common

@@ -218 +218 @@
         $(USPACE_PATH)/app/websrv/websrv \
         $(USPACE_PATH)/app/date/date \
+        $(USPACE_PATH)/app/vcalc/vcalc \
         $(USPACE_PATH)/app/vdemo/vdemo \
         $(USPACE_PATH)/app/viewer/viewer \

uspace/Makefile

@@ -84 +84 @@
         app/mkbd \
         app/date \
+        app/vcalc \
         app/vdemo \
         app/viewer \

uspace/app/vlaunch/vlaunch.c

@@ -127 +127 @@
         button_t *btn_vterm = create_button(NULL, "/app/vterm", "vterm",
             16, btn_bg, btn_fg, btn_text);
+        button_t *btn_vcalc = create_button(NULL, "/app/vcalc", "vcalc",
+            16, btn_bg, btn_fg, btn_text);
         button_t *btn_vdemo = create_button(NULL, "/app/vdemo", "vdemo",
             16, btn_bg, btn_fg, btn_text);
         button_t *btn_vlaunch = create_button(NULL, "/app/vlaunch", "vlaunch",
             16, btn_bg, btn_fg, btn_text);
-        grid_t *grid = create_grid(window_root(main_window), NULL, 1, 5, grd_bg);
+        grid_t *grid = create_grid(window_root(main_window), NULL, 1, 6, grd_bg);
         
         if ((!logo_canvas) || (!lbl_caption) || (!btn_vterm) ||
-            (!btn_vdemo) || (!btn_vlaunch) || (!grid)) {
+            (!btn_vcalc) || (!btn_vdemo) || (!btn_vlaunch) || (!grid)) {
                 window_close(main_window);
                 printf("Cannot create widgets.\n");
@@ -141 +143 @@
         
         sig_connect(&btn_vterm->clicked, &btn_vterm->widget, on_btn_click);
+        sig_connect(&btn_vcalc->clicked, &btn_vcalc->widget, on_btn_click);
         sig_connect(&btn_vdemo->clicked, &btn_vdemo->widget, on_btn_click);
         sig_connect(&btn_vlaunch->clicked, &btn_vlaunch->widget, on_btn_click);
@@ -147 +150 @@
         grid->add(grid, &lbl_caption->widget, 0, 1, 1, 1);
         grid->add(grid, &btn_vterm->widget, 0, 2, 1, 1);
-        grid->add(grid, &btn_vdemo->widget, 0, 3, 1, 1);
-        grid->add(grid, &btn_vlaunch->widget, 0, 4, 1, 1);
+        grid->add(grid, &btn_vcalc->widget, 0, 3, 1, 1);
+        grid->add(grid, &btn_vdemo->widget, 0, 4, 1, 1);
+        grid->add(grid, &btn_vlaunch->widget, 0, 5, 1, 1);
         
-        window_resize(main_window, 0, 0, 210, 130 + LOGO_HEIGHT,
+        window_resize(main_window, 0, 0, 210, 164 + LOGO_HEIGHT,
             WINDOW_PLACEMENT_RIGHT | WINDOW_PLACEMENT_TOP);
         window_exec(main_window);