From ee5f0ba68e7f0d61ae657af9ccbd0a4f757fecc4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Wed, 25 Dec 2019 19:31:30 -0300
Subject: [PATCH] dragora-installer: improve of messages...

---
 archive/dragora-installer/dragora-installer | 34 +++++++++++++----------------
 recipes/tools/dragora-installer/recipe      |  2 +-
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/archive/dragora-installer/dragora-installer b/archive/dragora-installer/dragora-installer
index a6c89cfe..d320f79b 100644
--- a/archive/dragora-installer/dragora-installer
+++ b/archive/dragora-installer/dragora-installer
@@ -125,29 +125,25 @@ echo "$LINES $COLUMNS"
 
 export SUBTMPDIR LINES COLUMNS
 
-dialog --colors \
- --backtitle "\ZbDragora 3.0 Installer" \
+dialog --no-lines --colors \
+ --backtitle "\ZbThe installer of Dragora GNU/Linux-Libre 3.0" \
  --title "INSTALLER INFORMATION" \
  --cr-wrap --msgbox \
 "Welcome to \Z3${PROGRAM}\Zn.\n\n\
-This program prepares Dragora 3.0 to run on your computer.\n\n\
-    - To set up Dragora now, press \ZuENTER\Zn.\n\n\
-    - To quit, press \ZuEsc\Zn.\n\n\
+This program will help you install Dragora 3.0 on your computer...\n\n\
 
-Use the arrow keys to move between options and selections, also \ZuTAB\Zn to
-jump from one option to another.  \ZuENTER\Zn to continue, \ZuEsc\Zn to cancel
-or return to a previous menu, and \ZuCtrl+C\Zn to abort the installation at
-any time.
+                      \Z3^\Zn
+Use the arrow keys \Z3<-\Zn \Zb\Z7|\Zn \Z3->\Zn to move through the installer's menus.
+                      \Z3v\Zn
+Press \Z3[Tab]\Zn to jump to the next option and \Z3[Shift]\Zn\Zb\Z7+\Zn\Z3[Tab]\Zn to jump to the previous one.
 
-* Here is a representation of the most commonly used keys in a QWERTY layout:
+The confirmation options in the menus are made with \Z3[SPACE]\Zn or \Z3[ENTER]\Zn.
 
-\Z3[Esc]\Zn  \Z3[F1]\Zn
-                                           \Z3[<- ]\Zn  \Z3[Ins][Home][PageUp]\Zn
-\Z3[TAB]\Zn                                             \Z3[Del][End ][PageDown]\Zn
-                                       \Z3[-ENTER-]\Zn
-           \Z3[c]\Zn                                         \Z3[^]\Zn
-\Z3[Ctrl]\Zn    \Z3[          SPACE          ]\Zn               \Z3[<][V][>]\Zn
-\Zn" $((LINES - 8)) $((COLUMNS - 8))
+You can use \Z3[Ctrl]\Zn\Zb\Z7+\Zn\Z3[C]\Zn to abort the installation at any time.
+
+To quit a dialog (such as the one you are in) press \Z3[Esc]\Zn.
+
+" 23 $((COLUMNS - 8))
 
 # Try to detect and mount the hybrid ISO image, there may be a USB memory
 # stick already inserted.  If not, the media menu will be displayed.
@@ -160,8 +156,8 @@ then
      --backtitle "\ZbInstallation Medium" \
      --title "Pendrive/SDCard/CDROM" \
      --msgbox \
-"Please insert the media labeled as \"Dragora Packages\" and\n\
-press \Zb\Z7ENTER\Zn to continue.  Otherwise a media selection menu\n\
+"Please insert the medium labeled as \"Dragora Packages\" and\n\
+press \Zb\Z7ENTER\Zn to continue.  Otherwise, a media selection menu\n\
 will be displayed." 7 63
     if blkid -t LABEL="Dragora Packages" > /dev/null
     then
diff --git a/recipes/tools/dragora-installer/recipe b/recipes/tools/dragora-installer/recipe
index 02364b3b..0734bfbe 100644
--- a/recipes/tools/dragora-installer/recipe
+++ b/recipes/tools/dragora-installer/recipe
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 program=dragora-installer
-version=20191214
+version=20191225
 release=1
 
 # Set 'outdir' for a nice and well-organized output directory
-- 
2.11.4.GIT