projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r3552@krups: intrigeri | 2005-11-15 03:13:03 +0100
[matthijs/upstream/backupninja.git]
/
handlers
/
easydialog.sh
diff --git
a/handlers/easydialog.sh
b/handlers/easydialog.sh
index 5d70653a8f0d65c581cb515476ddd08e4ea54be8..0113d9cb18885b997916996245d14d67064318df 100644
(file)
--- a/
handlers/easydialog.sh
+++ b/
handlers/easydialog.sh
@@
-33,7
+33,7
@@
setDimension() {
booleanBox() {
$DIALOG --backtitle "$BACKTITLE" --title "$1" \
booleanBox() {
$DIALOG --backtitle "$BACKTITLE" --title "$1" \
- --yesno "$2" $HEIGHT $WIDTH
+
`[ "$3" == no ] && echo '--defaultno'`
--yesno "$2" $HEIGHT $WIDTH
}
msgBox() {
}
msgBox() {
@@
-157,11
+157,13
@@
listBegin() {
_menu_items=0
_menu_text=
_menu_labels=
_menu_items=0
_menu_text=
_menu_labels=
+ _menu_status=
}
listItem() {
_menu_labels[$_menu_items]=$1
_menu_text[$_menu_items]=$2
}
listItem() {
_menu_labels[$_menu_items]=$1
_menu_text[$_menu_items]=$2
+ _menu_status[$_menu_items]=$3 # available only for checklist
let "_menu_items += 1"
}
let "_menu_items += 1"
}
@@
-175,6
+177,9
@@
listDisplay() {
local temp=$(mktemp -t) || exit 1
trap "rm -f $temp" 0
local temp=$(mktemp -t) || exit 1
trap "rm -f $temp" 0
+ local label
+ local text
+ local status
(
echo -ne " $HELP $_DEFAULT "
echo -ne " --backtitle '$BACKTITLE' "
(
echo -ne " $HELP $_DEFAULT "
echo -ne " --backtitle '$BACKTITLE' "
@@
-184,7
+189,8
@@
listDisplay() {
for ((i=0; i < $_menu_items ; i++)); do
label=${_menu_labels[$i]}
text=${_menu_text[$i]}
for ((i=0; i < $_menu_items ; i++)); do
label=${_menu_labels[$i]}
text=${_menu_text[$i]}
- echo -ne " $label '$text' "
+ status=${_menu_status[$i]}
+ echo -ne " $label '$text' $status "
done
) | xargs $DIALOG 2> $temp
done
) | xargs $DIALOG 2> $temp
@@
-237,7
+243,13
@@
formDisplay() {
done
) | xargs $DIALOG 2> $temp
local status=$?
done
) | xargs $DIALOG 2> $temp
local status=$?
- [ $status = 0 ] && REPLY=`cat $temp`
+
+ REPLY=
+ if [ $status = 0 ]; then
+ IFS=$''
+ REPLY=`cat $temp`
+ IFS=$' \t\n'
+ fi
rm -f $temp
return $status
}
rm -f $temp
return $status
}