Changeset 10312 for trunk

Timestamp:

04/07/11 16:36:33 (14 years ago)

Author:

tbretz

Message:

Some updates to the output of help messages.

Location:

trunk/FACT++/src

Files:

• LocalControl.h (modified) (2 diffs)
• RemoteControl.h (modified) (1 diff)
• Shell.cc (modified) (1 diff)
• Shell.h (modified) (1 diff)

trunk/FACT++/src/LocalControl.h

@@ -52 +52 @@
     { }
 
-    //bool PrintGeneralHelp()
-    //bool PrintKeyBindings()
+    bool PrintGeneralHelp()
+    {
+        T::PrintGeneralHelp();
+        lout << " " << kUnderline << "Specific commands:" << endl;
+        lout << kBold << "   st,states    " << kReset << "Display a list of the available states with description." << endl;
+        lout << endl;
+        return true;
+    }
     bool PrintCommands()
     {
@@ -65 +71 @@
     bool Process(const std::string &str)
     {
+        if (str=="states" || str=="st")
+        {
+            if (fStateMachine)
+                fStateMachine->PrintListOfStates(lout);
+            return true;
+        }
+
         if (T::Process(str))
             return true;

trunk/FACT++/src/RemoteControl.h

@@ -152 +152 @@
         T::PrintGeneralHelp();
         lout << " " << kUnderline << "Specific commands:" << endl;
-        lout << kBold << "  s,servers     " << kReset << "List all servers which are connected." << endl;
-        lout << kBold << "  svc,services  " << kReset << "List all services in the network." << endl;
+        lout << kBold << "   s,servers    " << kReset << "List all servers which are connected." << endl;
+        lout << kBold << "   svc,services " << kReset << "List all services in the network." << endl;
         lout << endl;
         return true;

trunk/FACT++/src/Shell.cc

@@ -423 +423 @@
 }
 
+bool Shell::PrintKeyBindings()
+{
+    ReadlineColor::PrintKeyBindings(win);
+    win << " " << kUnderline << "Special key bindings:" << endl << endl;;
+    win << kBold << "   F1              " << kReset << "Toggle visibility of upper panel" << endl;
+    win << endl;
+    return true;
+}
+
+bool Shell::PrintGeneralHelp()
+{
+    ReadlineColor::PrintGeneralHelp(win, GetName());
+    win << kBold << "   hide         " << kReset << "Hide upper panel." << endl;
+    win << kBold << "   show         " << kReset << "Show upper panel." << endl;
+    win << kBold << "   height <h>   " << kReset << "Set height of upper panel to h." << endl;
+    win << endl;
+    return true;
+}
+
 // --------------------------------------------------------------------------
 //

trunk/FACT++/src/Shell.h

@@ -57 +57 @@
     void Refresh() { ShowHide(-2); }
 
-    bool PrintGeneralHelp() { return ReadlineColor::PrintGeneralHelp(win, GetName()); }
-    bool PrintCommands()    { return ReadlineColor::PrintCommands(win);    }
-    bool PrintKeyBindings() { return ReadlineColor::PrintKeyBindings(win); }
+    bool PrintCommands() { return ReadlineColor::PrintCommands(win); }
+    bool PrintGeneralHelp();
+    bool PrintKeyBindings();
 
     bool Process(const std::string &str);