From 9dd6e35db718404d670dbdef4abecf2e60f4ddcc Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 31 Dec 2004 04:04:51 +0000
Subject: [PATCH] Small aesthetic changes:
- Only 'title-capitalize' window titles and menus; the rest should be
capitalized like normal english sentences
- The window title should be exactly the same as the menu item
(without the ellipsis character if there is one)
---
Common/CommandLine.cpp | 74 +++++++-------
Fltk/Callbacks.cpp | 178 +++++++++++++++++-----------------
Fltk/Colorbar_Window.cpp | 32 +++---
Fltk/GUI.cpp | 80 ++++++++-------
Fltk/GUI_Extras.cpp | 8 +-
Plugin/CutGrid.cpp | 4 +-
Plugin/CutMap.cpp | 4 +-
Plugin/CutParametric.cpp | 4 +-
Plugin/CutPlane.cpp | 4 +-
Plugin/CutSphere.cpp | 4 +-
Plugin/DecomposeInSimplex.cpp | 4 +-
Plugin/DisplacementRaise.cpp | 4 +-
Plugin/HarmonicToTime.cpp | 4 +-
Plugin/SphericalRaise.cpp | 4 +-
Plugin/StreamLines.cpp | 4 +-
doc/FAQ | 4 +-
doc/texinfo/command_line.texi | 74 +++++++-------
doc/texinfo/gmsh.texi | 30 +++---
doc/texinfo/shortcuts.texi | 114 +++++++++++-----------
19 files changed, 323 insertions(+), 311 deletions(-)
diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index 2a7a67102e..45e389512f 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -1,4 +1,4 @@
-// $Id: CommandLine.cpp,v 1.52 2004-12-27 00:46:59 geuzaine Exp $
+// $Id: CommandLine.cpp,v 1.53 2004-12-31 04:04:50 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -67,50 +67,50 @@ char gmsh_email[] = "Mailing list : gmsh@geuz.org" ;
void Print_Usage(char *name){
Msg(DIRECT, "Usage: %s [options] [files]", name);
Msg(DIRECT, "Geometry options:");
- Msg(DIRECT, " -0 parse input files, output unrolled geometry, and exit");
+ Msg(DIRECT, " -0 Parse input files, output unrolled geometry, and exit");
Msg(DIRECT, "Mesh options:");
- Msg(DIRECT, " -1, -2, -3 perform batch 1D, 2D and 3D mesh generation");
- Msg(DIRECT, " -saveall save all elements (discard physical group definitions)");
- Msg(DIRECT, " -o file specify mesh output file name");
- Msg(DIRECT, " -format string set output mesh format (msh, unv, gref)");
- Msg(DIRECT, " -algo string select mesh algorithm (iso, tri, aniso, netgen)");
- Msg(DIRECT, " -smooth int set number of mesh smoothing steps");
- Msg(DIRECT, " -optimize optimize quality of tetrahedral elements");
- Msg(DIRECT, " -order int set mesh order (1, 2)");
- Msg(DIRECT, " -scale float set global scaling factor");
- Msg(DIRECT, " -meshscale float set mesh scaling factor");
- Msg(DIRECT, " -clscale float set characteristic length scaling factor");
- Msg(DIRECT, " -rand float set random perturbation factor");
- Msg(DIRECT, " -bgm file load backround mesh from file");
- Msg(DIRECT, " -constrain constrain background mesh with characteristic lengths");
- Msg(DIRECT, " -histogram print mesh quality histogram");
- Msg(DIRECT, " -extrude use old extrusion mesh generator");
- Msg(DIRECT, " -recombine recombine meshes from old extrusion mesh generator");
+ Msg(DIRECT, " -1, -2, -3 Perform batch 1D, 2D and 3D mesh generation");
+ Msg(DIRECT, " -saveall Save all elements (discard physical group definitions)");
+ Msg(DIRECT, " -o file Specify mesh output file name");
+ Msg(DIRECT, " -format string Set output mesh format (msh, unv, gref)");
+ Msg(DIRECT, " -algo string Select mesh algorithm (iso, tri, aniso, netgen)");
+ Msg(DIRECT, " -smooth int Set number of mesh smoothing steps");
+ Msg(DIRECT, " -optimize Optimize quality of tetrahedral elements");
+ Msg(DIRECT, " -order int Set mesh order (1, 2)");
+ Msg(DIRECT, " -scale float Set global scaling factor");
+ Msg(DIRECT, " -meshscale float Set mesh scaling factor");
+ Msg(DIRECT, " -clscale float Set characteristic length scaling factor");
+ Msg(DIRECT, " -rand float Set random perturbation factor");
+ Msg(DIRECT, " -bgm file Load backround mesh from file");
+ Msg(DIRECT, " -constrain Constrain background mesh with characteristic lengths");
+ Msg(DIRECT, " -histogram Print mesh quality histogram");
+ Msg(DIRECT, " -extrude Use old extrusion mesh generator");
+ Msg(DIRECT, " -recombine Recombine meshes from old extrusion mesh generator");
#if defined(HAVE_FLTK)
- Msg(DIRECT, " -interactive display 2D mesh construction interactively");
+ Msg(DIRECT, " -interactive Display 2D mesh construction interactively");
Msg(DIRECT, "Post-processing options:");
- Msg(DIRECT, " -noview hide all views on startup");
- Msg(DIRECT, " -link int select link mode between views (0, 1, 2, 3, 4)");
- Msg(DIRECT, " -combine combine input views into multi-time-step ones");
+ Msg(DIRECT, " -noview Hide all views on startup");
+ Msg(DIRECT, " -link int Select link mode between views (0, 1, 2, 3, 4)");
+ Msg(DIRECT, " -combine Combine input views into multi-time-step ones");
Msg(DIRECT, "Display options:");
- Msg(DIRECT, " -nodb disable double buffering");
- Msg(DIRECT, " -fontsize int specify the font size for the GUI");
- Msg(DIRECT, " -scheme string specify FLTK GUI scheme");
- Msg(DIRECT, " -display string specify display");
+ Msg(DIRECT, " -nodb Disable double buffering");
+ Msg(DIRECT, " -fontsize int Specify the font size for the GUI");
+ Msg(DIRECT, " -scheme string Specify FLTK GUI scheme");
+ Msg(DIRECT, " -display string Specify display");
#endif
Msg(DIRECT, "Other options:");
#if defined(HAVE_FLTK)
- Msg(DIRECT, " -a, -g, -m, -s, -p start in automatic, geometry, mesh, solver or post-processing mode");
+ Msg(DIRECT, " -a, -g, -m, -s, -p Start in automatic, geometry, mesh, solver or post-processing mode");
#endif
- Msg(DIRECT, " -pid print process id on stdout");
- Msg(DIRECT, " -v int set verbosity level");
- Msg(DIRECT, " -nopopup don't popup dialog windows in scripts");
- Msg(DIRECT, " -string \"string\" parse string before project file");
- Msg(DIRECT, " -option file parse option file before GUI creation");
- Msg(DIRECT, " -convert file file perform batch conversion of views and meshes into latest file formats");
- Msg(DIRECT, " -version show version number");
- Msg(DIRECT, " -info show detailed version information");
- Msg(DIRECT, " -help show this message");
+ Msg(DIRECT, " -pid Print process id on stdout");
+ Msg(DIRECT, " -v int Set verbosity level");
+ Msg(DIRECT, " -nopopup Don't popup dialog windows in scripts");
+ Msg(DIRECT, " -string \"string\" Parse string before project file");
+ Msg(DIRECT, " -option file Parse option file before GUI creation");
+ Msg(DIRECT, " -convert file file Perform batch conversion of views and meshes into latest file formats");
+ Msg(DIRECT, " -version Show version number");
+ Msg(DIRECT, " -info Show detailed version information");
+ Msg(DIRECT, " -help Show this message");
}
char *Get_BuildOptions(void)
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 8b372b1cb3..bbb6335eb6 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.318 2004-12-30 23:53:53 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.319 2004-12-31 04:04:50 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -265,7 +265,7 @@ void status_cancel_cb(CALLBACK_ARGS)
void file_new_cb(CALLBACK_ARGS)
{
test:
- if(file_chooser(0, 1, "New project file", "*", 0)) {
+ if(file_chooser(0, 1, "New", "*", 0)) {
char *name = file_chooser_get_name(1);
struct stat buf;
if(!stat(name, &buf)){
@@ -291,7 +291,7 @@ void file_new_cb(CALLBACK_ARGS)
void file_open_cb(CALLBACK_ARGS)
{
int n = List_Nbr(CTX.post.list);
- if(file_chooser(0, 0, "Open project file", "*", 0)) {
+ if(file_chooser(0, 0, "Open", "*", 0)) {
OpenProblem(file_chooser_get_name(1));
Draw();
}
@@ -302,7 +302,7 @@ void file_open_cb(CALLBACK_ARGS)
void file_merge_cb(CALLBACK_ARGS)
{
int n = List_Nbr(CTX.post.list);
- int f = file_chooser(1, 0, "Merge file(s)", "*", 0);
+ int f = file_chooser(1, 0, "Merge", "*", 0);
if(f) {
for(int i = 1; i <= f; i++)
MergeProblem(file_chooser_get_name(i));
@@ -366,27 +366,27 @@ int _save_vrml(char *name)
int _save_ps(char *name)
{
- return gl2ps_dialog(name, "PS options", 0, 0);
+ return gl2ps_dialog(name, "PS Options", 0, 0);
}
int _save_eps(char *name)
{
- return gl2ps_dialog(name, "EPS options", 1, 0);
+ return gl2ps_dialog(name, "EPS Options", 1, 0);
}
int _save_epstex(char *name)
{
- return gl2ps_dialog(name, "EPS options", 1, 1);
+ return gl2ps_dialog(name, "EPS Options", 1, 1);
}
int _save_pdf(char *name)
{
- return gl2ps_dialog(name, "PDF options", 2, 0);
+ return gl2ps_dialog(name, "PDF Options", 2, 0);
}
int _save_pdftex(char *name)
{
- return gl2ps_dialog(name, "PDF options", 2, 1);
+ return gl2ps_dialog(name, "PDF Options", 2, 1);
}
int _save_jpegtex(char *name)
@@ -489,7 +489,7 @@ void file_save_as_cb(CALLBACK_ARGS)
}
test:
- if(file_chooser(0, 1, "Save file as", pat, patindex)) {
+ if(file_chooser(0, 1, "Save As", pat, patindex)) {
char *name = file_chooser_get_name(1);
if(CTX.confirm_overwrite) {
struct stat buf;
@@ -512,7 +512,7 @@ void file_save_as_cb(CALLBACK_ARGS)
void file_rename_cb(CALLBACK_ARGS)
{
test:
- if(file_chooser(0, 1, "Rename project file", "*", 0, CTX.filename)) {
+ if(file_chooser(0, 1, "Rename", "*", 0, CTX.filename)) {
char *name = file_chooser_get_name(1);
if(CTX.confirm_overwrite) {
struct stat buf;
@@ -704,7 +704,7 @@ void general_arrow_param_cb(CALLBACK_ARGS)
double a = opt_general_arrow_head_radius(0, GMSH_GET, 0);
double b = opt_general_arrow_stem_length(0, GMSH_GET, 0);
double c = opt_general_arrow_stem_radius(0, GMSH_GET, 0);
- while(arrow_editor("Arrow editor", a, b, c)){
+ while(arrow_editor("Arrow Editor", a, b, c)){
opt_general_arrow_head_radius(0, GMSH_SET, a);
opt_general_arrow_stem_length(0, GMSH_SET, b);
opt_general_arrow_stem_radius(0, GMSH_SET, c);
@@ -935,7 +935,7 @@ void message_clear_cb(CALLBACK_ARGS)
void message_save_cb(CALLBACK_ARGS)
{
test:
- if(file_chooser(0, 1, "Save messages", "*", 0)) {
+ if(file_chooser(0, 1, "Save", "*", 0)) {
char *name = file_chooser_get_name(1);
if(CTX.confirm_overwrite) {
struct stat buf;
@@ -1187,70 +1187,70 @@ void help_short_cb(CALLBACK_ARGS)
Msg(DIRECT, "Keyboard shortcuts:");
#endif
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, " 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, " ");
- Msg(DIRECT, " < go back to previous context");
- Msg(DIRECT, " > go forward to next context");
- Msg(DIRECT, " 0 or Esc reload project file");
- Msg(DIRECT, " 1 or F1 mesh lines");
- Msg(DIRECT, " 2 or F2 mesh surfaces");
- Msg(DIRECT, " 3 or F3 mesh volumes");
+ Msg(DIRECT, " < Go back to previous context");
+ Msg(DIRECT, " > Go forward to next context");
+ Msg(DIRECT, " 0 or Esc Reload project file");
+ Msg(DIRECT, " 1 or F1 Mesh lines");
+ Msg(DIRECT, " 2 or F2 Mesh surfaces");
+ Msg(DIRECT, " 3 or F3 Mesh volumes");
Msg(DIRECT, " ");
- Msg(DIRECT, " g go to geometry module");
- Msg(DIRECT, " m go to mesh module");
- Msg(DIRECT, " p go to post-processing module");
- Msg(DIRECT, " s go to solver module");
+ Msg(DIRECT, " g Go to geometry module");
+ Msg(DIRECT, " m Go to mesh module");
+ Msg(DIRECT, " p Go to post-processing module");
+ Msg(DIRECT, " s Go to solver module");
Msg(DIRECT, " ");
- Msg(DIRECT, " Shift+g show geometry options");
- Msg(DIRECT, " Shift+m show mesh options");
- Msg(DIRECT, " Shift+o show general options");
- Msg(DIRECT, " Shift+p show post-processing options");
- Msg(DIRECT, " Shift+s show solver options");
- Msg(DIRECT, " Shift+w show post-processing view options");
+ Msg(DIRECT, " Shift+g Show geometry options");
+ Msg(DIRECT, " Shift+m Show mesh options");
+ Msg(DIRECT, " Shift+o Show general options");
+ Msg(DIRECT, " Shift+p Show post-processing options");
+ Msg(DIRECT, " Shift+s Show solver options");
+ Msg(DIRECT, " Shift+w Show post-processing view options");
Msg(DIRECT, " ");
- Msg(DIRECT, " Ctrl+a bring all windows to front");
- Msg(DIRECT, " Ctrl+i show statistics window");
- Msg(DIRECT, " Ctrl+l show message console");
- Msg(DIRECT, " Ctrl+m merge file");
- Msg(DIRECT, " Ctrl+n new project file");
- Msg(DIRECT, " Ctrl+o open project file");
- Msg(DIRECT, " Ctrl+q quit");
- Msg(DIRECT, " Ctrl+r rename project file");
- Msg(DIRECT, " Ctrl+s save file as");
+ Msg(DIRECT, " Ctrl+a Bring all windows to front");
+ Msg(DIRECT, " Ctrl+i Show statistics window");
+ Msg(DIRECT, " Ctrl+l Show message console");
+ Msg(DIRECT, " Ctrl+m Merge file");
+ Msg(DIRECT, " Ctrl+n Create new project file");
+ Msg(DIRECT, " Ctrl+o Open project file");
+ Msg(DIRECT, " Ctrl+q Quit");
+ Msg(DIRECT, " Ctrl+r Rename project file");
+ Msg(DIRECT, " Ctrl+s Save file as");
Msg(DIRECT, " ");
- Msg(DIRECT, " Shift+Ctrl+c show clipping plane window");
- Msg(DIRECT, " Shift+Ctrl+o show option window");
- Msg(DIRECT, " Shift+Ctrl+s save mesh in default format");
- Msg(DIRECT, " Shift+Ctrl+v show visibility window");
+ Msg(DIRECT, " Shift+Ctrl+c Show clipping plane window");
+ Msg(DIRECT, " Shift+Ctrl+o Show option window");
+ Msg(DIRECT, " Shift+Ctrl+s Save mesh in default format");
+ Msg(DIRECT, " Shift+Ctrl+v Show visibility window");
Msg(DIRECT, " ");
- Msg(DIRECT, " Alt+a hide/show small axes");
- 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+h hide/show all post-processing views");
- Msg(DIRECT, " Alt+i hide/show all post-processing view scales");
- Msg(DIRECT, " Alt+l hide/show geometry lines");
- Msg(DIRECT, " Alt+m toggle visibility of all mesh entities");
- Msg(DIRECT, " Alt+n hide/show all post-processing view annotations");
- Msg(DIRECT, " Alt+o change projection mode (orthographic/perspective)");
- Msg(DIRECT, " Alt+p hide/show geometry points");
- Msg(DIRECT, " Alt+s hide/show geometry surfaces");
- Msg(DIRECT, " Alt+t loop through interval modes for all post-processing views");
- Msg(DIRECT, " Alt+v hide/show geometry volumes");
- Msg(DIRECT, " Alt+w enable/disable all lighting");
- Msg(DIRECT, " Alt+x set X view");
- Msg(DIRECT, " Alt+y set Y view");
- Msg(DIRECT, " Alt+z set Z view");
+ Msg(DIRECT, " Alt+a Hide/show small axes");
+ 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+h Hide/show all post-processing views");
+ Msg(DIRECT, " Alt+i Hide/show all post-processing view scales");
+ Msg(DIRECT, " Alt+l Hide/show geometry lines");
+ Msg(DIRECT, " Alt+m Toggle visibility of all mesh entities");
+ Msg(DIRECT, " Alt+n Hide/show all post-processing view annotations");
+ Msg(DIRECT, " Alt+o Change projection mode (orthographic/perspective)");
+ Msg(DIRECT, " Alt+p Hide/show geometry points");
+ Msg(DIRECT, " Alt+s Hide/show geometry surfaces");
+ Msg(DIRECT, " Alt+t Loop through interval modes for all post-processing views");
+ Msg(DIRECT, " Alt+v Hide/show geometry volumes");
+ Msg(DIRECT, " Alt+w Enable/disable all lighting");
+ Msg(DIRECT, " Alt+x Set X view");
+ Msg(DIRECT, " Alt+y Set Y view");
+ Msg(DIRECT, " Alt+z Set Z view");
Msg(DIRECT, " ");
- Msg(DIRECT, " Alt+Shift+a hide/show moving axes");
- Msg(DIRECT, " Alt+Shift+l hide/show surface mesh edges");
- 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+a Hide/show moving axes");
+ Msg(DIRECT, " Alt+Shift+l Hide/show surface mesh edges");
+ 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, " ");
WID->create_message_window();
}
@@ -1260,20 +1260,20 @@ void help_mouse_cb(CALLBACK_ARGS)
Msg(DIRECT, " ");
Msg(DIRECT, "Mouse actions:");
Msg(DIRECT, " ");
- Msg(DIRECT, " move - highlight the elementary geometrical entity");
+ Msg(DIRECT, " move - Highlight the elementary geometrical entity");
Msg(DIRECT, " currently under the mouse pointer and display");
Msg(DIRECT, " its properties in the status bar");
- Msg(DIRECT, " - size a rubber zoom started with Ctrl+Left button");
- Msg(DIRECT, " Left button - rotate");
- Msg(DIRECT, " - accept a rubber zoom started with Ctrl+Left button");
- Msg(DIRECT, " Ctrl+Left button start (anisotropic) rubber zoom");
- Msg(DIRECT, " Middle button - zoom (isotropic)");
- Msg(DIRECT, " - cancel a rubber zoom");
- Msg(DIRECT, " Ctrl+Middle button orthogonalize display");
- Msg(DIRECT, " Right button - pan");
- Msg(DIRECT, " - cancel a rubber zoom");
- Msg(DIRECT, " - pop up menu on post-processing view button");
- Msg(DIRECT, " Ctrl+Right button reset to default viewpoint");
+ Msg(DIRECT, " - Size a rubber zoom started with Ctrl+Left button");
+ Msg(DIRECT, " Left button - Rotate");
+ Msg(DIRECT, " - Accept a rubber zoom started with Ctrl+Left button");
+ Msg(DIRECT, " Ctrl+Left button Start (anisotropic) rubber zoom");
+ Msg(DIRECT, " Middle button - Zoom (isotropic)");
+ Msg(DIRECT, " - Cancel a rubber zoom");
+ Msg(DIRECT, " Ctrl+Middle button Orthogonalize display");
+ Msg(DIRECT, " Right button - Pan");
+ Msg(DIRECT, " - Cancel a rubber zoom");
+ Msg(DIRECT, " - Pop up menu on post-processing view button");
+ Msg(DIRECT, " Ctrl+Right button Reset to default viewpoint");
Msg(DIRECT, " ");
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");
@@ -2671,7 +2671,7 @@ void solver_file_open_cb(CALLBACK_ARGS)
// We allow to create the .pro file... Or should we add a "New file"
// button?
- if(file_chooser(0, 1, "Open problem definition file", tmp, 0)) {
+ if(file_chooser(0, 1, "Choose", tmp, 0)) {
WID->solver[num].input[0]->value(file_chooser_get_name(1));
if(SINFO[num].nboptions) {
char file[1024];
@@ -2697,7 +2697,7 @@ void solver_file_edit_cb(CALLBACK_ARGS)
void solver_choose_mesh_cb(CALLBACK_ARGS)
{
int num = (long)data;
- if(file_chooser(0, 0, "Open mesh file", "*.msh", 0))
+ if(file_chooser(0, 0, "Choose", "*.msh", 0))
WID->solver[num].input[1]->value(file_chooser_get_name(1));
}
@@ -2766,7 +2766,7 @@ void solver_kill_cb(CALLBACK_ARGS)
void solver_choose_executable_cb(CALLBACK_ARGS)
{
int num = (long)data;
- if(file_chooser(0, 0, "Choose executable",
+ if(file_chooser(0, 0, "Choose",
#if defined(WIN32)
"*.exe"
#else
@@ -2908,7 +2908,7 @@ void view_save_ascii_cb(CALLBACK_ARGS)
Post_View *v = *(Post_View **) List_Pointer(CTX.post.list, (long)data);
test:
- if(file_chooser(0, 1, "Save view in ASCII format", "*", 0, v->FileName)) {
+ if(file_chooser(0, 1, "Save As ASCII View", "*", 0, v->FileName)) {
char *name = file_chooser_get_name(1);
if(CTX.confirm_overwrite) {
struct stat buf;
@@ -2925,7 +2925,7 @@ void view_save_binary_cb(CALLBACK_ARGS)
Post_View *v = *(Post_View **) List_Pointer(CTX.post.list, (long)data);
test:
- if(file_chooser(0, 1, "Save view in binary format", "*", 0, v->FileName)) {
+ if(file_chooser(0, 1, "Save As Binary View", "*", 0, v->FileName)) {
char *name = file_chooser_get_name(1);
if(CTX.confirm_overwrite) {
struct stat buf;
@@ -2942,7 +2942,7 @@ void view_save_parsed_cb(CALLBACK_ARGS)
Post_View *v = *(Post_View **) List_Pointer(CTX.post.list, (long)data);
test:
- if(file_chooser(0, 1, "Save view in parsed format", "*", 0, v->FileName)) {
+ if(file_chooser(0, 1, "Save As Parsed View", "*", 0, v->FileName)) {
char *name = file_chooser_get_name(1);
if(CTX.confirm_overwrite) {
struct stat buf;
@@ -3657,7 +3657,7 @@ void view_arrow_param_cb(CALLBACK_ARGS)
double a = opt_view_arrow_head_radius(WID->view_number, GMSH_GET, 0);
double b = opt_view_arrow_stem_length(WID->view_number, GMSH_GET, 0);
double c = opt_view_arrow_stem_radius(WID->view_number, GMSH_GET, 0);
- while(arrow_editor("Arrow editor", a, b, c)){
+ while(arrow_editor("Arrow Editor", a, b, c)){
opt_view_arrow_head_radius(WID->view_number, GMSH_SET, a);
opt_view_arrow_stem_length(WID->view_number, GMSH_SET, b);
opt_view_arrow_stem_radius(WID->view_number, GMSH_SET, c);
diff --git a/Fltk/Colorbar_Window.cpp b/Fltk/Colorbar_Window.cpp
index f22e57bdda..8a57ff1817 100644
--- a/Fltk/Colorbar_Window.cpp
+++ b/Fltk/Colorbar_Window.cpp
@@ -1,4 +1,4 @@
-// $Id: Colorbar_Window.cpp,v 1.45 2004-12-26 18:37:01 geuzaine Exp $
+// $Id: Colorbar_Window.cpp,v 1.46 2004-12-31 04:04:50 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -227,49 +227,49 @@ void Colorbar_Window::redraw_range(int a, int b)
if(help_flag) {
i = 0;
fl_draw("1, 2, ..., Ctrl+1, Ctrl+2, ...", xx0, yy0 + (i + 1) * font_height);
- fl_draw("select predefined colormap", xx1, yy0 + (i + 1) * font_height);
+ fl_draw("Select predefined colormap", xx1, yy0 + (i + 1) * font_height);
i++;
fl_draw("mouse1", xx0, yy0 + (i + 1) * font_height);
- fl_draw("draw red or hue channel", xx1, yy0 + (i + 1) * font_height);
+ fl_draw("Draw red or hue channel", xx1, yy0 + (i + 1) * font_height);
i++;
fl_draw("mouse2", xx0, yy0 + (i + 1) * font_height);
- fl_draw("draw green or saturation channel", xx1, yy0 + (i + 1) * font_height);
+ fl_draw("Draw green or saturation channel", xx1, yy0 + (i + 1) * font_height);
i++;
fl_draw("mouse3", xx0, yy0 + (i + 1) * font_height);
- fl_draw("draw blue or value channel", xx1, yy0 + (i + 1) * font_height);
+ fl_draw("Draw blue or value channel", xx1, yy0 + (i + 1) * font_height);
i++;
fl_draw("Ctrl+mouse1", xx0, yy0 + (i + 1) * font_height);
- fl_draw("draw alpha channel", xx1, yy0 + (i + 1) * font_height);
+ fl_draw("Draw alpha channel", xx1, yy0 + (i + 1) * font_height);
i++;
fl_draw("Ctrl+c, Ctrl+v, r", xx0, yy0 + (i + 1) * font_height);
- fl_draw("copy, paste or reset colormap", xx1, yy0 + (i + 1) * font_height);
+ fl_draw("Copy, paste or reset colormap", xx1, yy0 + (i + 1) * font_height);
i++;
fl_draw("m", xx0, yy0 + (i + 1) * font_height);
- fl_draw("toggle RGB/HSV mode", xx1, yy0 + (i + 1) * font_height);
+ fl_draw("Toggle RGB/HSV mode", xx1, yy0 + (i + 1) * font_height);
i++;
fl_draw("left, right", xx0, yy0 + (i + 1) * font_height);
- fl_draw("translate abscissa", xx1, yy0 + (i + 1) * font_height);
+ fl_draw("Translate abscissa", xx1, yy0 + (i + 1) * font_height);
i++;
fl_draw("Ctrl+left, Ctrl+right", xx0, yy0 + (i + 1) * font_height);
- fl_draw("rotate abscissa", xx1, yy0 + (i + 1) * font_height);
+ fl_draw("Rotate abscissa", xx1, yy0 + (i + 1) * font_height);
i++;
fl_draw("i, Ctrl+i", xx0, yy0 + (i + 1) * font_height);
- fl_draw("invert abscissa or ordinate", xx1, yy0 + (i + 1) * font_height);
+ fl_draw("Invert abscissa or ordinate", xx1, yy0 + (i + 1) * font_height);
i++;
fl_draw("up, down", xx0, yy0 + (i + 1) * font_height);
- fl_draw("modify curvature of color channels", xx1, yy0 + (i + 1) * font_height);
+ fl_draw("Modify curvature of color channels", xx1, yy0 + (i + 1) * font_height);
i++;
fl_draw("a, Ctrl+a", xx0, yy0 + (i + 1) * font_height);
- fl_draw("modify alpha coefficient", xx1, yy0 + (i + 1) * font_height);
+ fl_draw("Modify alpha coefficient", xx1, yy0 + (i + 1) * font_height);
i++;
fl_draw("p, Ctrl+p", xx0, yy0 + (i + 1) * font_height);
- fl_draw("modify alpha channel power law", xx1, yy0 + (i + 1) * font_height);
+ fl_draw("Modify alpha channel power law", xx1, yy0 + (i + 1) * font_height);
i++;
fl_draw("b, Ctrl+b", xx0, yy0 + (i + 1) * font_height);
- fl_draw("modify gamma correction", xx1, yy0 + (i + 1) * font_height);
+ fl_draw("Modify gamma correction", xx1, yy0 + (i + 1) * font_height);
i++;
fl_draw("h", xx0, yy0 + (i + 1) * font_height);
- fl_draw("show this help message", xx1, yy0 + (i + 1) * font_height);
+ fl_draw("Show this help message", xx1, yy0 + (i + 1) * font_height);
i++;
}
else if(ct->ipar[COLORTABLE_MODE] == COLORTABLE_RGB)
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index d2ad6f6859..f01e2a3745 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.401 2004-12-30 23:46:13 geuzaine Exp $
+// $Id: GUI.cpp,v 1.402 2004-12-31 04:04:50 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -33,6 +33,15 @@
// The "Cancel" button, if present, should always be the last (-> at
// right)
+// Only 'title-capitalize' titles and menus (Rules: 1. Always
+// capitalize the first and the last word. 2. Capitalize all nouns,
+// pronouns, adjectives, verbs, adverbs, and subordinate
+// conjunctions. 3. Lowercase all articles, coordinate conjunctions,
+// and prepositions, when they are other than the first or last
+// word. 4. Lowercase the "to" in an infinitive.)
+//
+// Capitalize everything else as english sentences
+
// Don't indent this file
// *INDENT-OFF*
@@ -85,6 +94,9 @@ extern Context_T CTX;
// provide tools that help create or manage the content in the main
// window and are frequently left open to assist in accomplishing the
// task of the main window. Examples: Info and Show Tools.
+//
+// The window title should be exactly the same as the menu item (without
+// the ellipsis character if there is one)
Fl_Menu_Item m_menubar_table[] = {
{"&File", 0, 0, 0, FL_SUBMENU},
@@ -92,24 +104,24 @@ Fl_Menu_Item m_menubar_table[] = {
{"&Open...", FL_CTRL+'o', (Fl_Callback *)file_open_cb, 0},
{"M&erge...", FL_CTRL+'m', (Fl_Callback *)file_merge_cb, 0, FL_MENU_DIVIDER},
{"&Rename...", FL_CTRL+'r', (Fl_Callback *)file_rename_cb, 0},
- {"Save &as...", FL_CTRL+'s', (Fl_Callback *)file_save_as_cb, 0},
- {"Sa&ve mesh", FL_CTRL+FL_SHIFT+'s', (Fl_Callback *)mesh_save_cb, 0, FL_MENU_DIVIDER},
+ {"Save &As...", FL_CTRL+'s', (Fl_Callback *)file_save_as_cb, 0},
+ {"Sa&ve Mesh", FL_CTRL+FL_SHIFT+'s', (Fl_Callback *)mesh_save_cb, 0, FL_MENU_DIVIDER},
{"&Quit", FL_CTRL+'q', (Fl_Callback *)file_quit_cb, 0},
{0},
{"&Tools", 0, 0, 0, FL_SUBMENU},
{"&Options...", FL_CTRL+FL_SHIFT+'o', (Fl_Callback *)options_cb, 0},
{"&Visibility", FL_CTRL+FL_SHIFT+'v', (Fl_Callback *)visibility_cb, 0},
- {"&Clipping planes", FL_CTRL+FL_SHIFT+'c', (Fl_Callback *)clip_cb, 0, FL_MENU_DIVIDER},
+ {"&Clipping Planes", FL_CTRL+FL_SHIFT+'c', (Fl_Callback *)clip_cb, 0, FL_MENU_DIVIDER},
{"S&tatistics", FL_CTRL+'i', (Fl_Callback *)statistics_cb, 0},
- {"M&essage console", FL_CTRL+'l', (Fl_Callback *)message_cb, 0},
+ {"M&essage Console", FL_CTRL+'l', (Fl_Callback *)message_cb, 0},
{0},
{"&Help", 0, 0, 0, FL_SUBMENU},
- {"On&line documentation", 0, (Fl_Callback *)help_online_cb, 0, FL_MENU_DIVIDER},
- {"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},
- {"&Current options", 0, (Fl_Callback *)status_xyz1p_cb, (void*)5, FL_MENU_DIVIDER},
- {"&About...", 0, (Fl_Callback *)help_about_cb, 0},
+ {"On&line Documentation", 0, (Fl_Callback *)help_online_cb, 0, FL_MENU_DIVIDER},
+ {"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},
+ {"&Current Options", 0, (Fl_Callback *)status_xyz1p_cb, (void*)5, FL_MENU_DIVIDER},
+ {"&About Gmsh...", 0, (Fl_Callback *)help_about_cb, 0},
{0},
{0}
};
@@ -1136,48 +1148,48 @@ void GUI::set_context(Context_Item * menu_asked, int flag)
for(int j = 0; j < 2; j++) {
p[j]->add("Reload/View", 0,
(Fl_Callback *) view_reload_cb, (void *)nb, 0);
- p[j]->add("Reload/All views", 0,
+ p[j]->add("Reload/All Views", 0,
(Fl_Callback *) view_reload_all_cb, (void *)nb, 0);
- p[j]->add("Reload/All visible views", 0,
+ p[j]->add("Reload/All Visible Views", 0,
(Fl_Callback *) view_reload_visible_cb, (void *)nb, 0);
p[j]->add("Remove/View", FL_Delete,
(Fl_Callback *) view_remove_cb, (void *)nb, 0);
- p[j]->add("Remove/All views", 0,
+ p[j]->add("Remove/All Views", 0,
(Fl_Callback *) view_remove_all_cb, (void *)nb, 0);
- p[j]->add("Remove/All visible views", 0,
+ p[j]->add("Remove/All Visible Views", 0,
(Fl_Callback *) view_remove_visible_cb, (void *)nb, 0);
- p[j]->add("Remove/All invisible views", 0,
+ p[j]->add("Remove/All Invisible Views", 0,
(Fl_Callback *) view_remove_invisible_cb, (void *)nb, 0);
- p[j]->add("Remove/All empty views", 0,
+ p[j]->add("Remove/All Empty Views", 0,
(Fl_Callback *) view_remove_empty_cb, (void *)nb, 0);
- p[j]->add("Duplicate/View without options", 0,
+ p[j]->add("Duplicate/View without Options", 0,
(Fl_Callback *) view_duplicate_cb, (void *)nb, 0);
- p[j]->add("Duplicate/View with options", 0,
+ p[j]->add("Duplicate/View with Options", 0,
(Fl_Callback *) view_duplicate_with_options_cb, (void *)nb, 0);
- p[j]->add("Combine/Elements/From all views", 0,
+ p[j]->add("Combine/Elements/From All Views", 0,
(Fl_Callback *) view_combine_space_all_cb, (void *)nb, 0);
- p[j]->add("Combine/Elements/From visible views", 0,
+ p[j]->add("Combine/Elements/From Visible Views", 0,
(Fl_Callback *) view_combine_space_visible_cb, (void *)nb, 0);
- p[j]->add("Combine/Elements/By view name", 0,
+ p[j]->add("Combine/Elements/By View Name", 0,
(Fl_Callback *) view_combine_space_by_name_cb, (void *)nb, 0);
- p[j]->add("Combine/Time steps/From all views", 0,
+ p[j]->add("Combine/Time Steps/From All Views", 0,
(Fl_Callback *) view_combine_time_all_cb, (void *)nb, 0);
- p[j]->add("Combine/Time steps/From visible views", 0,
+ p[j]->add("Combine/Time Steps/From Visible Views", 0,
(Fl_Callback *) view_combine_time_visible_cb, (void *)nb, 0);
- p[j]->add("Combine/Time steps/By view name", 0,
+ p[j]->add("Combine/Time Steps/By View Name", 0,
(Fl_Callback *) view_combine_time_by_name_cb, (void *)nb, 0);
- p[j]->add("Set visibility/All on", 0,
+ p[j]->add("Set Visibility/All On", 0,
(Fl_Callback *) view_all_visible_cb, (void *)1, 0);
- p[j]->add("Set visibility/All off", 0,
+ p[j]->add("Set Visibility/All Off", 0,
(Fl_Callback *) view_all_visible_cb, (void *)0, 0);
- p[j]->add("Save as/Parsed view...", 0,
+ p[j]->add("Save As/Parsed View...", 0,
(Fl_Callback *) view_save_parsed_cb, (void *)nb, 0);
- p[j]->add("Save as/ASCII view...", 0,
+ p[j]->add("Save As/ASCII View...", 0,
(Fl_Callback *) view_save_ascii_cb, (void *)nb, 0);
- p[j]->add("Save as/Binary view...", 0,
+ p[j]->add("Save As/Binary View...", 0,
(Fl_Callback *) view_save_binary_cb, (void *)nb, 0);
add_post_plugins(p[j], nb);
- p[j]->add("Apply as background mesh", 0,
+ p[j]->add("Apply As Background Mesh", 0,
(Fl_Callback *) view_applybgmesh_cb, (void *)nb, FL_MENU_DIVIDER);
p[j]->add("Options...", 'o',
(Fl_Callback *) view_options_cb, (void *)nb, 0);
@@ -3325,7 +3337,7 @@ void GUI::create_message_window()
int width = CTX.msg_size[0];
int height = CTX.msg_size[1];
- msg_window = new Fl_Window(width, height, "Messages");
+ msg_window = new Fl_Window(width, height, "Message Console");
msg_window->box(GMSH_WINDOW_BOX);
msg_browser = new Fl_Browser(WB, WB, width - 2 * WB, height - 3 * WB - BH);
@@ -3697,7 +3709,7 @@ void GUI::create_geometry_context_window(int num)
int width = 31 * fontsize;
int height = 5 * WB + 9 * BH;
- context_geometry_window = new Fl_Window(width, height, "Contextual geometry definitions");
+ context_geometry_window = new Fl_Window(width, height, "Contextual Geometry Definitions");
context_geometry_window->box(GMSH_WINDOW_BOX);
{
Fl_Tabs *o = new Fl_Tabs(WB, WB, width - 2 * WB, height - 3 * WB - BH);
@@ -3845,7 +3857,7 @@ void GUI::create_mesh_context_window(int num)
int width = 31 * fontsize;
int height = 5 * WB + 5 * BH;
- context_mesh_window = new Fl_Window(width, height, "Contextual mesh definitions");
+ context_mesh_window = new Fl_Window(width, height, "Contextual Mesh Definitions");
context_mesh_window->box(GMSH_WINDOW_BOX);
{
Fl_Tabs *o = new Fl_Tabs(WB, WB, width - 2 * WB, height - 3 * WB - BH);
diff --git a/Fltk/GUI_Extras.cpp b/Fltk/GUI_Extras.cpp
index bb80a7ba95..30aae059da 100644
--- a/Fltk/GUI_Extras.cpp
+++ b/Fltk/GUI_Extras.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI_Extras.cpp,v 1.2 2004-12-30 23:25:03 geuzaine Exp $
+// $Id: GUI_Extras.cpp,v 1.3 2004-12-31 04:04:51 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -174,7 +174,7 @@ int jpeg_dialog(char *name, int TeX)
if(!dialog){
dialog = new _jpeg_dialog;
int h = 3*10 + 25 + 2*25, y = 0;
- dialog->window = new Fl_Window(200, h, "JPEG options"); y = 10;
+ dialog->window = new Fl_Window(200, h, "JPEG Options"); y = 10;
dialog->window->box(GMSH_WINDOW_BOX);
dialog->s[0] = new Fl_Value_Slider(10, y, 100, 25, "Quality"); y += 25;
dialog->s[0]->type(FL_HOR_SLIDER);
@@ -234,7 +234,7 @@ int gif_dialog(char *name)
if(!dialog){
dialog = new _gif_dialog;
int h = 3*10 + 25 + 4*25, y = 0;
- dialog->window = new Fl_Window(200, h, "GIF options"); y = 10;
+ dialog->window = new Fl_Window(200, h, "GIF Options"); y = 10;
dialog->window->box(GMSH_WINDOW_BOX);
dialog->b[0] = new Fl_Check_Button(10, y, 180, 25, "Dither"); y += 25;
dialog->b[1] = new Fl_Check_Button(10, y, 180, 25, "Interlace"); y += 25;
@@ -460,7 +460,7 @@ int msh_dialog(char *name)
if(!dialog){
dialog = new _msh_dialog;
int h = 3*10 + 25 + 2*25, y = 0;
- dialog->window = new Fl_Window(200, h, "MSH options"); y = 10;
+ dialog->window = new Fl_Window(200, h, "MSH Options"); y = 10;
dialog->window->box(GMSH_WINDOW_BOX);
dialog->c = new Fl_Choice(10, y, 130, 25, "Format"); y+= 25;
dialog->c->menu(versionmenu);
diff --git a/Plugin/CutGrid.cpp b/Plugin/CutGrid.cpp
index 8b5fabacda..7be16cf71a 100644
--- a/Plugin/CutGrid.cpp
+++ b/Plugin/CutGrid.cpp
@@ -1,4 +1,4 @@
-// $Id: CutGrid.cpp,v 1.12 2004-12-27 16:13:45 geuzaine Exp $
+// $Id: CutGrid.cpp,v 1.13 2004-12-31 04:04:51 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -165,7 +165,7 @@ double GMSH_CutGridPlugin::callbackV(int num, int action, double value)
void GMSH_CutGridPlugin::getName(char *name) const
{
- strcpy(name, "Cut grid");
+ strcpy(name, "Cut Grid");
}
void GMSH_CutGridPlugin::getInfos(char *author, char *copyright,
diff --git a/Plugin/CutMap.cpp b/Plugin/CutMap.cpp
index 0328397a78..8cff6cae0a 100644
--- a/Plugin/CutMap.cpp
+++ b/Plugin/CutMap.cpp
@@ -1,4 +1,4 @@
-// $Id: CutMap.cpp,v 1.43 2004-11-26 14:42:56 remacle Exp $
+// $Id: CutMap.cpp,v 1.44 2004-12-31 04:04:51 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -70,7 +70,7 @@ double GMSH_CutMapPlugin::callbackA(int num, int action, double value)
void GMSH_CutMapPlugin::getName(char *name) const
{
- strcpy(name, "Cut map");
+ strcpy(name, "Cut Map");
}
void GMSH_CutMapPlugin::getInfos(char *author, char *copyright,
diff --git a/Plugin/CutParametric.cpp b/Plugin/CutParametric.cpp
index 7875f66f16..d49a13113c 100644
--- a/Plugin/CutParametric.cpp
+++ b/Plugin/CutParametric.cpp
@@ -1,4 +1,4 @@
-// $Id: CutParametric.cpp,v 1.6 2004-11-25 02:10:40 geuzaine Exp $
+// $Id: CutParametric.cpp,v 1.7 2004-12-31 04:04:51 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -67,7 +67,7 @@ GMSH_CutParametricPlugin::GMSH_CutParametricPlugin()
void GMSH_CutParametricPlugin::getName(char *name) const
{
- strcpy(name, "Cut parametric");
+ strcpy(name, "Cut Parametric");
}
void GMSH_CutParametricPlugin::getInfos(char *author, char *copyright,
diff --git a/Plugin/CutPlane.cpp b/Plugin/CutPlane.cpp
index dbf6e7c65e..b014709d5e 100644
--- a/Plugin/CutPlane.cpp
+++ b/Plugin/CutPlane.cpp
@@ -1,4 +1,4 @@
-// $Id: CutPlane.cpp,v 1.42 2004-12-28 17:25:44 geuzaine Exp $
+// $Id: CutPlane.cpp,v 1.43 2004-12-31 04:04:51 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -115,7 +115,7 @@ double GMSH_CutPlanePlugin::callbackD(int num, int action, double value)
void GMSH_CutPlanePlugin::getName(char *name) const
{
- strcpy(name, "Cut plane");
+ strcpy(name, "Cut Plane");
}
void GMSH_CutPlanePlugin::getInfos(char *author, char *copyright,
diff --git a/Plugin/CutSphere.cpp b/Plugin/CutSphere.cpp
index af0ac714f8..6fcd640d54 100644
--- a/Plugin/CutSphere.cpp
+++ b/Plugin/CutSphere.cpp
@@ -1,4 +1,4 @@
-// $Id: CutSphere.cpp,v 1.39 2004-12-28 17:25:44 geuzaine Exp $
+// $Id: CutSphere.cpp,v 1.40 2004-12-31 04:04:51 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -119,7 +119,7 @@ double GMSH_CutSpherePlugin::callbackR(int num, int action, double value)
void GMSH_CutSpherePlugin::getName(char *name) const
{
- strcpy(name, "Cut sphere");
+ strcpy(name, "Cut Sphere");
}
void GMSH_CutSpherePlugin::getInfos(char *author, char *copyright,
diff --git a/Plugin/DecomposeInSimplex.cpp b/Plugin/DecomposeInSimplex.cpp
index 9e8a98dea0..254e282e09 100644
--- a/Plugin/DecomposeInSimplex.cpp
+++ b/Plugin/DecomposeInSimplex.cpp
@@ -1,4 +1,4 @@
-// $Id: DecomposeInSimplex.cpp,v 1.14 2004-11-25 02:10:40 geuzaine Exp $
+// $Id: DecomposeInSimplex.cpp,v 1.15 2004-12-31 04:04:51 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -48,7 +48,7 @@ GMSH_DecomposeInSimplexPlugin::GMSH_DecomposeInSimplexPlugin()
void GMSH_DecomposeInSimplexPlugin::getName(char *name) const
{
- strcpy(name, "Decompose in simplex");
+ strcpy(name, "Decompose in Simplex");
}
void GMSH_DecomposeInSimplexPlugin::getInfos(char *author, char *copyright,
diff --git a/Plugin/DisplacementRaise.cpp b/Plugin/DisplacementRaise.cpp
index 8d666d5641..4cdf6b378a 100644
--- a/Plugin/DisplacementRaise.cpp
+++ b/Plugin/DisplacementRaise.cpp
@@ -1,4 +1,4 @@
-// $Id: DisplacementRaise.cpp,v 1.17 2004-11-25 02:10:40 geuzaine Exp $
+// $Id: DisplacementRaise.cpp,v 1.18 2004-12-31 04:04:51 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -51,7 +51,7 @@ GMSH_DisplacementRaisePlugin::GMSH_DisplacementRaisePlugin()
void GMSH_DisplacementRaisePlugin::getName(char *name) const
{
- strcpy(name, "Displacement raise");
+ strcpy(name, "Displacement Raise");
}
void GMSH_DisplacementRaisePlugin::getInfos(char *author, char *copyright,
diff --git a/Plugin/HarmonicToTime.cpp b/Plugin/HarmonicToTime.cpp
index c7855622af..3fe027f394 100644
--- a/Plugin/HarmonicToTime.cpp
+++ b/Plugin/HarmonicToTime.cpp
@@ -1,4 +1,4 @@
-// $Id: HarmonicToTime.cpp,v 1.3 2004-11-25 02:10:40 geuzaine Exp $
+// $Id: HarmonicToTime.cpp,v 1.4 2004-12-31 04:04:51 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -51,7 +51,7 @@ GMSH_HarmonicToTimePlugin::GMSH_HarmonicToTimePlugin()
void GMSH_HarmonicToTimePlugin::getName(char *name) const
{
- strcpy(name, "Harmonic to time");
+ strcpy(name, "Harmonic to Time");
}
void GMSH_HarmonicToTimePlugin::getInfos(char *author, char *copyright,
diff --git a/Plugin/SphericalRaise.cpp b/Plugin/SphericalRaise.cpp
index bc558313a7..e6c8ded52d 100644
--- a/Plugin/SphericalRaise.cpp
+++ b/Plugin/SphericalRaise.cpp
@@ -1,4 +1,4 @@
-// $Id: SphericalRaise.cpp,v 1.20 2004-11-25 02:10:40 geuzaine Exp $
+// $Id: SphericalRaise.cpp,v 1.21 2004-12-31 04:04:51 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -53,7 +53,7 @@ GMSH_SphericalRaisePlugin::GMSH_SphericalRaisePlugin()
void GMSH_SphericalRaisePlugin::getName(char *name) const
{
- strcpy(name, "Spherical raise");
+ strcpy(name, "Spherical Raise");
}
void GMSH_SphericalRaisePlugin::getInfos(char *author, char *copyright,
diff --git a/Plugin/StreamLines.cpp b/Plugin/StreamLines.cpp
index 58bb049bfb..de785d85eb 100644
--- a/Plugin/StreamLines.cpp
+++ b/Plugin/StreamLines.cpp
@@ -1,4 +1,4 @@
-// $Id: StreamLines.cpp,v 1.17 2004-12-28 17:24:25 geuzaine Exp $
+// $Id: StreamLines.cpp,v 1.18 2004-12-31 04:04:51 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -161,7 +161,7 @@ double GMSH_StreamLinesPlugin::callbackV(int num, int action, double value)
void GMSH_StreamLinesPlugin::getName(char *name) const
{
- strcpy(name, "Stream lines");
+ strcpy(name, "Stream Lines");
}
void GMSH_StreamLinesPlugin::getInfos(char *author, char *copyright,
diff --git a/doc/FAQ b/doc/FAQ
index 75b5c9a4b2..c0d8a50182 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,4 +1,4 @@
-$Id: FAQ,v 1.47 2004-12-27 17:51:55 geuzaine Exp $
+$Id: FAQ,v 1.48 2004-12-31 04:04:51 geuzaine Exp $
This is the Gmsh FAQ
@@ -242,7 +242,7 @@ Section 7: Post-processing module
* 7.1 How do I compute a section of a plot?
-Use 'View->Plugins->Cut plane'.
+Use 'View->Plugins->Cut Plane'.
* 7.2 How do I animate my plots?
diff --git a/doc/texinfo/command_line.texi b/doc/texinfo/command_line.texi
index 011adb442b..6b9bee00b4 100644
--- a/doc/texinfo/command_line.texi
+++ b/doc/texinfo/command_line.texi
@@ -2,7 +2,7 @@
@ftable @code
@item -0
-parse input files, output unrolled geometry, and exit
+Parse input files, output unrolled geometry, and exit
@end ftable
@sp 1
@@ -11,41 +11,41 @@ parse input files, output unrolled geometry, and exit
@ftable @code
@item -1, -2, -3
-perform batch 1D, 2D and 3D mesh generation
+Perform batch 1D, 2D and 3D mesh generation
@item -saveall
-save all elements (discard physical group definitions)
+Save all elements (discard physical group definitions)
@item -o file
-specify mesh output file name
+Specify mesh output file name
@item -format string
-set output mesh format (msh, unv, gref)
+Set output mesh format (msh, unv, gref)
@item -algo string
-select 2D mesh algorithm (iso, tri, aniso, netgen)
+Select 2D mesh algorithm (iso, tri, aniso, netgen)
@item -smooth int
-set mesh smoothing
+Set mesh smoothing
@item -optimize
-optimize quality of tetrahedral elements
+Optimize quality of tetrahedral elements
@item -order int
-set the order of the generated elements (1, 2)
+Set the order of the generated elements (1, 2)
@item -scale float
-set global scaling factor
+Set global scaling factor
@item -meshscale float
-set mesh scaling factor
+Set mesh scaling factor
@item -clscale float
-set characteristic length scaling factor
+Set characteristic length scaling factor
@item -rand float
-set random perturbation factor
+Set random perturbation factor
@item -bgm file
-load backround mesh from file
+Load backround mesh from file
@item -constrain
-constrain background mesh with characteristic lengths
+Constrain background mesh with characteristic lengths
@item -histogram
-print mesh quality histogram
+Print mesh quality histogram
@item -extrude
-use old extrusion mesh generator
+Use old extrusion mesh generator
@item -recombine
-recombine meshes from old extrusion mesh generator
+Recombine meshes from old extrusion mesh generator
@item -interactive
-display 2D mesh construction interactively
+Display 2D mesh construction interactively
@end ftable
@sp 1
@@ -54,13 +54,13 @@ display 2D mesh construction interactively
@ftable @code
@item -noview
-hide all views on startup
+Hide all views on startup
@item -link int
-select link mode between views (0, 1, 2, 3, 4)
+Select link mode between views (0, 1, 2, 3, 4)
@item -smoothview
-smooth views
+Smooth views
@item -combine
-combine input views into multi-time-step ones
+Combine input views into multi-time-step ones
@end ftable
@sp 1
@@ -69,13 +69,13 @@ combine input views into multi-time-step ones
@ftable @code
@item -nodb
-disable double buffering
+Disable double buffering
@item -fontsize int
-specify the font size for the GUI
+Specify the font size for the GUI
@item -scheme string
-specify FLTK GUI scheme
+Specify FLTK GUI scheme
@item -display string
-specify display
+Specify display
@end ftable
@sp 1
@@ -84,23 +84,23 @@ specify display
@ftable @code
@item -a, -g, -m, -s, -p
-start in automatic, geometry, mesh, solver or post-processing mode
+Start in automatic, geometry, mesh, solver or post-processing mode
@item -pid
-print pid on stdout
+Print pid on stdout
@item -v int
-set verbosity level
+Set verbosity level
@item -nopopup
-don't popup dialog windows in scripts
+Don't popup dialog windows in scripts
@item -string "string"
-parse string before project file
+Parse string before project file
@item -option file
-parse option file before GUI creation
+Parse option file before GUI creation
@item -convert file file
-perform batch conversion of views and meshes into latest file formats
+Perform batch conversion of views and meshes into latest file formats
@item -version
-show version number
+Show version number
@item -info
-show detailed version information
+Show detailed version information
@item -help
-show this message
+Show this message
@end ftable
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 74abe6d4d8..e06ba28f0a 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
-@c $Id: gmsh.texi,v 1.157 2004-12-30 05:45:24 geuzaine Exp $
+@c $Id: gmsh.texi,v 1.158 2004-12-31 04:04:51 geuzaine Exp $
@c
@c Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
@c
@@ -2535,11 +2535,11 @@ the surfaces---as well as all the lines if `1D' was not called before; `3D'
will mesh all the volumes---and all the surfaces if `2D' was not called
before). To save the resulting mesh in the current mesh format, choose
`Save' in the context-dependent buttons, or select the appropriate format
-with the `File->Save as' menu. The default mesh file name is based on the
+with the `File->Save As' menu. The default mesh file name is based on the
name of the first input file on the command line (or @file{untitled} if
there wasn't any input file given), with an appended extension depending on
the mesh format@footnote{Nearly all the interactive commands have shortcuts:
-see @ref{Keyboard shortcuts}, or select `Help->Keyboard shortcuts' in the
+see @ref{Keyboard shortcuts}, or select `Help->Keyboard Shortcuts' in the
menu.}.
To create a new geometry or to modify an existing geometry, select
@@ -2578,7 +2578,7 @@ for all views' option in the `Tools->Options->Post-processing' menu.
Note that all the options specified interactively can also be directly
specified in the ASCII input files. All available options, with their
-current values, can be saved into a file by selecting `File->Save as->Gmsh
+current values, can be saved into a file by selecting `File->Save As->Gmsh
options', or simply viewed by pressing the `?' button in the status bar. To
save the current options as your default preferences for all future Gmsh
sessions, use the `Tools->Options->Save' button.
@@ -2641,18 +2641,18 @@ In the following, for a 2 button mouse, @kbd{Middle button} =
@kbd{Move the mouse}:
@itemize @bullet
@item
-highlight the elementary geometrical entity currently under the mouse
+Highlight the elementary geometrical entity currently under the mouse
pointer and display its properties in the status bar
@item
-size a rubber zoom started with @kbd{Ctrl+Left button}
+Size a rubber zoom started with @kbd{Ctrl+Left button}
@end itemize
@kbd{Left button}:
@itemize @bullet
@item
-rotate
+Rotate
@item
-accept a rubber zoom started with @kbd{Ctrl+Left button}
+Accept a rubber zoom started with @kbd{Ctrl+Left button}
@end itemize
@kbd{Ctrl+Left button}: start (anisotropic) rubber zoom
@@ -2660,9 +2660,9 @@ accept a rubber zoom started with @kbd{Ctrl+Left button}
@kbd{Middle button}:
@itemize @bullet
@item
-zoom (isotropic)
+Zoom (isotropic)
@item
-cancel a rubber zoom
+Cancel a rubber zoom
@end itemize
@kbd{Ctrl+Middle button}: orthogonalize display
@@ -2670,11 +2670,11 @@ cancel a rubber zoom
@kbd{Right button}:
@itemize @bullet
@item
-pan
+Pan
@item
-cancel a rubber zoom
+Cancel a rubber zoom
@item
-pop up menu on post-processing view button
+Pop up menu on post-processing view button
@end itemize
@kbd{Ctrl+Right button}: reset to default viewpoint
@@ -2997,7 +2997,7 @@ which is useful for (very) large data sets.
Gmsh can convert any format to any other, either in a script (cf. @code{Save
View} and @code{PostProcessing.Format} in @ref{Post-processing commands},
and @ref{Post-processing options}, respectively) or in the graphical user
-interface (using the `View->Save as' menu).
+interface (using the `View->Save As' menu).
@menu
* Parsed post-processing file format::
@@ -3703,7 +3703,7 @@ button moves one step per pixel, the middle by 10 * step, and the right
button by 100 * step;
@item
selecting the content of an input field, or lines in the message console
-(Tools->Message console), copies the selected text to the clipboard;
+(`Tools->Message Console'), copies the selected text to the clipboard;
@end itemize
@item
diff --git a/doc/texinfo/shortcuts.texi b/doc/texinfo/shortcuts.texi
index dcd64c88a3..36a85eb972 100644
--- a/doc/texinfo/shortcuts.texi
+++ b/doc/texinfo/shortcuts.texi
@@ -2,139 +2,139 @@ Keyboard shortcuts:
@table @kbd
@item Left arrow
-go to previous time step
+Go to previous time step
@item Right arrow
-go to next time step
+Go to next time step
@item Up arrow
-make previous view visible
+Make previous view visible
@item Down arrow
-make next view visible
+Make next view visible
@sp 1 @c ----------------------------------------------
@item <
-go back to previous context
+Go back to previous context
@item >
-go forward to next context
+Go forward to next context
@item 0 or Esc
-reload project file
+Reload project file
@item 1 or F1
-mesh lines
+Mesh lines
@item 2 or F2
-mesh surfaces
+Mesh surfaces
@item 3 or F3
-mesh volumes
+Mesh volumes
@sp 1 @c ----------------------------------------------
@item g
-go to geometry module
+Go to geometry module
@item m
-go to mesh module
+Go to mesh module
@item p
-go to post-processing module
+Go to post-processing module
@item s
-go to solver module
+Go to solver module
@sp 1 @c ----------------------------------------------
@item Shift+g
-show geometry options
+Show geometry options
@item Shift+m
-show mesh options
+Show mesh options
@item Shift+o
-show general options
+Show general options
@item Shift+p
-show post-processing options
+Show post-processing options
@item Shift+s
-show solver options
+Show solver options
@item Shift+w
-show post-processing view options
+Show post-processing view options
@sp 1 @c ----------------------------------------------
@item Ctrl+a
-bring all windows to front
+Bring all windows to front
@item Ctrl+i
-show statistics window
+Show statistics window
@item Ctrl+l
-show message console
+Show message console
@item Ctrl+m
-merge file(s)
+Merge file(s)
@item Ctrl+n
-new project file
+Create new project file
@item Ctrl+o
-open project file
+Open project file
@item Ctrl+q
-quit
+Quit
@item Ctrl+r
-rename project file
+Rename project file
@item Ctrl+s
-save file as
+Save file
@sp 1 @c ----------------------------------------------
@item Shift+Ctrl+c
-show clipping plane window
+Show clipping plane window
@item Shift+Ctrl+o
-show option window
+Show option window
@item Shift+Ctrl+s
-save mesh in default format
+Save mesh in default format
@item Shift+Ctrl+v
-show visibility window
+Show visibility window
@sp 1 @c ----------------------------------------------
@item Alt+a
-hide/show small axes
+Hide/show small axes
@item Alt+b
-hide/show bounding boxes
+Hide/show bounding boxes
@item Alt+c
-loop through predefined color schemes
+Loop through predefined color schemes
@item Alt+d
-change surface mesh display mode (solid/wireframe)
+Change surface mesh display mode (solid/wireframe)
@item Alt+f
-change redraw mode (fast/full)
+Change redraw mode (fast/full)
@item Alt+h
-hide/show all post-processing views
+Hide/show all post-processing views
@item Alt+i
-hide/show all post-processing view scales
+Hide/show all post-processing view scales
@item Alt+l
-hide/show geometry lines
+Hide/show geometry lines
@item Alt+m
-toggle visibility of all mesh entities
+Toggle visibility of all mesh entities
@item Alt+n
-hide/show all post-processing view annotations
+Hide/show all post-processing view annotations
@item Alt+o
-change projection mode (orthographic/perspective)
+Change projection mode (orthographic/perspective)
@item Alt+p
-hide/show geometry points
+Hide/show geometry points
@item Alt+s
-hide/show geometry surfaces
+Hide/show geometry surfaces
@item Alt+t
-loop through interval modes for all post-processing views
+Loop through interval modes for all post-processing views
@item Alt+v
-hide/show geometry volumes
+Hide/show geometry volumes
@item Alt+w
-enable/disable all lighting
+Enable/disable all lighting
@item Alt+x
-set X view
+Set X view
@item Alt+y
-set Y view
+Set Y view
@item Alt+z
-set Z view
+Set Z view
@sp 1 @c ----------------------------------------------
@item Alt+Shift+a
-hide/show moving axes
+Hide/show moving axes
@item Alt+Shift+l
-hide/show surface mesh edges
+Hide/show surface mesh edges
@item Alt+Shift+p
-hide/show mesh points
+Hide/show mesh points
@item Alt+Shift+s
-hide/show mesh surfaces
+Hide/show mesh surfaces
@item Alt+Shift+v
-hide/show mesh volumes
+Hide/show mesh volumes
@end table
--
GitLab