diff --git a/Fltk/Bitmaps.h b/Fltk/Bitmaps.h index b3bca55c977086898bba9bab4f52922e7cdb4676..6e6a7607ff775c066d12d7401ce521b10dc93429 100644 --- a/Fltk/Bitmaps.h +++ b/Fltk/Bitmaps.h @@ -39,64 +39,6 @@ static char gmsh32x32_bits[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }; #endif -// 'About Gmsh' bitmap - -#define about_width 49 -#define about_height 111 -static char about_bits[] = { - 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x00, - 0x00,0x00,0x08,0x00,0x00,0xfe,0x00,0x00,0x00,0x10,0x00,0x00,0xfe,0x00,0x00, - 0x00,0x20,0x00,0x00,0xfe,0x00,0x00,0x00,0x40,0x00,0x00,0xfe,0x00,0x00,0x00, - 0xc0,0x00,0x00,0xfe,0x00,0x00,0x00,0xc0,0x01,0x00,0xfe,0x00,0x00,0x00,0xc0, - 0x01,0x00,0xfe,0x00,0x00,0x00,0xff,0x03,0x00,0xfe,0x00,0x00,0xf0,0xff,0x03, - 0x00,0xfe,0x00,0x00,0xf0,0xff,0x03,0x00,0xfe,0x70,0x00,0xf0,0xff,0x03,0x00, - 0xfe,0xfc,0x03,0xe0,0xff,0x00,0x00,0xfe,0xf8,0x0f,0xc0,0x01,0x00,0x00,0xfe, - 0xf0,0x3f,0xc0,0x00,0x00,0x00,0xfe,0xe0,0x7f,0x00,0x01,0x00,0x00,0xfe,0x80, - 0xff,0x00,0x01,0x00,0x00,0xfe,0x00,0xfe,0x01,0x02,0x00,0x00,0xfe,0x00,0xf8, - 0x03,0x0c,0x00,0x00,0xfe,0x00,0xf0,0x07,0x08,0x00,0x00,0xfe,0x00,0xc0,0x0f, - 0x10,0x00,0x00,0xfe,0x00,0x00,0x1f,0x70,0x00,0x00,0xfe,0x00,0x00,0x7c,0xf8, - 0x00,0x00,0xfe,0x00,0x00,0xf0,0xff,0x00,0x00,0xfe,0x00,0x00,0xc0,0xff,0x01, - 0x00,0xfe,0x00,0x00,0x00,0xfe,0x01,0x00,0xfe,0x00,0x00,0x00,0xf8,0x00,0x00, - 0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0xfe, - 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x00, - 0x00,0xe0,0x03,0x00,0x00,0xfe,0x00,0x00,0xf0,0x0f,0x00,0x00,0xfe,0x00,0x80, - 0xf8,0x1f,0x00,0x00,0xfe,0x00,0x00,0xff,0x21,0x00,0x00,0xfe,0x00,0x00,0xff, - 0x40,0x00,0x00,0xfe,0x00,0x00,0x7e,0x80,0x00,0x00,0xfe,0x00,0x00,0x3c,0x80, - 0x00,0x00,0xfe,0x00,0x00,0x38,0xc0,0x01,0x00,0xfe,0x00,0x00,0x20,0xf0,0x01, - 0x00,0xfe,0x00,0x00,0x40,0xf8,0x01,0x00,0xfe,0x00,0x00,0x80,0xf8,0x01,0x00, - 0xfe,0x00,0x00,0x00,0xf1,0x00,0x00,0xfe,0x00,0x00,0x00,0x04,0x00,0x00,0xfe, - 0x00,0x00,0x00,0x08,0x00,0x00,0xfe,0x00,0x00,0x00,0x08,0x00,0x00,0xfe,0x00, - 0x00,0x00,0x10,0x00,0x00,0xfe,0x00,0x00,0x00,0x30,0x00,0x00,0xfe,0x00,0x00, - 0x00,0x70,0x00,0x00,0xfe,0x00,0x00,0x00,0x70,0x00,0x00,0xfe,0x00,0x00,0x00, - 0xf8,0x00,0x00,0xfe,0x00,0x00,0xc0,0xff,0x01,0x00,0xfe,0x00,0x00,0xf0,0xff, - 0x01,0x00,0xfe,0x00,0x00,0xf0,0xff,0x01,0x00,0xfe,0x00,0x00,0xf0,0xff,0x00, - 0x00,0xfe,0x00,0x00,0xe0,0x1f,0x00,0x00,0xfe,0x00,0x00,0xc0,0x01,0x00,0x00, - 0xfe,0x00,0x00,0xc0,0x00,0x00,0x00,0xfe,0x00,0x00,0x80,0x00,0x00,0x00,0xfe, - 0x00,0x00,0x00,0x01,0x00,0x00,0xfe,0x00,0x00,0x00,0x02,0x00,0x00,0xfe,0x00, - 0x00,0x00,0x04,0x00,0x00,0xfe,0x00,0x00,0x38,0x08,0x00,0x00,0xfe,0x00,0x00, - 0xf8,0x18,0x00,0x00,0xfe,0x00,0x00,0xf8,0x3f,0x00,0x00,0xfe,0x00,0x00,0xf8, - 0x7f,0x00,0x00,0xfe,0x00,0x00,0xf0,0xff,0x00,0x00,0xfe,0x00,0x00,0xf0,0xff, - 0x00,0x00,0xfe,0x00,0x00,0x60,0xfc,0x01,0x00,0xfe,0x00,0x00,0x40,0xf0,0x01, - 0x00,0xfe,0x00,0x00,0x80,0x00,0x00,0x00,0xfe,0x00,0x00,0x80,0x00,0x00,0x00, - 0xfe,0x00,0x00,0x00,0x01,0x00,0x00,0xfe,0x00,0x00,0x00,0x02,0x00,0x00,0xfe, - 0x00,0x00,0x0c,0x06,0x00,0x00,0xfe,0x00,0x00,0x3c,0x04,0x00,0x00,0xfe,0x00, - 0x00,0xf8,0x08,0x00,0x00,0xfe,0x00,0x00,0xf8,0x1f,0x00,0x00,0xfe,0x00,0x00, - 0xf0,0x3f,0x00,0x00,0xfe,0x00,0x00,0xe0,0x7f,0x00,0x00,0xfe,0x00,0x00,0xc0, - 0xff,0x00,0x00,0xfe,0x00,0x00,0x00,0xff,0x00,0x00,0xfe,0x00,0x00,0x00,0xfc, - 0x00,0x00,0xfe,0x00,0x00,0x00,0x0c,0x00,0x00,0xfe,0x00,0x00,0x00,0x10,0x00, - 0x00,0xfe,0x00,0x00,0x00,0x10,0x00,0x00,0xfe,0x00,0x00,0x00,0x20,0x00,0x00, - 0xfe,0x00,0x00,0x00,0x60,0x00,0x00,0xfe,0x00,0x00,0x00,0xcf,0x00,0x00,0xfe, - 0x00,0x00,0xde,0xbf,0x01,0x00,0xfe,0x00,0x00,0xfe,0xff,0x03,0x00,0xfe,0x00, - 0x00,0xfe,0x1f,0x0f,0x00,0xfe,0x00,0x00,0xf8,0x07,0x1e,0x00,0xfe,0x00,0x00, - 0xf0,0x03,0x7e,0x00,0xfe,0x00,0x00,0xd0,0x07,0xfc,0x00,0xfe,0x00,0x00,0x10, - 0x08,0xf8,0x03,0xfe,0x00,0x00,0x10,0x18,0xf0,0x07,0xfe,0x00,0x00,0x10,0x30, - 0xe0,0x0f,0xfe,0x00,0x00,0x10,0x30,0xc0,0x1f,0xfe,0x00,0x00,0x10,0x70,0x80, - 0x3f,0xfe,0x00,0x00,0x20,0xf8,0x00,0x7f,0xfe,0x00,0x00,0x60,0xfc,0x00,0xfe, - 0xfe,0x00,0x00,0xc0,0xff,0x01,0xfc,0xfe,0x00,0x00,0xc0,0xff,0x01,0x78,0xfe, - 0x00,0x00,0x80,0xff,0x01,0x00,0xfe,0x00,0x00,0x00,0xff,0x01,0x00,0xfe,0x00, - 0x00,0x00,0xfc,0x01,0x00,0xfe,0x00,0x00,0x00,0xf8,0x00,0x00,0xfe,0x00,0x00, - 0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0xfe}; - // 'Abort' bitmap // disabled until the mesh thread is back /* diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp index 7df89f334faa122a77e7ad74e090516f3fd0da15..4016bfa226d3e12097d9feb7c7ee0d3ad1e716e9 100644 --- a/Fltk/Callbacks.cpp +++ b/Fltk/Callbacks.cpp @@ -1,4 +1,4 @@ -// $Id: Callbacks.cpp,v 1.275 2004-09-19 03:42:11 geuzaine Exp $ +// $Id: Callbacks.cpp,v 1.276 2004-09-19 06:42:38 geuzaine Exp $ // // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // @@ -1546,6 +1546,13 @@ void help_online_cb(CALLBACK_ARGS) SystemCall(cmd); } +void help_credits_cb(CALLBACK_ARGS) +{ + char cmd[1000]; + _replace_multi_format(CTX.web_browser, "http://www.geuz.org/gmsh/doc/CREDITS", cmd); + SystemCall(cmd); +} + // Module Menu void mod_geometry_cb(CALLBACK_ARGS) diff --git a/Fltk/Callbacks.h b/Fltk/Callbacks.h index c6d7f43ee1939d9fcc04dfd54015f4395e300064..ca7a20faa90ca6c28a37a8c056349e4a1119a116 100644 --- a/Fltk/Callbacks.h +++ b/Fltk/Callbacks.h @@ -164,6 +164,7 @@ void help_mouse_cb(CALLBACK_ARGS) ; void help_command_line_cb(CALLBACK_ARGS) ; void help_online_cb(CALLBACK_ARGS) ; void help_license_cb(CALLBACK_ARGS) ; +void help_credits_cb(CALLBACK_ARGS) ; void help_about_cb(CALLBACK_ARGS) ; // Module Menu diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp index 571ffd4afaa2df94fd6bceaae1115c4a1c1de282..5eb55418eeae242904b529357f425b453d43fe2d 100644 --- a/Fltk/GUI.cpp +++ b/Fltk/GUI.cpp @@ -1,4 +1,4 @@ -// $Id: GUI.cpp,v 1.349 2004-09-19 03:42:11 geuzaine Exp $ +// $Id: GUI.cpp,v 1.350 2004-09-19 06:42:38 geuzaine Exp $ // // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // @@ -3383,20 +3383,14 @@ void GUI::create_about_window() return; } - int width = 40 * fontsize; - int height = 10 * BH; + int width = 33 * fontsize; + int height = 15 * BH; about_window = new Fl_Window(width, height, "About Gmsh"); about_window->box(WINDOW_BOX); { - Fl_Box *o = new Fl_Box(2 * WB, WB, about_width, height - 3 * WB - BH); - about_bmp = new Fl_Bitmap(about_bits, about_width, about_height); - about_bmp->label(o); - } - - { - Fl_Browser *o = new Fl_Browser(WB + 80, WB, width - 2 * WB - 80, height - 3 * WB - BH); + Fl_Browser *o = new Fl_Browser(WB, WB, width - 2 * WB, height - 3 * WB - BH); o->add(" "); o->add("@c@b@.Gmsh"); o->add("@c@.A three-dimensional finite element mesh generator"); @@ -3421,12 +3415,12 @@ void GUI::create_about_window() o->add(buffer); sprintf(buffer, "@c@.Build OS: %s", GMSH_OS); o->add(buffer); - sprintf(buffer, "@c@.Build options: %s", Get_BuildOptions()); - o->add(buffer); sprintf(buffer, "@c@.Build date: %s", GMSH_DATE); o->add(buffer); sprintf(buffer, "@c@.Build host: %s", GMSH_HOST); o->add(buffer); + sprintf(buffer, "@c@.Options: %s", Get_BuildOptions()); + o->add(buffer); sprintf(buffer, "@c@.Packaged by: %s", GMSH_PACKAGER); o->add(buffer); o->add(" "); @@ -3435,10 +3429,15 @@ void GUI::create_about_window() } { - Fl_Button *o = new Fl_Button(width - 2*BB - 2*WB, height - BH - WB, BB, BH, "License"); + Fl_Button *o = new Fl_Button(width - 3*BB - 3*WB, height - BH - WB, BB, BH, "License"); o->callback(help_license_cb); } + { + Fl_Button *o = new Fl_Button(width - 2*BB - 2*WB, height - BH - WB, BB, BH, "Credits"); + o->callback(help_credits_cb); + } + { Fl_Return_Button *o = new Fl_Return_Button(width - BB - WB, height - BH - WB, BB, BH, "OK"); o->callback(cancel_cb, (void *)about_window); diff --git a/Fltk/GUI.h b/Fltk/GUI.h index 8a6c13e1f21a663e0d370d6031856a1ca40ccba0..41337fcb10fa1b95a7ffcb2c7094ace1e73e6ae0 100644 --- a/Fltk/GUI.h +++ b/Fltk/GUI.h @@ -121,7 +121,7 @@ class GUI{ Fl_Scroll *m_scroll; // Bitmaps - Fl_Bitmap *abort_bmp, *start_bmp, *stop_bmp, *rewind_bmp, *about_bmp ; + Fl_Bitmap *abort_bmp, *start_bmp, *stop_bmp, *rewind_bmp ; void add_post_plugins ( Fl_Menu_Button *button , int iView); void add_multiline_in_browser(Fl_Browser *o, char* prefix, char *str);