Changeset 1745

Timestamp:

02/29/08 05:32:20 (10 months ago)

Author:

jteh

Message:

Merge from guiRefactor branch:

1551 James Teh 2008-02-28

Some major changes to the GUI:
Get rid of the old NVDA main window. This includes the quick start text, which is extremely outdated, full of errors, difficult for translators and otherwise abominable.
Instead, move to a system tray popup menu. This is activated when NVDA+N is pressed or when the system tray icon is right clicked.
As a result, the shortcut keys to access menu items (e.g. Control+Shift+V for Voice Settings) can no longer be used, so remove them from the menu item text.
We still have a main frame to handle events and act as the main app window which causes the app to exit once destroyed. Showing and hiding this window briefly at startup also seems to make Windows more readily disposed to allowing NVDA popups to come to the foreground later. I suspect this has something to do with the application receiving permission to set the foreground window, but I don't really understand it.
All dialogs are no longer children of the mainFrame. This isn't necessary and causes foreground window problems.
Change all occurrences of the literal -1 to wx.ID_ANY.

1554 James Teh 2008-02-28

Major rework of the settingsDialogs code.

All settings dialogs now inherit from the new SettingsDialog? class. SettingsDialog? encapsulates functionality common to all settings dialogs.
Aside from its cosmetic and design appeal, all dialogs are now destroyed properly after they are dismissed.
The dialog title is now maintained inside the dialog class instead of in the caller.
The ID is wx.ID_ANY for all dialogs; this is no longer passed from the caller.
Also, all settings dialog class names now start with a capital letter.

1555 James Teh 2008-02-28

Remove the NVDA menu. Move User Dictionaries into the Preferences menu. Move Revert to Save configuration, Save Configuration and Exit to the bottom of the root sys tray menu.

1556 James Teh 2008-02-29

Fix a bug whereby NVDAObjectTextInfo.find() would land on an incorrect position if searching from anywhere but the start. This was exhibited in the cursor manager find text functionality.
Fix the code which handles reverse searching in NVDAObjectTextInfo.find(). Note that this is not yet accessible from the cursor manager UI.
CursorManager?: Add NVDA+Control+f to activate the find dialog. NVDA+f3 now searches for the next occurrence of the string or brings up the find dialog if no string has yet been entered.
Minor tweaks to some text and add code comments.

Location:

trunk

Files:

• . (modified) (3 props)
• source/NVDAObjects/__init__.py (modified) (1 diff)
• source/cursorManager.py (modified) (4 diffs)
• source/gui/__init__.py (modified) (7 diffs)
• source/gui/settingsDialogs.py (modified) (20 diffs)

trunk

@@ -19 +19 @@
 1530 jamie@jantrid.net-20080215080141-qov11ehariolqw9r
 1550 jamie@jantrid.net-20080225041147-i0y220xihclzjie9
+1560 jamie@jantrid.net-20080229052638-g5ue0zyljknt2jcm
-timestamp: 2008-02-25 14:11:47.684000015 +1000
+timestamp: 2008-02-29 15:26:38.703000069 +1000
 committer: James Teh <jamie@jantrid.net>
 properties: 
 jamie@jantrid.net-20080211041432-1l2b1pi3k3iso2kg
 jamie@jantrid.net-20080212104116-78n366kl7diwve24
+jamie@jantrid.net-20080229050825-20q1xhb2t4c0zcza

@@ -19 +19 @@
 1530 jamie@jantrid.net-20080215080141-qov11ehariolqw9r
 1550 jamie@jantrid.net-20080225041147-i0y220xihclzjie9
+1560 jamie@jantrid.net-20080229052638-g5ue0zyljknt2jcm

@@ -1 @@
-timestamp: 2008-02-25 14:11:47.684000015 +1000
+timestamp: 2008-02-29 15:26:38.703000069 +1000
 committer: James Teh <jamie@jantrid.net>
 properties: 

@@ -2 +2 @@
 jamie@jantrid.net-20080211041432-1l2b1pi3k3iso2kg
 jamie@jantrid.net-20080212104116-78n366kl7diwve24
+jamie@jantrid.net-20080229050825-20q1xhb2t4c0zcza

trunk/source/NVDAObjects/__init__.py

@@ -292 +292 @@
 
         def find(self,text,caseSensitive=False,reverse=False):
