globalCommands: Don't import mainFrame from gui at import time, as gui might not...

Fixes errors with the commands to open settings dialogs and save/revert configuration when starting with the papenmeier driver.

diff --git a/source/globalCommands.py b/source/globalCommands.py
index 2e111d6..525a91d 100755 (executable)
--- a/source/globalCommands.py
+++ b/source/globalCommands.py
@@ -26,7 +26,6 @@ import config
 import winUser\r
 import appModuleHandler\r
 import winKernel\r
-from gui import mainFrame\r
 import treeInterceptorHandler\r
 import scriptHandler\r
 import ui\r
@@ -880,47 +879,47 @@ class GlobalCommands(ScriptableObject):
        script_reportAppModuleInfo.__doc__ = _("Speaks the filename of the active application along with the name of the currently loaded appModule")\r
 \r
        def script_activateGeneralSettingsDialog(self, gesture):\r
-               wx.CallAfter(mainFrame.onGeneralSettingsCommand, None)\r
+               wx.CallAfter(gui.mainFrame.onGeneralSettingsCommand, None)\r
        script_activateGeneralSettingsDialog.__doc__ = _("Shows the NVDA general settings dialog")\r
 \r
        def script_activateSynthesizerDialog(self, gesture):\r
-               wx.CallAfter(mainFrame.onSynthesizerCommand, None)\r
+               wx.CallAfter(gui.mainFrame.onSynthesizerCommand, None)\r
        script_activateSynthesizerDialog.__doc__ = _("Shows the NVDA synthesizer dialog")\r
 \r
        def script_activateVoiceDialog(self, gesture):\r
-               wx.CallAfter(mainFrame.onVoiceCommand, None)\r
+               wx.CallAfter(gui.mainFrame.onVoiceCommand, None)\r
        script_activateVoiceDialog.__doc__ = _("Shows the NVDA voice settings dialog")\r
 \r
        def script_activateKeyboardSettingsDialog(self, gesture):\r
-               wx.CallAfter(mainFrame.onKeyboardSettingsCommand, None)\r
+               wx.CallAfter(gui.mainFrame.onKeyboardSettingsCommand, None)\r
        script_activateKeyboardSettingsDialog.__doc__ = _("Shows the NVDA keyboard settings dialog")\r
 \r
        def script_activateMouseSettingsDialog(self, gesture):\r
-               wx.CallAfter(mainFrame.onMouseSettingsCommand, None)\r
+               wx.CallAfter(gui.mainFrame.onMouseSettingsCommand, None)\r
        script_activateMouseSettingsDialog.__doc__ = _("Shows the NVDA mouse settings dialog")\r
 \r
        def script_activateObjectPresentationDialog(self, gesture):\r
-               wx.CallAfter(mainFrame. onObjectPresentationCommand, None)\r
+               wx.CallAfter(gui.mainFrame. onObjectPresentationCommand, None)\r
        script_activateObjectPresentationDialog.__doc__ = _("Shows the NVDA object presentation settings dialog")\r
 \r
        def script_activateBrowseModeDialog(self, gesture):\r
-               wx.CallAfter(mainFrame.onBrowseModeCommand, None)\r
+               wx.CallAfter(gui.mainFrame.onBrowseModeCommand, None)\r
        script_activateBrowseModeDialog.__doc__ = _("Shows the NVDA browse mode settings dialog")\r
 \r
        def script_activateDocumentFormattingDialog(self, gesture):\r
-               wx.CallAfter(mainFrame.onDocumentFormattingCommand, None)\r
+               wx.CallAfter(gui.mainFrame.onDocumentFormattingCommand, None)\r
        script_activateDocumentFormattingDialog.__doc__ = _("Shows the NVDA document formatting settings dialog")\r
 \r
        def script_saveConfiguration(self,gesture):\r
-               wx.CallAfter(mainFrame.onSaveConfigurationCommand, None)\r
+               wx.CallAfter(gui.mainFrame.onSaveConfigurationCommand, None)\r
        script_saveConfiguration.__doc__ = _("Saves the current NVDA configuration")\r
 \r
        def script_revertConfiguration(self,gesture):\r
                scriptCount=scriptHandler.getLastScriptRepeatCount()\r
                if scriptCount==0:\r
-                       mainFrame.onRevertToSavedConfigurationCommand(None)\r
+                       gui.mainFrame.onRevertToSavedConfigurationCommand(None)\r
                elif scriptCount==2:\r
-                       mainFrame.onRevertToDefaultConfigurationCommand(None)\r
+                       gui.mainFrame.onRevertToDefaultConfigurationCommand(None)\r
        script_revertConfiguration.__doc__ = _("Pressing once reverts the current configuration to the most recently saved state. Pressing three times reverts to factory defaults.")\r
 \r
        def script_activatePythonConsole(self,gesture):\r