Skip to content

Change Magnifier settings into a more organised way #19913

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

Draft
Boumtchack wants to merge 4 commits into
base: master
Choose a base branch
from
+72 −69
Draft

Change Magnifier settings into a more organised way #19913

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4f4777
initial commit
Boumtchack Apr 7, 2026
541952b
copilot review
Boumtchack Apr 7, 2026
bf293c2
Merge branch 'master' into MagnifierSettingsRework
Boumtchack Apr 21, 2026
383c842
Merge branch 'master' into MagnifierSettingsRework
Boumtchack Apr 28, 2026
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
163 changes: 105 additions & 58 deletions source/gui/settingsDialogs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6000,101 +6000,148 @@ def makeSettings(
sizer=settingsSizer,
)

sHelper.addItem(wx.StaticText(self, label=self.panelDescription))

Comment thread
Boumtchack marked this conversation as resolved.
Outdated
# GENERAL GROUP
# Translators: This is the label for a group of general magnifier options in the
# magnifier settings panel
generalGroupText = _("General")
generalGroupSizer = wx.StaticBoxSizer(wx.VERTICAL, self, label=generalGroupText)
generalGroupBox = generalGroupSizer.GetStaticBox()
generalGroup = guiHelper.BoxSizerHelper(self, sizer=generalGroupSizer)
sHelper.addItem(generalGroup)

# ZOOM SETTINGS
# Translators: The label for a setting in magnifier settings to select the default zoom level.
defaultZoomLabelText = _("Default &zoom level:")
# Translators: The label for a setting in magnifier settings to select the zoom level.
zoomLabelText = _(" &zoom level:")
Comment thread
Boumtchack marked this conversation as resolved.
Outdated

zoomValues = magnifierConfig.ZoomLevel.zoom_range()
zoomChoices = magnifierConfig.ZoomLevel.zoom_strings()

self.defaultZoomList = sHelper.addLabeledControl(
defaultZoomLabelText,
self.zoomList = generalGroup.addLabeledControl(
zoomLabelText,
wx.Choice,
choices=zoomChoices,
)
self.bindHelpEvent(
"MagnifierDefaultZoom",
self.defaultZoomList,
"ZoomLevel",
Comment thread
Boumtchack marked this conversation as resolved.
Outdated
self.zoomList,
)

# Set default value from config
defaultZoom = magnifierConfig.getDefaultZoomLevel()
zoomIndex = bisect.bisect_left(zoomValues, defaultZoom)
# Set value from config
zoomLevel = magnifierConfig.getDefaultZoomLevel()
zoomIndex = bisect.bisect_left(zoomValues, zoomLevel)
# Find the closest value
if zoomIndex == 0:
closestIndex = 0
elif zoomIndex >= len(zoomValues):
closestIndex = len(zoomValues) - 1
else:
closestIndex = min(zoomIndex - 1, zoomIndex, key=lambda i: abs(zoomValues[i] - defaultZoom))
self.defaultZoomList.SetSelection(closestIndex)
closestIndex = min(zoomIndex - 1, zoomIndex, key=lambda i: abs(zoomValues[i] - zoomLevel))
self.zoomList.SetSelection(closestIndex)

# FILTER SETTINGS
# Translators: The label for a setting in magnifier settings to select the filter
filterLabelText = _(" &filter:")
Comment thread
Boumtchack marked this conversation as resolved.
Outdated
filterChoices = [f.displayString for f in Filter]
self.filterList = generalGroup.addLabeledControl(
filterLabelText,
wx.Choice,
choices=filterChoices,
)
self.bindHelpEvent("MagnifierFilter", self.filterList)
Comment thread
Boumtchack marked this conversation as resolved.

# Set value from config
filterValue = magnifierConfig.getDefaultFilter()
self.filterList.SetSelection(list(Filter).index(filterValue))

# TRUE CENTER
# Translators: The label for a setting in magnifier settings to select whether true center is used in full-screen mode
trueCenterText = _("Use &true center")
self.trueCenterCheckBox = generalGroup.addItem(
wx.CheckBox(generalGroupBox, label=trueCenterText),
)
self.bindHelpEvent(
"MagnifierUseTrueCenter",
self.trueCenterCheckBox,
)
self.trueCenterCheckBox.SetValue(magnifierConfig.isTrueCentered())

# PAN SETTINGS
# Translators: The label for a setting in magnifier settings to select the pan step size (in percentage).
panStepSizeLabelText = _("&Panning step size (%):")

self.defaultPanSpinCtrl = sHelper.addLabeledControl(
self.panSpinCtrl = generalGroup.addLabeledControl(
panStepSizeLabelText,
wx.SpinCtrl,
min=1,
max=100,
)
self.bindHelpEvent(
"magnifierPanStep",
self.defaultPanSpinCtrl,
)

# Set default value from config
defaultPan = magnifierConfig.getDefaultPanStep()
self.defaultPanSpinCtrl.SetValue(defaultPan)

# FILTER SETTINGS
# Translators: The label for a setting in magnifier settings to select the default filter
defaultFilterLabelText = _("Default &filter:")
filterChoices = [f.displayString for f in Filter]
self.defaultFilterList = sHelper.addLabeledControl(
defaultFilterLabelText,
wx.Choice,
choices=filterChoices,
)
self.bindHelpEvent("MagnifierDefaultFilter", self.defaultFilterList)

# Set default value from config
defaultFilter = magnifierConfig.getDefaultFilter()
self.defaultFilterList.SetSelection(list(Filter).index(defaultFilter))
"MagnifierPanStep",
Comment thread
Boumtchack marked this conversation as resolved.
Outdated
self.panSpinCtrl,
)

# Set value from config
panStep = magnifierConfig.getDefaultPanStep()
self.panSpinCtrl.SetValue(panStep)

# FOCUS GROUP
# Translators: This is the label for a group of focus magnifier options in the
# magnifier settings panel
focusGroupText = _("Focus")
focusGroupSizer = wx.StaticBoxSizer(wx.VERTICAL, self, label=focusGroupText)
focusGroupBox = focusGroupSizer.GetStaticBox()
focusGroup = guiHelper.BoxSizerHelper(self, sizer=focusGroupSizer)
sHelper.addItem(focusGroup)

# placeholder for options Mouse, System focus, Review, and Navigator object.
# Translators: placeholder for Mouse
mouseLabelText = _("Mouse (placeholder)")
focusGroup.addItem(wx.StaticText(focusGroupBox, label=mouseLabelText))
# Translators: placeholder for System focus
systemFocusLabelText = _("System focus (placeholder)")
focusGroup.addItem(wx.StaticText(focusGroupBox, label=systemFocusLabelText))
# Translators: placeholder for Review
reviewLabelText = _("Review (placeholder)")
focusGroup.addItem(wx.StaticText(focusGroupBox, label=reviewLabelText))
# Translators: placeholder for Navigator object
navigatorObjectLabelText = _("Navigator object (placeholder)")
focusGroup.addItem(wx.StaticText(focusGroupBox, label=navigatorObjectLabelText))

Comment thread
Boumtchack marked this conversation as resolved.
# FULLSCREEN GROUP
# Translators: This is the label for a group of fullscreen magnifier options in the
# magnifier settings panel
fullscreenGroupText = _("Fullscreen")
self.fullscreenGroupSizer = wx.StaticBoxSizer(wx.VERTICAL, self, label=fullscreenGroupText)
fullscreenGroupBox = self.fullscreenGroupSizer.GetStaticBox()
fullscreenGroup = guiHelper.BoxSizerHelper(self, sizer=self.fullscreenGroupSizer)
sHelper.addItem(fullscreenGroup)

# FULLSCREEN MODE SETTINGS
# Translators: The label for a setting in magnifier settings to select the default full-screen mode
defaultFullscreenModeLabelText = _("Default &fullscreen mode:")
# Translators: The label for a setting in magnifier settings to select the full-screen mode
fullscreenModeLabelText = _(" fullscreen &mode:")
Comment thread
Boumtchack marked this conversation as resolved.
Outdated
fullscreenModeChoices = [mode.displayString for mode in FullScreenMode] if FullScreenMode else []
self.defaultFullscreenModeList = sHelper.addLabeledControl(
defaultFullscreenModeLabelText,
self.fullscreenModeList = fullscreenGroup.addLabeledControl(
fullscreenModeLabelText,
wx.Choice,
choices=fullscreenModeChoices,
)
self.bindHelpEvent(
"MagnifierDefaultFullscreenFocusMode",
self.defaultFullscreenModeList,
"MagnifierFullscreenMode",
Comment thread
Boumtchack marked this conversation as resolved.
Outdated
self.fullscreenModeList,
)

# TRUE CENTER
# Translators: The label for a setting in magnifier settings to select whether true center is used in full-screen mode
trueCenterText = _("Use &true center in fullscreen mode")
self.trueCenterCheckBox = sHelper.addItem(wx.CheckBox(self, label=trueCenterText))
self.bindHelpEvent(
"MagnifierUseTrueCenter",
self.trueCenterCheckBox,
)
self.trueCenterCheckBox.SetValue(magnifierConfig.isTrueCentered())

# Set default value from config
defaultFullscreenMode = magnifierConfig.getDefaultFullscreenMode()
self.defaultFullscreenModeList.SetSelection(list(FullScreenMode).index(defaultFullscreenMode))
# Set value from config
fullscreenModeValue = magnifierConfig.getDefaultFullscreenMode()
self.fullscreenModeList.SetSelection(list(FullScreenMode).index(fullscreenModeValue))

# KEEP MOUSE CENTERED
# Translators: The label for a checkbox to keep the mouse pointer centered in the magnifier view
keepMouseCenteredText = _("Keep &mouse pointer centered in magnifier view")
self.keepMouseCenteredCheckBox = sHelper.addItem(wx.CheckBox(self, label=keepMouseCenteredText))
self.keepMouseCenteredCheckBox = fullscreenGroup.addItem(
wx.CheckBox(fullscreenGroupBox, label=keepMouseCenteredText),
)
self.bindHelpEvent(
"MagnifierKeepMouseCentered",
self.keepMouseCenteredCheckBox,
Expand All @@ -6103,15 +6150,15 @@ def makeSettings(

def onSave(self):
"""Save the current selections to config."""
selectedZoom = self.defaultZoomList.GetSelection()
selectedZoom = self.zoomList.GetSelection()
magnifierConfig.setDefaultZoomLevel(magnifierConfig.ZoomLevel.zoom_range()[selectedZoom])

magnifierConfig.setDefaultPanStep(self.defaultPanSpinCtrl.GetValue())
magnifierConfig.setDefaultPanStep(self.panSpinCtrl.GetValue())

selectedFilterIdx = self.defaultFilterList.GetSelection()
selectedFilterIdx = self.filterList.GetSelection()
magnifierConfig.setDefaultFilter(list(Filter)[selectedFilterIdx])

selectedModeIdx = self.defaultFullscreenModeList.GetSelection()
selectedModeIdx = self.fullscreenModeList.GetSelection()
magnifierConfig.setDefaultFullscreenMode(list(FullScreenMode)[selectedModeIdx])

config.conf["magnifier"]["isTrueCentered"] = self.trueCenterCheckBox.GetValue()
Expand Down
Loading