--- trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:36:41	2415
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/07 14:06:18	2426
@@ -127,18 +127,11 @@
 	local mode
 	local retval
 
-	mode=$(dialog \
-	--backtitle "${TITLE}" \
-	--title "[ Festplatten Partitionierung ]" \
-	--cancel-label "Abbrechen" \
-	--ok-label "Weiter" \
-	--stdout \
-	--colors \
-	--menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \
-	"1" "Automatisches Setup (Empfohlen)" \
-	"" "" \
-	"" "\Z1Experten Modi:\Zn" \
-	"2" "Normale IDE-Disk (Manuell)" \
+	mode=$(menubox -h $"[ Harddrive partitioning ]" $"\nSelect an installation mode" \
+		$"1:Automatic setup (recommended)" \
+		":" \
+		$":\Z1Expert modes:\Zn" \
+		$"2:Common IDE-disk (manual setup)")
 	retval=$?
 	[[ ${retval} -eq 1 ]] && return 1
 	if [[ ${retval} -eq 0 ]]
@@ -153,99 +146,62 @@
 
 dialog_hardware_detection()
 {
-	local i
-	local hwtmp
-
-	if [ -x $(type -P mktemp) ]
-	then
-		hwtmp="$(mktemp)"
-	else
-		hwtmp="/tmp/hwtmp.sh"
-	fi
+	local message
 
 	run_hardware_detection_disks
 
-	echo "dialog \\"  > ${hwtmp}
-	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
-	echo "--ok-label \"Weiter\" \\" >> ${hwtmp}
-	echo "--stdout \\" >> ${hwtmp}
-	echo "--colors \\" >> ${hwtmp}
-	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
-	echo "	Festplatten:\n \\" >> ${hwtmp}
+	message+=$"Harddrives:\n"
 
 	if [[ ! -z ${ALL_DISKS} ]]
 	then
 		for i in ${ALL_DISKS}
 		do
-			echo "		\\Z3${i}\\Zn\n \\" >> ${hwtmp}
+			message+="\Z3${i}\Zn "
 		done
+		message+="\n"
 	fi
 
 	if [[ ! -z ${ALL_CDROMS} ]]
 	then
-		echo "	\n \\" >> ${hwtmp}
-		echo "	CDROM Laufwerke:\n \\" >> ${hwtmp}
+		message+="\n"
+		message+=$"Optical disk drives:\n"
 		for i in ${ALL_CDROMS}
 		do
-			echo "		\\Z3${i}\\Zn\n \\" >> ${hwtmp}
+			message+="\Z3${i}\Zn"
 		done
+		message+="\n"
 	fi
 
 	# other devices
 	run_hardware_detection
 	case "${SPECIALDEVICE}" in
-		zotac*) echo "	\n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;
-		rangee) echo "	\n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;
-		maxdata) echo "	\n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;
-		*) echo "	\n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;
+		zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
+		rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
+		maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
+		*) message+=$"\n \\ZnCommon device detected.\Zn" ;;
 	esac
 	if [[ ${FORMFACTOR} = laptop ]]
 	then
-		echo "	\n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}
+		message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving  mode.\Zn"
 	fi
 
