Changeset 124

Timestamp:

04/30/06 10:17:47 (19 years ago)

Author:

jerome

Message:

Now unconditionally accept incoming requests from localhost, to allow
clean shutdowns.
Implemented the -q | --allowquit command line option.
Doesn't set the taskbar icon when not under Windows.

Files:

• pykoticon/trunk/bin/pykoticon (modified) (10 diffs)

pykoticon/trunk/bin/pykoticon

@@ -100 +100 @@
         self.debug = options.debug
         self.printServers = [ socket.gethostbyname(arg) for arg in arguments ]
+        if "127.0.0.1" not in self.printServers :
+            self.printServers.append("127.0.0.1") # to allow clean shutdown
         loop = threading.Thread(target=self.mainloop)
         loop.start()
@@ -218 +220 @@
         wx.Frame.__init__(self, parent, id, \
                _("PyKotIcon info for %s") % self.getCurrentUserName(), \
-               size = (1, 1), \
+               size = (0, 0), \
                style = wx.FRAME_NO_TASKBAR | wx.NO_FULL_REPAINT_ON_RESIZE)
                      
@@ -226 +228 @@
         self.redicon = wx.Icon(os.path.join(iconsdir, "pykoticon-red.ico"), \
                                   wx.BITMAP_TYPE_ICO)
-        self.tbicon.SetIcon(self.greenicon, "PyKotIcon")
+        if isWindows :                          
+            self.tbicon.SetIcon(self.greenicon, "PyKotIcon")
         
         wx.EVT_TASKBAR_LEFT_DCLICK(self.tbicon, self.OnTaskBarActivate)
@@ -245 +248 @@
         
         wx.EVT_ICONIZE(self, self.OnIconify)
-        wx.EVT_CLOSE(self, self.OnClose)
+        wx.EVT_CLOSE(self, self.FakeOnClose)
         self.Show(True)
         
@@ -259 +262 @@
             
     def OnIconify(self, event) :
+        """Iconify/De-iconify the application."""
         if not self.IsIconized() :
             self.Iconize(True)
@@ -264 +268 @@
 
     def OnTaskBarActivate(self, event) :
+        """Show the application if it is minimized."""
         if self.IsIconized() :
             self.Iconize(False)
@@ -271 +276 @@
 
     def OnClose(self, event) :
+        """Cleanly quit the application."""
         self.closeServer()
         self.menu.Destroy()
@@ -277 +283 @@
 
     def OnTaskBarMenu(self, event) :
+        """Open the taskbar menu."""
         self.tbicon.PopupMenu(self.menu)
 
+    def FakeOnClose(self, event) :
+        """React to close from windows corner."""
+        if self.options.allowquit :
+            self.Close()
+        else :
+            self.quitIsForbidden()
+            
     def OnTaskBarClose(self, event) :
-        self.Close()
+        """React to close from the taskbar."""
+        if self.options.allowquit :
+            self.Close()
+        else :
+            self.quitIsForbidden()
+            
+    def quitIsForbidden() :        
+        """Displays a message indicating that quitting the application is not allowed."""
+        message = _("Sorry, this was forbidden by your system administrator.")
+        caption = _("Information")
+        style = wx.OK | wx.ICON_INFORMATION | wx.STAY_ON_TOP
+        dialog = wx.MessageDialog(self, message, caption, style)
+        dialog.ShowModal()
+        dialog.Destroy()
         
     def OnAbout(self, event) :    
@@ -323 +350 @@
         if not self.quitEvent.isSet() :
             self.quitEvent.set()
-        server = xmlrpclib.ServerProxy("http://localhost:%s" % self.port)    
+        server = xmlrpclib.ServerProxy("http://localhost:%s" % self.options.port)    
         try :
             # wake the server with an empty request 
@@ -337 +364 @@
         self.quitEvent = threading.Event()
         self.charset = charset
-        self.port = options.port
+        self.options = options
         self.server = MyXMLRPCServer(self, options, arguments)