Show
Ignore:
Timestamp:
05/07/08 09:04:04 (7 months ago)
Author:
jteh
Message:

Merging guiFixes branch.
This fixes #65 (Freeze when launching NVDA dialogs).
I'm also hoping it will fix #41 (NVDA menu sometimes does not correctly obtain focus), but I can't reproduce this issue on my system, so I can't test it.

In addition, this fixes the issue wherein the tray menu would not appear when the right mouse button was clicked on the tray icon.

Aside from this, there is quite a bit of code cleanup and simplification.

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property bzr:revision-id:v3-list-QlpoOTFBWSZTWbrL2vUAAB1VgAAQABCAQDrrnqAgAFCgaaGRkxBoTIJ6mmaNRwhndFAoNhZjh_YY4a01fOg1ulgNNC2UrzPdXXEnDpX8XckU4UJC6y9r1A..

      •  

        old new  
        87871813 jamie@jantrid.net-20080502122842-u2xfo1in3euux4ci 
        88881825 jamie@jantrid.net-20080506061049-3qk3r33c6a8dc4jo 
         891828 jamie@jantrid.net-20080507090220-y1fjk3t08rbcx18z 
    • Property bzr:revision-info

      •  

        old new  
        1 timestamp: 2008-05-06 16:10:49.217000008 +1000 
         1timestamp: 2008-05-07 19:02:20.607000113 +1000 
        22committer: James Teh <jamie@jantrid.net> 
        33properties:  
    • Property bzr:ancestry:v3-list-QlpoOTFBWSZTWbrL2vUAAB1VgAAQABCAQDrrnqAgAFCgaaGRkxBoTIJ6mmaNRwhndFAoNhZjh_YY4a01fOg1ulgNNC2UrzPdXXEnDpX8XckU4UJC6y9r1A..

      •  

        old new  
        33jamie@jantrid.net-20080212104116-78n366kl7diwve24 
        44jamie@jantrid.net-20080229050825-20q1xhb2t4c0zcza 
         5jamie@jantrid.net-20080507074841-cxoldzwvz389fete 

  • trunk/source/gui/logViewer.py

    r1962 r2023  
    77import gui 
    88 
     9#: The singleton instance of the log viewer UI. 
     10logViewer = None 
     11 
    912class LogViewer(wx.Frame): 
    1013        """The NVDA log viewer GUI. 
    1114        """ 
    1215 
    13         def __init__(self): 
    14                 super(LogViewer, self).__init__(None, wx.ID_ANY, _("NVDA Log Viewer")) 
    15                 gui.topLevelWindows.append(self) 
     16        def __init__(self, parent): 
     17                super(LogViewer, self).__init__(parent, wx.ID_ANY, _("NVDA Log Viewer")) 
    1618                self.Bind(wx.EVT_ACTIVATE, self.onActivate) 
    1719                self.Bind(wx.EVT_CLOSE, self.onClose) 
    … …  
    4749 
    4850        def onActivate(self, evt): 
    49                 self.refresh() 
     51                if evt.GetActive(): 
     52                        self.refresh() 
    5053                evt.Skip() 
    5154 
    … …  
    6467                        wx.MessageBox(_("Error saving log: %s") % e.strerror, _("Error"), style=wx.OK | wx.ICON_ERROR) 
    6568 
    66         def Destroy(self): 
    67                 gui.topLevelWindows.remove(self) 
    68                 super(LogViewer, self).Destroy() 
     69def activate(): 
     70        """Activate the log viewer. 
     71        If the log viewer has not already been created and opened, this will create and open it. 
     72        Otherwise, it will be brought to the foreground if possible. 
     73        """ 
     74        global logViewer 
     75        if not logViewer: 
     76                logViewer = LogViewer(gui.mainFrame) 
     77        logViewer.Raise() 
     78        logViewer.Show()