From 73668b94894fa720dc82b66119fdf2a2b72611e7 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 28 Feb 2004 02:15:37 +0000
Subject: [PATCH] The fltk folks finally fixed the ctrl+n/ctrl+p/... bug, so we
can use ctrl+n for new file now.
---
Fltk/Callbacks.cpp | 3 ++-
Fltk/GUI.cpp | 11 ++++-------
doc/texinfo/shortcuts.texi | 3 +++
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index e6dc9a1069..dc04a676f6 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.206 2004-02-28 00:48:48 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.207 2004-02-28 02:15:37 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -1471,6 +1471,7 @@ void help_short_cb(CALLBACK_ARGS)
Msg(DIRECT, " Shift+m show mesh options");
Msg(DIRECT, " "XX"+m merge file");
Msg(DIRECT, " Shift+n show general options");
+ Msg(DIRECT, " "XX"+m new file");
Msg(DIRECT, " Shift+o show option window");
Msg(DIRECT, " "XX"+o open file");
Msg(DIRECT, " p go to post-processor module");
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 569df52fbf..dda114c3cd 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.274 2004-02-28 00:48:48 geuzaine Exp $
+// $Id: GUI.cpp,v 1.275 2004-02-28 02:15:37 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -79,15 +79,12 @@ extern Context_T CTX;
// Definition of the static menus
-// Don't define shortcuts for FL_CTRL+'n', FL_CTRL+'p', FL_CTRL+'f', FL_CTRL+'b'
-// these are used by fltk for widget navigation (in the same way as the 4 arrow keys)
-
// We shouldn't use the 'g', 'm' 's' and 'p' mnemonics since they are
-// already defined as global shortcuts (geometry, mesh, solver, post).
+// already defined as global shortcuts (for geometry, mesh, solver, post).
Fl_Menu_Item m_menubar_table[] = {
{"&File", 0, 0, 0, FL_SUBMENU},
- {"&New...", 0, (Fl_Callback *)file_new_cb, 0},
+ {"&New...", FL_CTRL+'n', (Fl_Callback *)file_new_cb, 0},
{"&Open...", FL_CTRL+'o', (Fl_Callback *)file_open_cb, 0},
{"M&erge...", FL_CTRL+'m', (Fl_Callback *)file_merge_cb, 0, FL_MENU_DIVIDER},
{"Sa&ve mesh", FL_CTRL+'s', (Fl_Callback *)mesh_save_cb, 0},
@@ -159,7 +156,7 @@ Fl_Menu_Item m_menubar_table[] = {
#if defined(__APPLE__) && defined(HAVE_FL_SYS_MENU_BAR)
Fl_Menu_Item m_sys_menubar_table[] = {
{"File", 0, 0, 0, FL_SUBMENU},
- {"New...", 0, (Fl_Callback *)file_new_cb, 0},
+ {"New...", FL_CTRL+'n', (Fl_Callback *)file_new_cb, 0},
{"Open...", FL_CTRL+'o', (Fl_Callback *)file_open_cb, 0},
{"Merge...", FL_CTRL+'m', (Fl_Callback *)file_merge_cb, 0, FL_MENU_DIVIDER},
{"Save Mesh", FL_CTRL+'s', (Fl_Callback *)mesh_save_cb, 0},
diff --git a/doc/texinfo/shortcuts.texi b/doc/texinfo/shortcuts.texi
index 93ee16fb58..feaa7a3341 100644
--- a/doc/texinfo/shortcuts.texi
+++ b/doc/texinfo/shortcuts.texi
@@ -31,6 +31,9 @@ merge file
@item Shift+n
show general options
+@item Ctrl+n
+show new file
+
@item Shift+o
show option window
--
GitLab