Installer GUI: Make sure to set create desktop shortut and run at window logon both...

diff --git a/source/gui/installerGui.py b/source/gui/installerGui.py
index cc8cdfe..19932a9 100644 (file)
--- a/source/gui/installerGui.py
+++ b/source/gui/installerGui.py
@@ -72,16 +72,19 @@ class InstallerDialog(wx.Dialog):
                if self.isUpdate:\r
                        # Translators: An informational message in the Install NVDA dialog.\r
                        msg+=" "+_("A previous copy of NVDA has been found on your system. This copy will be updated.") \r
+                       if os.stat(installer.defaultInstallPath)!=os.stat(installer.getInstallPath(True)):\r
+                               # Translators: a message in the installer telling the user NVDA is now located in a different place.\r
+                               msg+=" "+_("The installation path for NVDA has changed. it will now  be installed in {path}").format(path=installer.defaultInstallPath)\r
                dialogCaption=wx.StaticText(self,label=msg) \r
                mainSizer.Add(dialogCaption)\r
                optionsSizer = wx.BoxSizer(wx.VERTICAL)\r
                # Translators: The label of a checkbox option in the Install NVDA dialog.\r
                ctrl = self.startOnLogonCheckbox = wx.CheckBox(self, label=_("Use NVDA on the Windows &logon screen"))\r
-               ctrl.Value = config.getStartOnLogonScreen()\r
+               ctrl.Value = config.getStartOnLogonScreen() if self.isUpdate else True\r
                optionsSizer.Add(ctrl)\r
                # Translators: The label of a checkbox option in the Install NVDA dialog.\r
                ctrl = self.createDesktopShortcutCheckbox = wx.CheckBox(self, label=_("Create &desktop icon and shortcut key (control+alt+n)"))\r
-               ctrl.Value = installer.isDesktopShortcutInstalled()\r
+               ctrl.Value = installer.isDesktopShortcutInstalled() if self.isUpdate else True\r
                optionsSizer.Add(ctrl)\r
                mainSizer.Add(optionsSizer)\r
 \r