From: Michael Curran <mick@kulgan.net>
Date: Mon, 7 May 2012 11:03:43 +0000 (+1000)
Subject: Installer GUI: Make sure to set create desktop shortut and run at window logon both... 
X-Git-Tag: jpdev130418~878
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8b2bf07b14efe74e66c831f797697d39ce608b77;p=nvdajp%2Fnvdajp.git

Installer GUI: Make sure to set create desktop shortut and run at window logon both to true by default if no previous install of NVDA exists. also if a previous copy is being updated, and it was not previously installed to NVDA's new instal path in Program Files, then let the user know with an extra sentence in the installer dialog. Fixes #2302.
---

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