Improve accessibility of settings forms and dialogs
This commit is contained in:
@@ -80,6 +80,7 @@ class GuiPreferences(NDialog):
|
|||||||
# SideBar
|
# SideBar
|
||||||
self.sidebar = NPagedSideBar(self)
|
self.sidebar = NPagedSideBar(self)
|
||||||
self.sidebar.setLabelColor(SHARED.theme.helpText)
|
self.sidebar.setLabelColor(SHARED.theme.helpText)
|
||||||
|
self.sidebar.setAccessibleName(self.titleLabel.text())
|
||||||
self.sidebar.buttonClicked.connect(self._sidebarClicked)
|
self.sidebar.buttonClicked.connect(self._sidebarClicked)
|
||||||
|
|
||||||
# Form
|
# Form
|
||||||
|
|||||||
@@ -86,6 +86,7 @@ class GuiProjectSettings(NDialog):
|
|||||||
# SideBar
|
# SideBar
|
||||||
self.sidebar = NPagedSideBar(self)
|
self.sidebar = NPagedSideBar(self)
|
||||||
self.sidebar.setLabelColor(SHARED.theme.helpText)
|
self.sidebar.setLabelColor(SHARED.theme.helpText)
|
||||||
|
self.sidebar.setAccessibleName(self.titleLabel.text())
|
||||||
self.sidebar.addButton(self.tr("Settings"), self.PAGE_SETTINGS)
|
self.sidebar.addButton(self.tr("Settings"), self.PAGE_SETTINGS)
|
||||||
self.sidebar.addButton(self.tr("Status"), self.PAGE_STATUS)
|
self.sidebar.addButton(self.tr("Status"), self.PAGE_STATUS)
|
||||||
self.sidebar.addButton(self.tr("Importance"), self.PAGE_IMPORT)
|
self.sidebar.addButton(self.tr("Importance"), self.PAGE_IMPORT)
|
||||||
@@ -349,6 +350,7 @@ class _StatusPage(NFixedPage):
|
|||||||
self.listBox.setHeaderLabels([self.tr("Label"), self.tr("Usage")])
|
self.listBox.setHeaderLabels([self.tr("Label"), self.tr("Usage")])
|
||||||
self.listBox.setColumnWidth(self.C_LABEL, wCol0)
|
self.listBox.setColumnWidth(self.C_LABEL, wCol0)
|
||||||
self.listBox.setIndentation(0)
|
self.listBox.setIndentation(0)
|
||||||
|
self.listBox.setAccessibleName(pageLabel)
|
||||||
self.listBox.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
|
self.listBox.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
|
||||||
self.listBox.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
|
self.listBox.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
|
||||||
self.listBox.itemSelectionChanged.connect(self._onSelectionChanged)
|
self.listBox.itemSelectionChanged.connect(self._onSelectionChanged)
|
||||||
@@ -686,6 +688,7 @@ class _ReplacePage(NFixedPage):
|
|||||||
self.listBox.setHeaderLabels([self.tr("Keyword"), self.tr("Replace With")])
|
self.listBox.setHeaderLabels([self.tr("Keyword"), self.tr("Replace With")])
|
||||||
self.listBox.setColumnWidth(self.C_KEY, wCol0)
|
self.listBox.setColumnWidth(self.C_KEY, wCol0)
|
||||||
self.listBox.setIndentation(0)
|
self.listBox.setIndentation(0)
|
||||||
|
self.listBox.setAccessibleName(self.pageTitle.text())
|
||||||
self.listBox.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
|
self.listBox.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
|
||||||
self.listBox.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
|
self.listBox.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
|
||||||
self.listBox.itemSelectionChanged.connect(self._onSelectionChanged)
|
self.listBox.itemSelectionChanged.connect(self._onSelectionChanged)
|
||||||
|
|||||||
@@ -211,7 +211,8 @@ class NScrollableForm(QScrollArea):
|
|||||||
else:
|
else:
|
||||||
qWidget = widget
|
qWidget = widget
|
||||||
|
|
||||||
qLabel = QLabel(label or "", self)
|
text = label or ""
|
||||||
|
qLabel = QLabel(text, self)
|
||||||
qLabel.setIndent(self._indent)
|
qLabel.setIndent(self._indent)
|
||||||
qLabel.setBuddy(qWidget)
|
qLabel.setBuddy(qWidget)
|
||||||
|
|
||||||
@@ -227,6 +228,7 @@ class NScrollableForm(QScrollArea):
|
|||||||
row.addLayout(labelBox, stretch[0])
|
row.addLayout(labelBox, stretch[0])
|
||||||
if editable:
|
if editable:
|
||||||
self._editable[editable] = qHelp
|
self._editable[editable] = qHelp
|
||||||
|
text = f"{text}: {helpText}"
|
||||||
else:
|
else:
|
||||||
row.addWidget(qLabel, stretch[0])
|
row.addWidget(qLabel, stretch[0])
|
||||||
|
|
||||||
@@ -235,6 +237,7 @@ class NScrollableForm(QScrollArea):
|
|||||||
box.addWidget(qWidget, 1)
|
box.addWidget(qWidget, 1)
|
||||||
box.addWidget(QLabel(unit, self), 0)
|
box.addWidget(QLabel(unit, self), 0)
|
||||||
row.addLayout(box, stretch[1])
|
row.addLayout(box, stretch[1])
|
||||||
|
text = f"{text} Unit: {unit}"
|
||||||
elif isinstance(button, QAbstractButton):
|
elif isinstance(button, QAbstractButton):
|
||||||
box = QHBoxLayout()
|
box = QHBoxLayout()
|
||||||
box.addWidget(qWidget, 1)
|
box.addWidget(qWidget, 1)
|
||||||
@@ -243,10 +246,11 @@ class NScrollableForm(QScrollArea):
|
|||||||
else:
|
else:
|
||||||
row.addWidget(qWidget, stretch[1])
|
row.addWidget(qWidget, stretch[1])
|
||||||
|
|
||||||
|
self._first = False
|
||||||
self._layout.addLayout(row)
|
self._layout.addLayout(row)
|
||||||
if label:
|
if label:
|
||||||
self._index[label.strip()] = qWidget
|
self._index[label.strip()] = qWidget
|
||||||
self._first = False
|
qLabel.setAccessibleName(text)
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -104,6 +104,7 @@ class GuiBuildSettings(NToolDialog):
|
|||||||
# SideBar
|
# SideBar
|
||||||
self.sidebar = NPagedSideBar(self)
|
self.sidebar = NPagedSideBar(self)
|
||||||
self.sidebar.setLabelColor(SHARED.theme.helpText)
|
self.sidebar.setLabelColor(SHARED.theme.helpText)
|
||||||
|
self.sidebar.setAccessibleName(self.titleLabel.text())
|
||||||
|
|
||||||
self.sidebar.addLabel(self.tr("General"))
|
self.sidebar.addLabel(self.tr("General"))
|
||||||
self.sidebar.addButton(self.tr("Selection"), self.OPT_FILTERS)
|
self.sidebar.addButton(self.tr("Selection"), self.OPT_FILTERS)
|
||||||
|
|||||||
@@ -86,6 +86,7 @@ class GuiNovelDetails(NNonBlockingDialog):
|
|||||||
# SideBar
|
# SideBar
|
||||||
self.sidebar = NPagedSideBar(self)
|
self.sidebar = NPagedSideBar(self)
|
||||||
self.sidebar.setLabelColor(SHARED.theme.helpText)
|
self.sidebar.setLabelColor(SHARED.theme.helpText)
|
||||||
|
self.sidebar.setAccessibleName(self.titleLabel.text())
|
||||||
self.sidebar.addButton(self.tr("Overview"), self.PAGE_OVERVIEW)
|
self.sidebar.addButton(self.tr("Overview"), self.PAGE_OVERVIEW)
|
||||||
self.sidebar.addButton(self.tr("Contents"), self.PAGE_CONTENTS)
|
self.sidebar.addButton(self.tr("Contents"), self.PAGE_CONTENTS)
|
||||||
self.sidebar.setSelected(self.PAGE_OVERVIEW)
|
self.sidebar.setSelected(self.PAGE_OVERVIEW)
|
||||||
|
|||||||
Reference in New Issue
Block a user