Skip to content

Fix gui alignment issues #6287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
feerrenrut wants to merge 26 commits into from
Closed

Fix gui alignment issues #6287

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1e232cf
fix alignment of the exit dialog
feerrenrut Aug 19, 2016
825864f
fix general settings alignments
feerrenrut Aug 19, 2016
e13351d
fixed alignment in the synthesizer dialog
feerrenrut Aug 19, 2016
81cd171
fix alignment on voice settings dialog
feerrenrut Aug 19, 2016
c3f2a35
fix alignment on keyboard and mouse settings dialogs
feerrenrut Aug 19, 2016
fa3384c
fix alignment on braille settings dialogs
feerrenrut Aug 19, 2016
82b7dbf
fix alignment on the object presentation settings dialogs
feerrenrut Aug 19, 2016
1ba26ac
fix alignment on the dictionary dialog
feerrenrut Aug 19, 2016
dfacc70
fix alignment on the input gestures dialog
feerrenrut Aug 19, 2016
e710892
fix alignment on the configuration profiles dialog
feerrenrut Aug 22, 2016
c64f213
fix alignment on the new config profile dialog
feerrenrut Aug 22, 2016
173879f
fix alignment on the profile triggers dialog
feerrenrut Aug 22, 2016
531aaa9
Pull out common gui patterns into a helper module.
feerrenrut Aug 30, 2016
0cb617b
Show symbols on tree view
feerrenrut Aug 31, 2016
b3a05c4
fixed up alignment and spacing on the elements list dialog
feerrenrut Aug 31, 2016
4b8ab58
WIP
feerrenrut Sep 8, 2016
17e2c3a
Gui helper is now class based
feerrenrut Sep 12, 2016
899358e
Moved more of the code over to the class based approach
feerrenrut Sep 14, 2016
20c88e0
Updated comments for the guiHelper
feerrenrut Sep 15, 2016
108ee95
Fix some errors and remove 'name' parameter
feerrenrut Sep 16, 2016
8e93c71
Fixed up missed part of gui
feerrenrut Sep 17, 2016
a8ca09b
fix alignment on several dialogs
feerrenrut Sep 17, 2016
4b52d5d
Update some remainig dialogs
feerrenrut Sep 18, 2016
86548ae
minor fixes
feerrenrut Sep 19, 2016
ac401a8
Review actions for #6287
feerrenrut Sep 27, 2016
a262092
Fixed up an out of order comment for #6287
feerrenrut Sep 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix general settings alignments
  • Loading branch information
@feerrenrut
feerrenrut committed Sep 19, 2016
commit 825864f1e473b9481c679caab235540c569ea2a5
28 changes: 16 additions & 12 deletions source/gui/settingsDialogs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def __init__(self, parent):
self.makeSettings(self.settingsSizer)
mainSizer.Add(self.settingsSizer,border=20,flag=wx.LEFT|wx.RIGHT|wx.TOP)
buttonSizer=self.CreateButtonSizer(wx.OK|wx.CANCEL)
mainSizer.Add(buttonSizer,border=20,flag=wx.LEFT|wx.RIGHT|wx.BOTTOM)
mainSizer.Add(buttonSizer,border=15,flag=wx.LEFT|wx.RIGHT|wx.BOTTOM) #Button sizer has 5 px border already.
mainSizer.Fit(self)
self.SetSizer(mainSizer)
self.Bind(wx.EVT_BUTTON,self.onOk,id=wx.ID_OK)
Expand Down Expand Up @@ -129,10 +129,12 @@ class GeneralSettingsDialog(SettingsDialog):
)

