gui: move IndeterminateProgressDialog out of installerGui.py and into __init__.py...

diff --git a/source/gui/__init__.py b/source/gui/__init__.py
index a2c49f8..ea8b70b 100644 (file)
--- a/source/gui/__init__.py
+++ b/source/gui/__init__.py
@@ -11,6 +11,7 @@ import threading
 import ctypes\r
 import wx\r
 import globalVars\r
+import tones\r
 import ui\r
 from logHandler import log\r
 import config\r
@@ -611,3 +612,23 @@ class ExecAndPump(threading.Thread):
                        self.func(*self.args,**self.kwargs)\r
                except Exception as e:\r
                        self.threadExc=e\r
+\r
+class IndeterminateProgressDialog(wx.ProgressDialog):\r
+\r
+       def __init__(self, parent, title, message):\r
+               super(IndeterminateProgressDialog, self).__init__(title, message, parent=parent)\r
+               self.timer = wx.PyTimer(self.Pulse)\r
+               self.timer.Start(1000)\r
+               self.Raise()\r
+\r
+       def Pulse(self):\r
+               super(IndeterminateProgressDialog, self).Pulse()\r
+               if self.IsActive():\r
+                       tones.beep(440, 40)\r
+\r
+       def done(self):\r
+               self.timer.Stop()\r
+               if self.IsActive():\r
+                       tones.beep(1760, 40)\r
+               self.Hide()\r
+               self.Destroy()\r

diff --git a/source/gui/installerGui.py b/source/gui/installerGui.py
index cc8cdfe..758dace 100644 (file)
--- a/source/gui/installerGui.py
+++ b/source/gui/installerGui.py
@@ -16,7 +16,7 @@ import gui
 import tones\r
 \r
 def doInstall(createDesktopShortcut,startOnLogon,isUpdate,silent=False):\r
-       progressDialog = IndeterminateProgressDialog(gui.mainFrame,\r
+       progressDialog = gui.IndeterminateProgressDialog(gui.mainFrame,\r
                # Translators: The title of the dialog presented while NVDA is being updated.\r
                _("Updating NVDA") if isUpdate\r
                # Translators: The title of the dialog presented while NVDA is being installed.\r
@@ -107,26 +107,6 @@ class InstallerDialog(wx.Dialog):
        def onCancel(self, evt):\r
                self.Destroy()\r
 \r
-class IndeterminateProgressDialog(wx.ProgressDialog):\r
-\r
-       def __init__(self, parent, title, message):\r
-               super(IndeterminateProgressDialog, self).__init__(title, message, parent=parent)\r
-               self.timer = wx.PyTimer(self.Pulse)\r
-               self.timer.Start(1000)\r
-               self.Raise()\r
-\r
-       def Pulse(self):\r
-               super(IndeterminateProgressDialog, self).Pulse()\r
-               if self.IsActive():\r
-                       tones.beep(440, 40)\r
-\r
-       def done(self):\r
-               self.timer.Stop()\r
-               if self.IsActive():\r
-                       tones.beep(1760, 40)\r
-               self.Hide()\r
-               self.Destroy()\r
-\r
 class PortableCreaterDialog(wx.Dialog):\r
 \r
        def __init__(self, parent):\r
@@ -201,7 +181,7 @@ class PortableCreaterDialog(wx.Dialog):
                self.Destroy()\r
 \r
 def doCreatePortable(portableDirectory,createAutorun=False,copyUserConfig=False):\r
-       d = IndeterminateProgressDialog(gui.mainFrame,\r
+       d = gui.IndeterminateProgressDialog(gui.mainFrame,\r
                # Translators: The title of the dialog presented while a portable copy of NVDA is bieng created.\r
                _("Creating Portable Copy"),\r
                # Translators: The message displayed while a portable copy of NVDA is bieng created.\r