diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index e42a180dcfa0dd263178d5f3c3b1bfd1d172fdd2..67acefa990fb11acada88e47a085d5c81a0036af 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.249 2004-06-20 23:25:31 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.250 2004-06-22 17:39:11 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -1335,37 +1335,21 @@ void visibility_number_cb(CALLBACK_ARGS)
void help_short_cb(CALLBACK_ARGS)
{
- // *INDENT-OFF*
Msg(DIRECT, " ");
- Msg(DIRECT, "Menu bar shortcuts:");
+ Msg(DIRECT, "Keyboard shortcuts:");
Msg(DIRECT, " ");
+ Msg(DIRECT, " Left arrow go to previous time step");
+ Msg(DIRECT, " Right arrow go to next time step");
+ Msg(DIRECT, " Up arrow make previous view visible");
+ Msg(DIRECT, " Down arrow make next view visible");
Msg(DIRECT, " < go back to previous context");
Msg(DIRECT, " > go forward to next context");
- Msg(DIRECT, " Shift+a raise (show) all open windows");
- Msg(DIRECT, " g go to geometry module");
- Msg(DIRECT, " Shift+g show geometry options");
- Msg(DIRECT, " Shift+i show statistics window");
- Msg(DIRECT, " m go to mesh module");
- Msg(DIRECT, " Shift+m show mesh options");
- Msg(DIRECT, " "XX"+m merge file");
- Msg(DIRECT, " Shift+n show general options");
- Msg(DIRECT, " "XX"+n new file");
- Msg(DIRECT, " Shift+o show option window");
- Msg(DIRECT, " "XX"+o open file");
- Msg(DIRECT, " p go to post-processor module");
- Msg(DIRECT, " Shift+p show general post-processing options");
- Msg(DIRECT, " "XX"+q quit");
- Msg(DIRECT, " "XX"+s save mesh in default format");
- Msg(DIRECT, " "XX"+Shift+s save file as");
- Msg(DIRECT, " Shift+w show current post-processing view options");
- Msg(DIRECT, " ");
- Msg(DIRECT, "Other shortcuts");
- Msg(DIRECT, " ");
Msg(DIRECT, " 0 or Esc reload geometry input file");
Msg(DIRECT, " 1 or F1 mesh lines");
Msg(DIRECT, " 2 or F2 mesh surfaces");
Msg(DIRECT, " 3 or F3 mesh volumes");
Msg(DIRECT, " Alt+a hide/show small axes");
+ Msg(DIRECT, " Shift+a raise (show) all open windows");
Msg(DIRECT, " Alt+Shift+a hide/show big moving axes");
Msg(DIRECT, " Alt+b hide/show all post-processing scales");
Msg(DIRECT, " Alt+c loop through predefined color schemes");
@@ -1373,36 +1357,46 @@ void help_short_cb(CALLBACK_ARGS)
Msg(DIRECT, " Shift+d decrease animation delay");
Msg(DIRECT, " "XX"+Shift+d increase animation delay");
Msg(DIRECT, " Alt+f change redraw mode (fast/full)");
+ Msg(DIRECT, " g go to geometry module");
+ Msg(DIRECT, " Shift+g show geometry options");
Msg(DIRECT, " Alt+h hide/show all post-processing views");
+ Msg(DIRECT, " Shift+i show statistics window");
Msg(DIRECT, " Alt+l hide/show geometry lines");
Msg(DIRECT, " Alt+Shift+l hide/show surface mesh edges");
+ Msg(DIRECT, " m go to mesh module");
Msg(DIRECT, " Alt+m change visibility of all mesh entities");
+ Msg(DIRECT, " Shift+m show mesh options");
+ Msg(DIRECT, " "XX"+m merge file");
+ Msg(DIRECT, " Shift+n show general options");
+ Msg(DIRECT, " "XX"+n new file");
Msg(DIRECT, " Alt+o change projection mode (ortho/perspective)");
+ Msg(DIRECT, " Shift+o show option window");
+ Msg(DIRECT, " "XX"+o open file");
+ Msg(DIRECT, " p go to post-processor module");
Msg(DIRECT, " Alt+p hide/show geometry points");
+ Msg(DIRECT, " Shift+p show general post-processing options");
Msg(DIRECT, " Alt+Shift+p hide/show mesh points");
+ Msg(DIRECT, " "XX"+q quit");
Msg(DIRECT, " Alt+s hide/show geometry surfaces");
Msg(DIRECT, " Alt+Shift+s hide/show mesh surfaces");
+ Msg(DIRECT, " "XX"+s save mesh in default format");
+ Msg(DIRECT, " "XX"+Shift+s save file as");
Msg(DIRECT, " Alt+t loop through interval modes for all post-processing views");
Msg(DIRECT, " Alt+v hide/show geometry volumes");
Msg(DIRECT, " Alt+Shift+v hide/show mesh volumes");
Msg(DIRECT, " Alt+w enable/disable all lighting");
+ Msg(DIRECT, " Shift+w show current post-processing view options");
Msg(DIRECT, " Alt+x set X view");
Msg(DIRECT, " Alt+y set Y view");
Msg(DIRECT, " Alt+z set Z view");
- Msg(DIRECT, " Left arrow go to previous time step");
- Msg(DIRECT, " Right arrow go to next time step");
- Msg(DIRECT, " Up arrow make previous view visible");
- Msg(DIRECT, " Down arrow make next view visible");
Msg(DIRECT, " ");
- // *INDENT-ON*
WID->create_message_window();
}
void help_mouse_cb(CALLBACK_ARGS)
{
- // *INDENT-OFF*
Msg(DIRECT, " ");
- Msg(DIRECT, "Mouse:");
+ Msg(DIRECT, "Mouse actions:");
Msg(DIRECT, " ");
Msg(DIRECT, " move - highlight the elementary geometrical entity");
Msg(DIRECT, " currently under the mouse pointer and display");
@@ -1422,7 +1416,6 @@ void help_mouse_cb(CALLBACK_ARGS)
Msg(DIRECT, " For a 2 button mouse, Middle button = Shift+Left button");
Msg(DIRECT, " For a 1 button mouse, Middle button = Shift+Left button, Right button = Alt+Left button");
Msg(DIRECT, " ");
- // *INDENT-ON*
WID->create_message_window();
}
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 223a93de0b713f27904b80e45eac4d8fb055ae88..ba444ae58a88c219afb7942a19d371da5a29d60a 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.317 2004-06-20 23:25:31 geuzaine Exp $
+// $Id: GUI.cpp,v 1.318 2004-06-22 17:39:11 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -89,8 +89,8 @@ Fl_Menu_Item m_menubar_table[] = {
{0},
{"&Help", 0, 0, 0, FL_SUBMENU},
{"&Current options...", 0, (Fl_Callback *)status_xyz1p_cb, (void*)5},
- {"M&ouse...", 0, (Fl_Callback *)help_mouse_cb, 0},
- {"S&hortcuts...", 0, (Fl_Callback *)help_short_cb, 0},
+ {"M&ouse actions...", 0, (Fl_Callback *)help_mouse_cb, 0},
+ {"&Keyboard shortcuts...", 0, (Fl_Callback *)help_short_cb, 0},
{"C&ommand line options...", 0, (Fl_Callback *)help_command_line_cb, 0, FL_MENU_DIVIDER},
{"On&line documentation", 0, (Fl_Callback *)help_online_cb, 0, FL_MENU_DIVIDER},
{"&About...", 0, (Fl_Callback *)help_about_cb, 0},
@@ -120,8 +120,8 @@ Fl_Menu_Item m_sys_menubar_table[] = {
{0},
{"Help",0,0,0,FL_SUBMENU},
{"Current Options...", 0, (Fl_Callback *)status_xyz1p_cb, (void*)5},
- {"Mouse...", 0, (Fl_Callback *)help_mouse_cb, 0},
- {"Shortcuts...", 0, (Fl_Callback *)help_short_cb, 0},
+ {"Mouse Actions...", 0, (Fl_Callback *)help_mouse_cb, 0},
+ {"Keyboard Shortcuts...", 0, (Fl_Callback *)help_short_cb, 0},
{"Command Line Options...", 0, (Fl_Callback *)help_command_line_cb, 0, FL_MENU_DIVIDER},
{"Online Documentation", 0, (Fl_Callback *)help_online_cb, 0, FL_MENU_DIVIDER},
{"About Gmsh...", 0, (Fl_Callback *)help_about_cb, 0},
diff --git a/doc/texinfo/shortcuts.texi b/doc/texinfo/shortcuts.texi
index e24d4e5e77ef60ff25a40983e5527dc5658426d0..5333610bd04d1b4f940862e083616e76384c4db0 100644
--- a/doc/texinfo/shortcuts.texi
+++ b/doc/texinfo/shortcuts.texi
@@ -1,70 +1,24 @@
-Menu bar shortcuts:
+Keyboard shortcuts:
@table @kbd
-@item <
-go back to previous context
-
-@item >
-go forward to next context
-
-@item Shift+a
-raise (show) all open windows
-
-@item g
-go to geometry module
-
-@item Shift+g
-show geometry options
-
-@item Shift+i
-show statistics window
-
-@item m
-go to mesh module
-
-@item Shift+m
-show mesh options
-
-@item Ctrl+m
-merge file
-
-@item Shift+n
-show general options
-
-@item Ctrl+n
-new file
-
-@item Shift+o
-show option window
-
-@item Ctrl+o
-open file
-
-@item p
-go to post-processor module
-
-@item Shift+p
-show general post-processing options
-
-@item Ctrl+q
-quit
-
-@item Ctrl+s
-save mesh in default format
+@item Left arrow
+go to previous time step
-@item Ctrl+Shift+s
-save file as
+@item Right arrow
+go to next time step
-@item Shift+w
-show current post-processing view options
+@item Up arrow
+make previous view visible
-@end table
+@item Down arrow
+make next view visible
-@sp 1
+@item <
+go back to previous context
-Other shortcuts:
+@item >
+go forward to next context
-@table @kbd
@item 0
@item Esc
reload geometry input file
@@ -84,6 +38,9 @@ mesh volumes
@item Alt+a
hide/show small axes
+@item Shift+a
+raise (show) all open windows
+
@item Alt+Shift+a
hide/show big moving axes
@@ -105,33 +62,78 @@ increase animation delay
@item Alt+f
change redraw mode (fast/full)
+@item g
+go to geometry module
+
+@item Shift+g
+show geometry options
+
@item Alt+h
hide/show all post-processing views
+@item Shift+i
+show statistics window
+
@item Alt+l
hide/show geometry lines
@item Alt+Shift+l
hide/show surface mesh edges
+@item m
+go to mesh module
+
@item Alt+m
change visibility of all mesh entities
+@item Shift+m
+show mesh options
+
+@item Ctrl+m
+merge file
+
+@item Shift+n
+show general options
+
+@item Ctrl+n
+new file
+
@item Alt+o
change projection mode (ortho/perspective)
+@item Shift+o
+show option window
+
+@item Ctrl+o
+open file
+
+@item p
+go to post-processor module
+
@item Alt+p
hide/show geometry points
+@item Shift+p
+show general post-processing options
+
@item Alt+Shift+p
hide/show mesh points
+@item Ctrl+q
+quit
+
@item Alt+s
hide/show geometry surfaces
@item Alt+Shift+s
hide/show mesh surfaces
+@item Ctrl+s
+save mesh in default format
+
+@item Ctrl+Shift+s
+save file as
+
@item Alt+t
loop through interval modes for all post-processing views
@@ -144,6 +146,9 @@ hide/show mesh volumes
@item Alt+w
enable/disable all lighting
+@item Shift+w
+show current post-processing view options
+
@item Alt+x
set X view
@@ -153,16 +158,4 @@ set Y view
@item Alt+z
set Z view
-@item Left arrow
-go to previous time step
-
-@item Right arrow
-go to next time step
-
-@item Up arrow
-make previous view visible
-
-@item Down arrow
-make next view visible
-
@end table