--- deliantra/Deliantra-Client/bin/cfplus	2006/05/30 14:35:09	1.34
+++ deliantra/Deliantra-Client/bin/cfplus	2006/05/31 13:44:26	1.38
@@ -108,6 +108,8 @@
 our $BIND_WINDOW;
 our $BIND_EDITOR;
 
+our $SPELL_LIST;
+
 sub status {
    $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
 }
@@ -932,7 +934,6 @@
       force_w => $WIDTH  * 9/10,
       force_h => $HEIGHT * 9/10,
       title   => "Inventory",
-      name    => "inventory_window",
    ;
 
    $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
@@ -953,6 +954,13 @@
    $invwin
 }
 
+sub make_spell_list {
+   $SPELL_LIST = new CFClient::UI::SpellList
+      force_w => $WIDTH * (9/10),
+      force_h => $HEIGHT * (9/10);
+   $SPELL_LIST
+}
+
 sub make_binding_window {
    my $binding_list = new CFClient::UI::VBox;
 
@@ -1014,8 +1022,11 @@
       };
 
    $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
-   $vb->add (new CFClient::UI::Button
+   $vb->add ($binding_list);
+   $vb->add (my $hb = new CFClient::UI::HBox);
+   $hb->add (new CFClient::UI::Button
       text => "record new",
+      expand => 1,
       tooltip => "This button opens the binding editor with an empty binding.",
       on_activate => sub {
          $::BIND_EDITOR->set_binding (undef, undef, [],
@@ -1032,7 +1043,15 @@
          $::BIND_EDITOR->show;
       },
    );
-   $vb->add ($binding_list);
+   $hb->add (new CFClient::UI::Button
+      text => "close",
+      tooltip => "Closes the binding window",
+      expand => 1,
+      on_activate => sub {
+         $::BIND_WINDOW->hide;
+      }
+   );
+
    $refresh->();
    $BIND_WINDOW
 }
@@ -1180,7 +1199,8 @@
       $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
          tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
       $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
-         tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
+         tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
+                   ."You can also hit the Tab-key to show/hide the Inventory.");
 
       $BUTTONBAR->add (new CFClient::UI::Button
          text             => "Save Config",
@@ -1198,8 +1218,18 @@
       $BUTTONBAR->add (new CFClient::UI::Flopper 
          text => "Bindings",
          other => make_binding_window,
-         tooltip => "Lets you delete bindings you have made with the recorder"
-      );
+         tooltip =>
+            "Lets you define, edit and delete bindings."
+            ."There is a shortcut for making bindings: LCTRL+Insert 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."
+            ."After pressing the combo the binding will be saved automatically and the "
+            ."binding editor closes");
+
+      $BUTTONBAR->add (new CFClient::UI::Flopper 
+         text => "Spells",
+         other => make_spell_list,
+         tooltip => "The spell list");
 
       $BUTTONBAR->add (new CFClient::UI::Button
          text        => "Quit",