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
This commit is contained in:
@@ -199,7 +199,7 @@ class CVCWindow(MokoWindow):
|
|||||||
super(CVCWindow, self).__init__("Zugriffsrechte", None)
|
super(CVCWindow, self).__init__("Zugriffsrechte", None)
|
||||||
|
|
||||||
self.predecessor = predecessor
|
self.predecessor = predecessor
|
||||||
# self.successor = PinpadWindow(self)
|
self.successor = PinpadGTK("pin", None)
|
||||||
|
|
||||||
#Convert the binary certificate to the internal representation and
|
#Convert the binary certificate to the internal representation and
|
||||||
#extract the relative authorization from the chat
|
#extract the relative authorization from the chat
|
||||||
@@ -221,8 +221,6 @@ class CVCWindow(MokoWindow):
|
|||||||
chk = customCheckButton(AT_CHAT_STRINGS[i], i, self.body)
|
chk = customCheckButton(AT_CHAT_STRINGS[i], i, self.body)
|
||||||
self.access_rights.append(chk)
|
self.access_rights.append(chk)
|
||||||
|
|
||||||
# self.show_all()
|
|
||||||
|
|
||||||
def btnForward_clicked(self, widget, data=None):
|
def btnForward_clicked(self, widget, data=None):
|
||||||
""" Check wether any access right have been deselected and modify the
|
""" Check wether any access right have been deselected and modify the
|
||||||
CHAT accordingly """
|
CHAT accordingly """
|
||||||
@@ -234,7 +232,8 @@ class CVCWindow(MokoWindow):
|
|||||||
|
|
||||||
#super(CVCWindow, self).btnForward_clicked(widget, data)
|
#super(CVCWindow, self).btnForward_clicked(widget, data)
|
||||||
newCHAT = self.__formatHexString(self.rel_auth)
|
newCHAT = self.__formatHexString(self.rel_auth)
|
||||||
PinpadGTK("pin", newCHAT)
|
self.successor.set_chat(newCHAT)
|
||||||
|
self.successor.show()
|
||||||
self.hide()
|
self.hide()
|
||||||
|
|
||||||
def __formatHexString(self, int_list):
|
def __formatHexString(self, int_list):
|
||||||
@@ -363,11 +362,14 @@ class PinpadGTK:
|
|||||||
|
|
||||||
#Display Main Window
|
#Display Main Window
|
||||||
self.window = self.builder.get_object("MainWindow")
|
self.window = self.builder.get_object("MainWindow")
|
||||||
self.window.show()
|
|
||||||
|
|
||||||
if (self.window):
|
|
||||||
self.window.connect("destroy", self.shutdown)
|
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):
|
def shutdown(self, widget):
|
||||||
"""Stop the cardChecker thread before exiting the application"""
|
"""Stop the cardChecker thread before exiting the application"""
|
||||||
self.cardChecker.stop()
|
self.cardChecker.stop()
|
||||||
|
|||||||
Reference in New Issue
Block a user