Improve accessibility for keyboard and screen reader users

src/autotype/AutoTypeSelectDialog.cpp

@@ -68,6 +68,8 @@ AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent)
     });
 
     m_ui->helpButton->setIcon(icons()->icon("system-help"));
+    m_ui->helpButton->setAccessibleName(tr("Show Auto-Type shortcuts"));
+    m_ui->helpButton->setFocusPolicy(Qt::TabFocus);
 
     m_ui->search->installEventFilter(this);
 

src/autotype/PickcharsDialog.cpp

@@ -52,7 +52,8 @@ PickcharsDialog::PickcharsDialog(const QString& string, QWidget* parent)
     for (const auto& ch : string) {
         auto btn = new QPushButton(QString::number(count + 1));
         btn->setProperty("char", ch);
-        btn->setProperty("count", count);
+        btn->setProperty("count", count);
+        btn->setAccessibleName(tr("Character %1, position %2").arg(ch).arg(count + 1));
         connect(btn, &QPushButton::clicked, this, &PickcharsDialog::charSelected);
         m_ui->charsGrid->addWidget(btn, count / width, count % width);
         m_lastSelected = count;

src/gui/ApplicationSettingsWidget.cpp

@@ -20,6 +20,7 @@
 #include "gui/osutils/OSUtilsBase.h"
 #include "ui_ApplicationSettingsWidgetGeneral.h"
 #include "ui_ApplicationSettingsWidgetSecurity.h"
+#include <QAccessible>
 #include <QDesktopServices>
 #include <QDir>
 #include <QLabel>
@@ -151,25 +152,45 @@ ApplicationSettingsWidget::ApplicationSettingsWidget(QWidget* parent)
     connect(m_generalUi->resetSettingsButton, SIGNAL(clicked()), SLOT(resetSettings()));
     connect(m_generalUi->importSettingsButton, SIGNAL(clicked()), SLOT(importSettings()));
     connect(m_generalUi->exportSettingsButton, SIGNAL(clicked()), SLOT(exportSettings()));
-    connect(m_generalUi->useAlternativeSaveCheckBox, SIGNAL(toggled(bool)),
-            m_generalUi->alternativeSaveComboBox, SLOT(setEnabled(bool)));
+    connect(m_generalUi->useAlternativeSaveCheckBox, &QCheckBox::toggled, this, [this](bool enabled) {
+        if (!enabled && m_generalUi->alternativeSaveComboBox->hasFocus()) {
+            m_generalUi->useAlternativeSaveCheckBox->setFocus();
+        }
+        m_generalUi->alternativeSaveComboBox->setEnabled(enabled);
+    });
 
-    connect(m_generalUi->backupBeforeSaveCheckBox, SIGNAL(toggled(bool)),
-            m_generalUi->backupFilePath, SLOT(setEnabled(bool)));
-    connect(m_generalUi->backupBeforeSaveCheckBox, SIGNAL(toggled(bool)),
-            m_generalUi->backupFilePathPicker, SLOT(setEnabled(bool)));
+    connect(m_generalUi->backupBeforeSaveCheckBox, &QCheckBox::toggled, this, [this](bool enabled) {
+        if (!enabled
+            && (m_generalUi->backupFilePath->hasFocus() || m_generalUi->backupFilePathPicker->hasFocus())) {
+            m_generalUi->backupBeforeSaveCheckBox->setFocus();
+        }
+        m_generalUi->backupFilePath->setEnabled(enabled);
+        m_generalUi->backupFilePathPicker->setEnabled(enabled);
+    });
     connect(m_generalUi->backupFilePathPicker, SIGNAL(pressed()), SLOT(selectBackupDirectory()));
     connect(m_generalUi->showExpiredEntriesOnDatabaseUnlockCheckBox, SIGNAL(toggled(bool)),
             SLOT(showExpiredEntriesOnDatabaseUnlockToggled(bool)));
     connect(m_generalUi->autoTypeAskCheckBox, SIGNAL(toggled(bool)),
             SLOT(autoTypeAskToggled(bool)));
 
-    connect(m_secUi->clearClipboardCheckBox, SIGNAL(toggled(bool)),
-            m_secUi->clearClipboardSpinBox, SLOT(setEnabled(bool)));
-    connect(m_secUi->clearSearchCheckBox, SIGNAL(toggled(bool)),
-            m_secUi->clearSearchSpinBox, SLOT(setEnabled(bool)));
-    connect(m_secUi->lockDatabaseIdleCheckBox, SIGNAL(toggled(bool)),
-            m_secUi->lockDatabaseIdleSpinBox, SLOT(setEnabled(bool)));
+    connect(m_secUi->clearClipboardCheckBox, &QCheckBox::toggled, this, [this](bool enabled) {
+        if (!enabled && m_secUi->clearClipboardSpinBox->hasFocus()) {
+            m_secUi->clearClipboardCheckBox->setFocus();
+        }
+        m_secUi->clearClipboardSpinBox->setEnabled(enabled);
+    });
+    connect(m_secUi->clearSearchCheckBox, &QCheckBox::toggled, this, [this](bool enabled) {
+        if (!enabled && m_secUi->clearSearchSpinBox->hasFocus()) {
+            m_secUi->clearSearchCheckBox->setFocus();
+        }
+        m_secUi->clearSearchSpinBox->setEnabled(enabled);
+    });
+    connect(m_secUi->lockDatabaseIdleCheckBox, &QCheckBox::toggled, this, [this](bool enabled) {
+        if (!enabled && m_secUi->lockDatabaseIdleSpinBox->hasFocus()) {
+            m_secUi->lockDatabaseIdleCheckBox->setFocus();
+        }
+        m_secUi->lockDatabaseIdleSpinBox->setEnabled(enabled);
+    });
     // clang-format on
 
     connect(m_generalUi->minimizeAfterUnlockCheckBox, &QCheckBox::toggled, this, [this](bool state) {
@@ -178,6 +199,9 @@ ApplicationSettingsWidget::ApplicationSettingsWidget(QWidget* parent)
         }
         m_secUi->lockDatabaseMinimizeCheckBox->setToolTip(
             state ? tr("This setting cannot be enabled when minimize on unlock is enabled.") : "");
+        if (state && m_secUi->lockDatabaseMinimizeCheckBox->hasFocus()) {
+            m_secUi->lockDatabaseIdleCheckBox->setFocus();
+        }
         m_secUi->lockDatabaseMinimizeCheckBox->setEnabled(!state);
     });
 
