--- deliantra/Deliantra-Client/bin/cfplus	2006/06/05 00:17:47	1.52
+++ deliantra/Deliantra-Client/bin/cfplus	2006/06/05 05:23:21	1.56
@@ -27,7 +27,6 @@
    if %PAR::LibCache;
 
 use Time::HiRes 'time';
-use Pod::POM;
 use Event;
 
 use Crossfire;
@@ -176,9 +175,9 @@
 
 sub stop_game {
    $LOGIN_BUTTON->set_text ("Login");
+   $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
    $SETUP_DIALOG->show;
    $INV_WINDOW->hide;
-   $LOGVIEW->hide;
 
    return unless $CONN;
 
@@ -905,6 +904,7 @@
       $QUIT_DIALOG = new CFClient::UI::FancyFrame
          x     => "center",
          y     => "center",
+         z     => 50,
          title => "Really Quit?",
       ;
 
@@ -1102,7 +1102,8 @@
             sub {
                $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
                $SETUP_DIALOG->show;
-            });
+            },
+         );
          $SETUP_DIALOG->hide;
          $::BIND_EDITOR->show;
       },
@@ -1126,6 +1127,7 @@
    my $win = new CFClient::UI::FancyFrame
       x       => 'center',
       y       => 'center',
+      z       => 2,
       name    => 'doc_browser',
       force_w => int $WIDTH  * 7/8,
       force_h => int $HEIGHT * 7/8,
@@ -1147,8 +1149,7 @@
       $buttons->add (new CFClient::UI::Button
          text => $label,
          on_activate => sub {
-            my $parser = new Pod::POM;
-            my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
+            my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod";
 
             $viewer->clear;
             
@@ -1210,7 +1211,7 @@
       $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
 
       $STATUSBOX = new CFClient::UI::Statusbox;
-      $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
+      $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
 
       (new CFClient::UI::Frame
          bg      => [0, 0, 0, 0.4],
@@ -1261,6 +1262,7 @@
          name    => "setup_dialog",
          x       => 'center',
          y       => 'center',
+         z       => 2,
          force_w => $::WIDTH  * 0.6,
          force_h => $::HEIGHT * 0.6,
       ;
@@ -1278,9 +1280,9 @@
          "Configure the use of audio, sound effects and background music.");
       $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
          "Lets you define, edit and delete bindings."
-       . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor "
+       . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
        . "with nothing set and the recording started. After doing the actions you "
-       . "want to record press Insert and you will be asked to press a key-combo. "
+       . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
        . "After pressing the combo the binding will be saved automatically and the "
        . "binding editor closes");
       $SETUP_NOTEBOOK->add (Spells   => $SETUP_SPELLS = spell_setup,