Connect it all together! (nvda_slave now supports an 'install' command which runs...

diff --git a/source/gui/installerGui.py b/source/gui/installerGui.py
index 3d5937b..65b0e65 100644 (file)
--- a/source/gui/installerGui.py
+++ b/source/gui/installerGui.py
@@ -71,9 +71,7 @@ class InstallerDialog(wx.Dialog):
        def onInstall(self, evt):\r
                self.Hide()\r
                self.progressDialog = IndeterminateProgressDialog(self, _("Installing NVDA"), _("Please wait while NVDA is being installed."))\r
-               wx.CallLater(5000, self.installDone)\r
-\r
-       def installDone(self):\r
+               config.execElevated("nvda_slave.exe",["install",self.programFolderEdit.Value,self.startMenuFolderEdit.Value,str(int(self.installServiceCheckbox.Value)),str(int(self.createDesktopShortcutCheckbox.Value)),str(int(self.startOnLogonCheckbox.Value))],wait=True)\r
                self.progressDialog.done()\r
                self.Destroy()\r
 \r

diff --git a/source/nvda_slave.pyw b/source/nvda_slave.pyw
index 6e77b86..d58940c 100755 (executable)
--- a/source/nvda_slave.pyw
+++ b/source/nvda_slave.pyw
@@ -19,6 +19,9 @@ def main():
                if action == "service_NVDALauncher":\r
                        import nvda_service\r
                        nvda_service.nvdaLauncher()\r
+               elif action=="install":\r
+                       import installer\r
+                       installer.install(args[0],args[1],bool(int(args[2])),bool(int(args[3])),bool(int(args[4])))\r
                elif action=="launchNVDA":\r
                        import subprocess\r
                        import shellapi\r
@@ -62,4 +65,6 @@ def main():
                sys.exit(e)\r
 \r
 if __name__ == "__main__":\r
+       import languageHandler\r
+       languageHandler.setLanguage("Windows")\r
        main()\r