ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.177 by root, Thu Jul 19 15:43:14 2007 UTC vs.
Revision 1.180 by root, Sat Jul 21 13:37:09 2007 UTC

… …
272 ellipsise => 0, 272 ellipsise => 0,
273 markup => "\nOr use your keyboard and the text entry below:\n"; 273 markup => "\nOr use your keyboard and the text entry below:\n";
274 274
275 unshift @dialog, my $table = new CFPlus::UI::Table; 275 unshift @dialog, my $table = new CFPlus::UI::Table;
276 276
277 $table->add (0, 0, new CFPlus::UI::Button 277 $table->add_at (0, 0, new CFPlus::UI::Button
278 text => "Next Race", 278 text => "Next Race",
279 on_activate => sub { 279 on_activate => sub {
280 $conn->send ("reply n"); 280 $conn->send ("reply n");
281 destroy_query_dialog $conn; 281 destroy_query_dialog $conn;
282 0 282 0
283 }, 283 },
284 ); 284 );
285 $table->add (2, 0, new CFPlus::UI::Button 285 $table->add_at (2, 0, new CFPlus::UI::Button
286 text => "Accept", 286 text => "Accept",
287 on_activate => sub { 287 on_activate => sub {
288 $conn->send ("reply d"); 288 $conn->send ("reply d");
289 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
290 0 290 0
… …
333 markup => "\nOr use your keyboard and the text entry below:\n"; 333 markup => "\nOr use your keyboard and the text entry below:\n";
334 334
335 unshift @dialog, my $table = new CFPlus::UI::Table; 335 unshift @dialog, my $table = new CFPlus::UI::Table;
336 336
337 # left: re-roll 337 # left: re-roll
338 $table->add (0, 0, new CFPlus::UI::Button 338 $table->add_at (0, 0, new CFPlus::UI::Button
339 text => "Roll Again", 339 text => "Roll Again",
340 on_activate => sub { 340 on_activate => sub {
341 $conn->send ("reply y"); 341 $conn->send ("reply y");
342 destroy_query_dialog $conn; 342 destroy_query_dialog $conn;
343 0 343 0
… …
357 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 357 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
358 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 358 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
359 ], 359 ],
360 ), 1 .. 2; 360 ), 1 .. 2;
361 361
362 $table->add (2, 0, new CFPlus::UI::Button 362 $table->add_at (2, 0, new CFPlus::UI::Button
363 text => "Swap Stats", 363 text => "Swap Stats",
364 on_activate => sub { 364 on_activate => sub {
365 $conn->{stat_change_with} = $sw2->{value}; 365 $conn->{stat_change_with} = $sw2->{value};
366 $conn->send ("reply $sw1->{value}"); 366 $conn->send ("reply $sw1->{value}");
367 destroy_query_dialog $conn; 367 destroy_query_dialog $conn;
368 0 368 0
369 }, 369 },
370 ); 370 );
371 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 371 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
372 372
373 # right: accept 373 # right: accept
374 $table->add (4, 0, new CFPlus::UI::Button 374 $table->add_at (4, 0, new CFPlus::UI::Button
375 text => "Accept", 375 text => "Accept",
376 on_activate => sub { 376 on_activate => sub {
377 $conn->send ("reply n"); 377 $conn->send ("reply n");
378 $STATS_PAGE->hide; 378 $STATS_PAGE->hide;
379 destroy_query_dialog $conn; 379 destroy_query_dialog $conn;
… …
521 521
522 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 522 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
523 523
524 my $row = 0; 524 my $row = 0;
525 525
526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 526 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
527 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 527 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
528 can_events => 1, 528 can_events => 1,
529 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 529 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
530 530
531 my $vidmode_tooltip = 531 my $vidmode_tooltip =
532 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 532 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
533 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 533 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
534 534
535 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 535 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
536 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 536 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
537 537
538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider 538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
539 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 539 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
540 tooltip => $vidmode_tooltip); 540 tooltip => $vidmode_tooltip);
541 $hbox->add (my $mode_label = new CFPlus::UI::Label 541 $hbox->add (my $mode_label = new CFPlus::UI::Label
… …
548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
549 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 549 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
550 }); 550 });
551 $mode_slider->emit (changed => $mode_slider->{range}[0]); 551 $mode_slider->emit (changed => $mode_slider->{range}[0]);
552 552
553 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 553 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
554 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 554 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
555 state => $CFG->{fullscreen}, 555 state => $CFG->{fullscreen},
556 tooltip => "Bring the client into fullscreen mode.", 556 tooltip => "Bring the client into fullscreen mode.",
557 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 557 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
558 ); 558 );
559 559
560 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 560 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
561 $table->add (1, $row++, new CFPlus::UI::CheckBox 561 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
562 state => $CFG->{fast}, 562 state => $CFG->{fast},
563 tooltip => "Lower the visual quality considerably to speed up rendering.", 563 tooltip => "Lower the visual quality considerably to speed up rendering.",
564 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 564 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
565 ); 565 );
566 566
567 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 567 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
568 $table->add (1, $row++, new CFPlus::UI::Slider 568 $table->add_at (1, $row++, new CFPlus::UI::Slider
569 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 569 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
570 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 570 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
571 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 571 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
572 ); 572 );
573 573
574 $table->add (1, $row++, new CFPlus::UI::Button 574 $table->add_at (1, $row++, new CFPlus::UI::Button
575 expand => 1, align => 0, text => "Apply", 575 expand => 1, align => 0, text => "Apply",
576 tooltip => "Apply the video settings above.", 576 tooltip => "Apply the video settings above.",
577 on_activate => sub { 577 on_activate => sub {
578 video_shutdown (); 578 video_shutdown ();
579 video_init (); 579 video_init ();
580 0 580 0
581 } 581 }
582 ); 582 );
583 583
584 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 584 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
585 $table->add (1, $row++, new CFPlus::UI::Slider 585 $table->add_at (1, $row++, new CFPlus::UI::Slider
586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
589 ); 589 );
590 590
591 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 591 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
592 $table->add (1, $row++, new CFPlus::UI::CheckBox 592 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
593 state => $CFG->{map_smoothing}, 593 state => $CFG->{map_smoothing},
594 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 594 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
595 . "This increases load on the graphics subsystem and works only with 2.x servers. " 595 . "This increases load on the graphics subsystem and works only with 2.x servers. "
596 . "Changes take effect at next connection only.", 596 . "Changes take effect at next connection only.",
597 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 597 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
598 ); 598 );
599 599
600 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 600 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
601 $table->add (1, $row++, new CFPlus::UI::CheckBox 601 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
602 state => $CFG->{fow_enable}, 602 state => $CFG->{fow_enable},
603 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 603 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
605 ); 605 );
606 606
607 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 607 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
608 $table->add (1, $row++, new CFPlus::UI::Slider 608 $table->add_at (1, $row++, new CFPlus::UI::Slider
609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
610 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 610 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
611 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 611 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
612 ); 612 );
613 613
614 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 614 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
615 $table->add (1, $row++, new CFPlus::UI::Slider 615 $table->add_at (1, $row++, new CFPlus::UI::Slider
616 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 616 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
617 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 617 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
618 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 618 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
619 ); 619 );
620 620
621 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 621 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
622 $table->add (1, $row++, new CFPlus::UI::Slider 622 $table->add_at (1, $row++, new CFPlus::UI::Slider
623 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 623 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
624 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 624 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
625 on_changed => sub { 625 on_changed => sub {
626 $CFG->{gauge_fontsize} = $_[1]; 626 $CFG->{gauge_fontsize} = $_[1];
627 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
628 0 628 0
629 } 629 }
630 ); 630 );
631 631
632 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 632 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
633 $table->add (1, $row++, new CFPlus::UI::Slider 633 $table->add_at (1, $row++, new CFPlus::UI::Slider
634 range => [$CFG->{gauge_size}, 0.2, 0.8], 634 range => [$CFG->{gauge_size}, 0.2, 0.8],
635 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 635 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
636 on_changed => sub { 636 on_changed => sub {
637 $CFG->{gauge_size} = $_[1]; 637 $CFG->{gauge_size} = $_[1];
638 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 638 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
648 648
649 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 649 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
650 650
651 my $row = 0; 651 my $row = 0;
652 652
653 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 653 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
654 $table->add (1, $row++, new CFPlus::UI::CheckBox 654 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
655 state => $CFG->{audio_enable}, 655 state => $CFG->{audio_enable},
656 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 656 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
657 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 657 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
658 ); 658 );
659# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 659# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
660# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 660# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
661# $CFG->{effects_volume} = $_[1]; 661# $CFG->{effects_volume} = $_[1];
662# }); 662# });
663 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 663 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
664 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 664 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
665 $hbox->add (new CFPlus::UI::CheckBox 665 $hbox->add (new CFPlus::UI::CheckBox
666 expand => 1, state => $CFG->{bgm_enable}, 666 expand => 1, state => $CFG->{bgm_enable},
667 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 667 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
668 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 668 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
669 ); 669 );
… …
671 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 671 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
672 tooltip => "The volume of the background music. Changes are instant.", 672 tooltip => "The volume of the background music. Changes are instant.",
673 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 673 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
674 ); 674 );
675 675
676 $table->add (1, $row++, new CFPlus::UI::Button 676 $table->add_at (1, $row++, new CFPlus::UI::Button
677 expand => 1, align => 0, text => "Apply", 677 expand => 1, align => 0, text => "Apply",
678 tooltip => "Apply the audio settings", 678 tooltip => "Apply the audio settings",
679 on_activate => sub { 679 on_activate => sub {
680 audio_shutdown (); 680 audio_shutdown ();
681 audio_init (); 681 audio_init ();
… …
740} 740}
741 741
742sub debug_setup { 742sub debug_setup {
743 my $table = new CFPlus::UI::Table; 743 my $table = new CFPlus::UI::Table;
744 744
745 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 745 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
746 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 746 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
747 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 747 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
748 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 748 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
749 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 749 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
750 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 750 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
751 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 751 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
752 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 752 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
753 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 753 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
754 754
755 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 755 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
756
757 $table->add_at (7,7, my $t = new CFPlus::UI::Table);
758 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
759 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
760 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
761 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
762 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
756 763
757 $table 764 $table
758} 765}
759 766
760sub stats_window { 767sub stats_window {
… …
808 [2, 4, st_spd => "Spd", 10.54], 815 [2, 4, st_spd => "Spd", 10.54],
809 [2, 5, st_wspd => "WSp", 10.54], 816 [2, 5, st_wspd => "WSp", 10.54],
810 ) { 817 ) {
811 my ($col, $row, $id, $label, $template) = @$_; 818 my ($col, $row, $id, $label, $template) = @$_;
812 819
813 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 820 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
814 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 821 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
815 align => +1, template => $template, tooltip => "#stat_$label"); 822 align => +1, template => $template, tooltip => "#stat_$label");
816 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 823 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
817 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 824 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
818 align => -1, text => $label, tooltip => "#stat_$label"); 825 align => -1, text => $label, tooltip => "#stat_$label");
819 } 826 }
820 827
821 $vb->add (new CFPlus::UI::FancyFrame 828 $vb->add (new CFPlus::UI::FancyFrame
… …
862 cold => ["Cold", 869 cold => ["Cold",
863 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 870 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
864 ghit => ["Ghost hit", 871 ghit => ["Ghost hit",
865 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 872 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
866 ); 873 );
874
867 for (qw/slow holyw conf fire depl magic 875 for (qw/slow holyw conf fire depl magic
868 drain acid pois para deat phys 876 drain acid pois para deat phys
869 blind fear tund elec cold ghit/) 877 blind fear tund elec cold ghit/)
870 { 878 {
871 $tbl2->add ($col, $row, 879 $tbl2->add_at ($col, $row,
872 $STATWIDS->{"res_$_"} = 880 $STATWIDS->{"res_$_"} =
873 new CFPlus::UI::Label 881 new CFPlus::UI::Label
874 font => $FONT_FIXED, 882 font => $FONT_FIXED,
875 template => "-100%", 883 template => "-100%",
876 align => +1, 884 align => +1,
877 valign => 0, 885 valign => 0,
878 can_events => 1, 886 can_events => 1,
879 can_hover => 1, 887 can_hover => 1,
880 tooltip => $resist_names{$_}->[1], 888 tooltip => $resist_names{$_}->[1],
881 ); 889 );
882 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 890 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
883 font => $FONT_FIXED, 891 font => $FONT_FIXED,
884 can_hover => 1, 892 can_hover => 1,
885 can_events => 1, 893 can_events => 1,
886 path => "ui/resist/resist_$_.png", 894 path => "ui/resist/resist_$_.png",
887 tooltip => $resist_names{$_}->[1], 895 tooltip => $resist_names{$_}->[1],
888 ); 896 );
889 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 897 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
890 text => $resist_names{$_}->[0], 898 text => $resist_names{$_}->[0],
891 font => $FONT_FIXED, 899 font => $FONT_FIXED,
892 can_hover => 1, 900 can_hover => 1,
893 can_events => 1, 901 can_events => 1,
894 tooltip => $resist_names{$_}->[1], 902 tooltip => $resist_names{$_}->[1],
… …
927 return if $METASERVER_ATIME > time; 935 return if $METASERVER_ATIME > time;
928 $METASERVER_ATIME = time + 60; 936 $METASERVER_ATIME = time + 60;
929 937
930 my $table = $METASERVER->{table}; 938 my $table = $METASERVER->{table};
931 $table->clear; 939 $table->clear;
932 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 940 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
933 941
934 my $ok = 0; 942 my $ok = 0;
935 943
936 CFPlus::background { 944 CFPlus::background {
937 my $ua = CFPlus::lwp_useragent; 945 my $ua = CFPlus::lwp_useragent;
… …
948 "The time this server has been running without being restarted.", 956 "The time this server has been running without being restarted.",
949 "The server software version - a '+' indicates a Crossfire+ server.", 957 "The server software version - a '+' indicates a Crossfire+ server.",
950 "Short information about this server provided by its admins.", 958 "Short information about this server provided by its admins.",
951 ); 959 );
952 my @col = qw(#Users Host Uptime Version Description); 960 my @col = qw(#Users Host Uptime Version Description);
953 $table->add ($_, 0, new CFPlus::UI::Label 961 $table->add_at ($_, 0, new CFPlus::UI::Label
954 can_hover => 1, can_events => 1, 962 can_hover => 1, can_events => 1,
955 align => 0, fg => [1, 1, 0], 963 align => 0, fg => [1, 1, 0],
956 text => $col[$_], tooltip => $tip[$_]) 964 text => $col[$_], tooltip => $tip[$_])
957 for 0 .. $#col; 965 for 0 .. $#col;
958 966
… …
980 988
981 $m = [$users, $host, $uptime, $version, $desc]; 989 $m = [$users, $host, $uptime, $version, $desc];
982 990
983 $y++; 991 $y++;
984 992
985 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 993 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
986 (new CFPlus::UI::Button 994 (new CFPlus::UI::Button
987 text => "Use", 995 text => "Use",
988 tooltip => "Put this server into the <b>Host:Port</b> field", 996 tooltip => "Put this server into the <b>Host:Port</b> field",
989 on_activate => sub { 997 on_activate => sub {
990 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 998 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
993 }, 1001 },
994 ), 1002 ),
995 (new CFPlus::UI::Empty expand => 1), 1003 (new CFPlus::UI::Empty expand => 1),
996 ]); 1004 ]);
997 1005
998 $table->add ($_, $y, new CFPlus::UI::Label 1006 $table->add_at ($_, $y, new CFPlus::UI::Label
999 max_w => $::WIDTH * 0.4, 1007 max_w => $::WIDTH * 0.4,
1000 ellipsise => 0, 1008 ellipsise => 0,
1001 align => $align[$_], 1009 align => $align[$_],
1002 text => $m->[$_], 1010 text => $m->[$_],
1003 tooltip => $tip[$_], 1011 tooltip => $tip[$_],
… …
1044 1052
1045 $vbox->add (new CFPlus::UI::FancyFrame 1053 $vbox->add (new CFPlus::UI::FancyFrame
1046 label => "Connection Settings", 1054 label => "Connection Settings",
1047 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1055 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1048 ); 1056 );
1049 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1057 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1050 1058
1051 { 1059 {
1052 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1060 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1053 1061
1054 $vbox->add ( 1062 $vbox->add (
1055 $HOST_ENTRY = new CFPlus::UI::Entry 1063 $HOST_ENTRY = new CFPlus::UI::Entry
1056 expand => 1, 1064 expand => 1,
1057 text => $CFG->{profile}{default}{host}, 1065 text => $CFG->{profile}{default}{host},
… …
1071 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1079 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1072 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1080 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1073 ); 1081 );
1074 } 1082 }
1075 1083
1076 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1084 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1077 $table->add (1, 4, new CFPlus::UI::Entry 1085 $table->add_at (1, 4, new CFPlus::UI::Entry
1078 text => $CFG->{profile}{default}{user}, 1086 text => $CFG->{profile}{default}{user},
1079 tooltip => "The name of your character on the server", 1087 tooltip => "The name of your character on the server",
1080 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1088 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1081 ); 1089 );
1082 1090
1083 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1091 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1084 $table->add (1, 5, new CFPlus::UI::Entry 1092 $table->add_at (1, 5, new CFPlus::UI::Entry
1085 text => $CFG->{profile}{default}{password}, 1093 text => $CFG->{profile}{default}{password},
1086 hidden => 1, 1094 hidden => 1,
1087 tooltip => "The password for your character", 1095 tooltip => "The password for your character",
1088 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1096 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1089 ); 1097 );
1090 1098
1091 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1099 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1092 $table->add (1, 7, new CFPlus::UI::Slider 1100 $table->add_at (1, 7, new CFPlus::UI::Slider
1093 force_w => 100, 1101 force_w => 100,
1094 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1102 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1095 tooltip => "This is the size of the portion of the map update the server sends you. " 1103 tooltip => "This is the size of the portion of the map update the server sends you. "
1096 . "If you set this to a high value you will be able to see further, " 1104 . "If you set this to a high value you will be able to see further, "
1097 . "but you also increase bandwidth requirements and latency. " 1105 . "but you also increase bandwidth requirements and latency. "
1098 . "This option is only used once at log-in.", 1106 . "This option is only used once at log-in.",
1099 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1107 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1100 ); 1108 );
1101 1109
1102 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1110 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1103 $table->add (1, 8, new CFPlus::UI::CheckBox 1111 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1104 state => $CFG->{face_prefetch}, 1112 state => $CFG->{face_prefetch},
1105 tooltip => "<b>Background Image Prefetch</b>\n\n" 1113 tooltip => "<b>Background Image Prefetch</b>\n\n"
1106 . "If enabled, the client automatically pre-fetches images from the server. " 1114 . "If enabled, the client automatically pre-fetches images from the server. "
1107 . "This might increase or create lag, but increases the chances " 1115 . "This might increase or create lag, but increases the chances "
1108 . "of faces being ready for display when you encounter them. " 1116 . "of faces being ready for display when you encounter them. "
… …
1110 . "so only set it if you really need to prefetch images. " 1118 . "so only set it if you really need to prefetch images. "
1111 . "This option can be set and unset any time.", 1119 . "This option can be set and unset any time.",
1112 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1120 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1113 ); 1121 );
1114 1122
1115 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1123 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1116 $table->add (1, 9, new CFPlus::UI::Entry 1124 $table->add_at (1, 9, new CFPlus::UI::Entry
1117 text => $CFG->{output_rate}, 1125 text => $CFG->{output_rate},
1118 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1126 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1119 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1127 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1120 . "default will be used, which is usually around 100kb/s.", 1128 . "default will be used, which is usually around 100kb/s.",
1121 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1129 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1122 ); 1130 );
1123 1131
1124 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1132 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1125 $table->add (1, 10, new CFPlus::UI::Entry 1133 $table->add_at (1, 10, new CFPlus::UI::Entry
1126 text => $CFG->{output_count}, 1134 text => $CFG->{output_count},
1127 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1135 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1128 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1136 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1129 ); 1137 );
1130 1138
1131 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1139 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1132 $table->add (1, 11, new CFPlus::UI::Entry 1140 $table->add_at (1, 11, new CFPlus::UI::Entry
1133 text => $CFG->{output_sync}, 1141 text => $CFG->{output_sync},
1134 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1142 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1135 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1143 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1136 ); 1144 );
1137 1145
1138 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1146 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1139 expand => 1, 1147 expand => 1,
1140 align => 0, 1148 align => 0,
1141 text => "Login", 1149 text => "Login",
1142 on_activate => sub { 1150 on_activate => sub {
1143 $CONN ? stop_game 1151 $CONN ? stop_game
… …
1157sub client_setup { 1165sub client_setup {
1158 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1166 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1159 1167
1160 my $row = 0; 1168 my $row = 0;
1161 1169
1162 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1170 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1163 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1171 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1164 text => $CFG->{say_command}, 1172 text => $CFG->{say_command},
1165 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1173 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1166 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1174 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1167 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1175 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1168 on_changed => sub { 1176 on_changed => sub {
… …
1170 $CFG->{say_command} = $value; 1178 $CFG->{say_command} = $value;
1171 0 1179 0
1172 } 1180 }
1173 ); 1181 );
1174 1182
1175 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1183 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1176 $table->add (1, $row++, new CFPlus::UI::CheckBox 1184 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1177 state => $CFG->{show_tips}, 1185 state => $CFG->{show_tips},
1178 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1186 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1179 on_changed => sub { 1187 on_changed => sub {
1180 my ($self, $value) = @_; 1188 my ($self, $value) = @_;
1181 $CFG->{show_tips} = $value; 1189 $CFG->{show_tips} = $value;
1182 0 1190 0
1183 } 1191 }
1184 ); 1192 );
1185 1193
1186 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1194 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1187 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1195 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1188 text => $CFG->{logview_max_par}, 1196 text => $CFG->{logview_max_par},
1189 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1197 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1190 . "sends more messages than this number, older messages get removed to save memory and " 1198 . "sends more messages than this number, older messages get removed to save memory and "
1191 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1199 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1192 on_changed => sub { 1200 on_changed => sub {
… …
1313 ], 1321 ],
1314 ["Weight/Value ratio", 2, 17] 1322 ["Weight/Value ratio", 2, 17]
1315 ) 1323 )
1316 { 1324 {
1317 my ($title, $x, $y, @bits) = @$_; 1325 my ($title, $x, $y, @bits) = @$_;
1318 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1326 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1319 1327
1320 for (@bits) { 1328 for (@bits) {
1321 ++$y; 1329 ++$y;
1322 1330
1323 my $mask = $_->[1]; 1331 my $mask = $_->[1];
1324 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1332 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1325 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1333 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1326 state => $::CFG->{pickup} & $mask, 1334 state => $::CFG->{pickup} & $mask,
1327 on_changed => sub { 1335 on_changed => sub {
1328 my ($box, $value) = @_; 1336 my ($box, $value) = @_;
1329 1337
1330 if ($value) { 1338 if ($value) {
… …
1341 1349
1342 ${$_->[2]} = $checkbox if $_->[2]; 1350 ${$_->[2]} = $checkbox if $_->[2];
1343 } 1351 }
1344 } 1352 }
1345 1353
1346 $table->add (2, 18, new CFPlus::UI::ValSlider 1354 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1347 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1355 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1348 template => ">= 99", 1356 template => ">= 99",
1349 to_value => sub { ">= " . 5 * $_[0] }, 1357 to_value => sub { ">= " . 5 * $_[0] },
1350 on_changed => sub { 1358 on_changed => sub {
1351 my ($slider, $value) = @_; 1359 my ($slider, $value) = @_;
… …
1354 $::CFG->{pickup} |= int $value 1362 $::CFG->{pickup} |= int $value
1355 if $value; 1363 if $value;
1356 1; 1364 1;
1357 }); 1365 });
1358 1366
1359 $table->add (3, 18, new CFPlus::UI::Button 1367 $table->add_at (3, 18, new CFPlus::UI::Button
1360 text => "set", 1368 text => "set",
1361 on_activate => sub { 1369 on_activate => sub {
1362 $::CONN->send_command ("pickup $::CFG->{pickup}") 1370 $::CONN->send_command ("pickup $::CFG->{pickup}")
1363 if defined $::CONN; 1371 if defined $::CONN;
1364 0 1372 0
… …
1681 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1689 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1682 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1690 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1683 1691
1684 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1692 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1685 1693
1686 $table->add (0, 0, new CFPlus::UI::Button 1694 $table->add_at (0, 0, new CFPlus::UI::Button
1687 text => "Close", 1695 text => "Close",
1688 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.", 1696 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1689 on_activate => $close, 1697 on_activate => $close,
1690 ); 1698 );
1691 1699
1692 $table->add (2, 0, new CFPlus::UI::Button 1700 $table->add_at (2, 0, new CFPlus::UI::Button
1693 text => "Next", 1701 text => "Next",
1694 tooltip => "Show the next <b>Tip of the day</b>.", 1702 tooltip => "Show the next <b>Tip of the day</b>.",
1695 on_activate => sub { 1703 on_activate => sub {
1696 $close->(); 1704 $close->();
1697 &show_tip_of_the_day; 1705 &show_tip_of_the_day;
… …
1964 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1); 1972 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1965 1973
1966 $vb->add (my $table = new CFPlus::UI::Table expand => 1); 1974 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1967 my $row = 0; 1975 my $row = 0;
1968 if ($info->{has_name}) { 1976 if ($info->{has_name}) {
1969 $table->add (0, $row, new CFPlus::UI::Label text => "Name:"); 1977 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1970 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 }); 1978 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1971 } 1979 }
1972 if ($info->{has_text}) { 1980 if ($info->{has_text}) {
1973 $table->add (0, $row, new CFPlus::UI::Label text => "Text:"); 1981 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1974 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 }); 1982 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1975 } 1983 }
1976 if ($info->{has_connection}) { 1984 if ($info->{has_connection}) {
1977 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:"); 1985 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1978 $table->add (1, $row++, 1986 $table->add_at (1, $row++,
1979 new CFPlus::UI::Entry 1987 new CFPlus::UI::Entry
1980 expand => 1, 1988 expand => 1,
1981 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 }, 1989 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1982 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate" 1990 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1983 ); 1991 );

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines