Skip to content

Fix preferences tab order #498

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

Open
miakh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix preferences tab order #498

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
90 changes: 90 additions & 0 deletions Render/prefpage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,62 @@
from Render.rdrhandler import RendererHandler
from Render.virtualenv import ensure_rendervenv, remove_virtualenv

_TAB_ORDER = (
# General
"lineEdit_3",
"spinBox",
"spinBox_2",
# Appleseed
"prefFileChooser2",
"AppleseedCli_Test",
"prefFileChooser3",
"AppleseedStudio_Test",
"prefLineEdit1",
# Cycles
"fileChooser_4",
"Cycles_Test",
"lineEdit_2",
# LuxCore
"fileChooser",
"LuxcoreCli_Test",
"fileChooser_2",
"LuxcoreUi_Test",
"comboBox",
"lineEdit_4",
# PovRay
"fileChooser_3",
"Povray_Test",
"lineEdit",
# OSPRay
"fileChooser_8",
"Ospray_Test",
"lineEdit_6",
# PBRT
"fileChooser_9",
"Pbrt_Test",
"lineEdit_7",
# LuxRender (deprecated)
"fileChooser_5",
"fileChooser_6",
"lineEdit_5",
# Plugins
"checkBox_7",
"checkBox_9",
"checkBox_14",
"checkBox_11",
"ResetVenv",
# Advanced
"checkBox_8",
"checkBox_10",
"checkBox_3",
"checkBox_6",
"checkBox",
"checkBox_2",
"checkBox_4",
"spinBox_3",
"checkBox_5",
)

# ===========================================================================
# Main class
# ===========================================================================
Expand All @@ -76,6 +132,7 @@ def __init__(self, parent=None):
page = Gui.PySideUic.loadUi(PREFPAGE, self)
self.setLayout(page.layout())
self.setWindowTitle(page.windowTitle())
_set_tab_order(self)

# Connect test buttons
test_buttons = (
Expand Down Expand Up @@ -166,6 +223,39 @@ def reset_venv(self):
# ===========================================================================


def _set_tab_order(page):
"""Set a visual top-to-bottom tab order for preference controls."""
controls = []
missing = []
for name in _TAB_ORDER:
widget = page.findChild(QWidget, name)
if widget is None:
missing.append(name)
continue

if widget.metaObject().className() == "Gui::PrefFileChooser":
children = [
child
for child in widget.children()
if isinstance(child, QWidget)
and child.focusPolicy() & Qt.TabFocus
]
controls.extend(children)
if not children:
missing.append(name)
else:
controls.append(widget)

if missing:
App.Console.PrintWarning(
"Render preferences: cannot set complete tab order; "
f"missing controls: {', '.join(missing)}\n"
)

for current, following in zip(controls, controls[1:]):
QWidget.setTabOrder(current, following)


def _load_settings_helper(widget):
"""Load settings to a widget (helper).

Expand Down