From 29891f06bc60065156248c334ec5e8331e817446 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 31 Dec 2004 07:55:18 +0000
Subject: [PATCH] Ctrl+a->Shift+a
---
Fltk/Callbacks.cpp | 6 +++---
Fltk/GUI.cpp | 4 ++--
doc/texinfo/shortcuts.texi | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index bbb6335eb6..acd7ce6d48 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.319 2004-12-31 04:04:50 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.320 2004-12-31 07:55:17 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -1182,7 +1182,7 @@ void help_short_cb(CALLBACK_ARGS)
{
Msg(DIRECT, " ");
#if defined(__APPLE__)
- Msg(DIRECT, "Keyboard shortcuts (Ctrl and Cmd can be used interchangeably):");
+ Msg(DIRECT, "Keyboard shortcuts (Ctrl and Command can be used interchangeably):");
#else
Msg(DIRECT, "Keyboard shortcuts:");
#endif
@@ -1204,6 +1204,7 @@ void help_short_cb(CALLBACK_ARGS)
Msg(DIRECT, " p Go to post-processing module");
Msg(DIRECT, " s Go to solver module");
Msg(DIRECT, " ");
+ Msg(DIRECT, " Shift+a Bring all windows to front");
Msg(DIRECT, " Shift+g Show geometry options");
Msg(DIRECT, " Shift+m Show mesh options");
Msg(DIRECT, " Shift+o Show general options");
@@ -1211,7 +1212,6 @@ void help_short_cb(CALLBACK_ARGS)
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");
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 0bed098df1..c476c2de02 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.403 2004-12-31 06:09:31 geuzaine Exp $
+// $Id: GUI.cpp,v 1.404 2004-12-31 07:55:17 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -528,7 +528,7 @@ int GUI::global_shortcuts(int event)
quit_selection = 1;
return 0; // trick: do as if we didn't use it
}
- else if(Fl::test_shortcut(FL_CTRL + 'a') || Fl::test_shortcut(FL_META + 'a')) {
+ else if(Fl::test_shortcut(FL_SHIFT + 'a')) {
// raise all open windows (graphics first, then options, then menu)
if(g_window && g_window->shown()) g_window->show();
if(opt_window && opt_window->shown()) opt_window->show();
diff --git a/doc/texinfo/shortcuts.texi b/doc/texinfo/shortcuts.texi
index 36a85eb972..d8004356d0 100644
--- a/doc/texinfo/shortcuts.texi
+++ b/doc/texinfo/shortcuts.texi
@@ -38,6 +38,8 @@ Go to solver module
@sp 1 @c ----------------------------------------------
+@item Shift+a
+Bring all windows to front
@item Shift+g
Show geometry options
@item Shift+m
@@ -53,8 +55,6 @@ Show post-processing view options
@sp 1 @c ----------------------------------------------
-@item Ctrl+a
-Bring all windows to front
@item Ctrl+i
Show statistics window
@item Ctrl+l
--
GitLab