@@ -187,8 +211,12 @@ ApplicationSettingsWidget::ApplicationSettingsWidget(QWidget* parent)
             QString error;
             if (autoType()->registerGlobalShortcut(key, modifiers, &error)) {
                 m_generalUi->autoTypeShortcutWidget->setStyleSheet("");
+                m_generalUi->autoTypeShortcutWidget->setAccessibleDescription({});
             } else {
                 QToolTip::showText(mapToGlobal(rect().bottomLeft()), error);
+                m_generalUi->autoTypeShortcutWidget->setAccessibleDescription(error);
+                QAccessibleEvent alertEvent(m_generalUi->autoTypeShortcutWidget, QAccessible::Alert);
+                QAccessible::updateAccessibility(&alertEvent);
                 StateColorPalette statePalette;
                 auto color = statePalette.color(StateColorPalette::ColorRole::Error);
                 m_generalUi->autoTypeShortcutWidget->setStyleSheet(
@@ -658,18 +686,30 @@ void ApplicationSettingsWidget::autoSaveToggled(bool checked)
         m_generalUi->autoSaveOnExitCheckBox->setChecked(true);
         m_generalUi->autoSaveNonDataChangesCheckBox->setChecked(true);
     }
+    if (checked
+        && (m_generalUi->autoSaveOnExitCheckBox->hasFocus() || m_generalUi->autoSaveNonDataChangesCheckBox->hasFocus())) {
+        m_generalUi->autoSaveAfterEveryChangeCheckBox->setFocus();
+    }
     m_generalUi->autoSaveOnExitCheckBox->setEnabled(!checked);
     m_generalUi->autoSaveNonDataChangesCheckBox->setEnabled(!checked);
 }
 
 void ApplicationSettingsWidget::hideWindowOnCopyCheckBoxToggled(bool checked)
 {
+    if (!checked
+        && (m_generalUi->minimizeOnCopyRadioButton->hasFocus() || m_generalUi->dropToBackgroundOnCopyRadioButton->hasFocus())) {
+        m_generalUi->hideWindowOnCopyCheckBox->setFocus();
+    }
     m_generalUi->minimizeOnCopyRadioButton->setEnabled(checked);
     m_generalUi->dropToBackgroundOnCopyRadioButton->setEnabled(checked);
 }
 
 void ApplicationSettingsWidget::systrayToggled(bool checked)
 {
+    if (!checked
+        && (m_generalUi->trayIconAppearance->hasFocus() || m_generalUi->systrayMinimizeToTrayCheckBox->hasFocus())) {
+        m_generalUi->systrayShowCheckBox->setFocus();
+    }
     m_generalUi->trayIconAppearance->setEnabled(checked);
     m_generalUi->trayIconAppearanceLabel->setEnabled(checked);
     m_generalUi->systrayMinimizeToTrayCheckBox->setEnabled(checked);
@@ -682,23 +722,37 @@ void ApplicationSettingsWidget::rememberDatabasesToggled(bool checked)
         m_generalUi->openPreviousDatabasesOnStartupCheckBox->setChecked(false);
     }
 