-                if not reverse:
+                if reverse:
+                        # When searching in reverse, we reverse both strings and do a forwards search.
+                        text = text[::-1]
+                        # Start searching one before the start to avoid finding the current match.
+                        inText=self._getTextRange(0,self._startOffset)[::-1]
+                else:
+                        # Start searching one past the start to avoid finding the current match.
                         inText=self._getTextRange(self._startOffset+1,self._getStoryLength())
-                else:
-                        inText=self._getTextRange(0,self._startOffset)[::-1]
                 m=re.search(re.escape(text),inText,re.IGNORECASE)
                 if not m:
                         return False
-                offset=m.start()
                 if reverse:
-                        offset=self._startOffset-offset
+                        offset=self._startOffset-m.end()
+                else:
+                        offset=self._startOffset+1+m.start()
                 self._startOffset=self._endOffset=offset
                 return True

trunk/source/cursorManager.py

@@ -80 +80 @@
 
         def doFindTextDialogHelper(self,text):
+                if not text:
+                        self._inFind=False
+                        return
                 info=self.makeTextInfo(textHandler.POSITION_CARET)
                 res=info.find(text)
@@ -91 +94 @@
                                 speech.speakFormattedText(info)
                 else:
-                        errorDialog=gui.scriptUI.MessageDialog(_("text: \"%s\" not found")%text,title=_("Find Error"))
+                        errorDialog=gui.scriptUI.MessageDialog(_("text \"%s\" not found")%text,title=_("Find Error"),style=gui.scriptUI.wx.OK|gui.scriptUI.wx.ICON_ERROR)
                         errorDialog.run()
                 self._lastFindText=text
@@ -98 +101 @@
         def script_find(self,keyPress,nextScript): 
                 self.doFindTextDialog()
-        script_find.__doc__ = _("find a text pattern from the current cursor's position")
+        script_find.__doc__ = _("find a text string from the current cursor position")
+
+        def script_findNext(self, keyPress, nextScript):
+                if not self._lastFindText:
+                        self.doFindTextDialog()
+                        return
+                self.doFindTextDialogHelper(self._lastFindText)
+        script_findNext.__doc__ = _("find the next occurrence of the previously entered text string from the current cursor's position")
 
         def script_pageUp(self,keyPress,nextScript):
@@ -262 +272 @@
                         ("control+a","selectAll"),
                         ("control+c","copyToClipboard"),
-                        ("NVDA+f3","find"),
+                        ("NVDA+Control+f","find"),
+                        ("NVDA+f3","findNext"),
                 ):
                         self.bindKey_runtime(keyName, scriptName)

trunk/source/gui/__init__.py

@@ -17 +17 @@
 from settingsDialogs import *
 import userDictHandler
+#import winUser
 
 ### Constants
 appTitle = "NVDA"
