diff options
Diffstat (limited to 'src/Configmenu.cc')
-rw-r--r-- | src/Configmenu.cc | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/Configmenu.cc b/src/Configmenu.cc index 1fdf2bf..b54dd1e 100644 --- a/src/Configmenu.cc +++ b/src/Configmenu.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Configmenu.cc,v 1.8 2002/01/09 14:11:20 fluxgen Exp $ | 25 | // $Id: Configmenu.cc,v 1.9 2002/01/11 09:20:42 fluxgen Exp $ |
26 | 26 | ||
27 | // stupid macros needed to access some functions in version 2 of the GNU C | 27 | // stupid macros needed to access some functions in version 2 of the GNU C |
28 | // library | 28 | // library |
@@ -382,70 +382,70 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm) : Basemenu(cm->screen) | |||
382 | #else // !NLS | 382 | #else // !NLS |
383 | 0, 0, | 383 | 0, 0, |
384 | #endif // NLS | 384 | #endif // NLS |
385 | "Smart Placement (Rows)"), BScreen::RowSmartPlacement); | 385 | "Smart Placement (Rows)"), BScreen::ROWSMARTPLACEMENT); |
386 | insert(i18n->getMessage( | 386 | insert(i18n->getMessage( |
387 | #ifdef NLS | 387 | #ifdef NLS |
388 | ConfigmenuSet, ConfigmenuSmartCols, | 388 | ConfigmenuSet, ConfigmenuSmartCols, |
389 | #else // !NLS | 389 | #else // !NLS |
390 | 0, 0, | 390 | 0, 0, |
391 | #endif // NLS | 391 | #endif // NLS |
392 | "Smart Placement (Columns)"), BScreen::ColSmartPlacement); | 392 | "Smart Placement (Columns)"), BScreen::COLSMARTPLACEMENT); |
393 | insert(i18n->getMessage( | 393 | insert(i18n->getMessage( |
394 | #ifdef NLS | 394 | #ifdef NLS |
395 | ConfigmenuSet, ConfigmenuCascade, | 395 | ConfigmenuSet, ConfigmenuCascade, |
396 | #else // !NLS | 396 | #else // !NLS |
397 | 0, 0, | 397 | 0, 0, |
398 | #endif // NLS | 398 | #endif // NLS |
399 | "Cascade Placement"), BScreen::CascadePlacement); | 399 | "Cascade Placement"), BScreen::CASCADEPLACEMENT); |
400 | insert(i18n->getMessage( | 400 | insert(i18n->getMessage( |
401 | #ifdef NLS | 401 | #ifdef NLS |
402 | ConfigmenuSet, ConfigmenuLeftRight, | 402 | ConfigmenuSet, ConfigmenuLeftRight, |
403 | #else // !NLS | 403 | #else // !NLS |
404 | 0, 0, | 404 | 0, 0, |
405 | #endif // NLS | 405 | #endif // NLS |
406 | "Left to Right"), BScreen::LeftRight); | 406 | "Left to Right"), BScreen::LEFTRIGHT); |
407 | insert(i18n->getMessage( | 407 | insert(i18n->getMessage( |
408 | #ifdef NLS | 408 | #ifdef NLS |
409 | ConfigmenuSet, ConfigmenuRightLeft, | 409 | ConfigmenuSet, ConfigmenuRightLeft, |
410 | #else // !NLS | 410 | #else // !NLS |
411 | 0, 0, | 411 | 0, 0, |
412 | #endif // NLS | 412 | #endif // NLS |
413 | "Right to Left"), BScreen::RightLeft); | 413 | "Right to Left"), BScreen::RIGHTLEFT); |
414 | insert(i18n->getMessage( | 414 | insert(i18n->getMessage( |
415 | #ifdef NLS | 415 | #ifdef NLS |
416 | ConfigmenuSet, ConfigmenuTopBottom, | 416 | ConfigmenuSet, ConfigmenuTopBottom, |
417 | #else // !NLS | 417 | #else // !NLS |
418 | 0, 0, | 418 | 0, 0, |
419 | #endif // NLS | 419 | #endif // NLS |
420 | "Top to Bottom"), BScreen::TopBottom); | 420 | "Top to Bottom"), BScreen::TOPBOTTOM); |
421 | insert(i18n->getMessage( | 421 | insert(i18n->getMessage( |
422 | #ifdef NLS | 422 | #ifdef NLS |
423 | ConfigmenuSet, ConfigmenuBottomTop, | 423 | ConfigmenuSet, ConfigmenuBottomTop, |
424 | #else // !NLS | 424 | #else // !NLS |
425 | 0, 0, | 425 | 0, 0, |
426 | #endif // NLS | 426 | #endif // NLS |
427 | "Bottom to Top"), BScreen::BottomTop); | 427 | "Bottom to Top"), BScreen::BOTTOMTOP); |
428 | 428 | ||
429 | update(); | 429 | update(); |
430 | 430 | ||
431 | switch (configmenu->screen->getPlacementPolicy()) { | 431 | switch (configmenu->screen->getPlacementPolicy()) { |
432 | case BScreen::RowSmartPlacement: | 432 | case BScreen::ROWSMARTPLACEMENT: |
433 | setItemSelected(0, True); | 433 | setItemSelected(0, True); |
434 | break; | 434 | break; |
435 | 435 | ||
436 | case BScreen::ColSmartPlacement: | 436 | case BScreen::COLSMARTPLACEMENT: |
437 | setItemSelected(1, True); | 437 | setItemSelected(1, True); |
438 | break; | 438 | break; |
439 | 439 | ||
440 | case BScreen::CascadePlacement: | 440 | case BScreen::CASCADEPLACEMENT: |
441 | setItemSelected(2, True); | 441 | setItemSelected(2, True); |
442 | break; | 442 | break; |
443 | } | 443 | } |
444 | 444 | ||
445 | Bool rl = (configmenu->screen->getRowPlacementDirection() == | 445 | Bool rl = (configmenu->screen->getRowPlacementDirection() == |
446 | BScreen::LeftRight), | 446 | BScreen::LEFTRIGHT), |
447 | tb = (configmenu->screen->getColPlacementDirection() == | 447 | tb = (configmenu->screen->getColPlacementDirection() == |
448 | BScreen::TopBottom); | 448 | BScreen::TOPBOTTOM); |
449 | 449 | ||
450 | setItemSelected(3, rl); | 450 | setItemSelected(3, rl); |
451 | setItemSelected(4, ! rl); | 451 | setItemSelected(4, ! rl); |
@@ -461,7 +461,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { | |||
461 | 461 | ||
462 | if (item->function()) { | 462 | if (item->function()) { |
463 | switch (item->function()) { | 463 | switch (item->function()) { |
464 | case BScreen::RowSmartPlacement: | 464 | case BScreen::ROWSMARTPLACEMENT: |
465 | configmenu->screen->savePlacementPolicy(item->function()); | 465 | configmenu->screen->savePlacementPolicy(item->function()); |
466 | 466 | ||
467 | setItemSelected(0, True); | 467 | setItemSelected(0, True); |
@@ -470,7 +470,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { | |||
470 | 470 | ||
471 | break; | 471 | break; |
472 | 472 | ||
473 | case BScreen::ColSmartPlacement: | 473 | case BScreen::COLSMARTPLACEMENT: |
474 | configmenu->screen->savePlacementPolicy(item->function()); | 474 | configmenu->screen->savePlacementPolicy(item->function()); |
475 | 475 | ||
476 | setItemSelected(0, False); | 476 | setItemSelected(0, False); |
@@ -479,7 +479,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { | |||
479 | 479 | ||
480 | break; | 480 | break; |
481 | 481 | ||
482 | case BScreen::CascadePlacement: | 482 | case BScreen::CASCADEPLACEMENT: |
483 | configmenu->screen->savePlacementPolicy(item->function()); | 483 | configmenu->screen->savePlacementPolicy(item->function()); |
484 | 484 | ||
485 | setItemSelected(0, False); | 485 | setItemSelected(0, False); |
@@ -488,32 +488,32 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { | |||
488 | 488 | ||
489 | break; | 489 | break; |
490 | 490 | ||
491 | case BScreen::LeftRight: | 491 | case BScreen::LEFTRIGHT: |
492 | configmenu->screen->saveRowPlacementDirection(BScreen::LeftRight); | 492 | configmenu->screen->saveRowPlacementDirection(BScreen::LEFTRIGHT); |
493 | 493 | ||
494 | setItemSelected(3, True); | 494 | setItemSelected(3, True); |
495 | setItemSelected(4, False); | 495 | setItemSelected(4, False); |
496 | 496 | ||
497 | break; | 497 | break; |
498 | 498 | ||
499 | case BScreen::RightLeft: | 499 | case BScreen::RIGHTLEFT: |
500 | configmenu->screen->saveRowPlacementDirection(BScreen::RightLeft); | 500 | configmenu->screen->saveRowPlacementDirection(BScreen::RIGHTLEFT); |
501 | 501 | ||
502 | setItemSelected(3, False); | 502 | setItemSelected(3, False); |
503 | setItemSelected(4, True); | 503 | setItemSelected(4, True); |
504 | 504 | ||
505 | break; | 505 | break; |
506 | 506 | ||
507 | case BScreen::TopBottom: | 507 | case BScreen::TOPBOTTOM: |
508 | configmenu->screen->saveColPlacementDirection(BScreen::TopBottom); | 508 | configmenu->screen->saveColPlacementDirection(BScreen::TOPBOTTOM); |
509 | 509 | ||
510 | setItemSelected(5, True); | 510 | setItemSelected(5, True); |
511 | setItemSelected(6, False); | 511 | setItemSelected(6, False); |
512 | 512 | ||
513 | break; | 513 | break; |
514 | 514 | ||
515 | case BScreen::BottomTop: | 515 | case BScreen::BOTTOMTOP: |
516 | configmenu->screen->saveColPlacementDirection(BScreen::BottomTop); | 516 | configmenu->screen->saveColPlacementDirection(BScreen::BOTTOMTOP); |
517 | 517 | ||
518 | setItemSelected(5, False); | 518 | setItemSelected(5, False); |
519 | setItemSelected(6, True); | 519 | setItemSelected(6, True); |