+    if (!checked
+        && (m_generalUi->rememberLastDatabasesSpinbox->hasFocus() || m_generalUi->rememberLastKeyFilesCheckBox->hasFocus()
+            || m_generalUi->openPreviousDatabasesOnStartupCheckBox->hasFocus())) {
+        m_generalUi->rememberLastDatabasesCheckBox->setFocus();
+    }
     m_generalUi->rememberLastDatabasesSpinbox->setEnabled(checked);
     m_generalUi->rememberLastKeyFilesCheckBox->setEnabled(checked);
     m_generalUi->openPreviousDatabasesOnStartupCheckBox->setEnabled(checked);
 }
 
 void ApplicationSettingsWidget::checkUpdatesToggled(bool checked)
 {
+    if (!checked && m_generalUi->checkForUpdatesIncludeBetasCheckBox->hasFocus()) {
+        m_generalUi->checkForUpdatesOnStartupCheckBox->setFocus();
+    }
     m_generalUi->checkForUpdatesIncludeBetasCheckBox->setEnabled(checked);
 }
 
 void ApplicationSettingsWidget::showExpiredEntriesOnDatabaseUnlockToggled(bool checked)
 {
+    if (!checked && m_generalUi->showExpiredEntriesOnDatabaseUnlockOffsetSpinBox->hasFocus()) {
+        m_generalUi->showExpiredEntriesOnDatabaseUnlockCheckBox->setFocus();
+    }
     m_generalUi->showExpiredEntriesOnDatabaseUnlockOffsetSpinBox->setEnabled(checked);
 }
 
 void ApplicationSettingsWidget::autoTypeAskToggled(bool checked)
 {
+    if (!checked && m_generalUi->autoTypeSkipMainWindowConfirmationCheckBox->hasFocus()) {
+        m_generalUi->autoTypeAskCheckBox->setFocus();
+    }
     m_generalUi->autoTypeSkipMainWindowConfirmationCheckBox->setEnabled(checked);
 }
 

src/gui/ApplicationSettingsWidgetGeneral.ui

@@ -126,6 +126,12 @@
                 </item>
                 <item>
                  <widget class="QSpinBox" name="rememberLastDatabasesSpinbox">
+                  <property name="accessibleName">
+                   <string>Number of recent databases to remember</string>
+                  </property>
+                  <property name="accessibleDescription">
+                   <string>Sets how many previously used database files are kept in the recent files list.</string>
+                  </property>
                   <property name="suffix">
                    <string> recent files</string>
                   </property>
@@ -493,6 +499,12 @@
                   <property name="enabled">
                    <bool>false</bool>
                   </property>