-quickStartMessage=_("""NVDA - Quick Start document
-
-NVDA (%(description)s)
-Version: %(version)s
-URL: %(url)s
-Please send bugs and suggestions to: %(maintainer)s <%(maintainer_email)s>.
-
---- Copyright Info ---
-%(copyrightInfo)s
-----------------------
-
-This is the NVDA interface window. It enables you to control NVDA's settings, and also to exit NVDA altogether.
-
-To bring this window up at any time, press insert+n. To close this window without exiting NVDA, press alt+f4.
-
-To exit NVDA completely, either press insert+q from anywhere, or choose 'exit' from the NVDA menuin this window. NVDA will then bring up a dialog box asking you if you want to exit, and you can either press the OK or Cancel button.
-
-To set the preferences (such as voice settings, key Settings, reading of tooltips etc),
-Use the alt key to move to the menu bar and then use the arrow keys to navigate the menus and find the settings you want to change. Pressing enter on many of the menu items will bring up a dialog box in which you can change the individual settings. Most settings will take effect straight away (such as changing the rate or pitch of the voice) so you can easily find what settings most suit you. However, if you cancel out of the dialog box the settings will go back to what they were before you changed them. 
-
-By default settings are not kept for the next time you run NVDA unless you press ctrl+s or choose 'save configuration' from the NVDA menu. You can set NVDA to automatically save the settings on exit by going to 'general settings...' in the Preferences menu and checking the 'Save configuration on exit' checkbox and press ing ok.
-
-Some usefull key commands when using NVDA are:
-
-General key strokes:
-control - interupt/pause speech
-shift - unpause speech
-NVDA+1 - turns keyboard help on and off
-NVDA+upArrow - reports the object with focus
-NVDA+downArrow - starts sayAll (press control or any other key to stop)
-NVDA+tab - report the object currently in focus
-NVDA+t speak title
-NVDA+f12 - report time and date
-NVDA+2 - turn speaking of typed characters on and off
-NVDA+3 turn speaking of typed words on and off
-NVDA+4 - turn speaking of typed command keys (such as space, arrows, control and shift combinations) on and off
-NVDA+pageUp - increase rate of speech
-NVDA+pageDown - decrease rate of speech
-NVDA+p - turn reading of punctuation on and off
-NVDA+s - toggle speech modes (off, talk and beeps)
-NVDA+m - turn  reading of objects under the mouse on and off
-NVDA+f - report current font (when in a document)
-
-Object navigation:
-NVDA+numpadAdd - Where am I
-NVDA+numpad5 - current object
-shift+NVDA+numpad5 - dimensions and location of current object
-NVDA+numpad8 - parent object
-NVDA+numpad4 - previous object
-NVDA+numpad6 - next object
-NVDA+numpad2 - first child object
-NVDA+numpadMinus - move to focus object
-NVDA+end - move to statusbar
-NVDA+numpadDivide - Move mouse to current navigator object
-NVDA+numpadMultiply - move to mouse
-nvda+numpadEnter - activate current object
-
-Reviewing the current object:
-shift+numpad7 - move to top line
-numpad7 - previous line
-numpad8 - current line
-numpad9 - next line
-shift+numpad9 - bottom line
-numpad4 - previous word
-numpad5 - current word
-numpad6 - next word
-shift+numpad1 - start of line
-numpad1 - previous character
-numpad2 - current character
-numpad3 - next character
-shift+numpad3 - end of line
-""")%vars(versionInfo)
- 
 iconPath="%s/images/icon.png"%os.getcwd()
 
@@ -130 +58 @@
                 self.Bind(evt_externalCommand, self.onShowGuiCommand, id=id_showGuiCommand)
                 wx.EVT_COMMAND(self,wx.ID_ANY,evt_externalExecute,lambda evt: evt.run())
