# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1211727208 0
# Node ID 37ac5a2b6e887ace33c720f1ce3cf2e01451cff8
# Parent  7f10b236e5a3cae0daa5300836ded38f52ef9225
tazdialog: more utf8->ascii convertions

diff -r 7f10b236e5a3 -r 37ac5a2b6e88 tinyutils/tazdialog
--- a/tinyutils/tazdialog	Thu May 22 20:39:46 2008 +0000
+++ b/tinyutils/tazdialog	Sun May 25 14:53:28 2008 +0000
@@ -31,7 +31,6 @@
 	gauge=""
 	inputbox=""
 	default=""
-
 	buttonhelp=""
 	checklist=""
 	menu=""
@@ -54,11 +53,8 @@
 			buttonok="1"; buttoncancel="1"; break;;
 		--gauge) msgbox="$2"; lines="$3"; cols="$4"
 			percent="$5"; gauge="1"; break;;
-		--inputbox) msgbox="$2"; lines="$3"; cols="$4"
-			default="$5"
-			buttonok="1"; buttoncancel="1"
-			inputbox="1"; break;;
-
+		--inputbox) msgbox="$2"; lines="$3"; cols="$4"; default="$5"
+			buttonok="1"; buttoncancel="1"; inputbox="1"; break;;
 		--checklist) msgbox="$2"; lines="$3"; cols="$4"; inlines="$5"
 			buttonok="1"; checklist="1"; shift 5; break;;
 		--menu) msgbox="$2"; lines="$3"; cols="$4"; inlines="$5"
@@ -77,6 +73,12 @@
 fi
 msgbox="$(toutf8 "$msgbox")"
 textbox="$(toutf8 "$textbox")"
+title="$(toutf8 "$title")"
+backtitle="$(toutf8 "$backtitle")"
+yeslabel="$(toutf8 "$yeslabel")"
+nolabel="$(toutf8 "$nolabel")"
+extralabel="$(toutf8 "$extralabel")"
+default="$(toutf8 "$default")"
 BOX="<window"
 [ -n "$backtitle" ] && BOX="$BOX title=\"$backtitle\""
 [ -n "$ICON" ] && BOX="$BOX icon-name=\"$ICON\""
@@ -179,7 +181,8 @@
 "
 export BOX
 status=$(if [ -n "$gauge" ]; then
-	( while read line; do
+	([ -n "$percent" ] && echo $percent
+	while read line; do
 		case "$line" in
 		[0-9]*) echo $line;;
 		*);;