--- deliantra/Deliantra-Client/bin/cfplus	2006/06/05 05:23:21	1.56
+++ deliantra/Deliantra-Client/bin/cfplus	2006/06/05 22:07:43	1.58
@@ -712,6 +712,7 @@
       name  => 'metaserver_dialog',
       x     => 'center',
       y     => 'center',
+      z     => 3,
       child => (my $vbox = new CFClient::UI::VBox),
       on_visibility_change => sub {
          update_metaserver if $_[1];
@@ -936,41 +937,41 @@
 
    for (
          ["General", 0, 0,
-            ["Enable autopickup"       => CFClient::Pickup::PU_NEWMODE],
-            ["Inhibit autopickup"      => CFClient::Pickup::PU_INHIBIT],
-            ["Stop before pickup"      => CFClient::Pickup::PU_STOP],
-            ["Debug autopickup"        => CFClient::Pickup::PU_DEBUG],
+            ["Enable autopickup"       => PICKUP_NEWMODE],
+            ["Inhibit autopickup"      => PICKUP_INHIBIT],
+            ["Stop before pickup"      => PICKUP_STOP],
+            ["Debug autopickup"        => PICKUP_DEBUG],
          ],
          ["Weapons", 0, 6,
-            ["All weapons"             => CFClient::Pickup::PU_ALLWEAPON],
-            ["Missile weapons"         => CFClient::Pickup::PU_MISSILEWEAPON],
-            ["Bows"                    => CFClient::Pickup::PU_BOW],
-            ["Arrows"                  => CFClient::Pickup::PU_ARROW],
+            ["All weapons"             => PICKUP_ALLWEAPON],
+            ["Missile weapons"         => PICKUP_MISSILEWEAPON],
+            ["Bows"                    => PICKUP_BOW],
+            ["Arrows"                  => PICKUP_ARROW],
          ],
          ["Armour", 0, 12,
-            ["Helmets"                 => CFClient::Pickup::PU_HELMET],
-            ["Shields"                 => CFClient::Pickup::PU_SHIELD],
-            ["Body Armour"             => CFClient::Pickup::PU_ARMOUR],
-            ["Boots"                   => CFClient::Pickup::PU_BOOTS],
-            ["Gloves"                  => CFClient::Pickup::PU_GLOVES],
-            ["Cloaks"                  => CFClient::Pickup::PU_CLOAK],
+            ["Helmets"                 => PICKUP_HELMET],
+            ["Shields"                 => PICKUP_SHIELD],
+            ["Body Armour"             => PICKUP_ARMOUR],
+            ["Boots"                   => PICKUP_BOOTS],
+            ["Gloves"                  => PICKUP_GLOVES],
+            ["Cloaks"                  => PICKUP_CLOAK],
          ],
 
          ["Readables", 2, 2,
-            ["Spellbooks"              => CFClient::Pickup::PU_SPELLBOOK],
-            ["Skillscrolls"            => CFClient::Pickup::PU_SKILLSCROLL],
-            ["Normal Books/Scrolls"    => CFClient::Pickup::PU_READABLES],
+            ["Spellbooks"              => PICKUP_SPELLBOOK],
+            ["Skillscrolls"            => PICKUP_SKILLSCROLL],
+            ["Normal Books/Scrolls"    => PICKUP_READABLES],
          ],
          ["Misc", 2, 7,
-            ["Food"                    => CFClient::Pickup::PU_FOOD],
-            ["Drinks"                  => CFClient::Pickup::PU_DRINK],
-            ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
-            ["Keys"                    => CFClient::Pickup::PU_KEY],
-            ["Magical Items"           => CFClient::Pickup::PU_MAGICAL],
-            ["Potions"                 => CFClient::Pickup::PU_POTION],
-            ["Magic Devices"           => CFClient::Pickup::PU_MAGIC_DEVICE],
-            ["Ignore cursed"           => CFClient::Pickup::PU_NOT_CURSED],
-            ["Jewelery"                => CFClient::Pickup::PU_JEWELS],
+            ["Food"                    => PICKUP_FOOD],
+            ["Drinks"                  => PICKUP_DRINK],
+            ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
+            ["Keys"                    => PICKUP_KEY],
+            ["Magical Items"           => PICKUP_MAGICAL],
+            ["Potions"                 => PICKUP_POTION],
+            ["Magic Devices"           => PICKUP_MAGIC_DEVICE],
+            ["Ignore cursed"           => PICKUP_NOT_CURSED],
+            ["Jewelery"                => PICKUP_JEWELS],
          ],
        )
    {
@@ -1149,12 +1150,13 @@
       $buttons->add (new CFClient::UI::Button
          text => $label,
          on_activate => sub {
-            my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod";
+            my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
+               doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
 
             $viewer->clear;
             
             $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
-               for @{ CFClient::pod_to_pango_list $pom };
+               for @$pom;
 
             $viewer->set_offset (0);
          },
@@ -1273,7 +1275,7 @@
       $SETUP_NOTEBOOK->add (Server   => $SETUP_SERVER = server_setup,
          "Configure the server to play on, your username, password and other server-related options.");
       $SETUP_NOTEBOOK->add (Pickup   => autopickup_setup,
-         "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");
+         "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
       $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
          "Configure the video mode, performance, fonts and other graphical aspects of the game.");
       $SETUP_NOTEBOOK->add (Audio    => audio_setup,
@@ -1288,7 +1290,7 @@
       $SETUP_NOTEBOOK->add (Spells   => $SETUP_SPELLS = spell_setup,
          "Displays all spells you have and lets you edit keyboard shortcuts for them.");
 
-      $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
+      $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
 
       $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
          tooltip => "Toggles a dialog where you can configure all aspects of this client.");