diff --git a/pace-gui/images/Makefile.am b/pace-gui/images/Makefile.am
index 69e74c3..b5bd882 100644
--- a/pace-gui/images/Makefile.am
+++ b/pace-gui/images/Makefile.am
@@ -2,7 +2,8 @@ pixmapsdir = $(datadir)/pace-gui/
pixmaps_DATA = \
OpenPACElogo.png \
apply.png \
- error.png
+ error.png \
+ wait.gif
EXTRA_DIST = \
$(pixmaps_DATA)
diff --git a/pace-gui/images/wait.gif b/pace-gui/images/wait.gif
new file mode 100644
index 0000000..9a4c8d5
Binary files /dev/null and b/pace-gui/images/wait.gif differ
diff --git a/pace-gui/src/pace-gui.py b/pace-gui/src/pace-gui.py
index 71723bc..684a5df 100644
--- a/pace-gui/src/pace-gui.py
+++ b/pace-gui/src/pace-gui.py
@@ -448,7 +448,10 @@ class PinpadGTK:
#If we have a CHAT, we pass it to pace-tool
if (self.chat):
- cmd.append("--chat=" + self.chat)
+# cmd.append("--chat=" + self.chat)
+ print "--chat=" + self.chat
+
+ cmd.append("-v")
#Try to call pace-tool. This is a blocking call. A progress bar is being
#shown while the subprocess is running
@@ -465,19 +468,35 @@ class PinpadGTK:
return
#Animate the progress bar
+# line = p.stdout.readline()
+# self.progressWindow.show()
+# while gtk.events_pending():
+# gtk.main_iteration()
+# while line:
+# self.progressWindow.inc_fraction()
+# while gtk.events_pending():
+# gtk.main_iteration()
+# line = p.stdout.readline()
+
+ foo = gtk.Window(gtk.WINDOW_POPUP)
+ animation = gtk.gdk.PixbufAnimation(image_dir + "/wait.gif")
+ img = gtk.Image()
+ img.set_from_animation(animation)
+ foo.add(img)
+ foo.show_all()
+
line = p.stdout.readline()
- self.progressWindow.show()
- while gtk.events_pending():
- gtk.main_iteration()
+# self.progressWindow.show()
while line:
- self.progressWindow.inc_fraction()
- while gtk.events_pending():
- gtk.main_iteration()
+# self.progressWindow.inc_fraction()
+ while gtk.events_pending(): #Keep GUI responsive
+ gtk.main_iteration()
line = p.stdout.readline()
#Get the return value of the pace-tool process
ret = p.poll()
- self.progressWindow.hide()
+ foo.destroy()
+# self.progressWindow.hide()
self.cardChecker.resume()
if (ret == 0):
@@ -486,7 +505,7 @@ class PinpadGTK:
gtk.BUTTONS_OK, "PIN wurde korrekt eingegeben")
res = popup.run()
popup.destroy()
- self.shutdown() #FIXME
+ self.shutdown(None) #FIXME
else:
popup = gtk.MessageDialog(self.window, gtk.DIALOG_MODAL |
gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_WARNING,
diff --git a/pace-gui/src/pinpad.glade b/pace-gui/src/pinpad.glade
index d31cf2f..77efa0c 100644
--- a/pace-gui/src/pinpad.glade
+++ b/pace-gui/src/pinpad.glade
@@ -82,7 +82,7 @@
True
0.10000000149011612
5
- apply.png
+ error.png
1