Changes in uspace/app/vlaunch/vlaunch.c [bdfdc51c:2c7fdaa] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/vlaunch/vlaunch.c
rbdfdc51c r2c7fdaa 85 85 } 86 86 87 static void on_ btn_click(widget_t *widget, void *data)87 static void on_vterm(widget_t *widget, void *data) 88 88 { 89 const char *app = (const char *) widget_get_data(widget); 90 app_launch(app); 89 app_launch("/app/vterm"); 90 } 91 92 static void on_vdemo(widget_t *widget, void *data) 93 { 94 app_launch("/app/vdemo"); 95 } 96 97 static void on_vlaunch(widget_t *widget, void *data) 98 { 99 app_launch("/app/vlaunch"); 91 100 } 92 101 … … 105 114 106 115 winreg = argv[1]; 107 window_t *main_window = window_open(argv[1], NULL,116 window_t *main_window = window_open(argv[1], 108 117 WINDOW_MAIN | WINDOW_DECORATED | WINDOW_RESIZEABLE, "vlaunch"); 109 118 if (!main_window) { … … 121 130 pixel_t lbl_text = PIXEL(255, 0, 0, 0); 122 131 123 canvas_t *logo_canvas = create_canvas(NULL, NULL,LOGO_WIDTH, LOGO_HEIGHT,132 canvas_t *logo_canvas = create_canvas(NULL, LOGO_WIDTH, LOGO_HEIGHT, 124 133 logo); 125 label_t *lbl_caption = create_label(NULL, NULL, "Launch application:", 126 16, lbl_bg, lbl_text); 127 button_t *btn_vterm = create_button(NULL, "/app/vterm", "vterm", 128 16, btn_bg, btn_fg, btn_text); 129 button_t *btn_vcalc = create_button(NULL, "/app/vcalc", "vcalc", 130 16, btn_bg, btn_fg, btn_text); 131 button_t *btn_vdemo = create_button(NULL, "/app/vdemo", "vdemo", 132 16, btn_bg, btn_fg, btn_text); 133 button_t *btn_vlaunch = create_button(NULL, "/app/vlaunch", "vlaunch", 134 16, btn_bg, btn_fg, btn_text); 135 grid_t *grid = create_grid(window_root(main_window), NULL, 1, 6, grd_bg); 134 label_t *lbl_caption = create_label(NULL, "Launch application:", 16, 135 lbl_bg, lbl_text); 136 button_t *btn_vterm = create_button(NULL, "vterm", 16, btn_bg, 137 btn_fg, btn_text); 138 button_t *btn_vdemo = create_button(NULL, "vdemo", 16, btn_bg, 139 btn_fg, btn_text); 140 button_t *btn_vlaunch = create_button(NULL, "vlaunch", 16, btn_bg, 141 btn_fg, btn_text); 142 grid_t *grid = create_grid(window_root(main_window), 1, 5, grd_bg); 136 143 137 144 if ((!logo_canvas) || (!lbl_caption) || (!btn_vterm) || 138 (!btn_v calc) || (!btn_vdemo) || (!btn_vlaunch) || (!grid)) {145 (!btn_vdemo) || (!btn_vlaunch) || (!grid)) { 139 146 window_close(main_window); 140 147 printf("Cannot create widgets.\n"); … … 142 149 } 143 150 144 sig_connect(&btn_vterm->clicked, &btn_vterm->widget, on_btn_click); 145 sig_connect(&btn_vcalc->clicked, &btn_vcalc->widget, on_btn_click); 146 sig_connect(&btn_vdemo->clicked, &btn_vdemo->widget, on_btn_click); 147 sig_connect(&btn_vlaunch->clicked, &btn_vlaunch->widget, on_btn_click); 151 sig_connect(&btn_vterm->clicked, NULL, on_vterm); 152 sig_connect(&btn_vdemo->clicked, NULL, on_vdemo); 153 sig_connect(&btn_vlaunch->clicked, NULL, on_vlaunch); 148 154 149 155 grid->add(grid, &logo_canvas->widget, 0, 0, 1, 1); 150 156 grid->add(grid, &lbl_caption->widget, 0, 1, 1, 1); 151 157 grid->add(grid, &btn_vterm->widget, 0, 2, 1, 1); 152 grid->add(grid, &btn_vcalc->widget, 0, 3, 1, 1); 153 grid->add(grid, &btn_vdemo->widget, 0, 4, 1, 1); 154 grid->add(grid, &btn_vlaunch->widget, 0, 5, 1, 1); 158 grid->add(grid, &btn_vdemo->widget, 0, 3, 1, 1); 159 grid->add(grid, &btn_vlaunch->widget, 0, 4, 1, 1); 155 160 156 window_resize(main_window, 0, 0, 210, 1 64+ LOGO_HEIGHT,161 window_resize(main_window, 0, 0, 210, 130 + LOGO_HEIGHT, 157 162 WINDOW_PLACEMENT_RIGHT | WINDOW_PLACEMENT_TOP); 158 163 window_exec(main_window);
Note:
See TracChangeset
for help on using the changeset viewer.