diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index c49032122d67d2cedeb672ebc58f19337dd7a770..c3f0ded01d16b7805294143adb78828e220aa0ac 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.432 2006-08-16 21:11:41 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.433 2006-08-16 21:55:26 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -1641,7 +1641,6 @@ void help_short_cb(CALLBACK_ARGS)
Msg(DIRECT, " Alt+a Loop through axes modes");
Msg(DIRECT, " Alt+b Hide/show bounding boxes");
Msg(DIRECT, " Alt+c Loop through predefined color schemes");
- Msg(DIRECT, " Alt+d Change surface mesh display mode (solid/wireframe)");
Msg(DIRECT, " Alt+f Change redraw mode (fast/full)");
Msg(DIRECT, " Alt+g Loop through axes modes for visible post-processing views");
Msg(DIRECT, " Alt+h Hide/show all post-processing views");
@@ -1660,11 +1659,13 @@ void help_short_cb(CALLBACK_ARGS)
Msg(DIRECT, " Alt+z Set Z view");
Msg(DIRECT, " ");
Msg(DIRECT, " Alt+Shift+a Hide/show small axes");
- Msg(DIRECT, " Alt+Shift+l Hide/show surface mesh edges");
+ Msg(DIRECT, " Alt+Shift+b Hide/show mesh volume faces");
+ Msg(DIRECT, " Alt+Shift+d Hide/show mesh surface faces");
+ Msg(DIRECT, " Alt+Shift+l Hide/show mesh lines");
Msg(DIRECT, " Alt+Shift+o Adjust projection parameters");
Msg(DIRECT, " Alt+Shift+p Hide/show mesh points");
- Msg(DIRECT, " Alt+Shift+s Hide/show mesh surfaces");
- Msg(DIRECT, " Alt+Shift+v Hide/show mesh volumes");
+ Msg(DIRECT, " Alt+Shift+s Hide/show mesh surface edges");
+ Msg(DIRECT, " Alt+Shift+v Hide/show mesh volume edges");
Msg(DIRECT, " Alt+Shift+x Set -X view");
Msg(DIRECT, " Alt+Shift+y Set -Y view");
Msg(DIRECT, " Alt+Shift+z Set -Z view");
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 00590c140aa0f9f9816349c386e92b5febb53024..fb675722ccdd1a46a2930965e1fcdde99d20bff3 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.518 2006-08-16 21:11:41 geuzaine Exp $
+// $Id: GUI.cpp,v 1.519 2006-08-16 21:55:26 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -645,12 +645,6 @@ int GUI::global_shortcuts(int event)
redraw_opengl();
return 1;
}
- else if(Fl::test_shortcut(FL_ALT + 'd')) {
- opt_mesh_surfaces_faces(0, GMSH_SET | GMSH_GUI,
- !opt_mesh_surfaces_faces(0, GMSH_GET, 0));
- redraw_opengl();
- return 1;
- }
else if(Fl::test_shortcut(FL_ALT + 'w')) {
opt_geometry_light(0, GMSH_SET | GMSH_GUI,
!opt_geometry_light(0, GMSH_GET, 0));
@@ -742,6 +736,19 @@ int GUI::global_shortcuts(int event)
redraw_opengl();
return 1;
}
+ else if(Fl::test_shortcut(FL_ALT + 'd') ||
+ Fl::test_shortcut(FL_ALT + FL_SHIFT + 'd')) {
+ opt_mesh_surfaces_faces(0, GMSH_SET | GMSH_GUI,
+ !opt_mesh_surfaces_faces(0, GMSH_GET, 0));
+ redraw_opengl();
+ return 1;
+ }
+ else if(Fl::test_shortcut(FL_ALT + FL_SHIFT + 'b')) {
+ opt_mesh_volumes_faces(0, GMSH_SET | GMSH_GUI,
+ !opt_mesh_volumes_faces(0, GMSH_GET, 0));
+ redraw_opengl();
+ return 1;
+ }
else if(Fl::test_shortcut(FL_ALT + 'm')) {
int old = opt_mesh_points(0, GMSH_GET, 0) ||
opt_mesh_lines(0, GMSH_GET, 0) ||
diff --git a/doc/texinfo/opt_general.texi b/doc/texinfo/opt_general.texi
index 0dc8a4bdb69378d811097a95d794ec90e7603ffa..8ec47fe0365411aefba4fff360c7f9254a9a2926 100644
--- a/doc/texinfo/opt_general.texi
+++ b/doc/texinfo/opt_general.texi
@@ -386,12 +386,12 @@ Saved in: @code{General.SessionFileName}
@item General.FontSize
Size of the font in the user interface@*
-Default value: @code{12}@*
+Default value: @code{13}@*
Saved in: @code{General.OptionsFileName}
@item General.GraphicsFontSize
Size of the font in the graphic window@*
-Default value: @code{14}@*
+Default value: @code{16}@*
Saved in: @code{General.OptionsFileName}
@item General.GraphicsHeight
@@ -614,6 +614,11 @@ Width (in pixels) of the message window@*
Default value: @code{450}@*
Saved in: @code{General.SessionFileName}
+@item General.MouseSelection
+Mouse selection mode (0=none, 1=no hover, 2=full)@*
+Default value: @code{2}@*
+Saved in: @code{General.OptionsFileName}
+
@item General.NoPopup
Disable interactive dialog windows in scripts (and use default values instead)@*
Default value: @code{0}@*
@@ -834,11 +839,6 @@ Level of information printed during processing (0=no information)@*
Default value: @code{3}@*
Saved in: @code{General.OptionsFileName}
-@item General.VisibilityMode
-Default mode for the visibility browser (0=Geometry+Mesh, 1=Geometry, 2=Mesh)@*
-Default value: @code{0}@*
-Saved in: @code{General.OptionsFileName}
-
@item General.VisibilityPositionX
Horizontal position (in pixels) of the upper left corner of the visibility window@*
Default value: @code{650}@*
diff --git a/doc/texinfo/opt_geometry.texi b/doc/texinfo/opt_geometry.texi
index 58154aa2accfb43c5a362b3781bcf4984030c500..50c2d13522ce1dcf90af192cfa04007069589260 100644
--- a/doc/texinfo/opt_geometry.texi
+++ b/doc/texinfo/opt_geometry.texi
@@ -151,7 +151,7 @@ Saved in: @code{General.OptionsFileName}
@item Geometry.Color.Volumes
Normal geometry volume color@*
-Default value: @code{@{128,128,128@}}@*
+Default value: @code{@{255,255,0@}}@*
Saved in: @code{General.OptionsFileName}
@item Geometry.Color.PointsSelect
diff --git a/doc/texinfo/opt_mesh.texi b/doc/texinfo/opt_mesh.texi
index f44b941b8235cacb5a77d517262489c000525389..35708044ad250dccbc845104793274478393269e 100644
--- a/doc/texinfo/opt_mesh.texi
+++ b/doc/texinfo/opt_mesh.texi
@@ -59,8 +59,8 @@ Enable mesh cut plane@*
Default value: @code{0}@*
Saved in: @code{-}
-@item Mesh.CutPlaneAsSurface
-Draw the intersection volume layer as a surface@*
+@item Mesh.CutPlaneDrawIntersect
+Draw only the volume elements that intersect with the cut plane@*
Default value: @code{0}@*
Saved in: @code{-}
@@ -239,11 +239,6 @@ Display mesh vertices (nodes)?@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
-@item Mesh.PointsPerElement
-Display mesh nodes per element (slower, but permits to visualize only a subset of the nodes)@*
-Default value: @code{0}@*
-Saved in: @code{General.OptionsFileName}
-
@item Mesh.PointInsertion
Point insertion method for isotropic 2D algorithm (1=center of circumscribed circle, 2=center of gravity)@*
Default value: @code{1}@*
@@ -304,11 +299,6 @@ Recombine algorithm (1=mixed triangles-quadrangles, 2=all quadrangles)@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
-@item Mesh.RenumberNodes
-Renumber nodes to remove holes in the numbering sequence@*
-Default value: @code{0}@*
-Saved in: @code{General.OptionsFileName}
-
@item Mesh.SaveAll
Ignore Physical definitions and save all elements@*
Default value: @code{0}@*
@@ -399,11 +389,6 @@ Mesh node color@*
Default value: @code{@{0,255,0@}}@*
Saved in: @code{General.OptionsFileName}
-@item Mesh.Color.PointsSup
-Second order mesh node color@*
-Default value: @code{@{255,0,255@}}@*
-Saved in: @code{General.OptionsFileName}
-
@item Mesh.Color.Lines
Mesh line color@*
Default value: @code{@{0,255,0@}}@*
diff --git a/doc/texinfo/opt_plugin.texi b/doc/texinfo/opt_plugin.texi
index 172800bdefb0b1921b2f0cea13b2b4dcc7fdfafb..cd7039892f8980588a58c7b4138cab899062aa73 100644
--- a/doc/texinfo/opt_plugin.texi
+++ b/doc/texinfo/opt_plugin.texi
@@ -295,7 +295,7 @@ component of the `TimeStep'-th time step in the
view `iView' to the expression `Expression'.
`Expression' can contain:
-- the usual mathematical functions (Log, Sqrt
+- the usual mathematical functions (Log, Sqrt,
Sin, Cos, Fabs, ...) and operators (+, -, *, /, ^);
- the symbols x, y and z, to retrieve the
diff --git a/doc/texinfo/opt_print.texi b/doc/texinfo/opt_print.texi
index ac92913682938646681640d1dc50fc4f2b8b6fa7..669c8fee4b7be4c3ed5456c050d1cead827e5d8c 100644
--- a/doc/texinfo/opt_print.texi
+++ b/doc/texinfo/opt_print.texi
@@ -40,7 +40,7 @@ Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
@item Print.EpsQuality
-PostScript/PDF quality (0=bitmap, 1=vector (simple sort), 2=vector (accurate sort)@*
+PostScript/PDF quality (0=bitmap, 1=vector (simple sort), 2=vector (accurate sort), 3=vector (unsorted)@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
diff --git a/doc/texinfo/shortcuts.texi b/doc/texinfo/shortcuts.texi
index 74cca2f8efcd5711d4d564f38e87a1f1c769280c..5306391df61d3fa0c601847a533d12eb0c895f74 100644
--- a/doc/texinfo/shortcuts.texi
+++ b/doc/texinfo/shortcuts.texi
@@ -94,8 +94,6 @@ Loop through axes modes
Hide/show bounding boxes
@item Alt+c
Loop through predefined color schemes
-@item Alt+d
-Change surface mesh display mode (solid/wireframe)
@item Alt+f
Change redraw mode (fast/full)
@item Alt+g
@@ -133,16 +131,20 @@ Set Z view
@item Alt+Shift+a
Hide/show small axes
+@item Alt+Shift+b
+Hide/show mesh volume faces
+@item Alt+Shift+d
+Hide/show mesh surface faces
@item Alt+Shift+l
-Hide/show surface mesh edges
+Hide/show mesh lines
@item Alt+Shift+o
Adjust projection parameters
@item Alt+Shift+p
Hide/show mesh points
@item Alt+Shift+s
-Hide/show mesh surfaces
+Hide/show mesh surface edges
@item Alt+Shift+v
-Hide/show mesh volumes
+Hide/show mesh volume edges
@item Alt+Shift+x
Set -X view
@item Alt+Shift+y