From 9802ff0c9ede5c6247589df91d44c1a8e8d0fe21 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 5 May 2001 08:56:58 +0000
Subject: [PATCH] typos
---
Fltk/Callbacks.cpp | 44 +++++++++++++++----------------
Fltk/GUI.cpp | 64 +++++++++++++++++++++++-----------------------
2 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 944ebbe3a6..b26297b0eb 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.51 2001-05-04 22:42:21 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.52 2001-05-05 08:56:58 geuzaine Exp $
#include <sys/types.h>
#include <signal.h>
@@ -165,7 +165,7 @@ void status_cancel_cb(CALLBACK_ARGS){
void file_open_cb(CALLBACK_ARGS) {
char *newfile;
int n = List_Nbr(Post_ViewList);
- newfile = fl_file_chooser("Open File", "*", NULL);
+ newfile = fl_file_chooser("Open file", "*", NULL);
if (newfile != NULL) {
OpenProblem(newfile);
Draw();
@@ -177,7 +177,7 @@ void file_open_cb(CALLBACK_ARGS) {
void file_merge_cb(CALLBACK_ARGS) {
char *newfile;
int n = List_Nbr(Post_ViewList);
- newfile = fl_file_chooser("Merge File", "*", NULL);
+ newfile = fl_file_chooser("Merge file", "*", NULL);
if (newfile != NULL) {
MergeProblem(newfile);
Draw();
@@ -196,60 +196,60 @@ void file_save_options_cb(CALLBACK_ARGS) {
void file_save_as_auto_cb(CALLBACK_ARGS) {
char *newfile;
- if((newfile = fl_file_chooser("Save File by Extension", "*", NULL)))
+ if((newfile = fl_file_chooser("Save file by extension", "*", NULL)))
CreateOutputFile(newfile, CTX.print.format = FORMAT_AUTO);
}
void file_save_as_geo_cb(CALLBACK_ARGS) {
char *newfile;
- if((newfile = fl_file_chooser("Save GEO File", "*", NULL)))
+ if((newfile = fl_file_chooser("Save GEO file", "*", NULL)))
CreateOutputFile(newfile, CTX.print.format = FORMAT_GEO);
}
void file_save_as_geo_options_cb(CALLBACK_ARGS) {
char *newfile;
- if((newfile = fl_file_chooser("Save Options File", "*", NULL)))
+ if((newfile = fl_file_chooser("Save options file", "*", NULL)))
Print_Options(0,GMSH_FULLRC, newfile);
}
void file_save_as_msh_cb(CALLBACK_ARGS) {
char *newfile;
- if((newfile = fl_file_chooser("Save MSH File", "*", NULL)))
+ if((newfile = fl_file_chooser("Save MSH file", "*", NULL)))
CreateOutputFile(newfile, CTX.print.format = CTX.mesh.format = FORMAT_MSH);
}
void file_save_as_unv_cb(CALLBACK_ARGS) {
char *newfile;
- if((newfile = fl_file_chooser("Save UNV File", "*", NULL)))
+ if((newfile = fl_file_chooser("Save UNV file", "*", NULL)))
CreateOutputFile(newfile, CTX.print.format = CTX.mesh.format = FORMAT_UNV);
}
void file_save_as_gref_cb(CALLBACK_ARGS) {
char *newfile;
- if((newfile = fl_file_chooser("Save GREF File", "*", NULL)))
+ if((newfile = fl_file_chooser("Save GREF file", "*", NULL)))
CreateOutputFile(newfile, CTX.print.format = CTX.mesh.format = FORMAT_GREF);
}
void file_save_as_eps_simple_cb(CALLBACK_ARGS) {
char *newfile;
- if((newfile = fl_file_chooser("Save EPS File", "*", NULL))){
+ if((newfile = fl_file_chooser("Save EPS file", "*", NULL))){
CTX.print.eps_quality = 1;
CreateOutputFile(newfile, CTX.print.format = FORMAT_EPS);
}
}
void file_save_as_eps_accurate_cb(CALLBACK_ARGS) {
char *newfile;
- if((newfile = fl_file_chooser("Save EPS File", "*", NULL))){
+ if((newfile = fl_file_chooser("Save EPS file", "*", NULL))){
CTX.print.eps_quality = 2;
CreateOutputFile(newfile, CTX.print.format = FORMAT_EPS);
}
}
void file_save_as_jpeg_cb(CALLBACK_ARGS) {
char *newfile;
- if((newfile = fl_file_chooser("Save JPEG File", "*", NULL)))
+ if((newfile = fl_file_chooser("Save JPEG file", "*", NULL)))
CreateOutputFile(newfile, CTX.print.format = FORMAT_JPEG);
}
void file_save_as_gif_cb(CALLBACK_ARGS) {
char *newfile;
- if((newfile = fl_file_chooser("Save GIF File", "*", NULL))){
+ if((newfile = fl_file_chooser("Save GIF file", "*", NULL))){
CTX.print.gif_dither = 0;
CTX.print.gif_transparent = 0;
CreateOutputFile(newfile, CTX.print.format = FORMAT_GIF);
@@ -257,7 +257,7 @@ void file_save_as_gif_cb(CALLBACK_ARGS) {
}
void file_save_as_gif_dithered_cb(CALLBACK_ARGS) {
char *newfile;
- if((newfile = fl_file_chooser("Save GIF File", "*", NULL))){
+ if((newfile = fl_file_chooser("Save GIF file", "*", NULL))){
CTX.print.gif_dither = 1;
CTX.print.gif_transparent = 0;
CreateOutputFile(newfile, CTX.print.format = FORMAT_GIF);
@@ -265,7 +265,7 @@ void file_save_as_gif_dithered_cb(CALLBACK_ARGS) {
}
void file_save_as_gif_transparent_cb(CALLBACK_ARGS) {
char *newfile;
- if((newfile = fl_file_chooser("Save GIF File", "*", NULL))){
+ if((newfile = fl_file_chooser("Save GIF file", "*", NULL))){
CTX.print.gif_dither = 0;
CTX.print.gif_transparent = 1;
CreateOutputFile(newfile, CTX.print.format = FORMAT_GIF);
@@ -273,12 +273,12 @@ void file_save_as_gif_transparent_cb(CALLBACK_ARGS) {
}
void file_save_as_ppm_cb(CALLBACK_ARGS) {
char *newfile;
- if((newfile = fl_file_chooser("Save PPM File", "*", NULL)))
+ if((newfile = fl_file_chooser("Save PPM file", "*", NULL)))
CreateOutputFile(newfile, CTX.print.format = FORMAT_PPM);
}
void file_save_as_yuv_cb(CALLBACK_ARGS) {
char *newfile;
- if((newfile = fl_file_chooser("Save YUV File", "*", NULL)))
+ if((newfile = fl_file_chooser("Save YUV file", "*", NULL)))
CreateOutputFile(newfile, CTX.print.format = FORMAT_YUV);
}
@@ -437,7 +437,7 @@ void opt_message_clear_cb(CALLBACK_ARGS) {
}
void opt_message_save_cb(CALLBACK_ARGS) {
char *newfile;
- if((newfile = fl_file_chooser("Save Messages", "*", NULL)))
+ if((newfile = fl_file_chooser("Save messages", "*", NULL)))
WID->save_message(newfile);
}
@@ -1321,7 +1321,7 @@ void getdp_cb(CALLBACK_ARGS){
}
void getdp_file_open_cb(CALLBACK_ARGS){
char *newfile;
- newfile = fl_file_chooser("Open Problem Definition File", "*", NULL);
+ newfile = fl_file_chooser("Open problem definition file", "*.[Pp][Rr][Oo]", NULL);
if (newfile != NULL){
WID->getdp_input[0]->value(newfile);
GetDP(newfile);
@@ -1335,7 +1335,7 @@ void getdp_file_edit_cb(CALLBACK_ARGS){
}
void getdp_choose_mesh_cb(CALLBACK_ARGS){
char *newfile;
- newfile = fl_file_chooser("Open Mesh File", "*", NULL);
+ newfile = fl_file_chooser("Open mesh file", "*.[Mm][Ss][Hh]", NULL);
if (newfile != NULL) WID->getdp_input[1]->value(newfile);
}
void getdp_pre_cb(CALLBACK_ARGS){
@@ -1467,13 +1467,13 @@ void view_remove_cb(CALLBACK_ARGS){
void view_save_ascii_cb(CALLBACK_ARGS){
char *newfile;
- if((newfile = fl_file_chooser("Save View in ASCII Format", "*", NULL)))
+ if((newfile = fl_file_chooser("Save view in ASCII format", "*", NULL)))
Write_View(0, (Post_View*)List_Pointer(Post_ViewList,(int)data), newfile);
}
void view_save_binary_cb(CALLBACK_ARGS){
char *newfile;
- if((newfile = fl_file_chooser("Save View in Binary Format", "*", NULL)))
+ if((newfile = fl_file_chooser("Save view in binary format", "*", NULL)))
Write_View(1, (Post_View*)List_Pointer(Post_ViewList,(int)data), newfile);
}
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 8ad9f018cf..a07f0f19d6 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.69 2001-05-04 22:42:21 geuzaine Exp $
+// $Id: GUI.cpp,v 1.70 2001-05-05 08:56:58 geuzaine Exp $
// To make the interface as visually consistent as possible, please:
// - use the BH, BW, WB, IW values for button heights/widths, window borders, etc.
@@ -902,7 +902,7 @@ void GUI::create_general_options_window(){
gen_window = new Fl_Window(width,height);
gen_window->box(WINDOW_BOX);
- gen_window->label("General Options");
+ gen_window->label("General options");
{
Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
{
@@ -1068,7 +1068,7 @@ void GUI::create_geometry_options_window(){
geo_window = new Fl_Window(width,height);
geo_window->box(WINDOW_BOX);
- geo_window->label("Geometry Options");
+ geo_window->label("Geometry options");
{
Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
{
@@ -1179,7 +1179,7 @@ void GUI::create_mesh_options_window(){
mesh_window = new Fl_Window(width,height);
mesh_window->box(WINDOW_BOX);
- mesh_window->label("Mesh Options");
+ mesh_window->label("Mesh options");
{
Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
{
@@ -1356,7 +1356,7 @@ void GUI::create_post_options_window(){
post_window = new Fl_Window(width,height);
post_window->box(WINDOW_BOX);
- post_window->label("Post Processing Options");
+ post_window->label("Post-processing options");
{
Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
{
@@ -1445,40 +1445,40 @@ void GUI::create_statistics_window(){
Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Geometry");
o->labelsize(CTX.fontsize);
o->hide();
- stat_value[0] = new Fl_Output(width/2, 2*WB+1*BH, IW, BH, "Number of points");
- stat_value[1] = new Fl_Output(width/2, 2*WB+2*BH, IW, BH, "Number of curves");
- stat_value[2] = new Fl_Output(width/2, 2*WB+3*BH, IW, BH, "Number of surfaces");
- stat_value[3] = new Fl_Output(width/2, 2*WB+4*BH, IW, BH, "Number of volumes");
+ stat_value[0] = new Fl_Output(2*WB, 2*WB+1*BH, IW, BH, "Points");
+ stat_value[1] = new Fl_Output(2*WB, 2*WB+2*BH, IW, BH, "Curves");
+ stat_value[2] = new Fl_Output(2*WB, 2*WB+3*BH, IW, BH, "Surfaces");
+ stat_value[3] = new Fl_Output(2*WB, 2*WB+4*BH, IW, BH, "Volumes");
o->end();
}
{
Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Mesh");
o->labelsize(CTX.fontsize);
- stat_value[4] = new Fl_Output(width/2, 2*WB+1*BH, IW, BH, "Nodes on curves");
- stat_value[5] = new Fl_Output(width/2, 2*WB+2*BH, IW, BH, "Nodes on surfaces");
- stat_value[6] = new Fl_Output(width/2, 2*WB+3*BH, IW, BH, "Nodes in volumes");
- stat_value[7] = new Fl_Output(width/2, 2*WB+4*BH, IW, BH, "Triangles");
- stat_value[8] = new Fl_Output(width/2, 2*WB+5*BH, IW, BH, "Quadrangles");
- stat_value[9] = new Fl_Output(width/2, 2*WB+6*BH, IW, BH, "Tetrahedra");
- stat_value[10] = new Fl_Output(width/2, 2*WB+7*BH, IW, BH, "Hexahedra");
- stat_value[11] = new Fl_Output(width/2, 2*WB+8*BH, IW, BH, "Prisms");
- stat_value[12] = new Fl_Output(width/2, 2*WB+9*BH, IW, BH, "Time for 1D mesh");
- stat_value[13] = new Fl_Output(width/2, 2*WB+10*BH, IW, BH, "Time for 2D mesh");
- stat_value[14] = new Fl_Output(width/2, 2*WB+11*BH, IW, BH, "Time for 3D mesh");
- stat_value[15] = new Fl_Output(width/2, 2*WB+12*BH, IW, BH, "Gamma factor");
- stat_value[16] = new Fl_Output(width/2, 2*WB+13*BH, IW, BH, "Eta factor");
- stat_value[17] = new Fl_Output(width/2, 2*WB+14*BH, IW, BH, "Rho factor");
+ stat_value[4] = new Fl_Output(2*WB, 2*WB+1*BH, IW, BH, "Nodes on curves");
+ stat_value[5] = new Fl_Output(2*WB, 2*WB+2*BH, IW, BH, "Nodes on surfaces");
+ stat_value[6] = new Fl_Output(2*WB, 2*WB+3*BH, IW, BH, "Nodes in volumes");
+ stat_value[7] = new Fl_Output(2*WB, 2*WB+4*BH, IW, BH, "Triangles");
+ stat_value[8] = new Fl_Output(2*WB, 2*WB+5*BH, IW, BH, "Quadrangles");
+ stat_value[9] = new Fl_Output(2*WB, 2*WB+6*BH, IW, BH, "Tetrahedra");
+ stat_value[10] = new Fl_Output(2*WB, 2*WB+7*BH, IW, BH, "Hexahedra");
+ stat_value[11] = new Fl_Output(2*WB, 2*WB+8*BH, IW, BH, "Prisms");
+ stat_value[12] = new Fl_Output(2*WB, 2*WB+9*BH, IW, BH, "Time for 1D mesh");
+ stat_value[13] = new Fl_Output(2*WB, 2*WB+10*BH, IW, BH, "Time for 2D mesh");
+ stat_value[14] = new Fl_Output(2*WB, 2*WB+11*BH, IW, BH, "Time for 3D mesh");
+ stat_value[15] = new Fl_Output(2*WB, 2*WB+12*BH, IW, BH, "Gamma factor");
+ stat_value[16] = new Fl_Output(2*WB, 2*WB+13*BH, IW, BH, "Eta factor");
+ stat_value[17] = new Fl_Output(2*WB, 2*WB+14*BH, IW, BH, "Rho factor");
o->end();
}
{
Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Post-processing");
o->labelsize(CTX.fontsize);
o->hide();
- stat_value[18] = new Fl_Output(width/2, 2*WB+1*BH, IW, BH, "Views loaded");
- stat_value[19] = new Fl_Output(width/2, 2*WB+2*BH, IW, BH, "Visible Points");
- stat_value[20] = new Fl_Output(width/2, 2*WB+3*BH, IW, BH, "Visible lines");
- stat_value[21] = new Fl_Output(width/2, 2*WB+4*BH, IW, BH, "Visible triangles");
- stat_value[22] = new Fl_Output(width/2, 2*WB+5*BH, IW, BH, "Visible tetrahedra");
+ stat_value[18] = new Fl_Output(2*WB, 2*WB+1*BH, IW, BH, "Views");
+ stat_value[19] = new Fl_Output(2*WB, 2*WB+2*BH, IW, BH, "Visible Points");
+ stat_value[20] = new Fl_Output(2*WB, 2*WB+3*BH, IW, BH, "Visible lines");
+ stat_value[21] = new Fl_Output(2*WB, 2*WB+4*BH, IW, BH, "Visible triangles");
+ stat_value[22] = new Fl_Output(2*WB, 2*WB+5*BH, IW, BH, "Visible tetrahedra");
o->end();
}
o->end();
@@ -1488,7 +1488,7 @@ void GUI::create_statistics_window(){
stat_value[i]->labelsize(CTX.fontsize);
stat_value[i]->textsize(CTX.fontsize);
stat_value[i]->type(FL_HORIZONTAL);
- stat_value[i]->align(FL_ALIGN_LEFT);
+ stat_value[i]->align(FL_ALIGN_RIGHT);
stat_value[i]->value(0);
}
@@ -2085,7 +2085,7 @@ void GUI::create_geometry_context_window(int num){
context_geometry_window = new Fl_Window(width,height);
context_geometry_window->box(WINDOW_BOX);
- context_geometry_window->label("Contextual Geometry Definitions");
+ context_geometry_window->label("Contextual geometry definitions");
{
Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
// 0: Parameter
@@ -2255,7 +2255,7 @@ void GUI::create_mesh_context_window(int num){
context_mesh_window = new Fl_Window(width,height);
context_mesh_window->box(WINDOW_BOX);
- context_mesh_window->label("Contextual Mesh Definitions");
+ context_mesh_window->label("Contextual mesh definitions");
{
Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
// 0: Characteristic length
@@ -2353,7 +2353,7 @@ void GUI::create_getdp_window(){
getdp_window = new Fl_Window(width,height);
getdp_window->box(WINDOW_BOX);
- getdp_window->label("GetDP Solver");
+ getdp_window->label("GetDP solver");
{
Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-1*BH);
{
--
GitLab