-                self.Bind(wx.EVT_CLOSE, self.onHideGuiCommand)
-                menuBar=wx.MenuBar()
-                self.sysTrayMenu=wx.Menu()
-                menu_NVDA = wx.Menu()
-                item = menu_NVDA.Append(wx.ID_ANY, _("&Revert to saved configuration\tCtrl+R"),_("Reset all settings to saved state"))
-                self.Bind(wx.EVT_MENU, self.onRevertToSavedConfigurationCommand, item)
-                item = menu_NVDA.Append(wx.ID_SAVE, _("&Save configuration\tCtrl+S"), _("Write the current configuration to nvda.ini"))
-                self.Bind(wx.EVT_MENU, self.onSaveConfigurationCommand, item)
-                subMenu_userDicts = wx.Menu()
-                item = subMenu_userDicts.Append(wx.ID_ANY,_("&Default dictionary..."),_("dialog where you can set default dictionary by adding dictionary entries to the list"))
-                self.Bind(wx.EVT_MENU, self.onDefaultDictionaryCommand, item)
-                item = subMenu_userDicts.Append(wx.ID_ANY,_("&Voice dictionary..."),_("dialog where you can set voice-specific dictionary by adding dictionary entries to the list"))
-                self.Bind(wx.EVT_MENU, self.onVoiceDictionaryCommand, item)
-                item = subMenu_userDicts.Append(wx.ID_ANY,_("&Temporary dictionary..."),_("dialog where you can set temporary dictionary by adding dictionary entries to the edit box"))
-                self.Bind(wx.EVT_MENU, self.onTemporaryDictionaryCommand, item)
-                menu_NVDA.AppendMenu(wx.ID_ANY,_("User &dictionaries"),subMenu_userDicts)
-                menu_NVDA.AppendSeparator()
-                item = menu_NVDA.Append(wx.ID_EXIT, _("E&xit"),_("Exit NVDA"))
-                self.Bind(wx.EVT_MENU, self.onExitCommand, item)
-                menuBar.Append(menu_NVDA,_("&NVDA"))
-                self.sysTrayMenu.AppendMenu(wx.ID_ANY,_("&NVDA"),menu_NVDA)
-                menu_preferences=wx.Menu()
-                item = menu_preferences.Append(wx.ID_ANY,_("&General settings...\tCtrl+Shift+G"),_("General settings"))
-                self.Bind(wx.EVT_MENU, self.onGeneralSettingsCommand, item)
-                item = menu_preferences.Append(wx.ID_ANY,_("&Synthesizer...\tCtrl+Shift+S"),_(" the synthesizer to use"))
-                self.Bind(wx.EVT_MENU, self.onSynthesizerCommand, item)
-                item = menu_preferences.Append(wx.ID_ANY,_("&Voice settings...\tCtrl+Shift+V"),_("Choose the voice, rate, pitch and volume  to use"))
-                self.Bind(wx.EVT_MENU, self.onVoiceCommand, item)
-                item = menu_preferences.Append(wx.ID_ANY,_("&Keyboard Settings...\tCtrl+K"),_("Configure keyboard layout, speaking of typed characters, words or command keys"))
-                self.Bind(wx.EVT_MENU, self.onKeyboardSettingsCommand, item)
-                item = menu_preferences.Append(wx.ID_ANY, _("&Mouse settings...\tCtrl+M"),_("Change reporting of mouse sape, object under mouse"))
-                self.Bind(wx.EVT_MENU, self.onMouseSettingsCommand, item)
-                item = menu_preferences.Append(wx.ID_ANY,_("&Object presentation...\tCtrl+Shift+O"),_("Change reporting of objects")) 
-                self.Bind(wx.EVT_MENU, self.onObjectPresentationCommand, item)
-                item = menu_preferences.Append(wx.ID_ANY,_("Virtual &buffers...\tCtrl+Shift+B"),_("Change virtual buffers specific settings")) 
-                self.Bind(wx.EVT_MENU, self.onVirtualBuffersCommand, item)
-                item = menu_preferences.Append(wx.ID_ANY,_("Document &formatting...\tCtrl+Shift+F"),_("Change Settings of document properties")) 
-                self.Bind(wx.EVT_MENU, self.onDocumentFormattingCommand, item)
-                menuBar.Append(menu_preferences,_("&Preferences"))
-                self.sysTrayMenu.AppendMenu(wx.ID_ANY,_("&Preferences"),menu_preferences)
-                menu_help = wx.Menu()
-                item = menu_help.Append(wx.ID_ANY, _("NVDA homepage"), _("Opens NVDA homepage in the default browser"))
-                self.Bind(wx.EVT_MENU, self.onHomePageCommand, item)
-                item = menu_help.Append(wx.ID_ANY, _("NVDA wiki"), _("Opens NVDA wiki in the default browser"))
-                self.Bind(wx.EVT_MENU, self.onNvdaWikiCommand, item)
-                item = menu_help.Append(wx.ID_ABOUT, _("About..."), _("About NVDA"))
-                self.Bind(wx.EVT_MENU, self.onAboutCommand, item)
-                menuBar.Append(menu_help,_("&Help"))
-                self.sysTrayMenu.AppendMenu(wx.ID_ANY,_("&Help"),menu_help)
-                self.SetMenuBar(menuBar)
-                sizer=wx.BoxSizer(wx.VERTICAL)
-                textCtrl=wx.TextCtrl(self,wx.ID_ANY,size=(500,500),style=wx.TE_RICH2|wx.TE_READONLY|wx.TE_MULTILINE)
-                sizer.Add(textCtrl)
-                sizer.Fit(self)
-                self.SetSizer(sizer)
-                textCtrl.AppendText(quickStartMessage)
-                textCtrl.SetSelection(0,0)
-                icon=wx.Icon(iconPath,wx.BITMAP_TYPE_PNG)
-                self.SetIcon(icon)
-                self.sysTrayButton=wx.TaskBarIcon()
-                self.sysTrayButton.SetIcon(icon,_("NVDA"))
-                self.sysTrayButton.Bind(wx.EVT_TASKBAR_LEFT_DCLICK,self.onShowGuiCommand)
-                self.Center()
+                self.sysTrayIcon = SysTrayIcon(self)
                 self.Show(True)
-                if globalVars.appArgs.minimal or config.conf["general"]["hideInterfaceOnStartup"]:
-                        self.Show(False)
+                self.Show(False)
+
+        def Destroy(self):
+                self.sysTrayIcon.Destroy()
+                super(MainFrame, self).Destroy()
 
         def onAbortCommand(self,evt):
@@ -201 +70 @@
 
         def onShowGuiCommand(self,evt):
