From 0e195de5f641df58e6e47e249626a6741595cff8 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Fri, 16 Mar 2012 12:26:31 +0100
Subject: [PATCH] dom0/dispvm: new progress window for DispVM generation (#422)

---
 ...es_update_dispvm_savefile_with_progress.sh | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/dom0/restore/qubes_update_dispvm_savefile_with_progress.sh b/dom0/restore/qubes_update_dispvm_savefile_with_progress.sh
index aaaa5578..9410478b 100755
--- a/dom0/restore/qubes_update_dispvm_savefile_with_progress.sh
+++ b/dom0/restore/qubes_update_dispvm_savefile_with_progress.sh
@@ -1,14 +1,26 @@
 #!/bin/sh
-trap "exit 1" USR1 TERM
-export SHELL_PID=$$
-(
-	echo "1"
-	if ! qvm-create-default-dvm --used-template --default-script >/var/run/qubes/qvm-create-default-dvm.stdout </dev/null ; then 
-		kill -USR1 $SHELL_PID
-	fi
-        echo 100 
-) | zenity --progress --pulsate --auto-close \
-	--text="Please wait (up to 120s) while the DispVM savefile is being updated. This only happens when you have updated the template, next time will be much faster." \
-	--title="Updating default DispVM savefile"
-exit 0
-                  
\ No newline at end of file
+
+ref=`kdialog --title="Updating default DispVM savefile" \
+--progressbar \
+"<center>
+    <font>
+        <b>Please wait (up to 120s) while the DispVM savefile is being updated.</b>
+        <br>
+        <i><small>
+            This only happens when you have updated the template.<br>
+            Next time will be much faster.
+        </small></i>
+    </font>
+</center>" 0`;
+
+trap "qdbus $ref close" EXIT
+
+#qdbus $ref showCancelButton true;
+
+ret=0
+
+if ! qvm-create-default-dvm --used-template --default-script >/var/run/qubes/qvm-create-default-dvm.stdout </dev/null ; then
+	ret=1
+fi
+
+exit $ret