aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Dialog.h
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-01-18 18:20:00 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-05-07 14:57:15 +0200
commitafceb7ebaed13dd680a1acfb8354b736a1fd2cc3 (patch)
treeb9991ad80c428cde0dcbfa075bed3af13c1e1afc /nx-X11/programs/Xserver/hw/nxagent/Dialog.h
parentb7169bdcaf320e219dec23e79882176bc4b69d4c (diff)
downloadnx-libs-afceb7ebaed13dd680a1acfb8354b736a1fd2cc3.tar.gz
nx-libs-afceb7ebaed13dd680a1acfb8354b736a1fd2cc3.tar.bz2
nx-libs-afceb7ebaed13dd680a1acfb8354b736a1fd2cc3.zip
Dialog.c: show configured keystrokes in dialogs
Instead of hardcoding the keystrokes in Dialog.h determine the currently configured keystrokes for the action and insert them into the dialog strings. Fixes ArcticaProject/nx-libs#438
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Dialog.h')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Dialog.h19
1 files changed, 11 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.h b/nx-X11/programs/Xserver/hw/nxagent/Dialog.h
index 42bba290d..2f503bc62 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.h
@@ -174,7 +174,7 @@ nxagentFailedReconnectionMessage
"\
The session is now running in desktop resize mode.\n\
You can resize the desktop by simply dragging the\n\
-desktop window's border. You can press Ctrl+Alt+R\n\
+desktop window's border. You can press %s\n\
again to disable this option.\
"
@@ -187,9 +187,12 @@ again to disable this option.\
"\
The session is now running in viewport mode. You can\n\
navigate across different areas of the desktop window\n\
-by dragging the desktop with the mouse or by using the\n\
-arrows keys while pressing Ctrl+Alt. Press Ctrl+Alt+R\n\
-again to return to the desktop resize mode.\
+by dragging the desktop with the mouse while pressing\n\
+Ctrl+Alt or use the keystrokes listed below. Press\n\
+%s again to return to the desktop resize mode.\n\
+\n\
+Use these keystrokes to navigate:\n\
+%s\
"
#define DIALOG_DISABLE_DESKTOP_RESIZE_MODE_TYPE "ok"
@@ -201,7 +204,7 @@ again to return to the desktop resize mode.\
\
"\
Deferred screen updates are now enabled. You can press\n\
-Ctrl+Alt+E again to disable this option.\
+%s again to disable this option.\
"
#define DIALOG_ENABLE_DEFER_MODE_TYPE "ok"
@@ -213,7 +216,7 @@ Ctrl+Alt+E again to disable this option.\
\
"\
Deferred screen updates are now disabled. You can press\n\
-Ctrl+Alt+E to enable it again.\
+%s to enable it again.\
"
#define DIALOG_DISABLE_DEFER_MODE_TYPE "ok"
@@ -225,7 +228,7 @@ Ctrl+Alt+E to enable it again.\
\
"\
Keyboard auto-grabbing mode is now enabled. You can press\n\
-Ctrl+Alt+G again to disable auto-grabbing.\
+%s again to disable auto-grabbing.\
"
#define DIALOG_ENABLE_AUTOGRAB_MODE_TYPE "ok"
@@ -237,7 +240,7 @@ Ctrl+Alt+G again to disable auto-grabbing.\
\
"\
Keyboard auto-grabbing mode is now disabled. You can press\n\
-Ctrl+Alt+G again to re-enable auto-grabbing.\
+%s again to re-enable auto-grabbing.\
"
#define DIALOG_DISABLE_AUTOGRAB_MODE_TYPE "ok"