WIP Accessibility

Source/CartManager.cpp

@@ -121,11 +121,11 @@ CartManager::CartManager(DexedAudioProcessorEditor *editor) : Component("CartMan
     mainWindow = editor;
     cartDir = DexedAudioProcessor::dexedCartDir;
 
-    activeCart.reset(new ProgramListBox("activepgm", 8));
+    activeCart.reset(new ProgramListBox("Active Programs Selector", 8));
     addAndMakeVisible(activeCart.get());
     activeCart->addListener(this);
 
-    browserCart.reset(new ProgramListBox("browserpgm", 2));
+    browserCart.reset(new ProgramListBox("Browser Programs Selector", 2));
     addAndMakeVisible(browserCart.get());
     browserCart->addListener(this);
 
@@ -140,6 +140,7 @@ CartManager::CartManager(DexedAudioProcessorEditor *editor) : Component("CartMan
     cartBrowser->addKeyListener(this);
     addAndMakeVisible(cartBrowser.get());
 
+    cartBrowser->setTitle("Cartridge file browser");
     cartBrowser->setDragAndDropDescription("Sysex Browser");
     cartBrowser->addListener(this);
 
@@ -234,8 +235,7 @@ void CartManager::programSelected(ProgramListBox *source, int pos) {
 
 void CartManager::buttonClicked(juce::Button *buttonThatWasClicked) {
     if ( buttonThatWasClicked == closeButton.get() ) {
-        mainWindow->startTimer(100);
-        getParentComponent()->setVisible(false);
+        hideCartridgeManager();
         return;
     }
 
@@ -411,15 +411,25 @@ void CartManager::initialFocus() {
     cartBrowser->grabKeyboardFocus();
 }
 
+void CartManager::hideCartridgeManager() {
+        mainWindow->startTimer(100);
+        getParentComponent()->setVisible(false);
+}
+
 bool CartManager::keyPressed(const KeyPress& key, Component* originatingComponent) {
-    if ( key.getKeyCode() == 13 ) {
+    if ( key.getKeyCode() == KeyPress::returnKey ) {
         File file = cartBrowser->getSelectedFile();
         if ( file.isDirectory() )
             return true;
         mainWindow->loadCart(file);
         activeCart->setCartridge(mainWindow->processor->currentCart);
         return true;
     }
+    if ( key.getKeyCode() == KeyPress::escapeKey ) {
+        hideCartridgeManager();
+        return true;
+    }
+
     return false;
 }
 

Source/CartManager.h

@@ -109,6 +109,7 @@ class CartManager  : public Component, public Button::Listener, public DragAndDr
     virtual bool keyPressed(const KeyPress& key, Component* originatingComponent) override;
 
     void initialFocus();
+    void hideCartridgeManager();
 
     std::unique_ptr<ComponentTraverser> createFocusTraverser() override;
 };

Source/OperatorEditor.cpp

@@ -314,6 +314,10 @@ OperatorEditor::OperatorEditor ()
 
     background = lookAndFeel->imageOperator;
 
+    opSwitch->setTitle("Operator switch");
+    kbdLeftCurve->setTitle("Keyboard Left Curve");
+    kbdRightCurve->setTitle("Keyboard Right Curve");
+
     //[/Constructor]
 }
 

Source/PluginEditor.cpp

@@ -115,6 +115,10 @@ void DexedAudioProcessorEditor::cartShow() {
     cartManager.initialFocus();
 }
 
+std::unique_ptr<ComponentTraverser> DexedAudioProcessorEditor::createFocusTraverser() {
+    return std::make_unique<FocusTraverser>();
+}
+
 void DexedAudioProcessorEditor::loadCart(File file) {
     Cartridge cart;
 

Source/PluginEditor.h

@@ -65,7 +65,8 @@ class DexedAudioProcessorEditor  : public AudioProcessorEditor, public ComboBox:
 
     virtual bool isInterestedInFileDrag (const StringArray &files) override;
     virtual void filesDropped (const StringArray &files, int x, int y ) override;
-
+    std::unique_ptr<ComponentTraverser> createFocusTraverser() override;
+
     static const int WINDOW_SIZE_X = 866;
     static const int WINDOW_SIZE_Y = 674;
 };

Source/PluginParam.h

@@ -23,6 +23,9 @@
 
 #include "../JuceLibraryCode/JuceHeader.h"
 
+#include <juce_gui_basics/detail/juce_ButtonAccessibilityHandler.h>
+#include <juce_gui_basics/juce_gui_basics.h>
+
 class DexedAudioProcessor;
 
 class Ctrl : public Slider::Listener, public Button::Listener, public ComboBox::Listener, public MouseListener {

Source/ProgramListBox.cpp

@@ -31,6 +31,7 @@ ProgramListBox::ProgramListBox(const String name, int numCols) : Component(name)
     dragCandidate = -1;
     readOnly = false;
     programNames.clear();
+    setTitle(name);
     setWantsKeyboardFocus(true);
     addKeyListener(this);
 }

Source/ProgramListBox.h

@@ -69,6 +69,21 @@ class ProgramListBox : public Component, public DragAndDropTarget, public KeyLis
     void itemDropped(const SourceDetails& dragSourceDetails) override;
 
     bool keyPressed (const KeyPress& key, Component* originatingComponent) override;
+
+    struct ProgramListBoxAH : public juce::AccessibilityHandler {
+        explicit ProgramListBoxAH(ProgramListBox *s): od(s), juce::AccessibilityHandler(*s, juce::AccessibilityRole::table,
+            juce::AccessibilityActions().addAction(juce::AccessibilityActionType::focus,
+                                                            [this]() {  })) {
+        }
+
+        ProgramListBox *od;
+        JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ProgramListBoxAH);
+    };
+
+
+    std::unique_ptr< AccessibilityHandler > createAccessibilityHandler(ProgramListBox *programListBox) {
+        return std::make_unique<ProgramListBoxAH>(programListBox);
+    }
 };