-                self.Center()
-                self.Show(True)
-                self.Raise()
-                #self.sysTrayButton.PopupMenu(self.sysTrayMenu)
-
-        def onHideGuiCommand(self,evt):
-                time.sleep(0.01)
-                self.Show(False)
+                self.sysTrayIcon.onActivate(None)
 
         def onRevertToSavedConfigurationCommand(self,evt):
@@ -221 +83 @@
 
         def onDefaultDictionaryCommand(self,evt):
-                d=DictionaryDialog(self,-1,_("Default dictionary"),userDictHandler.dictionaries["default"])
+                d=DictionaryDialog(None,_("Default dictionary"),userDictHandler.dictionaries["default"])
                 d.Show(True)
 
         def onVoiceDictionaryCommand(self,evt):
-                d=DictionaryDialog(self,-1,_("Voice dictionary (%s)")%userDictHandler.dictionaries["voice"].fileName,userDictHandler.dictionaries["voice"])
+                d=DictionaryDialog(None,_("Voice dictionary (%s)")%userDictHandler.dictionaries["voice"].fileName,userDictHandler.dictionaries["voice"])
                 d.Show(True)
 
         def onTemporaryDictionaryCommand(self,evt):
-                d=DictionaryDialog(self,-1,_("Temporary dictionary"),userDictHandler.dictionaries["temp"])
+                d=DictionaryDialog(None,_("Temporary dictionary"),userDictHandler.dictionaries["temp"])
                 d.Show(True)
 
@@ -235 +97 @@
                 canExit=False
                 if config.conf["general"]["askToExit"]:
-                        wasShown=self.IsShown()
-                        if not wasShown:
-                                self.onShowGuiCommand(None)
-                        self.Raise()
-                        self.SetFocus()
-                        d = wx.MessageDialog(self, _("Are you sure you want to quit NVDA?"), _("Exit NVDA"), wx.YES|wx.NO|wx.ICON_WARNING)
+                        d = wx.MessageDialog(None, _("Are you sure you want to quit NVDA?"), _("Exit NVDA"), wx.YES|wx.NO|wx.ICON_WARNING)
                         if d.ShowModal() == wx.ID_YES:
                                 canExit=True
-                        elif not wasShown:
-                                self.onHideGuiCommand(None)
                 else:
                         canExit=True
@@ -256 +111 @@
 
         def onGeneralSettingsCommand(self,evt):
-                d=generalSettingsDialog(self,-1,_("General settings"))
+                d=GeneralSettingsDialog(None)
                 d.Show(True)
 
         def onSynthesizerCommand(self,evt):
-                d=synthesizerDialog(self,-1,_("Synthesizer"))
+                d=SynthesizerDialog(None)
                 d.Show(True)
 
         def onVoiceCommand(self,evt):
-                d=voiceSettingsDialog(self,-1,_("Voice settings"))
+                d=VoiceSettingsDialog(None)
                 d.Show(True)
 
         def onKeyboardSettingsCommand(self,evt):
-                d=keyboardSettingsDialog(self,-1,_("Keyboard Settings"))
+                d=KeyboardSettingsDialog(None)
                 d.Show(True)
 
         def onMouseSettingsCommand(self,evt):
-                d=mouseSettingsDialog(self,-1,_("Mouse settings"))
+                d=MouseSettingsDialog(None)
                 d.Show(True)
 
         def onObjectPresentationCommand(self,evt):
-                d=objectPresentationDialog(self,-1,_("Object presentation"))
+                d=ObjectPresentationDialog(None)
                 d.Show(True)
 
         def onVirtualBuffersCommand(self,evt):
-                d=virtualBuffersDialog(self,-1,_("virtual buffers"))
+                d=VirtualBuffersDialog(None)
                 d.Show(True)
 
         def onDocumentFormattingCommand(self,evt):
-                d=documentFormattingDialog(self,-1,_("Document formatting"))
+                d=DocumentFormattingDialog(None)
                 d.Show(True)
 
