OSDN Git Service

installerGui:
authorJames Teh <jamie@jantrid.net>
Fri, 20 Apr 2012 02:46:32 +0000 (12:46 +1000)
committerJames Teh <jamie@jantrid.net>
Fri, 20 Apr 2012 02:46:32 +0000 (12:46 +1000)
* Remove the "Installation options" grouping, as it is redundant and creates extraneous verbosity.
* Place the options vertically instead of horizontally.
* Call mainSizer.Fit so that everything actually fits in the window properly.

source/gui/installerGui.py

index c0fa091..cc8cdfe 100644 (file)
@@ -74,8 +74,7 @@ class InstallerDialog(wx.Dialog):
                        msg+=" "+_("A previous copy of NVDA has been found on your system. This copy will be updated.") \r
                dialogCaption=wx.StaticText(self,label=msg) \r
                mainSizer.Add(dialogCaption)\r
-               # Translators: The label of the grouping containing options in the Install NVDA dialog.\r
-               optionsSizer = wx.StaticBoxSizer(wx.StaticBox(self, label=_("Installation options")), wx.HORIZONTAL)\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
@@ -98,6 +97,7 @@ class InstallerDialog(wx.Dialog):
                mainSizer.Add(sizer)\r
 \r
                self.Sizer = mainSizer\r
+               mainSizer.Fit(self)\r
 \r
        def onInstall(self, evt):\r
                self.Hide()\r
@@ -136,7 +136,7 @@ class PortableCreaterDialog(wx.Dialog):
                # Translators: An informational message displayed in the Create Portable NVDA dialog.\r
                dialogCaption=wx.StaticText(self,label=_("To create a portable copy of NVDA, please select the path and other options and then press Continue")) \r
                mainSizer.Add(dialogCaption)\r
-               optionsSizer = wx.BoxSizer(wx.HORIZONTAL)\r
+               optionsSizer = wx.BoxSizer(wx.VERTICAL)\r
                # Translators: The label of a grouping containing controls to select the destination directory\r
                # in the Create Portable NVDA dialog.\r
                sizer = wx.StaticBoxSizer(wx.StaticBox(self, label=_("Portable directory:")), wx.HORIZONTAL)\r
@@ -168,6 +168,7 @@ class PortableCreaterDialog(wx.Dialog):
                mainSizer.Add(sizer)\r
 \r
                self.Sizer = mainSizer\r
+               mainSizer.Fit(self)\r
 \r
        def onBrowseForPortableDirectory(self, evt):\r
                # Translators: The title of the dialog presented when browsing for the\r