From abd6006cd82d8d193e82c0d8447b667016b61ae1 Mon Sep 17 00:00:00 2001 From: oepen Date: Tue, 13 Jul 2010 09:50:46 +0000 Subject: [PATCH] Trying to initialise pinpad earlier, so that the transition from CVCWindow to Pinpad is smoother git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@220 96b47cad-a561-4643-ad3b-153ac7d7599c --- pace-gui/src/pace-gui.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pace-gui/src/pace-gui.py b/pace-gui/src/pace-gui.py index 80e4c93..8022fc2 100644 --- a/pace-gui/src/pace-gui.py +++ b/pace-gui/src/pace-gui.py @@ -199,7 +199,7 @@ class CVCWindow(MokoWindow): super(CVCWindow, self).__init__("Zugriffsrechte", None) self.predecessor = predecessor -# self.successor = PinpadWindow(self) + self.successor = PinpadGTK("pin", None) #Convert the binary certificate to the internal representation and #extract the relative authorization from the chat @@ -221,8 +221,6 @@ class CVCWindow(MokoWindow): chk = customCheckButton(AT_CHAT_STRINGS[i], i, self.body) self.access_rights.append(chk) -# self.show_all() - def btnForward_clicked(self, widget, data=None): """ Check wether any access right have been deselected and modify the CHAT accordingly """ @@ -234,7 +232,8 @@ class CVCWindow(MokoWindow): #super(CVCWindow, self).btnForward_clicked(widget, data) newCHAT = self.__formatHexString(self.rel_auth) - PinpadGTK("pin", newCHAT) + self.successor.set_chat(newCHAT) + self.successor.show() self.hide() def __formatHexString(self, int_list): @@ -363,10 +362,13 @@ class PinpadGTK: #Display Main Window self.window = self.builder.get_object("MainWindow") - self.window.show() + self.window.connect("destroy", self.shutdown) - if (self.window): - self.window.connect("destroy", self.shutdown) + def show(self): + self.window.show_all() + + def set_chat(self, chat): + self.chat = chat def shutdown(self, widget): """Stop the cardChecker thread before exiting the application"""