diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp index 6c738d3a3e0c7f0e7c77c644ba37edd03d1727b4..5d4a7454ec1d2476fef3e5d5764fd44a184a4e06 100644 --- a/Fltk/graphicWindow.cpp +++ b/Fltk/graphicWindow.cpp @@ -1992,7 +1992,7 @@ static Fl_Menu_Item bar_table[] = { {"&Help", 0, 0, 0, FL_SUBMENU}, {"On&line Documentation", 0, (Fl_Callback *)help_online_cb, 0, FL_MENU_DIVIDER}, {"&Keyboard and Mouse Usage", FL_CTRL+'h', (Fl_Callback *)help_basic_cb, 0, FL_MENU_DIVIDER}, - {"&Current Options and Workspace", 0, (Fl_Callback *)status_options_cb, (void*)"?", 0}, + {"&Current Options and Workspace", FL_CTRL+FL_SHIFT+'h', (Fl_Callback *)status_options_cb, (void*)"?", 0}, {"&Restore all Options to Default Settings", 0, (Fl_Callback *)options_restore_defaults_cb, 0, FL_MENU_DIVIDER}, {"&About Gmsh", 0, (Fl_Callback *)help_about_cb, 0}, {0}, @@ -2055,8 +2055,8 @@ static Fl_Menu_Item sysbar_table[] = { {0}, {"Help", 0, 0, 0, FL_SUBMENU}, {"Online Documentation", 0, (Fl_Callback *)help_online_cb, 0, FL_MENU_DIVIDER}, - {"Keyboard and Mouse Usage", 0, (Fl_Callback *)help_basic_cb, 0, FL_MENU_DIVIDER}, - {"Current Options and Workspace", 0, (Fl_Callback *)status_options_cb, (void*)"?"}, + {"Keyboard and Mouse Usage", 0, (Fl_Callback *)help_basic_cb, 0, FL_MENU_DIVIDER}, + {"Current Options and Workspace", FL_META+FL_SHIFT+'h', (Fl_Callback *)status_options_cb, (void*)"?"}, {"Restore all Options to Default Settings", 0, (Fl_Callback *)options_restore_defaults_cb, 0}, {0}, {0} @@ -2452,49 +2452,49 @@ void status_options_cb(Fl_Widget *w, void *data) } else if(what == "quick_access"){ // quick access menu static Fl_Menu_Item menu[] = { - { "Axes", 0, quick_access_cb, (void*)"axes", + { "Axes", FL_ALT + 'a', quick_access_cb, (void*)"axes", FL_MENU_TOGGLE }, { "Projection mode", 0, 0, 0, FL_SUBMENU }, - { "Orthographic", 0, quick_access_cb, (void*)"orthographic"}, + { "Orthographic", FL_ALT + 'o', quick_access_cb, (void*)"orthographic"}, { "Perspective", 0, quick_access_cb, (void*)"perspective"}, { 0 }, { "All general options...", 0, quick_access_cb, (void*)"general", FL_MENU_DIVIDER, 0, FL_ITALIC }, { "Geometry visibility", 0, 0, 0, FL_SUBMENU }, - { "Points", 0, quick_access_cb, (void*)"geometry_points", + { "Points", FL_ALT + 'p', quick_access_cb, (void*)"geometry_points", FL_MENU_TOGGLE }, - { "Lines", 0, quick_access_cb, (void*)"geometry_lines", + { "Lines", FL_ALT + 'l', quick_access_cb, (void*)"geometry_lines", FL_MENU_TOGGLE }, - { "Surfaces ", 0, quick_access_cb, (void*)"geometry_surfaces", + { "Surfaces ", FL_ALT + 's', quick_access_cb, (void*)"geometry_surfaces", FL_MENU_TOGGLE }, - { "Volumes", 0, quick_access_cb, (void*)"geometry_volumes", + { "Volumes", FL_ALT + 'v', quick_access_cb, (void*)"geometry_volumes", FL_MENU_TOGGLE }, { 0 }, { "All geometry options...", 0, quick_access_cb, (void*)"geometry", FL_MENU_DIVIDER, 0, FL_ITALIC }, { "Mesh visibility", 0, 0, 0, FL_SUBMENU }, - { "Nodes", 0, quick_access_cb, (void*)"mesh_points", + { "Nodes", FL_ALT + FL_SHIFT + 'p', quick_access_cb, (void*)"mesh_points", FL_MENU_TOGGLE }, - { "Lines", 0, quick_access_cb, (void*)"mesh_lines", - FL_MENU_TOGGLE }, - { "Surface edges ", 0, quick_access_cb, (void*)"mesh_surfaces_edges", - FL_MENU_TOGGLE }, - { "Surface faces", 0, quick_access_cb, (void*)"mesh_surfaces_faces", - FL_MENU_TOGGLE }, - { "Volume edges", 0, quick_access_cb, (void*)"mesh_volumes_edges", - FL_MENU_TOGGLE }, - { "Volume faces", 0, quick_access_cb, (void*)"mesh_volumes_faces", + { "Lines", FL_ALT + FL_SHIFT + 'l', quick_access_cb, (void*)"mesh_lines", FL_MENU_TOGGLE }, + { "Surface edges ", FL_ALT + FL_SHIFT + 's', quick_access_cb, + (void*)"mesh_surfaces_edges", FL_MENU_TOGGLE }, + { "Surface faces", FL_ALT + FL_SHIFT + 'd', quick_access_cb, + (void*)"mesh_surfaces_faces", FL_MENU_TOGGLE }, + { "Volume edges", FL_ALT + FL_SHIFT + 'v', quick_access_cb, + (void*)"mesh_volumes_edges", FL_MENU_TOGGLE }, + { "Volume faces", FL_ALT + FL_SHIFT + 'b', quick_access_cb, + (void*)"mesh_volumes_faces", FL_MENU_TOGGLE }, { 0 }, - { "Toggle mesh display", 0, quick_access_cb, (void*)"mesh_toggle" }, + { "Toggle mesh display", FL_ALT + 'm', quick_access_cb, (void*)"mesh_toggle" }, { "Global mesh size factor", 0, quick_access_cb, (void*)"mesh_size" }, { "All mesh options...", 0, quick_access_cb, (void*)"mesh", FL_MENU_DIVIDER, 0, FL_ITALIC }, - { "View element outlines ", 0, quick_access_cb, (void*)"view_element_outlines", - FL_MENU_TOGGLE }, + { "View element outlines ", FL_ALT + 'e', quick_access_cb, + (void*)"view_element_outlines", FL_MENU_TOGGLE }, { "View normal raise", 0, quick_access_cb, (void*)"view_normal_raise" }, { "View intervals", 0, 0, 0, FL_SUBMENU }, - { "Iso-values", 0, quick_access_cb, (void*)"view_iso"}, + { "Iso-values", FL_ALT + 't', quick_access_cb, (void*)"view_iso"}, { "Continuous map", 0, quick_access_cb, (void*)"view_continous"}, { "Filled iso-values", 0, quick_access_cb, (void*)"view_filled"}, { "Numeric values", 0, quick_access_cb, (void*)"view_numeric"},