WIP CartManager acessibility

Source/CMakeLists.txt

@@ -21,7 +21,7 @@ juce_add_plugin("${BaseTargetName}"
         NEEDS_MIDI_INPUT TRUE
         NEEDS_MIDI_OUTPUT TRUE
         IS_MIDI_EFFECT FALSE
-        EDITOR_WANTS_KEYBOARD_FOCUS FALSE
+        EDITOR_WANTS_KEYBOARD_FOCUS TRUE
         PLUGIN_MANUFACTURER_CODE DGSB
         PLUGIN_CODE Dexd
         FORMATS ${DEXED_JUCE_FORMATS}

Source/CartManager.cpp

@@ -219,14 +219,14 @@ void CartManager::updateCartFilename() {
 
 void CartManager::programSelected(ProgramListBox *source, int pos) {
     if ( source == activeCart.get() ) {
-        browserCart->setSelected(-1);
+        browserCart->setActive(-1);
         mainWindow->processor->setCurrentProgram(pos);
         mainWindow->processor->updateHostDisplay();
     } else {
         uint8_t unpackPgm[161];
         source->getCurrentCart().unpackProgram(unpackPgm, pos);
-        activeCart->setSelected(-1);
-        browserCart->setSelected(pos);
+        activeCart->setActive(-1);
+        browserCart->setActive(pos);
         repaint();
         mainWindow->processor->updateProgramFromSysex((uint8_t *) unpackPgm);
         mainWindow->processor->updateHostDisplay();
@@ -316,8 +316,8 @@ void CartManager::fileClicked(const File& file, const MouseEvent& e) {
 
 void CartManager::setActiveProgram(int idx, String activeName) {
     if ( activeCart->programNames[idx] == activeName ) {
-        activeCart->setSelected(idx);
-        browserCart->setSelected(-1);
+        activeCart->setActive(idx);
+        browserCart->setActive(-1);
     }
     activeCart->repaint();
 }
@@ -347,7 +347,7 @@ void CartManager::selectionChanged() {
     } else {
         browserCart->readOnly = false;
     }
-    browserCart->setSelected(-1);
+    browserCart->setActive(-1);
     browserCart->setCartridge(browserSysex);
 }
 

Source/GlobalEditor.cpp

@@ -453,13 +453,15 @@ GlobalEditor::GlobalEditor ()
     lfoType->addItem("SINE", 5);
     lfoType->addItem("S&HOLD", 6);
     lfoType->setImage(lookAndFeel->imageLFO);
+    lfoType->setTitle("LFO Waveform");
 
     programs = programSelector.get();
 
     background = lookAndFeel->imageGlobal;
     imageLight = lookAndFeel->imageLight;
     setTitle("Global Parameters");
     setFocusContainerType(FocusContainerType::focusContainer);
+    setWantsKeyboardFocus(true);
     aboutButton->setTitle("About DEXED");
     //[/Constructor]
 }

Source/OperatorEditor.cpp

@@ -297,7 +297,7 @@ OperatorEditor::OperatorEditor ()
 
     light = lookAndFeel->imageLight;
     Image tmp = lookAndFeel->imageScaling;
-
+    
     kbdLeftCurve->addItem("-LN", 1);
     kbdLeftCurve->addItem("-EX", 2);
     kbdLeftCurve->addItem("+EX", 3);
@@ -313,12 +313,12 @@ OperatorEditor::OperatorEditor ()
     kbdRightCurve->setImage(tmp, posRight);
 
     background = lookAndFeel->imageOperator;
-
     opSwitch->setTitle("Operator switch");
     opMode->setTitle("Operator Mode");
     kbdLeftCurve->setTitle("Keyboard Left Curve");
     kbdRightCurve->setTitle("Keyboard Right Curve");
 
+    setWantsKeyboardFocus(true);
     //[/Constructor]
 }
 
@@ -629,6 +629,10 @@ void OperatorEditor::mouseDown(const MouseEvent &event) {
     }
 }
 
+void OperatorEditor::toggleOpSwitch() {
+    opSwitch->setToggleState(!opSwitch->getToggleState(), dontSendNotification);
+}
+
 //[/MiscUserCode]
 
 

Source/OperatorEditor.h

@@ -54,6 +54,7 @@ class OperatorEditor  : public Component,
     void updateDisplay();
     void updateEnvPos(char pos);
     void mouseDown(const MouseEvent& e) override;
+    void toggleOpSwitch();
     //[/UserMethods]
 
     void paint (juce::Graphics& g) override;

Source/PluginEditor.cpp

@@ -37,7 +37,7 @@ DexedAudioProcessorEditor::DexedAudioProcessorEditor (DexedAudioProcessor* owner
       cartManager(this)
 {
     setSize(WINDOW_SIZE_X, (ownerFilter->showKeyboard ? WINDOW_SIZE_Y : WINDOW_SIZE_Y - 94));
-
+    setExplicitFocusOrder(1);
     processor = ownerFilter;
 
     lookAndFeel->setDefaultLookAndFeel(lookAndFeel);
@@ -89,6 +89,7 @@ DexedAudioProcessorEditor::DexedAudioProcessorEditor (DexedAudioProcessor* owner
     cartManagerCover.addChildComponent(&cartManager);
     cartManager.setVisible(true);
 
+    addKeyListener(this);
     updateUI();
     startTimer(100);
 }
@@ -516,3 +517,34 @@ void DexedAudioProcessorEditor::filesDropped (const StringArray &files, int x, i
             "Related to file \'"+fn.toStdString()+"\', an unknown exception occured.");
     };
 }
+
+bool DexedAudioProcessorEditor::keyPressed(const KeyPress& key, Component* originatingComponent) {
+    int keycode = key.getKeyCode();
+    ModifierKeys mods = key.getModifiers();
+
+    TRACE("key pressed: %d\n", keycode);
+
+    if ( (keycode >= '1' && keycode <= '6') && mods.isCtrlDown() ) {
+        int op = keycode - '1';
+
+        if ( mods.isShiftDown() ) {
+            operators[op].toggleOpSwitch();
+            return true;
+        }
+
+        operators[op].grabKeyboardFocus();
+        return true;
+    }
+
+    if ( keycode == 'G' && mods.isCtrlDown() ) {
+        global.grabKeyboardFocus();
+        return true;
+    }
+
+    if ( keycode == 'L' && mods.isCtrlDown() ) {
+        cartShow();
+        return true;
+    }
+
+    return false;
+}

Source/PluginEditor.h

@@ -32,7 +32,7 @@
 /**
 */
 class DexedAudioProcessorEditor  : public AudioProcessorEditor, public ComboBox::Listener, public Timer,
-                                   public FileDragAndDropTarget {
+                                   public FileDragAndDropTarget, public KeyListener {
     MidiKeyboardComponent midiKeyboard;
     OperatorEditor operators[6];
     Colour background;
@@ -67,6 +67,8 @@ class DexedAudioProcessorEditor  : public AudioProcessorEditor, public ComboBox:
     virtual void filesDropped (const StringArray &files, int x, int y ) override;
     std::unique_ptr<ComponentTraverser> createFocusTraverser() override;
 
+    bool keyPressed(const KeyPress& key, Component* originatingComponent) override;
+
     static const int WINDOW_SIZE_X = 866;
     static const int WINDOW_SIZE_Y = 674;
 };

Source/PluginProcessor.cpp

@@ -814,6 +814,7 @@ AudioProcessorEditor* DexedAudioProcessor::createEditor() {
         setDpiScaleFactor(1.0);
     else 
         setDpiScaleFactor(scaleFactor);
+
     return editor;
 }