diff --git a/Unix/Help.h b/Unix/Help.h
index abda3ff721c33c4bf46477b7de8b45cdc8da853c..e1eb3fca42342d31210e6f563c1581f962f72414 100644
--- a/Unix/Help.h
+++ b/Unix/Help.h
@@ -1,87 +1,88 @@
-/* $Id: Help.h,v 1.4 2000-12-05 18:59:17 geuzaine Exp $ */
+/* $Id: Help.h,v 1.5 2000-12-26 08:13:19 geuzaine Exp $ */
#ifndef _HELP_H_
#define _HELP_H_
static char txt_help[]=
"\n"
-" (x) stands for \"press x\"\n"
-" (x-y) stands for \"press x and, keeping it down, press y\"\n"
-" C, M and S stand for Control, Meta (or Alt) and Shift\n"
+" (x) stands for \"press x\"\n"
+" (x-y) stands for \"press x and, keeping it down, press y\"\n"
+" (x-y-z) stands for \"press x and, keeping it down, press y and z\"\n"
+" C, M and S stand for Control, Meta (or Alt) and Shift\n"
"\n"
"MOUSE:\n"
"\n"
-" move when passing over the entity, highlight it and\n"
-" display its properties on the bottom line\n"
-" size a rubber zoom started with (C-left)\n"
+" move . highlight the elementary geometrical entity \n"
+" currently under the mouse pointer and display\n"
+" its properties in the status bar\n"
+" . size a rubber zoom started with (C-left)\n"
"\n"
-" (left) apply rotation\n"
-" accept a rubber zoom started by (C-left)\n"
-" (middle) zoom\n"
-" cancel a rubber zoom\n"
-" (right) pan X (horizontal move)\n"
-" pan Y (vertical move)\n"
-" cancel a rubber zoom\n"
-" popup menu on module name\n"
-" popup menu on post processor toggle buttons\n"
+" (left) . rotate\n"
+" . accept a rubber zoom started by (C-left)\n"
+" (middle) . zoom (isotropic)\n"
+" . cancel a rubber zoom\n"
+" (right) . pan\n"
+" . cancel a rubber zoom\n"
+" . pop up menu on module name\n"
+" . pop up menu on post-processing view button\n"
"\n"
-" (C-left) start a rubber zoom\n"
-" (C-middle) re-orthogonalise viewport\n"
-" (C-right) reset viewport to default\n"
+" (C-left) start (anisotropic) rubber zoom\n"
+" (C-middle) orthogonalize display\n"
+" (C-right) reset viewpoint to default\n"
"\n"
"KEYBOARD:\n"
"\n"
"No modifier: basic module interaction\n"
"\n"
-" (0) reparse file\n"
-" (1),(f1) mesh lines\n"
-" (2),(f2) mesh surfaces\n"
-" (3),(f3) mesh volumes\n"
-" (g) go to geometry module\n"
-" (m) go to mesh module\n"
-" (p) go to post processor module\n"
+" (0) reload input file\n"
+" (1), (F1) mesh curves\n"
+" (2), (F2) mesh surfaces\n"
+" (3), (F3) mesh volumes\n"
+" (g) go to geometry module\n"
+" (m) go to mesh module\n"
+" (p) go to post processor module\n"
"\n"
-"Control modifier: popup file menus\n"
+"Control modifier: file menu\n"
"\n"
-" (C-a),(C-c) abort mesh thread\n"
-" (C-q) quit\n"
-" (C-o) hide/show open file dialog\n"
-" (C-p) hide/show print dialog\n"
-" (C-m) hide/show merge file dialog\n"
-" (C-s) quick mesh save\n"
-" (C-S-s) hide/show save mesh dialog\n"
+" (C-q) quit\n"
+" (C-o) hide/show open file dialog\n"
+" (C-p) hide/show save/print dialog\n"
+" (C-m) hide/show merge file dialog\n"
+" (C-s) quick mesh save\n"
"\n"
-"Shift modifier: popup option menus\n"
+"Shift modifier: pop up option menus\n"
"\n"
-" (S-g) hide/show geometry options\n"
-" (S-i) hide/show statistics window\n"
-" (S-m) hide/show mesh options\n"
-" (S-o) hide/show miscellaneous options\n"
-" (S-p) hide/show post processor general options\n"
-" (S-v) hide/show viewport options\n"
+" (S-g) hide/show geometry options\n"
+" (S-i) hide/show statistics window\n"
+" (S-m) hide/show mesh options\n"
+" (S-o) hide/show miscellaneous options\n"
+" (S-p) hide/show post-processing general options\n"
+" (S-v) hide/show viewpoint options\n"
"\n"
-"Meta (Alt) modifier: quick shortcuts (no popup)\n"
+"Meta (Alt) modifier: quick shortcuts (no pop up)\n"
"\n"
-" (M-a) hide/show 2D axes\n"
-" (M-S-a) hide/show 3D axes\n"
-" (M-b) hide/show all post processing scales\n"
-" (M-c) alternate between predefined color modes\n"
-" (M-d) alternate between mesh wireframe, hidden lines and shading modes\n"
-" (M-f) toggle redraw mode (fast/display all)\n"
-" (M-h) toggle highlight mode\n"
-" (M-l) hide/show geometry lines\n"
-" (M-S-l) hide/show mesh lines\n"
-" (M-m) toggle all mesh entities visibility\n"
-" (M-o) change projection mode\n"
-" (M-p) hide/show geometry points\n"
-" (M-S-p) hide/show mesh points\n"
-" (M-s) hide/show geometry surfaces\n"
-" (M-S-s) hide/show mesh surfaces\n"
-" (M-v) hide/show geometry volumes\n"
-" (M-S-v) hide/show mesh volumes\n"
-" (M-x) set X view\n"
-" (M-y) set Y view\n"
-" (M-z) set Z view\n"
-" (M-t) alternate intervals mode in post-processing\n"
+" (M-a) hide/show small axes\n"
+" (M-S-a) hide/show big moving axes\n"
+" (M-b) hide/show all post processing scales\n"
+" (M-c) alternate between predefined color schemes\n"
+" (M-d) alternate between mesh wire frame, hidden lines\n"
+" and shading modes\n"
+" (M-f) toggle redraw mode (fast/full)\n"
+" (M-h) toggle highlight mode\n"
+" (M-l) hide/show geometry lines\n"
+" (M-S-l) hide/show mesh lines\n"
+" (M-m) toggle all mesh entities visibility\n"
+" (M-o) change projection mode\n"
+" (M-p) hide/show geometry points\n"
+" (M-S-p) hide/show mesh points\n"
+" (M-s) hide/show geometry surfaces\n"
+" (M-S-s) hide/show mesh surfaces\n"
+" (M-t) alternate intervals mode for all post-processing\n"
+" views\n"
+" (M-v) hide/show geometry volumes\n"
+" (M-S-v) hide/show mesh volumes\n"
+" (M-x) set X view\n"
+" (M-y) set Y view\n"
+" (M-z) set Z view\n"
"\n"
;
diff --git a/Unix/Widgets.cpp b/Unix/Widgets.cpp
index 8715b120d5d2502ddbf16115596a5ce36833d19d..16d1586bc15cfe1347a6bc69907d7fc8ee244429 100644
--- a/Unix/Widgets.cpp
+++ b/Unix/Widgets.cpp
@@ -1,4 +1,4 @@
-/* $Id: Widgets.cpp,v 1.23 2000-12-21 14:53:10 geuzaine Exp $ */
+/* $Id: Widgets.cpp,v 1.24 2000-12-26 08:13:19 geuzaine Exp $ */
#include "Gmsh.h"
#include "GmshUI.h"
@@ -239,7 +239,7 @@ void CreateWidgets_M(Widgets_T *w){
XtManageChild(w->M.helpSep[0]);
i=0;
- XtSetArg(arg[i], XmNlabelString, XmStringCreateSimple("About Gmsh...")); i++;
+ XtSetArg(arg[i], XmNlabelString, XmStringCreateSimple("About...")); i++;
w->M.helpButt[1] = XmCreatePushButton(w->M.helpPane, "MhelpButt1", arg, i);
XtManageChild(w->M.helpButt[1]);
@@ -1228,7 +1228,7 @@ void CreateWidgets_OD(Widgets_T *w){
XtSetArg(arg[i], XmNminimum, 0); i++;
XtSetArg(arg[i], XmNmaximum, 100); i++;
XtSetArg(arg[i], XmNdecimalPoints, 1); i++;
- XtSetArg(arg[i], XmNshowValue, true); i++;
+ XtSetArg(arg[i], XmNshowValue, True); i++;
XtSetArg(arg[i], XmNvalue, CTX.post.anim_delay/1.e5); i++;
XtSetArg(arg[i], XmNorientation, XmHORIZONTAL); i++;
w->OD.postAnimScale = XmCreateScale(w->OD.postAnimFrameRowCol, "ODpostAnimScale", arg, i);
@@ -1321,7 +1321,7 @@ void CreateWidgets_OD(Widgets_T *w){
XtSetArg(arg[i], XmNminimum, 0); i++;
XtSetArg(arg[i], XmNmaximum, 2); i++;
XtSetArg(arg[i], XmNdecimalPoints, 0); i++;
- XtSetArg(arg[i], XmNshowValue, true); i++;
+ XtSetArg(arg[i], XmNshowValue, True); i++;
XtSetArg(arg[i], XmNvalue, CTX.color.id); i++;
XtSetArg(arg[i], XmNorientation, XmHORIZONTAL); i++;
w->OD.miscColorSchemeScale = XmCreateScale(w->OD.miscColorSchemeFrameRowCol, "ODmiscColorSchemeScale", arg, i);
@@ -1402,7 +1402,7 @@ void CreateWidgets_OD(Widgets_T *w){
XtSetArg(arg[i], XmNminimum, 0); i++;
XtSetArg(arg[i], XmNmaximum, 25); i++;
XtSetArg(arg[i], XmNdecimalPoints, 0); i++;
- XtSetArg(arg[i], XmNshowValue, false); i++;
+ XtSetArg(arg[i], XmNshowValue, False); i++;
XtSetArg(arg[i], XmNvalue, (int)25*CTX.shine); i++;
XtSetArg(arg[i], XmNorientation, XmHORIZONTAL); i++;
w->OD.miscShineScale = XmCreateScale(w->OD.miscShineFrameRowCol, "ODmiscShineScale", arg, i);
@@ -1724,7 +1724,7 @@ void CreateWidgets_HD(Widgets_T *w){
/* about */
i=0;
- XtSetArg(arg[i], XmNdialogTitle, XmStringCreateSimple("About Gmsh...")); i++;
+ XtSetArg(arg[i], XmNdialogTitle, XmStringCreateSimple("About Gmsh")); i++;
XtSetArg(arg[i], XmNautoUnmanage, True); i++;
XtSetArg(arg[i], XmNmessageString, XmStringCreateLtoR(TextAbout,XmFONTLIST_DEFAULT_TAG)); i++;
w->HD.aboutDialog = XmCreateInformationDialog(w->M.shell, "HDaboutDialog", arg, i);