Rev 4058 | Rev 4080 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4058 | Rev 4062 | ||
|---|---|---|---|
| Line 414... | Line 414... | ||
| 414 | (button, value) = xtui.choice_window(screen, 'HelenOS configuration', 'Choose configuration option', options, position) |
414 | (button, value) = xtui.choice_window(screen, 'HelenOS configuration', 'Choose configuration option', options, position) |
| 415 | 415 | ||
| 416 | if (button == 'cancel'): |
416 | if (button == 'cancel'): |
| 417 | return 'Configuration canceled' |
417 | return 'Configuration canceled' |
| 418 | 418 | ||
| - | 419 | if (button == 'done'): |
|
| - | 420 | if (check_choices(defaults, ask_names)): |
|
| - | 421 | break |
|
| - | 422 | else: |
|
| - | 423 | xtui.error_dialog(screen, 'Error', 'Some options have still undefined values. These options are marked with the "?" sign.') |
|
| - | 424 | continue |
|
| - | 425 | ||
| 419 | if (value == 0): |
426 | if (value == 0): |
| 420 | read_preconfigured(PRECONF, MAKEFILE, screen, defaults) |
427 | read_preconfigured(PRECONF, MAKEFILE, screen, defaults) |
| 421 | position = 1 |
428 | position = 1 |
| 422 | continue |
429 | continue |
| 423 | 430 | ||
| Line 430... | Line 437... | ||
| 430 | if (not defaults.has_key(selname)): |
437 | if (not defaults.has_key(selname)): |
| 431 | default = None |
438 | default = None |
| 432 | else: |
439 | else: |
| 433 | default = defaults[selname] |
440 | default = defaults[selname] |
| 434 | 441 | ||
| 435 | if (button == 'done'): |
- | |
| 436 | if (check_choices(defaults, ask_names)): |
- | |
| 437 | break |
- | |
| 438 | else: |
- | |
| 439 | xtui.error_dialog(screen, 'Error', 'Some options have still undefined values. These options are marked with the "?" sign.') |
- | |
| 440 | continue |
- | |
| 441 | - | ||
| 442 | if (seltype == 'choice'): |
442 | if (seltype == 'choice'): |
| 443 | defaults[selname] = subchoice(screen, name, choices, default) |
443 | defaults[selname] = subchoice(screen, name, choices, default) |
| 444 | elif ((seltype == 'y/n') or (seltype == 'n/y')): |
444 | elif ((seltype == 'y/n') or (seltype == 'n/y')): |
| 445 | if (defaults[selname] == 'y'): |
445 | if (defaults[selname] == 'y'): |
| 446 | defaults[selname] = 'n' |
446 | defaults[selname] = 'n' |