+                  <property name="accessibleName">
+                   <string>Alternative saving method</string>
+                  </property>
+                  <property name="accessibleDescription">
+                   <string>Select how KeePassXC saves the database when the alternative saving method is enabled.</string>
+                  </property>
                   <property name="focusPolicy">
                    <enum>Qt::FocusPolicy::StrongFocus</enum>
                   </property>

src/gui/ApplicationSettingsWidgetSecurity.ui

@@ -76,6 +76,9 @@
       </item>
       <item row="2" column="1">
        <widget class="QSpinBox" name="clearSearchSpinBox">
+        <property name="accessibleName">
+         <string>Search query clear time in minutes</string>
+        </property>
         <property name="enabled">
          <bool>false</bool>
         </property>

src/gui/CategoryListWidget.cpp

@@ -33,6 +33,9 @@ CategoryListWidget::CategoryListWidget(QWidget* parent)
     m_itemDelegate = new CategoryListWidgetDelegate(m_ui->categoryList);
     m_ui->categoryList->setItemDelegate(m_itemDelegate);
 
+    // This widget is a composite tab stop; direct focus must enter the actual category list.
+    setFocusProxy(m_ui->categoryList);
+
     connect(m_ui->categoryList, SIGNAL(currentRowChanged(int)), SLOT(emitCategoryChanged(int)));
 
     connect(m_ui->scrollUp, SIGNAL(clicked()), SLOT(scrollCategoriesUp()));
@@ -118,12 +121,18 @@ void CategoryListWidget::resizeEvent(QResizeEvent* event)
 
 void CategoryListWidget::updateCategoryScrollButtons()
 {
+    const bool canScroll = m_ui->categoryList->verticalScrollBar()->maximum() > 0;
+
+    if (!canScroll && (m_ui->scrollUp->hasFocus() || m_ui->scrollDown->hasFocus())) {
+        m_ui->categoryList->setFocus(Qt::OtherFocusReason);
+    }
+
     m_ui->scrollUp->setEnabled(m_ui->categoryList->verticalScrollBar()->value() != 0);
     m_ui->scrollDown->setEnabled(m_ui->categoryList->verticalScrollBar()->value()
                                  != m_ui->categoryList->verticalScrollBar()->maximum());
 
-    m_ui->scrollUp->setVisible(m_ui->categoryList->verticalScrollBar()->maximum() > 0);
-    m_ui->scrollDown->setVisible(m_ui->scrollUp->isVisible());
+    m_ui->scrollUp->setVisible(canScroll);
+    m_ui->scrollDown->setVisible(canScroll);
 }
 
 void CategoryListWidget::scrollCategoriesUp()

src/gui/DatabaseOpenWidget.cpp

@@ -90,7 +90,12 @@ DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent)
         m_ui->addKeyFileLinkLabel->setVisible(!state);
         m_ui->selectKeyFileComponent->setVisible(state);
     });
-    connect(m_ui->useHardwareKeyCheckBox, &QCheckBox::toggled, m_ui->hardwareKeyCombo, &QComboBox::setEnabled);
+    connect(m_ui->useHardwareKeyCheckBox, &QCheckBox::toggled, this, [this](bool enabled) {
+        if (!enabled && m_ui->hardwareKeyCombo->hasFocus()) {
+            m_ui->useHardwareKeyCheckBox->setFocus(Qt::OtherFocusReason);
+        }
+        m_ui->hardwareKeyCombo->setEnabled(enabled);
+    });
 
     m_ui->selectKeyFileComponent->setVisible(false);
     toggleHardwareKeyComponent(false);

src/gui/DatabaseWidget.cpp

@@ -19,6 +19,7 @@
 #include "DatabaseWidget.h"
 
 #include <QApplication>
+#include <QAccessible>
 #include <QBoxLayout>
 #include <QCheckBox>
 #include <QDesktopServices>
@@ -157,21 +158,25 @@ DatabaseWidget::DatabaseWidget(QSharedPointer<Database> db, QWidget* parent)
     m_previewSplitter->setChildrenCollapsible(true);
 
     m_groupView->setObjectName("groupView");