def makeSettings(self, settingsSizer):
dropDownLabelBorder = 10
dropDownLabelFlags = wx.RIGHT | wx.ALIGN_CENTER_VERTICAL # border on right, center vertically.
languageSizer=wx.BoxSizer(wx.HORIZONTAL)
# Translators: The label for a setting in general settings to select NVDA's interface language (once selected, NVDA must be restarted; the option user default means the user's Windows language will be used).
languageLabel=wx.StaticText(self,-1,label=_("&Language (requires restart to fully take effect):"))
languageSizer.Add(languageLabel)
languageSizer.Add(languageLabel,border=dropDownLabelBorder, flag=dropDownLabelFlags)
languageListID=wx.NewId()
self.languageNames=languageHandler.getAvailableLanguages()
# Translators: The list of languages for NVDA.
Expand All @@ -147,25 +149,27 @@ def makeSettings(self, settingsSizer):
languageSizer.Add(self.languageList)
if globalVars.appArgs.secure:
self.languageList.Disable()
settingsSizer.Add(languageSizer,border=10,flag=wx.BOTTOM)
settingsItemBorder = 10
settingsItemFlags = wx.BOTTOM
settingsSizer.Add(languageSizer,border=settingsItemBorder,flag=settingsItemFlags)
# Translators: The label for a setting in general settings to save current configuration when NVDA exits (if it is not checked, user needs to save configuration before quitting NVDA).
self.saveOnExitCheckBox=wx.CheckBox(self,wx.NewId(),label=_("&Save configuration on exit"))
self.saveOnExitCheckBox.SetValue(config.conf["general"]["saveConfigurationOnExit"])
if globalVars.appArgs.secure:
self.saveOnExitCheckBox.Disable()
settingsSizer.Add(self.saveOnExitCheckBox,border=10,flag=wx.BOTTOM)
settingsSizer.Add(self.saveOnExitCheckBox,border=settingsItemBorder,flag=settingsItemFlags)
# Translators: The label for a setting in general settings to ask before quitting NVDA (if not checked, NVDA will exit without asking the user for action).
self.askToExitCheckBox=wx.CheckBox(self,wx.NewId(),label=_("Sho&w exit options when exiting NVDA"))
self.askToExitCheckBox.SetValue(config.conf["general"]["askToExit"])
settingsSizer.Add(self.askToExitCheckBox,border=10,flag=wx.BOTTOM)
settingsSizer.Add(self.askToExitCheckBox,border=settingsItemBorder,flag=settingsItemFlags)
# Translators: The label for a setting in general settings to play sounds when NVDA starts or exits.
self.playStartAndExitSoundsCheckBox=wx.CheckBox(self,wx.NewId(),label=_("&Play sounds when starting or exiting NVDA"))
self.playStartAndExitSoundsCheckBox.SetValue(config.conf["general"]["playStartAndExitSounds"])
settingsSizer.Add(self.playStartAndExitSoundsCheckBox,border=10,flag=wx.BOTTOM)
settingsSizer.Add(self.playStartAndExitSoundsCheckBox,border=settingsItemBorder,flag=settingsItemFlags)
logLevelSizer=wx.BoxSizer(wx.HORIZONTAL)
# Translators: The label for a setting in general settings to select logging level of NVDA as it runs (available options and what they are logged are found under comments for the logging level messages themselves).
logLevelLabel=wx.StaticText(self,-1,label=_("L&ogging level:"))
logLevelSizer.Add(logLevelLabel)
logLevelSizer.Add(logLevelLabel, border=dropDownLabelBorder, flag=dropDownLabelFlags)
logLevelListID=wx.NewId()
# Translators: A combo box to choose log level (possible options are info, debug warning, input/output and debug).
self.logLevelList=wx.Choice(self,logLevelListID,name=_("Log level"),choices=[name for level, name in self.LOG_LEVELS])
Expand All @@ -177,32 +181,32 @@ def makeSettings(self, settingsSizer):
else:
log.debugWarning("Could not set log level list to current log level")
logLevelSizer.Add(self.logLevelList)
settingsSizer.Add(logLevelSizer,border=10,flag=wx.BOTTOM)
settingsSizer.Add(logLevelSizer,border=settingsItemBorder,flag=settingsItemFlags)
# Translators: The label for a setting in general settings to allow NVDA to start after logging onto Windows (if checked, NvDA will start automatically after loggin into Windows; if not, user must start NVDA by pressing the shortcut key (CTRL+Alt+N by default).
self.startAfterLogonCheckBox = wx.CheckBox(self, wx.ID_ANY, label=_("&Automatically start NVDA after I log on to Windows"))
self.startAfterLogonCheckBox.SetValue(config.getStartAfterLogon())
if globalVars.appArgs.secure or not config.isInstalledCopy():
self.startAfterLogonCheckBox.Disable()
settingsSizer.Add(self.startAfterLogonCheckBox)
settingsSizer.Add(self.startAfterLogonCheckBox,border=settingsItemBorder,flag=settingsItemFlags)
# Translators: The label for a setting in general settings to allow NVDA to come up in Windows login screen (useful if user needs to enter passwords or if multiple user accounts are present to allow user to choose the correct account).
self.startOnLogonScreenCheckBox = wx.CheckBox(self, wx.ID_ANY, label=_("Use NVDA on the Windows logon screen (requires administrator privileges)"))
self.startOnLogonScreenCheckBox.SetValue(config.getStartOnLogonScreen())
if globalVars.appArgs.secure or not config.canStartOnSecureScreens():
self.startOnLogonScreenCheckBox.Disable()
settingsSizer.Add(self.startOnLogonScreenCheckBox)
settingsSizer.Add(self.startOnLogonScreenCheckBox,border=settingsItemBorder,flag=settingsItemFlags)
# Translators: The label for a button in general settings to copy current user settings to system settings (to allow current settings to be used in secure screens such as User Account Control (UAC) dialog).
self.copySettingsButton= wx.Button(self, wx.ID_ANY, label=_("Use currently saved settings on the logon and other secure screens (requires administrator privileges)"))
self.copySettingsButton.Bind(wx.EVT_BUTTON,self.onCopySettings)
if globalVars.appArgs.secure or not config.canStartOnSecureScreens():
self.copySettingsButton.Disable()
settingsSizer.Add(self.copySettingsButton)
settingsSizer.Add(self.copySettingsButton,border=settingsItemBorder,flag=settingsItemFlags)
if updateCheck:
# Translators: The label of a checkbox in general settings to toggle automatic checking for updated versions of NVDA (if not checked, user must check for updates manually).
item=self.autoCheckForUpdatesCheckBox=wx.CheckBox(self,label=_("Automatically check for &updates to NVDA"))
item.Value=config.conf["update"]["autoCheck"]
if globalVars.appArgs.secure:
item.Disable()
settingsSizer.Add(item)
settingsSizer.Add(item,border=settingsItemBorder,flag=settingsItemFlags)

def postInit(self):
self.languageList.SetFocus()
Expand Down