diff --git a/novelwriter/dialogs/preferences.py b/novelwriter/dialogs/preferences.py index f98374af..bf330101 100644 --- a/novelwriter/dialogs/preferences.py +++ b/novelwriter/dialogs/preferences.py @@ -80,6 +80,7 @@ class GuiPreferences(NDialog): # SideBar self.sidebar = NPagedSideBar(self) self.sidebar.setLabelColor(SHARED.theme.helpText) + self.sidebar.setAccessibleName(self.titleLabel.text()) self.sidebar.buttonClicked.connect(self._sidebarClicked) # Form diff --git a/novelwriter/dialogs/projectsettings.py b/novelwriter/dialogs/projectsettings.py index 9c8190be..623be345 100644 --- a/novelwriter/dialogs/projectsettings.py +++ b/novelwriter/dialogs/projectsettings.py @@ -86,6 +86,7 @@ class GuiProjectSettings(NDialog): # SideBar self.sidebar = NPagedSideBar(self) 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("Status"), self.PAGE_STATUS) 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.setColumnWidth(self.C_LABEL, wCol0) self.listBox.setIndentation(0) + self.listBox.setAccessibleName(pageLabel) self.listBox.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows) self.listBox.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) 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.setColumnWidth(self.C_KEY, wCol0) self.listBox.setIndentation(0) + self.listBox.setAccessibleName(self.pageTitle.text()) self.listBox.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows) self.listBox.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) self.listBox.itemSelectionChanged.connect(self._onSelectionChanged) diff --git a/novelwriter/extensions/configlayout.py b/novelwriter/extensions/configlayout.py index 8183f9a9..b82a0997 100644 --- a/novelwriter/extensions/configlayout.py +++ b/novelwriter/extensions/configlayout.py @@ -211,7 +211,8 @@ class NScrollableForm(QScrollArea): else: qWidget = widget - qLabel = QLabel(label or "", self) + text = label or "" + qLabel = QLabel(text, self) qLabel.setIndent(self._indent) qLabel.setBuddy(qWidget) @@ -227,6 +228,7 @@ class NScrollableForm(QScrollArea): row.addLayout(labelBox, stretch[0]) if editable: self._editable[editable] = qHelp + text = f"{text}: {helpText}" else: row.addWidget(qLabel, stretch[0]) @@ -235,6 +237,7 @@ class NScrollableForm(QScrollArea): box.addWidget(qWidget, 1) box.addWidget(QLabel(unit, self), 0) row.addLayout(box, stretch[1]) + text = f"{text} Unit: {unit}" elif isinstance(button, QAbstractButton): box = QHBoxLayout() box.addWidget(qWidget, 1) @@ -243,10 +246,11 @@ class NScrollableForm(QScrollArea): else: row.addWidget(qWidget, stretch[1]) + self._first = False self._layout.addLayout(row) if label: self._index[label.strip()] = qWidget - self._first = False + qLabel.setAccessibleName(text) return diff --git a/novelwriter/tools/manussettings.py b/novelwriter/tools/manussettings.py index 3fa9bb03..855f64ea 100644 --- a/novelwriter/tools/manussettings.py +++ b/novelwriter/tools/manussettings.py @@ -104,6 +104,7 @@ class GuiBuildSettings(NToolDialog): # SideBar self.sidebar = NPagedSideBar(self) self.sidebar.setLabelColor(SHARED.theme.helpText) + self.sidebar.setAccessibleName(self.titleLabel.text()) self.sidebar.addLabel(self.tr("General")) self.sidebar.addButton(self.tr("Selection"), self.OPT_FILTERS) diff --git a/novelwriter/tools/noveldetails.py b/novelwriter/tools/noveldetails.py index fbbcbb5d..75580233 100644 --- a/novelwriter/tools/noveldetails.py +++ b/novelwriter/tools/noveldetails.py @@ -86,6 +86,7 @@ class GuiNovelDetails(NNonBlockingDialog): # SideBar self.sidebar = NPagedSideBar(self) 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("Contents"), self.PAGE_CONTENTS) self.sidebar.setSelected(self.PAGE_OVERVIEW)