+    m_groupView->setAccessibleName(tr("Groups"));
     m_groupView->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(m_groupView, SIGNAL(customContextMenuRequested(QPoint)), SLOT(emitGroupContextMenuRequested(QPoint)));
 
     m_entryView->setObjectName("entryView");
+    m_entryView->setAccessibleName(tr("Entries"));
     m_entryView->setContextMenuPolicy(Qt::CustomContextMenu);
     m_entryView->displayGroup(m_db->rootGroup());
     connect(m_entryView, SIGNAL(customContextMenuRequested(QPoint)), SLOT(emitEntryContextMenuRequested(QPoint)));
 
     // Add a notification for when we are searching
     m_searchingLabel->setObjectName("SearchBanner");
+    m_searchingLabel->setAccessibleName(tr("Search status"));
     m_searchingLabel->setText(tr("Searching…"));
     m_searchingLabel->setAlignment(Qt::AlignCenter);
     m_searchingLabel->setVisible(false);
 
     m_shareLabel->setObjectName("KeeShareBanner");
+    m_shareLabel->setAccessibleName(tr("Shared group status"));
     m_shareLabel->setRawText(tr("Shared group…"));
     m_shareLabel->setAlignment(Qt::AlignCenter);
     m_shareLabel->setVisible(false);
@@ -415,8 +420,16 @@ void DatabaseWidget::setSplitterSizes(const QHash<Config::ConfigKey, QList<int>>
 void DatabaseWidget::onConfigChanged(Config::ConfigKey key)
 {
     if (key == Config::GUI_HideGroupPanel) {
-        // Toggle the group splitter visibility and reset the size
-        m_groupSplitter->setVisible(!config()->get(Config::GUI_HideGroupPanel).toBool());
+        // Hiding the group panel can remove the focused group/tag view. Move
+        // focus to the entry view first so keyboard and screen-reader users
+        // are not left with focus on a hidden widget.
+        const bool hideGroupPanel = config()->get(Config::GUI_HideGroupPanel).toBool();
+        const auto focusWidget = QApplication::focusWidget();
+        if (hideGroupPanel && m_groupSplitter->isVisible() && focusWidget
+            && m_groupSplitter->isAncestorOf(focusWidget)) {
+            m_entryView->setFocus();
+        }
+        m_groupSplitter->setVisible(!hideGroupPanel);
         setSplitterSizes({{Config::GUI_SplitterState, QList<int>({})}});
     }
 }
@@ -1773,6 +1786,10 @@ void DatabaseWidget::search(const QString& searchtext)
     m_lastSearchText = searchtext;
 
     m_searchingLabel->setVisible(true);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+    QAccessibleAnnouncementEvent announcementEvent(m_searchingLabel, m_searchingLabel->text());
+    QAccessible::updateAccessibility(&announcementEvent);
+#endif
     m_shareLabel->setVisible(false);
 
     emit searchModeActivated();

src/gui/EditWidgetIcons.ui

@@ -35,6 +35,9 @@
      <property name="editTriggers">
       <set>QAbstractItemView::NoEditTriggers</set>
      </property>
+     <property name="tabKeyNavigation">
+      <bool>false</bool>
+     </property>
      <property name="movement">
       <enum>QListView::Static</enum>
      </property>

src/gui/EditWidgetProperties.ui

@@ -138,6 +138,9 @@
         <property name="selectionBehavior">
          <enum>QAbstractItemView::SelectRows</enum>
         </property>
+        <property name="tabKeyNavigation">
+         <bool>false</bool>
+        </property>
         <attribute name="horizontalHeaderDefaultSectionSize">
          <number>200</number>
         </attribute>
@@ -185,6 +188,8 @@
   <tabstop>createdEdit</tabstop>
   <tabstop>modifiedEdit</tabstop>
   <tabstop>uuidEdit</tabstop>
+  <tabstop>customDataTable</tabstop>
+  <tabstop>removeCustomDataButton</tabstop>
  </tabstops>
  <resources/>
  <connections/>