Changeset 806d761 in mainline for uspace/app/taskbar-cfg/smeedit.c
- Timestamp:
- 2024-02-07T23:44:59Z (12 months ago)
- Branches:
- master
- Children:
- 242e3c3
- Parents:
- 74cb6610
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/taskbar-cfg/smeedit.c
r74cb6610 r806d761 1 1 /* 2 * Copyright (c) 202 3Jiri Svoboda2 * Copyright (c) 2024 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 36 36 #include <stdio.h> 37 37 #include <stdlib.h> 38 #include <ui/checkbox.h> 38 39 #include <ui/fixed.h> 39 40 #include <ui/resource.h> … … 94 95 const char *cmd; 95 96 const char *caption; 97 bool terminal; 96 98 errno_t rc; 97 99 … … 101 103 cmd = smenu_entry_get_cmd(smentry->entry); 102 104 caption = smenu_entry_get_caption(smentry->entry); 105 terminal = smenu_entry_get_terminal(smentry->entry); 103 106 } else { 104 107 cmd = ""; 105 108 caption = ""; 109 terminal = false; 106 110 } 107 111 … … 122 126 params.rect.p0.y = 0; 123 127 params.rect.p1.x = 50; 124 params.rect.p1.y = 1 2;128 params.rect.p1.y = 13; 125 129 } else { 126 130 params.rect.p0.x = 0; 127 131 params.rect.p0.y = 0; 128 132 params.rect.p1.x = 370; 129 params.rect.p1.y = 2 00;133 params.rect.p1.y = 230; 130 134 } 131 135 … … 255 259 } 256 260 261 /* Start in terminal checkbox */ 262 263 rc = ui_checkbox_create(res, "Start in terminal", &smee->cbterminal); 264 if (rc != EOK) 265 goto error; 266 267 /* FIXME: Auto layout */ 268 if (ui_is_textmode(ui)) { 269 rect.p0.x = 3; 270 rect.p0.y = 8; 271 rect.p1.x = 6; 272 rect.p1.y = 9; 273 } else { 274 rect.p0.x = 10; 275 rect.p0.y = 155; 276 rect.p1.x = 360; 277 rect.p1.y = 170; 278 } 279 280 ui_checkbox_set_rect(smee->cbterminal, &rect); 281 ui_checkbox_set_checked(smee->cbterminal, terminal); 282 283 rc = ui_fixed_add(smee->fixed, ui_checkbox_ctl(smee->cbterminal)); 284 if (rc != EOK) { 285 printf("Error adding control to layout.\n"); 286 goto error; 287 } 288 257 289 /* OK button */ 258 290 … … 264 296 if (ui_is_textmode(ui)) { 265 297 rect.p0.x = 23; 266 rect.p0.y = 9;298 rect.p0.y = 10; 267 299 rect.p1.x = 35; 268 rect.p1.y = 1 0;300 rect.p1.y = 11; 269 301 } else { 270 302 rect.p0.x = 190; 271 rect.p0.y = 1 55;303 rect.p0.y = 190; 272 304 rect.p1.x = 270; 273 rect.p1.y = 180;305 rect.p1.y = 215; 274 306 } 275 307 … … 293 325 if (ui_is_textmode(ui)) { 294 326 rect.p0.x = 36; 295 rect.p0.y = 9;327 rect.p0.y = 10; 296 328 rect.p1.x = 48; 297 rect.p1.y = 1 0;329 rect.p1.y = 11; 298 330 } else { 299 331 rect.p0.x = 280; 300 rect.p0.y = 1 55;332 rect.p0.y = 190; 301 333 rect.p1.x = 360; 302 rect.p1.y = 180;334 rect.p1.y = 215; 303 335 } 304 336 … … 349 381 const char *cmd; 350 382 const char *caption; 383 bool terminal; 351 384 errno_t rc; 352 385 … … 356 389 cmd = ui_entry_get_text(smee->ecmd); 357 390 caption = ui_entry_get_text(smee->ecaption); 391 terminal = ui_checkbox_get_checked(smee->cbterminal); 358 392 359 393 if (smee->smentry == NULL) { 360 394 /* Create new entry */ 361 395 rc = smenu_entry_create(smee->startmenu->tbarcfg->tbarcfg, 362 caption, cmd, &entry);396 caption, cmd, terminal, &entry); 363 397 if (rc != EOK) 364 398 return; … … 379 413 return; 380 414 415 smenu_entry_set_terminal(smee->smentry->entry, terminal); 416 if (rc != EOK) 417 return; 418 381 419 (void)smenu_entry_save(smee->smentry->entry); 382 420 startmenu_entry_update(smee->smentry);
Note:
See TracChangeset
for help on using the changeset viewer.