diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-02-28 15:35:15 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-02-28 15:35:15 +0100 |
| commit | 7cc05b89cbe71455d5ea3859341908b3af451baa (patch) | |
| tree | 7a08f3706353c7c11a9a6b3547ac4eedcc33dd6b /src/core | |
| parent | 9f9c8d5450da681c6920bea816cbf9a0db170879 (diff) | |
ask_option fixes
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/libs/lib-ui.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/libs/lib-ui.sh b/src/core/libs/lib-ui.sh index 1724ed1..5955334 100644 --- a/src/core/libs/lib-ui.sh +++ b/src/core/libs/lib-ui.sh @@ -359,13 +359,13 @@ _dia_ask_option () DIA_MENU_TITLE=$2 EXTRA_INFO=$3 shift 4 - CANCEL_LABEL= - [ $TYPE == optional ] && CANCEL_LABEL='--cancel-label "Skip"' - _dia_DIALOG $DEFAULT $CANCEL_LABEL --colors --title " $DIA_MENU_TITLE " --menu "$DIA_MENU_TEXT $EXTRA_INFO" 20 80 16 "$@" 2>$ANSWER + CANCEL_LABEL=Cancel + [ $TYPE == optional ] && CANCEL_LABEL='Skip' + _dia_DIALOG $DEFAULT --cancel-label $CANCEL_LABEL --colors --title " $DIA_MENU_TITLE " --menu "$DIA_MENU_TEXT $EXTRA_INFO" 20 80 16 "$@" 2>$ANSWER ret=$? ANSWER_OPTION=`cat $ANSWER` debug 'UI' "dia_ask_option: User choose $ANSWER_OPTION ($DIA_MENU_TITLE)" - [ $type == required ] && return $ret + [ $TYPE == required ] && return $ret return 0 # TODO: check if dialog returned >0 because of an other reason then the user hitting 'cancel/skip' } |