Improve accessibility

.github/workflows/ci/helpers.sh

@@ -24,7 +24,10 @@ list_cache()
 
 run_tests()
 {
-  "$python" setup.py -q test -- --color=yes --durations=5 -ra "$@"
+  test_cmd=(env QT_QPA_PLATFORM=offscreen "$python" -m pytest --color=yes --durations=5 "$@")
+  run "$python" setup.py -q egg_info
+  info "$(printf "%q " "${test_cmd[@]}")"
+  "${test_cmd[@]}"
 }
 
 setup_cache_name()

.github/workflows/ci/skiplist_job_build.txt

@@ -1,5 +1,4 @@
-.github/workflows/ci/skiplist_job_test.txt
-.github/workflows/ci/skiplist_job_test_packaging.txt
+.github/workflows/ci/skiplist_job_test*.txt
 .gitignore
 pyproject.toml
 reqs/packaging.txt

.github/workflows/ci/skiplist_job_test.txt

@@ -1,4 +1,5 @@
 .github/workflows/ci/skiplist_job_build.txt
+.github/workflows/ci/skiplist_job_test_gui_qt.txt
 .github/workflows/ci/skiplist_job_test_packaging.txt
 .gitignore
 LICENSE.txt
@@ -13,5 +14,6 @@ reqs/build.txt
 reqs/dist_*.txt
 reqs/packaging.txt
 reqs/setup.txt