@@ -300 +155 @@
 %s: %s <%s>
 %s: %s"""%(versionInfo.longName,_("version"),versionInfo.version,_("url"),versionInfo.url,_("maintainer"),versionInfo.maintainer,versionInfo.maintainer_email,_("copyright"),versionInfo.copyrightInfo)
-                        d = wx.MessageDialog(self, aboutInfo, _("About NVDA"), wx.OK)
+                        d = wx.MessageDialog(None, aboutInfo, _("About NVDA"), wx.OK)
                         d.ShowModal()
                 except:
                         globalVars.log.error("gui.mainFrame.onAbout", exc_info=True)
+
+class SysTrayIcon(wx.TaskBarIcon):
+
+        def __init__(self, frame):
+                super(SysTrayIcon, self).__init__()
+                icon=wx.Icon(iconPath,wx.BITMAP_TYPE_PNG)
+                self.SetIcon(icon, appTitle)
+
+                self.menu=wx.Menu()
+                menu_preferences=wx.Menu()
+                item = menu_preferences.Append(wx.ID_ANY,_("&General settings..."),_("General settings"))
+                self.Bind(wx.EVT_MENU, frame.onGeneralSettingsCommand, item)
+                item = menu_preferences.Append(wx.ID_ANY,_("&Synthesizer..."),_(" the synthesizer to use"))
+                self.Bind(wx.EVT_MENU, frame.onSynthesizerCommand, item)
+                item = menu_preferences.Append(wx.ID_ANY,_("&Voice settings..."),_("Choose the voice, rate, pitch and volume  to use"))
+                self.Bind(wx.EVT_MENU, frame.onVoiceCommand, item)
+                item = menu_preferences.Append(wx.ID_ANY,_("&Keyboard Settings..."),_("Configure keyboard layout, speaking of typed characters, words or command keys"))
+                self.Bind(wx.EVT_MENU, frame.onKeyboardSettingsCommand, item)
+                item = menu_preferences.Append(wx.ID_ANY, _("&Mouse settings..."),_("Change reporting of mouse sape, object under mouse"))
+                self.Bind(wx.EVT_MENU, frame.onMouseSettingsCommand, item)
+                item = menu_preferences.Append(wx.ID_ANY,_("&Object presentation..."),_("Change reporting of objects")) 
+                self.Bind(wx.EVT_MENU, frame.onObjectPresentationCommand, item)
+                item = menu_preferences.Append(wx.ID_ANY,_("Virtual &buffers..."),_("Change virtual buffers specific settings")) 
+                self.Bind(wx.EVT_MENU, frame.onVirtualBuffersCommand, item)
+                item = menu_preferences.Append(wx.ID_ANY,_("Document &formatting..."),_("Change Settings of document properties")) 
+                self.Bind(wx.EVT_MENU, frame.onDocumentFormattingCommand, item)
+                subMenu_userDicts = wx.Menu()
+                item = subMenu_userDicts.Append(wx.ID_ANY,_("&Default dictionary..."),_("dialog where you can set default dictionary by adding dictionary entries to the list"))
+                self.Bind(wx.EVT_MENU, frame.onDefaultDictionaryCommand, item)
+                item = subMenu_userDicts.Append(wx.ID_ANY,_("&Voice dictionary..."),_("dialog where you can set voice-specific dictionary by adding dictionary entries to the list"))
+                self.Bind(wx.EVT_MENU, frame.onVoiceDictionaryCommand, item)
+                item = subMenu_userDicts.Append(wx.ID_ANY,_("&Temporary dictionary..."),_("dialog where you can set temporary dictionary by adding dictionary entries to the edit box"))
+                self.Bind(wx.EVT_MENU, frame.onTemporaryDictionaryCommand, item)
+                menu_preferences.AppendMenu(wx.ID_ANY,_("User &dictionaries"),subMenu_userDicts)
+                self.menu.AppendMenu(wx.ID_ANY,_("&Preferences"),menu_preferences)
+                menu_help = wx.Menu()
+                item = menu_help.Append(wx.ID_ANY, _("NVDA homepage"), _("Opens NVDA homepage in the default browser"))
+                self.Bind(wx.EVT_MENU, frame.onHomePageCommand, item)
+                item = menu_help.Append(wx.ID_ANY, _("NVDA wiki"), _("Opens NVDA wiki in the default browser"))
+                self.Bind(wx.EVT_MENU, frame.onNvdaWikiCommand, item)
+                item = menu_help.Append(wx.ID_ABOUT, _("About..."), _("About NVDA"))
+                self.Bind(wx.EVT_MENU, frame.onAboutCommand, item)
+                self.menu.AppendMenu(wx.ID_ANY,_("&Help"),menu_help)
+                self.menu.AppendSeparator()
+                item = self.menu.Append(wx.ID_ANY, _("&Revert to saved configuration"),_("Reset all settings to saved state"))
+                self.Bind(wx.EVT_MENU, frame.onRevertToSavedConfigurationCommand, item)
+                item = self.menu.Append(wx.ID_SAVE, _("&Save configuration"), _("Write the current configuration to nvda.ini"))
+                self.Bind(wx.EVT_MENU, frame.onSaveConfigurationCommand, item)
+                self.menu.AppendSeparator()
+                item = self.menu.Append(wx.ID_EXIT, _("E&xit"),_("Exit NVDA"))
+                self.Bind(wx.EVT_MENU, frame.onExitCommand, item)
+
+                self.Bind(wx.EVT_TASKBAR_RIGHT_UP, self.onActivate)
+
+        def Destroy(self):
+                self.menu.Destroy()
+                super(SysTrayIcon, self).Destroy()
+
+        def onActivate(self, evt):
+                self.PopupMenu(self.menu)
+                # Showing and hiding our main frame seems to cause Windows to switch to the previous foreground window.
+                # If we don't do this and no dialog was displayed, the user will be dumped in the invisible system tray window, which is bad.
+                # It is even worse than expected because the user can close the system tray window, breaking the system tray icon.
+                # Even if a dialog is displayed, this does no harm.
+                mainFrame.Show()
+                mainFrame.Hide()
 
 def initialize(app):

trunk/source/gui/settingsDialogs.py

@@ -33 +33 @@
         ]
 
-class generalSettingsDialog(wx.Dialog):
-
-        def __init__(self,parent,ID,title):
-                wx.Dialog.__init__(self,parent,ID,title)
+class SettingsDialog(wx.Dialog):
+        """A settings dialog.
+        A settings dialog consists of one or more settings controls and OK and Cancel buttons.
+        Action may be taken in response to the OK or Cancel buttons.
+
+        To use this dialog:
+                * Set L{title} to the title of the dialog.
+                * Override L{makeSettings} to populate a given sizer with the settings controls.
+                * Optionally, override L{postInit} to perform actions after the dialog is created, such as setting the focus.
+                * Optionally, extend one or both of L{onOk} or L{onCancel} to perform actions in response to the OK or Cancel buttons, respectively.
+
+        @ivar title: The title of the dialog.
+        @type title: str
+        """
+        title = ""
+
+        def __init__(self, parent):
+                """
+                @param parent: The parent for this dialog; C{None} for no parent.
+                @type parent: wx.Window
+                """
+                super(SettingsDialog, self).__init__(parent, wx.ID_ANY, self.title)
                 mainSizer=wx.BoxSizer(wx.VERTICAL)
                 settingsSizer=wx.BoxSizer(wx.VERTICAL)
+                self.makeSettings(settingsSizer)
+                mainSizer.Add(settingsSizer,border=20,flag=wx.LEFT|wx.RIGHT|wx.TOP)
+                buttonSizer=self.CreateButtonSizer(wx.OK|wx.CANCEL)
+                mainSizer.Add(buttonSizer,border=20,flag=wx.LEFT|wx.RIGHT|wx.BOTTOM)
+                mainSizer.Fit(self)
+                self.SetSizer(mainSizer)
+                self.Bind(wx.EVT_BUTTON,self.onOk,id=wx.ID_OK)
+                self.Bind(wx.EVT_BUTTON,self.onCancel,id=wx.ID_CANCEL)
+                self.postInit()
+
+        def makeSettings(self, sizer):
+                """Populate the dialog with settings controls.
+                Subclasses must override this method.
+                @param sizer: The sizer to which to add the settings controls.
+                @type sizer: wx.Sizer
+                """
+                raise NotImplementedError
+
+        def postInit(self):
+                """Called after the dialog has been created.
+                For example, this might be used to set focus to the desired control.
+                Sub-classes may override this method.
+                """
+
+        def onOk(self, evt):
+                """Take action in response to the OK button being pressed.
+                Sub-classes may extend this method.
+                This base method should always be called to clean up the dialog.
+                """
+                self.Destroy()
+
+        def onCancel(self, evt):
+                """Take action in response to the Cancel button being pressed.
+                Sub-classes may extend this method.
+                This base method should always be called to clean up the dialog.
+                """
+                self.Destroy()
+
+class GeneralSettingsDialog(SettingsDialog):
+        title = _("General settings")
+
+        def makeSettings(self, settingsSizer):
                 languageSizer=wx.BoxSizer(wx.HORIZONTAL)
                 languageLabel=wx.StaticText(self,-1,label=_("&Language (requires restart to fully take affect)"))
@@ -75 +135 @@
                 logLevelSizer.Add(self.logLevelList)
                 settingsSizer.Add(logLevelSizer,border=10,flag=wx.BOTTOM)
-                mainSizer.Add(settingsSizer,border=20,flag=wx.LEFT|wx.RIGHT|wx.TOP)
-                buttonSizer=self.CreateButtonSizer(wx.OK|wx.CANCEL)
-                mainSizer.Add(buttonSizer,border=20,flag=wx.LEFT|wx.RIGHT|wx.BOTTOM)
-                mainSizer.Fit(self)
-                self.SetSizer(mainSizer)
-                self.Bind(wx.EVT_BUTTON,self.onOk,id=wx.ID_OK)
+
+        def postInit(self):
                 self.languageList.SetFocus()
 
@@ -103 +159 @@
                                 config.save()
                                 queueHandler.queueFunction(queueHandler.interactiveQueue,gui.restart)
-                self.Destroy()
-
-class synthesizerDialog(wx.Dialog):
-
-        def __init__(self,parent,ID,title):
-                wx.Dialog.__init__(self,parent,ID,title)
-                mainSizer=wx.BoxSizer(wx.VERTICAL)
-                settingsSizer=wx.BoxSizer(wx.VERTICAL)
+                super(GeneralSettingsDialog, self).onOk(evt)
+
+class SynthesizerDialog(SettingsDialog):
+        title = _("Synthesizer")
+
+        def makeSettings(self, settingsSizer):
                 synthListSizer=wx.BoxSizer(wx.HORIZONTAL)
                 synthListLabel=wx.StaticText(self,-1,label=_("&Synthesizer"))
@@ -149 +203 @@
                 deviceListSizer.Add(self.deviceList)
                 settingsSizer.Add(deviceListSizer,border=10,flag=wx.BOTTOM)
-                mainSizer.Add(settingsSizer,border=20,flag=wx.LEFT|wx.RIGHT|wx.TOP)
-                buttonSizer=wx.BoxSizer(wx.HORIZONTAL)
-                buttonSizer=self.CreateButtonSizer(wx.OK|wx.CANCEL)
-                mainSizer.Add(buttonSizer,border=20,flag=wx.LEFT|wx.RIGHT|wx.BOTTOM)
-                mainSizer.Fit(self)
-                self.SetSizer(mainSizer)
-                self.Bind(wx.EVT_BUTTON,self.onOk,id=wx.ID_OK)
+
+        def postInit(self):
                 self.synthList.SetFocus()
 
@@ -164 +213 @@
                         wx.MessageDialog(self,_("Could not load the %s synthesizer.")%newSynth,_("Synthesizer Error"),wx.OK|wx.ICON_WARNING).ShowModal()
                         return 
-                self.Destroy()
-
-class voiceSettingsDialog(wx.Dialog):
-
-        def __init__(self,parent,ID,title):
-                wx.Dialog.__init__(self,parent,ID,title)
-                mainSizer=wx.BoxSizer(wx.VERTICAL)
-                settingsSizer=wx.BoxSizer(wx.VERTICAL)
+                super(SynthesizerDialog, self).onOk(evt)
+
+class VoiceSettingsDialog(SettingsDialog):
+        title = _("Voice settings")
+
+        def makeSettings(self, settingsSizer):
                 if getSynth().hasVoice:
                         voiceListSizer=wx.BoxSizer(wx.HORIZONTAL)

@@ -19 +19 @@
 1530 jamie@jantrid.net-20080215080141-qov11ehariolqw9r
 1550 jamie@jantrid.net-20080225041147-i0y220xihclzjie9
+1560 jamie@jantrid.net-20080229052638-g5ue0zyljknt2jcm

@@ -1 @@
-timestamp: 2008-02-25 14:11:47.684000015 +1000
+timestamp: 2008-02-29 15:26:38.703000069 +1000
 committer: James Teh <jamie@jantrid.net>
 properties: 

@@ -2 +2 @@
 jamie@jantrid.net-20080211041432-1l2b1pi3k3iso2kg
 jamie@jantrid.net-20080212104116-78n366kl7diwve24
+jamie@jantrid.net-20080229050825-20q1xhb2t4c0zcza