-	echo "	\" 14 70" >> ${hwtmp}
-	chmod a+x ${hwtmp}
-	${hwtmp}
-
-	# remove tmp file
-	if [[ -f ${hwtmp} ]]
-	then
-		rm ${hwtmp}
-	fi
+	messagebox -y 15 -h $"Detected hardware:" "${message}"
 }
 
 dialog_setup_hdd_partitions_manual()
 {
 	local i
+	local retval
 
-	if [[ -z ${installdevs} ]]
+	if [[ -z ${ALL_DISKS} ]]
 	then
-		dialog \
-		--backtitle "${TITLE}" \
-		--ok-label "Beenden" \
-		--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
+		dialog_no_harddrive_found
 		exit 1
 	else
-
-		echo "dialog \\" > /tmp/hddtmp.sh
-		echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
-		echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
-		echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
-		echo "--stdout \\" >> /tmp/hddtmp.sh
-		echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
-
-		for i in ${installdevs}
-		do
-			echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
-		done
-		echo -e "\n" >> /tmp/hddtmp.sh
-
-		chmod a+x /tmp/hddtmp.sh
-		HDD="$(/tmp/hddtmp.sh)"
-		RES=$?
-		[[ ${RES} -eq 1 ]] && return 1
-		if [[ ${RES} -eq 0 ]]
+		HDD=$(dialog_select_target_harddrive)
+		retval=$?
+		[[ ${retval} -eq 1 ]] && return 1
+		if [[ ${retval} -eq 0 ]]
 		then
 			dialog_setup_hdd_info
 			setup_hdd_partitions_manual
@@ -256,34 +212,17 @@
 dialog_setup_hdd_partitions_auto()
 {
 	local i
+	local retval
 
-	if [[ -z ${installdevs} ]]
+	if [[ -z ${ALL_DISKS} ]]
 	then
-		dialog \
-		--backtitle "${TITLE}" \
-		--ok-label "Beenden" \
-		--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
+		dialog_no_harddrive_found
 		exit 1
 	else
-
-		echo "dialog \\" > /tmp/hddtmp.sh
-		echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
-		echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
-		echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
-		echo "--stdout \\" >> /tmp/hddtmp.sh
-		echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
-
-		for i in ${installdevs}
-		do
-			echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
-		done
-		echo -e "\n" >> /tmp/hddtmp.sh
-
-		chmod a+x /tmp/hddtmp.sh
-		HDD="$(/tmp/hddtmp.sh)"
-		RES=$?
-		[[ ${RES} -eq 1 ]] && return 1
-		if [[ ${RES} -eq 0 ]]
+		HDD=$(dialog_select_target_harddrive)
+		retval=$?
+		[[ ${retval} -eq 1 ]] && return 1
+		if [[ ${retval} -eq 0 ]]
 		then
 			dialog_setup_hdd_info_auto
 			dialog_setup_hdd_create_partitions
@@ -307,35 +246,7 @@
 	export ALL_CDROMS="$(get_hwinfo cdrom)"
 }
 
-dialog_setup_hdd_create_partitions()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--infobox "Erstelle Disk Partitionen ..." 3 70
-}
-
-dialog_setup_hdd_format()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--infobox "Erstelle Datei-Systeme ..." 3 70
-}
-
-dialog_install_settings()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--infobox "Speichere System-Einstellungen ..." 3 70
-}
-
-dialog_install_system_image()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--gauge "Kopiere System-Image ..." 6 80
-}
-
-dialog_install_meter()
+install_meter()
 {
 	while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
 	do
@@ -348,53 +259,23 @@
 	return 0
 }
 
-
-dialog_install_bootsector()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--infobox "Schreibe den Bootsektor ..." 3 70
-}
-
-dialog_install_successful()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--colors \
-	--msgbox "Die Installation war \Z2erfolgreich\Zn." 5 81
-}
-
-dialog_install_failure()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--colors \
-	--msgbox "Die Installation ist \Z1Fehlgeschlagen\Zn.\n\n\
-		Fehler bei ${ERROR}, RetVal: ${RETVAL} \
-	" 10 81
-}
-
 dialog_main()
 {
-	METHOD=0
+	local method=0
+	local retval
 
-	while [[ ${METHOD} -le 2 ]]
+	while [[ ${method} -le 2 ]]
 	do
-		METHOD=$(dialog \
-		--backtitle "${TITLE}" \
-		--no-cancel \
-		--ok-label "Weiter" \
-		--stdout \
-		--menu "Konfiguration" 14 70 5 \
-		"1" "AutoSta_LX installieren" \
-		"2" "Uebersicht gefundener Laufwerke" \
-		"3" "Beenden und neustarten" \
-		"4" "Beenden und eine Shell starten")
-		RES=$?
-		[[ ${RES} -eq 1 ]] && exit 1
-		if [[ ${RES} -eq 0 ]]
+		method=$(menubox $"Configuration:" \
+			$"1:Install system" \
+			$"2:Show detected harddrives" \
+			$"3:Exit and reboot" \
+			$"4:Exit and drop into a shell")
+		retval=$?
+		[[ ${retval} -eq 1 ]] && exit 1
+		if [[ ${retval} -eq 0 ]]
 		then
-			case ${METHOD} in
+			case ${method} in
 				"1") dialog_setup_system_menu ;;
 				"2") dialog_hardware_detection ;;
 				"3") install_do_reboot ;;
@@ -829,7 +710,7 @@
 	dialog_setup_hdd_format
 	setup_hdd_format > /dev/null
 	install_mount_rootfs
-	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
+	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
 
 	dialog_install_settings
 	sleep 1
@@ -851,7 +732,7 @@
 	dialog_setup_hdd_format
 	setup_hdd_format > /dev/null
 	install_mount_rootfs
-	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
+	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
 
 	dialog_install_settings
 	sleep 1