Changeset 92

Timestamp:

01/27/06 09:46:13 (19 years ago)

Author:

jerome

Message:

Now exit is really clean

Location:

pykoticon/trunk

Files:

• bin/pykoticon (modified) (7 diffs)
• setup.py (modified) (1 diff)

pykoticon/trunk/bin/pykoticon

@@ -87 +87 @@
         self.logDebug("Remote host asked to close the application.")
         self.frame.quitEvent.set()
+        wx.CallAfter(self.frame.OnClose, None)
         return True
         
@@ -95 +96 @@
         """   
         wx.CallAfter(self.frame.askConfirmation, printername, username, jobid, jobtitle, jobsize)
+        
+        # ugly, isn't it ?
         while self.frame.askConfirmationResult is None :
             time.sleep(0.5)
         retcode = self.frame.askConfirmationResult    
-        self.frame.askConfirmationResult = None
+        self.frame.askConfirmationResult = None # prepare for next call, just in case
         return retcode
         
@@ -127 +130 @@
         self.register_function(self.export_nop)
         while not self.frame.quitEvent.isSet() :
-            self.logDebug("Loop!")
             self.handle_request()
         self.server_close()    
-        try :    
-            if not self.frame.closing :
-                self.frame.Close()  
-        except :    
-            # Probably already closed
-            pass
         sys.exit(0)
     
@@ -142 +138 @@
     def __init__(self, parent, id):
         self.askConfirmationResult = None
-        self.closing = False
         wx.Frame.__init__(self, parent, wx.ID_ANY, \
-               _("PyKota for user %s") % getCurrentUserName(), \
+               _("PyKota info for  %s") % getCurrentUserName(), \
                size = (-1, -1), \
                style = wxPython.wx.wxDEFAULT_FRAME_STYLE \
@@ -186 +181 @@
         server = xmlrpclib.ServerProxy("http://localhost:%s" % self.port)    
         try :
+            # wake the server with an empty request 
+            # for it to see the event object
+            # which has just been set
             server.nop()
         except :    
@@ -209 +207 @@
     def OnClose(self, event) :
         sys.stderr.write("Close event !\n")
-        self.closing = True
         self.closeServer()
         if hasattr(self, "menu") :
@@ -231 +228 @@
         message = _("""Hello %(username)s,
         
-                     You sent job %(jobid)s (%(jobtitle)s) to printer %(printername)s.
-                                    
-                     This job seems to be %(jobsize)s pages long. 
-                                    
-                     Please confirm or cancel.""") % locals()
+You sent job %(jobid)s (%(jobtitle)s) to printer %(printername)s.
+
+This job seems to be %(jobsize)s pages long. 
+
+Please confirm or cancel.""") % locals()
                      
         dialog = wx.MessageDialog(self, message, _("Confirmation"), wx.OK | wx.CANCEL)

pykoticon/trunk/setup.py

@@ -48 +48 @@
       author_email = "alet@librelogiciel.com",
       url = "http://www.librelogiciel.com/software/",
-      windows=[os.path.join("bin", "pykoticon")],
+      # windows=[os.path.join("bin", "pykoticon")],
       scripts=[os.path.join("bin", "pykoticon")],
       data_files=[(directory, glob.glob(os.path.join("icons", "*.ico")))])