installer GUI: Add some accelerators, change some names and add more options.

diff --git a/source/gui/__init__.py b/source/gui/__init__.py
index c16b09c..735788f 100644 (file)
--- a/source/gui/__init__.py
+++ b/source/gui/__init__.py
@@ -305,7 +305,7 @@ class SysTrayIcon(wx.TaskBarIcon):
                if not globalVars.appArgs.secure:\r
                        item = menu_tools.Append(wx.ID_ANY, _("Create Portable copy..."))\r
                        self.Bind(wx.EVT_MENU, frame.onCreatePortableCopyCommand, item)\r
-                       item = menu_tools.Append(wx.ID_ANY, _("Install NVDA..."))\r
+                       item = menu_tools.Append(wx.ID_ANY, _("&Install NVDA..."))\r
                        self.Bind(wx.EVT_MENU, frame.onInstallCommand, item)\r
                item = menu_tools.Append(wx.ID_ANY, _("Reload plugins"))\r
                self.Bind(wx.EVT_MENU, frame.onReloadPluginsCommand, item)\r

diff --git a/source/gui/installer.py b/source/gui/installer.py
index 3ac944b..9ad032b 100644 (file)
--- a/source/gui/installer.py
+++ b/source/gui/installer.py
@@ -9,7 +9,7 @@ class InstallerDialog(wx.Dialog):
                super(InstallerDialog, self).__init__(parent, title=_("Install NVDA"))\r
                mainSizer = self.mainSizer = wx.BoxSizer(wx.VERTICAL)\r
 \r
-               ctrl = self.startOnLogonCheckbox = wx.CheckBox(self, label=_("Use NVDA on the Windows logon screen"))\r
+               ctrl = self.startOnLogonCheckbox = wx.CheckBox(self, label=_("Use NVDA on the Windows &logon screen"))\r
                ctrl.Value = config.getStartOnLogonScreen()\r
                mainSizer.Add(ctrl)\r
                ctrl = self.advancedCheckbox = wx.CheckBox(self, label=_("Show &advanced options"))\r
@@ -19,15 +19,30 @@ class InstallerDialog(wx.Dialog):
 \r
                advancedSizer = self.advancedSizer = wx.BoxSizer(wx.VERTICAL)\r
 \r
-               sizer = wx.StaticBoxSizer(wx.StaticBox(self, label=_("Install to:")), wx.HORIZONTAL)\r
+               sizer = wx.StaticBoxSizer(wx.StaticBox(self, label=_("Install &to folder:")), wx.HORIZONTAL)\r
                # FIXME: Don't use os.getenv to get the path to Program Files.\r
                ctrl = self.programFolderEdit = wx.TextCtrl(self, value=os.path.join(unicode(os.getenv("ProgramFiles")), versionInfo.name))\r
                sizer.Add(ctrl)\r
-               ctrl = wx.Button(self, label=_("Change &folder"))\r
+               ctrl = wx.Button(self, label=_("Change"))\r
                ctrl.Bind(wx.EVT_BUTTON, self.onChangeProgramFolder)\r
                sizer.Add(ctrl)\r
                advancedSizer.Add(sizer)\r
 \r
+               sizer = wx.BoxSizer(wx.HORIZONTAL)\r
+               sizer.Add(wx.StaticText(self, label=_("&Start Menu folder:")))\r
+               ctrl = self.startMenuFolderEdit = wx.TextCtrl(self, value=versionInfo.name)\r
+               sizer.Add(ctrl)\r
+               advancedSizer.Add(sizer)\r
+\r
+               sizer = wx.BoxSizer(wx.VERTICAL)\r
+               ctrl = self.createDesktopShortcutCheckbox = wx.CheckBox(self, label=_("Create &desktop icon and shortcut key (control+alt+n)"))\r
+               ctrl.Value = True\r
+               sizer.Add(ctrl)\r
+               ctrl = self.installServiceCheckbox = wx.CheckBox(self, label=_("Install NVDA ser&vice (Windows logon/secure screen support)"))\r
+               ctrl.Value = True\r
+               sizer.Add(ctrl)\r
+               advancedSizer.Add(sizer)\r
+\r
                mainSizer.Add(advancedSizer)\r
                mainSizer.Hide(advancedSizer, recursive=True)\r
 \r