+test/gui_qt/*
 windows/*
 {EOF}

.github/workflows/ci/skiplist_job_test_gui_qt.txt

@@ -0,0 +1,16 @@
+.github/workflows/ci/skiplist_job_build.txt
+.github/workflows/ci/skiplist_job_test.txt
+.github/workflows/ci/skiplist_job_test_packaging.txt
+.gitignore
+LICENSE.txt
+linux/*
+MANIFEST.in
+osx/*_resources
+osx/make_app.sh
+pyproject.toml
+reqs/build.txt
+reqs/packaging.txt
+reqs/setup.txt
+test/test_*
+windows/*
+{EOF}

.github/workflows/ci/skiplist_job_test_packaging.txt

@@ -1,5 +1,5 @@
 .github/workflows/ci/skiplist_job_build.txt
-.github/workflows/ci/skiplist_job_test.txt
+.github/workflows/ci/skiplist_job_test*.txt
 .github/workflows/ci/skiplist_os_*.txt
 reqs/build.txt
 reqs/release.txt

.github/workflows/ci/workflow_context.yml

@@ -39,6 +39,7 @@ jobs:
     type: test
     reqs: ['dist', 'test']
     skiplists: ['job_test', 'os_linux']
+    test_args: -p no:pytest-qt --ignore=test/gui_qt
   - <<: *test
     <<: *dist_macos
     cache_extra_deps: ['osx/deps.sh']
@@ -61,6 +62,14 @@ jobs:
     variant: Python 3.9
     python: '3.9'
 
+  # Qt GUI tests.
+  - <<: *test
+    type: test_gui_qt
+    variant: Qt GUI
+    reqs: ['dist', 'dist_extra_gui_qt', 'test']
+    skiplists: ['job_test_gui_qt']
+    test_args: test/gui_qt
+
   # Packaging tests.
   - <<: *dist_other
     type: test_packaging

.github/workflows/ci/workflow_template.yml

@@ -145,11 +145,17 @@ jobs:
           <% endif %>
 
       <% endif %>
-      <% if j.type == 'test' %>
+      <% if j.type == 'test_gui_qt' %>
+      - name: Build UI
+        run: python setup.py build_ui
+
+      <% endif %>
+      <% if j.type in ['test', 'test_gui_qt'] %>
       # Test {{{
 
       - name: Run tests
-        run: run_tests
+        run: run_tests <@ j.test_args @>
+
 
       # }}}
 

MANIFEST.in

@@ -22,9 +22,11 @@ include plover/messages/*/LC_MESSAGES/*.po
 include plover/messages/plover.pot
 include plover_build_utils/*.sh
 include pyproject.toml
+include pytest.ini
 include reqs/*.txt
 include test/__init__.py
 include test/conftest.py
+include test/gui_qt/test_*.py
 include tox.ini
 include windows/*
 # Exclude: CI/Git/GitHub specific files,

news.d/api/1332.break.md

@@ -0,0 +1,4 @@
+The custom `test` command implementation provided by `plover_build_utils.setup.Test` has been removed:
+- support for it on setuptools' side has been deprecated since version 41.5.0
+- the custom handling of arguments conflicts with the use of some pytest options (e.g. `-m MARKEXPR`)
+- the workaround for pytest cache handling is not necessary anymore

news.d/feature/1308.ui.md

@@ -0,0 +1,6 @@
+Improve accessibility:
+- Disable tag-key navigation in tables, so focusing a table does not lock global tab-key navigation to it.
+- Remove some container widget, tweak focus rules to avoid extra unnecessary steps when using tab-key navigation (like selecting the dictionaries widget outer frame).
+- In form layouts, link each widget to its label (like each option in the configuration dialog).
+- Set the accessible name / description of focusable widgets.
+- Use lists for the dictionaries widget, suggestions widget, and the paper tape.

news.d/feature/1332.ui.md

@@ -0,0 +1,6 @@
+Improve accessibility:
+- Disable tag-key navigation in tables, so focusing a table does not lock global tab-key navigation to it.
+- Remove some container widget, tweak focus rules to avoid extra unnecessary steps when using tab-key navigation (like selecting the dictionaries widget outer frame).
+- In form layouts, link each widget to its label (like each option in the configuration dialog).
+- Set the accessible name / description of focusable widgets.
+- Use lists for the dictionaries widget, suggestions widget, and the paper tape.

plover/config.py

@@ -57,6 +57,9 @@ def replace(self, **kwargs):
     def from_dict(d):
         return DictionaryConfig(**d)
 
+    def __repr__(self):
+        return 'DictionaryConfig(%r, %r)' % (self.short_path, self.enabled)
+
 
 ConfigOption = namedtuple('ConfigOption', '''
                           name default

plover/gui_qt/add_translation_widget.ui

@@ -31,6 +31,16 @@
    </property>
    <item>
     <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Dictionary:</string>
+       </property>
+       <property name="buddy">
+        <cstring>dictionary</cstring>
+       </property>
+      </widget>
+     </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label">
        <property name="sizePolicy">
@@ -42,6 +52,9 @@
        <property name="text">
         <string>Strokes:</string>
        </property>
+       <property name="buddy">
+        <cstring>strokes</cstring>
+       </property>
       </widget>
      </item>
      <item row="1" column="1">
@@ -52,6 +65,9 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="accessibleName">
+        <string>Strokes</string>
+       </property>
       </widget>
      </item>
      <item row="2" column="0">
@@ -65,6 +81,9 @@
        <property name="text">
         <string>Translation:</string>
        </property>
+       <property name="buddy">
+        <cstring>translation</cstring>
+       </property>
       </widget>
      </item>
      <item row="2" column="1">
@@ -75,17 +94,19 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Dictionary:</string>
+       <property name="accessibleName">
+        <string>Translation</string>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="QComboBox" name="dictionary">
+       <property name="accessibleName">
+        <string>Dictionary</string>
+       </property>
+       <property name="accessibleDescription">
+        <string>Select the target dictionary for the new translation.</string>
+       </property>
        <property name="editable">
         <bool>false</bool>
        </property>
@@ -94,51 +115,58 @@
     </layout>
    </item>
    <item>
-    <widget class="QLabel" name="strokes_info">
+    <widget class="QTextEdit" name="strokes_info">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="accessibleName">
+      <string>Existing mappings (strokes)</string>
+     </property>
      <property name="frameShape">
       <enum>QFrame::Box</enum>
      </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
      <property name="textInteractionFlags">
       <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
      </property>
+     <property name="text" stdset="0">
+      <string/>
+     </property>
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="translation_info">
+    <widget class="QTextEdit" name="translation_info">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="accessibleName">
+      <string>Existing mappings (translations)</string>
+     </property>
      <property name="frameShape">
       <enum>QFrame::Box</enum>
      </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
      <property name="textInteractionFlags">
       <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
      </property>
+     <property name="text" stdset="0">
+      <string/>
+     </property>
     </widget>
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>strokes</tabstop>
+  <tabstop>translation</tabstop>
+  <tabstop>strokes_info</tabstop>
+  <tabstop>translation_info</tabstop>
+  <tabstop>dictionary</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>

plover/gui_qt/config_file_widget.ui

@@ -21,7 +21,14 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QLineEdit" name="path"/>
+    <widget class="QLineEdit" name="path">
+     <property name="accessibleName">
+      <string>Log file path.</string>
+     </property>
+     <property name="accessibleDescription">
+      <string>Path to the log file.</string>
+     </property>
+    </widget>
    </item>
    <item>
     <widget class="QPushButton" name="pushButton">
@@ -31,6 +38,12 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="accessibleName">
+      <string>Browse.</string>
+     </property>
+     <property name="accessibleDescription">
+      <string>Open a file picker to select the log file.</string>
+     </property>
      <property name="text">
       <string>Browse</string>
      </property>