Changes in uspace/app/vlaunch/vlaunch.c [395ca2e:87c0a45] in mainline

File:

• uspace/app/vlaunch/vlaunch.c (modified) (6 diffs)

uspace/app/vlaunch/vlaunch.c

@@ -33 +33 @@
  */
 
-#include <stdbool.h>
+#include <bool.h>
 #include <errno.h>
 #include <stdio.h>
@@ -46 +46 @@
 #include <button.h>
 #include <label.h>
-#include <canvas.h>
 
-#include <surface.h>
-#include <source.h>
-#include <drawctx.h>
-#include <codec/tga.h>
-
-#include "images.h"
-
-#define NAME  "vlaunch"
-
-#define LOGO_WIDTH   196
-#define LOGO_HEIGHT  66
+#define NAME "vlaunch"
 
 static char *winreg = NULL;
@@ -108 +97 @@
         }
         
-        surface_t *logo = decode_tga((void *) helenos_tga, helenos_tga_size, 0);
-        if (!logo) {
-                printf("Unable to decode logo.\n");
-                return 1;
-        }
-        
         winreg = argv[1];
-        window_t *main_window = window_open(argv[1], true, true, "vlaunch", 0, 0);
+        window_t *main_window = window_open(argv[1], true, true, "vlaunch");
         if (!main_window) {
                 printf("Cannot open main window.\n");
@@ -127 +110 @@
         pixel_t lbl_fg = PIXEL(255, 0, 0, 0);
         
-        canvas_t *logo_canvas = create_canvas(NULL, LOGO_WIDTH, LOGO_HEIGHT,
-            logo);
         label_t *lbl_caption = create_label(NULL, "Launch application:", 16,
             lbl_bg, lbl_fg);
@@ -137 +118 @@
         button_t *btn_vlaunch = create_button(NULL, "vlaunch", 16, btn_bg,
             btn_fg);
-        grid_t *grid = create_grid(window_root(main_window), 1, 5, grd_bg);
+        grid_t *grid = create_grid(window_root(main_window), 4, 1, grd_bg);
         
-        if ((!logo_canvas) || (!lbl_caption) || (!btn_vterm) ||
-            (!btn_vdemo) || (!btn_vlaunch) || (!grid)) {
+        if ((!lbl_caption) || (!btn_vterm) || (!btn_vdemo) ||
+            (!btn_vlaunch) || (!grid)) {
                 window_close(main_window);
                 printf("Cannot create widgets.\n");
@@ -150 +131 @@
         sig_connect(&btn_vlaunch->clicked, NULL, on_vlaunch);
         
-        grid->add(grid, &logo_canvas->widget, 0, 0, 1, 1);
-        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, &lbl_caption->widget, 0, 0, 1, 1);
+        grid->add(grid, &btn_vterm->widget, 1, 0, 1, 1);
+        grid->add(grid, &btn_vdemo->widget, 2, 0, 1, 1);
+        grid->add(grid, &btn_vlaunch->widget, 3, 0, 1, 1);
         
-        window_resize(main_window, 210, 130 + LOGO_HEIGHT);
+        window_resize(main_window, 180, 130);
         window_exec(main_window);
-        
         task_retval(0);
         async_manager();